diff --git a/hypha/apply/activity/adapters/emails.py b/hypha/apply/activity/adapters/emails.py
index e4bc3a4f51..7f2aff0371 100644
--- a/hypha/apply/activity/adapters/emails.py
+++ b/hypha/apply/activity/adapters/emails.py
@@ -146,13 +146,28 @@ def get_subject(self, message_type, source):
                         source=source
                     )
                 )
+            elif message_type == MESSAGES.COMMENT:
+                subject = _(
+                    "New comment on application to {ORG_LONG_NAME}: {source.title}"
+                ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source)
+            elif message_type in {
+                MESSAGES.DETERMINATION_OUTCOME,
+                MESSAGES.BATCH_DETERMINATION_OUTCOME,
+            }:
+                subject = _(
+                    "Your application to {ORG_LONG_NAME} has been reviewed: {source.title_text_display}"
+                ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source)
+            elif message_type == MESSAGES.DRAFT_SUBMISSION:
+                subject = _(
+                    "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+                ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source)
             else:
                 try:
                     subject = source.page.specific.subject or _(
                         "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
                     ).format(ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source)
                 except AttributeError:
-                    subject = _("Your {ORG_LONG_NAME} Project: {source.title}").format(
+                    subject = _("Your {ORG_LONG_NAME} project: {source.title}").format(
                         ORG_LONG_NAME=settings.ORG_LONG_NAME, source=source
                     )
             return subject
diff --git a/hypha/apply/funds/templates/funds/includes/projects_tab.html b/hypha/apply/funds/templates/funds/includes/projects_tab.html
index 9f73a5da42..6f7f102646 100644
--- a/hypha/apply/funds/templates/funds/includes/projects_tab.html
+++ b/hypha/apply/funds/templates/funds/includes/projects_tab.html
@@ -27,7 +27,7 @@
                 @keydown.escape="open = false"
                 :aria-expanded="open"
             >
-                {% blocktrans count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %}
+                {% blocktrans context "project tab" count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %}
                 {% heroicon_micro "chevron-down" aria_hidden="true" size=16 class="inline-block size-4" %}
             </button>
             <ul
diff --git a/hypha/apply/projects/templates/application_projects/submission_projects.html b/hypha/apply/projects/templates/application_projects/submission_projects.html
index a3833984df..539138b195 100644
--- a/hypha/apply/projects/templates/application_projects/submission_projects.html
+++ b/hypha/apply/projects/templates/application_projects/submission_projects.html
@@ -15,7 +15,7 @@
                 {% trans "Application" %}
             </a>
             <a class="tab tab-active" href="{% url 'funds:submissions:projects' pk=submission.id %}">
-                {% blocktrans count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %}
+                {% blocktrans context "project tab" count counter=projects|length %}Project{% plural %}Projects ({{ counter }}){% endblocktrans %}
             </a>
             <a
                 class="tab [--color-base-content:var(--color-neutral-content)]"
diff --git a/hypha/locale/cs/LC_MESSAGES/django.po b/hypha/locale/cs/LC_MESSAGES/django.po
index f975b7a5b7..15cfcffc20 100644
--- a/hypha/locale/cs/LC_MESSAGES/django.po
+++ b/hypha/locale/cs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-22 16:12+0000\n"
+"POT-Creation-Date: 2026-09-17 11:50+0000\n"
 "PO-Revision-Date: 2025-05-10 00:03+0000\n"
 "Last-Translator: Jiří Podhorecký <j.podhorecky@volny.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/hypha/hypha-core/"
@@ -31,164 +31,203 @@ msgstr " vybrané faktury"
 msgid "Please provide data for: {fields}"
 msgstr "Uveďte způsob, jakým mohou žadatelé podávat žádosti"
 
-#: hypha/apply/activity/adapters/activity_feed.py:28
+#: hypha/apply/activity/adapters/activity_feed.py:27
 #, python-brace-format
 msgid "Submitted {source.title_text_display} for {source.page.title}"
 msgstr "Odesláno {source.title_text_display} pro {source.page.title}"
 
+#: hypha/apply/activity/adapters/activity_feed.py:29
 #: hypha/apply/activity/adapters/activity_feed.py:30
-#: hypha/apply/activity/adapters/activity_feed.py:31
 msgid "edited the submission"
 msgstr "upravil podání"
 
-#: hypha/apply/activity/adapters/activity_feed.py:32
+#: hypha/apply/activity/adapters/activity_feed.py:31
 #, python-brace-format
 msgid "updated Lead from {old_lead} to {source.lead}"
 msgstr "aktualizoval vedení z {old_lead} na {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:33
+#: hypha/apply/activity/adapters/activity_feed.py:32
 #, python-brace-format
 msgid "batch updated Lead to {new_lead}"
 msgstr "dávkově aktualizováno Vedení na {new_lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:35
+#: hypha/apply/activity/adapters/activity_feed.py:34
 #, python-brace-format
 msgid "sent a determination. Outcome: {determination.clean_outcome}"
 msgstr "odesláno rozhodnutí. Výsledek: {determination.clean_outcome}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:38
+#: hypha/apply/activity/adapters/activity_feed.py:37
 msgid "Invited to submit a proposal"
 msgstr "Výzva k předložení návrhu"
 
-#: hypha/apply/activity/adapters/activity_feed.py:41
+#: hypha/apply/activity/adapters/activity_feed.py:40
 msgid "Submitted a review"
 msgstr "Odeslané hodnocení"
 
-#: hypha/apply/activity/adapters/activity_feed.py:42
+#: hypha/apply/activity/adapters/activity_feed.py:41
 msgid "Opened the submission while still sealed"
 msgstr "Otevření podání v zapečetěném stavu"
 
-#: hypha/apply/activity/adapters/activity_feed.py:45
+#: hypha/apply/activity/adapters/activity_feed.py:44
 #, python-brace-format
 msgid ""
 "{opinion.opinion_display}s with {opinion.review.author}s review of {source}"
 msgstr ""
 "{opinion.opinion_display}s s {opinion.review.author}s hodnocením {source}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:48
+#: hypha/apply/activity/adapters/activity_feed.py:47
 #, python-brace-format
 msgid "deleted the opinion for review: {review_opinion.review}"
 msgstr "vymazal stanovisko k hodnocení: {review_opinion.review}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:51
+#: hypha/apply/activity/adapters/activity_feed.py:50
 #, python-brace-format
 msgid "Created project with initial status of \"{status}\""
 msgstr "Vytvořen projekt s počátečním stavem „{status}“"
 
+#: hypha/apply/activity/adapters/activity_feed.py:52
+#, python-brace-format
+msgid "Created SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:53
+#, python-brace-format
+msgid "Edited SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:54
+#, fuzzy, python-brace-format
+#| msgid "Awaiting project form to be created."
+msgid "Created project form for project \"{related.project}\""
+msgstr "Čeká se na vytvoření projektového formuláře."
+
 #: hypha/apply/activity/adapters/activity_feed.py:55
+#, fuzzy, python-brace-format
+#| msgid "Awaiting project form to be created."
+msgid "Edited project form for project \"{related.project}\""
+msgstr "Čeká se na vytvoření projektového formuláře."
+
+#: hypha/apply/activity/adapters/activity_feed.py:58
 #, python-brace-format
 msgid "updated the project title from {old_title} to {source.title}"
 msgstr "aktualizoval název projektu z {old_title} na {source.title}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:57
+#: hypha/apply/activity/adapters/activity_feed.py:61
+#, python-brace-format
+msgid "updated contract number to {source.contract_number}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:63
 #, python-brace-format
 msgid "update Lead from {old_lead} to {source.lead}"
 msgstr "aktualizovat vedení z {old_lead} na {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:58
+#: hypha/apply/activity/adapters/activity_feed.py:64
 msgid "Requested approval"
 msgstr "Požadované schválení"
 
-#: hypha/apply/activity/adapters/activity_feed.py:60
+#: hypha/apply/activity/adapters/activity_feed.py:66
 #: hypha/apply/determinations/models.py:209
 #: hypha/apply/determinations/models.py:213
 #: hypha/apply/determinations/models.py:217
 #: hypha/apply/determinations/options.py:12
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
-#: hypha/apply/projects/utils.py:87
+#: hypha/apply/projects/utils.py:90
 msgid "Approved"
 msgstr "Schváleno"
 
-#: hypha/apply/activity/adapters/activity_feed.py:61
+#: hypha/apply/activity/adapters/activity_feed.py:67
 #, fuzzy
 #| msgid "requested changes for acceptance: \"{comment}\""
 msgid "requested changes for acceptance"
 msgstr "požadované změny k přijetí: \"{comment}\""
 
-#: hypha/apply/activity/adapters/activity_feed.py:62
+#: hypha/apply/activity/adapters/activity_feed.py:68
 msgid "Submitted Contract Documents"
 msgstr "Předložené smluvní dokumenty"
 
-#: hypha/apply/activity/adapters/activity_feed.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:69
 #, python-brace-format
 msgid "Uploaded a {contract.state} contract"
 msgstr "Nahraná smlouva {contract.state}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:64
+#: hypha/apply/activity/adapters/activity_feed.py:70
 msgid "Approved contract"
 msgstr "Schválená smlouva"
 
-#: hypha/apply/activity/adapters/activity_feed.py:66
-#: hypha/apply/projects/views/payment.py:275
+#: hypha/apply/activity/adapters/activity_feed.py:72
+#: hypha/apply/projects/views/invoice.py:280
 msgid "Invoice added"
 msgstr "Faktura přidána"
 
-#: hypha/apply/activity/adapters/activity_feed.py:67
+#: hypha/apply/activity/adapters/activity_feed.py:73
 msgid "Submitted a report"
 msgstr "Předložená zpráva"
 
-#: hypha/apply/activity/adapters/activity_feed.py:70
-#: hypha/apply/activity/options.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:74
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "deleted a report"
+msgstr "Předložená zpráva"
+
+#: hypha/apply/activity/adapters/activity_feed.py:77
+#: hypha/apply/activity/options.py:73
 msgid "disabled reporting"
 msgstr "vypnuté hlášení"
 
-#: hypha/apply/activity/adapters/activity_feed.py:74
+#: hypha/apply/activity/adapters/activity_feed.py:81
 msgid "archived this submission"
 msgstr "archivoval toto podání"
 
-#: hypha/apply/activity/adapters/activity_feed.py:75
+#: hypha/apply/activity/adapters/activity_feed.py:82
 msgid "un-archived this submission"
 msgstr "odarchivoval toto podání"
 
-#: hypha/apply/activity/adapters/activity_feed.py:76
+#: hypha/apply/activity/adapters/activity_feed.py:83
 msgid "deleted an invoice"
 msgstr "smazal fakturu"
 
-#: hypha/apply/activity/adapters/activity_feed.py:131
-#: hypha/apply/funds/views/submission_edit.py:630
+#: hypha/apply/activity/adapters/activity_feed.py:85
+#, fuzzy, python-brace-format
+#| msgid "updated Lead from {old_lead} to {source.lead}"
+msgid "updated author from {old_author} to {source.user}"
+msgstr "aktualizoval vedení z {old_lead} na {source.lead}"
+
+#: hypha/apply/activity/adapters/activity_feed.py:145
+#: hypha/apply/funds/views/submission_edit.py:631
 msgid "Reviewers updated."
 msgstr "Recenzenti aktualizováni."
 
-#: hypha/apply/activity/adapters/activity_feed.py:133
-#: hypha/apply/activity/adapters/slack.py:237
+#: hypha/apply/activity/adapters/activity_feed.py:147
+#: hypha/apply/activity/adapters/slack.py:257
 msgid "Added:"
 msgstr "Přidáno:"
 
-#: hypha/apply/activity/adapters/activity_feed.py:137
-#: hypha/apply/activity/adapters/slack.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:151
+#: hypha/apply/activity/adapters/slack.py:261
 msgid "Removed:"
 msgstr "Odstraněno:"
 
-#: hypha/apply/activity/adapters/activity_feed.py:143
+#: hypha/apply/activity/adapters/activity_feed.py:157
 msgid "Batch reviewers updated:"
 msgstr "Skupina hodnotitelů aktualizována:"
 
-#: hypha/apply/activity/adapters/activity_feed.py:146
+#: hypha/apply/activity/adapters/activity_feed.py:160
 #, python-brace-format
 msgid "{user} as {name}."
 msgstr "{user} jako {name}."
 
-#: hypha/apply/activity/adapters/activity_feed.py:165
+#: hypha/apply/activity/adapters/activity_feed.py:179
 #, python-brace-format
 msgid "Successfully deleted submissions: {title}"
 msgstr "Úspěšně odstraněné podání: {title}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:174
+#: hypha/apply/activity/adapters/activity_feed.py:188
 #, python-brace-format
 msgid "Successfully archived submissions: {title}"
 msgstr "Úspěšně archivovaná podání: {title}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:187
+#: hypha/apply/activity/adapters/activity_feed.py:201
 #, python-brace-format
 msgid ""
 "Successfully updated status to {invoice_status} for invoices: "
@@ -197,17 +236,17 @@ msgstr ""
 "Stav faktur byl úspěšně aktualizován na {invoice_status} pro faktury: "
 "{invoice_numbers}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:204
+#: hypha/apply/activity/adapters/activity_feed.py:218
 #, python-brace-format
 msgid "assigned Project form to {}"
 msgstr "přiřazen formulář projektu k {}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:210
+#: hypha/apply/activity/adapters/activity_feed.py:224
 #, python-brace-format
 msgid "removed the task {task.code} for {source} from the task list"
 msgstr "odstranil úlohu {task.code} pro {source} ze seznamu úloh"
 
-#: hypha/apply/activity/adapters/activity_feed.py:215
+#: hypha/apply/activity/adapters/activity_feed.py:229
 #, python-brace-format
 msgid ""
 "removed the task {task.code} for {source} from whole team's{user_groups} "
@@ -216,13 +255,13 @@ msgstr ""
 "odstranil úkol {task.code} pro {source} ze seznamu úkolů celého týmu "
 "{user_groups}."
 
-#: hypha/apply/activity/adapters/activity_feed.py:228
-#: hypha/apply/activity/adapters/activity_feed.py:260
+#: hypha/apply/activity/adapters/activity_feed.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:273
 #, python-brace-format
 msgid "Progressed from {old_display} to {new_display}"
 msgstr "Postoupeno z {old_display} na {new_display}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:291
+#: hypha/apply/activity/adapters/activity_feed.py:304
 #, python-brace-format
 msgid ""
 "Updated reporting frequency. New schedule is: {new_schedule} starting on "
@@ -231,117 +270,138 @@ msgstr ""
 "Aktualizovaná frekvence podávání zpráv. Nový harmonogram je: {new_schedule} "
 "počínaje dnem {schedule_start}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:296
+#: hypha/apply/activity/adapters/activity_feed.py:309
 #, fuzzy
 #| msgid "skipped report"
 msgid "Skipped a Report"
 msgstr "přeskočená zpráva"
 
-#: hypha/apply/activity/adapters/activity_feed.py:298
+#: hypha/apply/activity/adapters/activity_feed.py:311
 #, fuzzy
 #| msgid "More information required"
 msgid "Marked a Report as required"
 msgstr "Je třeba více informací"
 
-#: hypha/apply/activity/adapters/activity_feed.py:301
+#: hypha/apply/activity/adapters/activity_feed.py:314
 #, python-brace-format
 msgid "Updated Invoice status to: {invoice_status}."
 msgstr "Stav faktury aktualizován na: {invoice_status}."
 
-#: hypha/apply/activity/adapters/activity_feed.py:350
+#: hypha/apply/activity/adapters/activity_feed.py:363
 #, python-brace-format
 msgid "Updated screening decision from \"{old_status}\" to \"{new_status}\""
 msgstr ""
 "Aktualizováno rozhodnutí o kontrole z \"{old_status}\" na \"{new_status}\""
 
-#: hypha/apply/activity/adapters/activity_feed.py:353
+#: hypha/apply/activity/adapters/activity_feed.py:366
 #, python-brace-format
 msgid "Added screening decision to \"{new_status}\""
 msgstr "Přidáno rozhodnutí o kontrole do \"{new_status}\""
 
-#: hypha/apply/activity/adapters/activity_feed.py:357
+#: hypha/apply/activity/adapters/activity_feed.py:370
 #, python-brace-format
 msgid "Removed \"{old_status}\" screening decision."
 msgstr "Odstraněno rozhodnutí o kontrole \"{old_status}\"."
 
-#: hypha/apply/activity/adapters/base.py:196
+#: hypha/apply/activity/adapters/base.py:203
 #, python-brace-format
 msgid "{adapter} [to: {recipient}]: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:200
+#: hypha/apply/activity/adapters/base.py:207
 #, python-brace-format
 msgid "{adapter}: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:90
+#: hypha/apply/activity/adapters/emails.py:92
 #, python-brace-format
 msgid "Application ready to review: {source.title_text_display}"
 msgstr "Žádost je připravena ke kontrole: {source.title_text_display}"
 
-#: hypha/apply/activity/adapters/emails.py:96
+#: hypha/apply/activity/adapters/emails.py:98
 msgid "Multiple applications are now ready for your review"
 msgstr "K posouzení je nyní připraveno více žádostí"
 
-#: hypha/apply/activity/adapters/emails.py:99
+#: hypha/apply/activity/adapters/emails.py:101
 #, python-brace-format
 msgid "Reminder: Application ready to review: {source.title_text_display}"
 msgstr ""
 "Připomínáme: Žádost je připravena ke kontrole: {source.title_text_display}"
 
-#: hypha/apply/activity/adapters/emails.py:102
+#: hypha/apply/activity/adapters/emails.py:104
 #, fuzzy
 #| msgid "edited applicant"
 msgid "You are invited as a co-applicant"
 msgstr "upravený žadatel"
 
-#: hypha/apply/activity/adapters/emails.py:107
+#: hypha/apply/activity/adapters/emails.py:109
 #, python-brace-format
 msgid "Project is waiting for approval: {source.title}"
 msgstr "Projekt čeká na schválení: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:111
+#: hypha/apply/activity/adapters/emails.py:113
 #, python-brace-format
 msgid "Contract uploaded for the project: {source.title}"
 msgstr "Smlouva nahraná pro projekt: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:116
+#: hypha/apply/activity/adapters/emails.py:118
 #, python-brace-format
 msgid "Contract Documents required approval for the project: {source.title}"
 msgstr "Smluvní dokumentace vyžadující schválení projektu: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:126
+#: hypha/apply/activity/adapters/emails.py:128
 #, python-brace-format
 msgid "Project is waiting for the contract: {source.title}"
 msgstr "Projekt čeká na smlouvu: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:130
+#: hypha/apply/activity/adapters/emails.py:132
 #, python-brace-format
 msgid "Project is ready for invoicing: {source.title}"
 msgstr "Projekt je připraven k fakturaci: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:134
+#: hypha/apply/activity/adapters/emails.py:136
 #, python-brace-format
 msgid "Project status has changed to {project_status}: {source.title}"
 msgstr "Stav projektu se změnil na {project_status}: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:140
+#: hypha/apply/activity/adapters/emails.py:142
 msgid "Project has been rejected, please update and resubmit"
 msgstr "Projekt byl zamítnut, aktualizujte jej a předložte znovu"
 
-#: hypha/apply/activity/adapters/emails.py:143
+#: hypha/apply/activity/adapters/emails.py:145
 #, python-brace-format
 msgid "Project documents are ready to be assigned for approval: {source.title}"
 msgstr "Projektová dokumentace je připravena ke schválení: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:150
+#: hypha/apply/activity/adapters/emails.py:151
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
+msgid "New comment on application to {ORG_LONG_NAME}: {source.title}"
+msgstr "Vaše žádost na {ORG_LONG_NAME}: {source.title_text_display}"
+
+#: hypha/apply/activity/adapters/emails.py:158
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
+msgid ""
+"Your application to {ORG_LONG_NAME} has been reviewed: "
+"{source.title_text_display}"
+msgstr "Vaše žádost na {ORG_LONG_NAME}: {source.title_text_display}"
+
+#: hypha/apply/activity/adapters/emails.py:162
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
+msgid "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+msgstr "Vaše žádost na {ORG_LONG_NAME}: {source.title_text_display}"
+
+#: hypha/apply/activity/adapters/emails.py:167
 #, python-brace-format
 msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
 msgstr "Vaše žádost na {ORG_LONG_NAME}: {source.title_text_display}"
 
-#: hypha/apply/activity/adapters/emails.py:153
-#, python-brace-format
-msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+#: hypha/apply/activity/adapters/emails.py:170
+#, fuzzy, python-brace-format
+#| msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+msgid "Your {ORG_LONG_NAME} project: {source.title}"
 msgstr "Vaše {ORG_LONG_NAME} Projekt: {source.title}"
 
 #: hypha/apply/activity/adapters/slack.py:31
@@ -436,6 +496,12 @@ msgid "{user} has deleted {source.title_text_display}"
 msgstr "{user} smazal {source.title_text_display}"
 
 #: hypha/apply/activity/adapters/slack.py:73
+#, fuzzy, python-brace-format
+#| msgid "{user} has deleted {source.title_text_display}"
+msgid "{user} has anonymized {source.title_text_display}"
+msgstr "{user} smazal {source.title_text_display}"
+
+#: hypha/apply/activity/adapters/slack.py:76
 #, python-brace-format
 msgid ""
 "{user} has deleted {review.author} review for <{link}|"
@@ -444,7 +510,7 @@ msgstr ""
 "{user} smazal hodnocení {review.author} pro <{link}|"
 "{source.title_text_display}>"
 
-#: hypha/apply/activity/adapters/slack.py:76
+#: hypha/apply/activity/adapters/slack.py:79
 #, python-brace-format
 msgid ""
 "{user} has deleted {review_opinion.author} review opinion for <{link}|"
@@ -453,12 +519,12 @@ msgstr ""
 "{user} smazal názor {review_opinion.author} na recenzi pro <{link}|"
 "{source.title_text_display}>"
 
-#: hypha/apply/activity/adapters/slack.py:79
+#: hypha/apply/activity/adapters/slack.py:82
 #, python-brace-format
 msgid "{user} has created a Project: <{link}|{source.title}>"
 msgstr "{user} vytvořil Projekt: <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:82
+#: hypha/apply/activity/adapters/slack.py:85
 #, python-brace-format
 msgid ""
 "The lead of project <{link}|{source.title}> has been updated from {old_lead} "
@@ -467,7 +533,7 @@ msgstr ""
 "Vedoucí projektu <{link}|{source.title}> byl aktualizován z {old_lead} na "
 "{source.lead} od {user}"
 
-#: hypha/apply/activity/adapters/slack.py:85
+#: hypha/apply/activity/adapters/slack.py:88
 #, python-brace-format
 msgid ""
 "The project title has been updated from <{link}|{old_title}> to <{link}|"
@@ -476,7 +542,19 @@ msgstr ""
 "Název projektu byl aktualizován z <{link}|{old_title}> na <{link}|"
 "{source.title}> od {user}"
 
-#: hypha/apply/activity/adapters/slack.py:88
+#: hypha/apply/activity/adapters/slack.py:91
+#, fuzzy, python-brace-format
+#| msgid ""
+#| "The lead of project <{link}|{source.title}> has been updated from "
+#| "{old_lead} to {source.lead} by {user}"
+msgid ""
+"The contract number of project <{link}|{source.title}> has been updated to "
+"{source.contract_number} by {user}"
+msgstr ""
+"Vedoucí projektu <{link}|{source.title}> byl aktualizován z {old_lead} na "
+"{source.lead} od {user}"
+
+#: hypha/apply/activity/adapters/slack.py:94
 #, python-brace-format
 msgid ""
 "{user} has edited {review.author} review for <{link}|"
@@ -485,17 +563,17 @@ msgstr ""
 "{user} upravil {review.author} recenzi pro <{link}|"
 "{source.title_text_display}>"
 
-#: hypha/apply/activity/adapters/slack.py:91
+#: hypha/apply/activity/adapters/slack.py:97
 #, python-brace-format
 msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgstr "{user} požádal o schválení projektu <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:94
+#: hypha/apply/activity/adapters/slack.py:100
 #, python-brace-format
 msgid "{user} has approved project <{link}|{source.title}>"
 msgstr "{user} schválil projekt <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:97
+#: hypha/apply/activity/adapters/slack.py:103
 #, python-brace-format
 msgid ""
 "{user} has requested changes for project acceptance on <{link}|{source.title}"
@@ -503,12 +581,12 @@ msgid ""
 msgstr ""
 "{user} požádal o změny pro přijetí projektu dne <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:100
+#: hypha/apply/activity/adapters/slack.py:106
 #, python-brace-format
 msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgstr "{user} nahrál smlouvu pro <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:103
+#: hypha/apply/activity/adapters/slack.py:109
 #, python-brace-format
 msgid ""
 "{user} has submitted the contracting document for project <{link}|"
@@ -516,17 +594,17 @@ msgid ""
 msgstr ""
 "{user} předložil zadávací dokumentaci k projektu <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:106
+#: hypha/apply/activity/adapters/slack.py:112
 #, python-brace-format
 msgid "{user} has approved contract for <{link}|{source.title}>"
 msgstr "{user} schválil smlouvu pro <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:109
+#: hypha/apply/activity/adapters/slack.py:115
 #, python-brace-format
 msgid "{user} has created invoice for <{link}|{source.title}>"
 msgstr "{user} vytvořil fakturu pro <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:112
+#: hypha/apply/activity/adapters/slack.py:118
 #, python-brace-format
 msgid ""
 "{user} has changed the status of <{link_related}|invoice> on <{link}|"
@@ -535,27 +613,33 @@ msgstr ""
 "{user} změnil stav <{link_related}|faktury> na <{link}|{source.title}> na "
 "{invoice.status_display}"
 
-#: hypha/apply/activity/adapters/slack.py:115
+#: hypha/apply/activity/adapters/slack.py:121
 #, python-brace-format
 msgid "{user} has deleted invoice from <{link}|{source.title}>"
 msgstr "{user} smazal fakturu z <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:118
+#: hypha/apply/activity/adapters/slack.py:124
 #, python-brace-format
 msgid "{user} has updated invoice for <{link}|{source.title}>"
 msgstr "{user} aktualizoval fakturu za <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:121
+#: hypha/apply/activity/adapters/slack.py:127
 #, python-brace-format
 msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgstr "{user} odeslal zprávu pro <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:125
+#: hypha/apply/activity/adapters/slack.py:130
+#, fuzzy, python-brace-format
+#| msgid "{user} has submitted a report for <{link}|{source.title}>"
+msgid "{user} has deleted a report for <{link}|{source.title}>"
+msgstr "{user} odeslal zprávu pro <{link}|{source.title}>"
+
+#: hypha/apply/activity/adapters/slack.py:135
 #, python-brace-format
 msgid "{user} has created a new account for <{link}|{source}>"
 msgstr "{user} vytvořil nový účet pro <{link}|{source}>"
 
-#: hypha/apply/activity/adapters/slack.py:128
+#: hypha/apply/activity/adapters/slack.py:138
 #, python-brace-format
 msgid ""
 "{user} has edited account for <{link}|{source}> that now has following "
@@ -564,44 +648,58 @@ msgstr ""
 "{user} upravil účet pro <{link}|{source}>, který má nyní následující role: "
 "{roles}"
 
-#: hypha/apply/activity/adapters/slack.py:132
+#: hypha/apply/activity/adapters/slack.py:142
 #, python-brace-format
 msgid "{user} has archived the submission: {source.title_text_display}"
 msgstr "{user} archivoval podání: {source.title_text_display}"
 
-#: hypha/apply/activity/adapters/slack.py:135
+#: hypha/apply/activity/adapters/slack.py:145
 #, python-brace-format
 msgid "{user} has unarchived the submission: {source.title_text_display}"
 msgstr "{user} odarchivoval podání: {source.title_text_display}"
 
-#: hypha/apply/activity/adapters/slack.py:231
+#: hypha/apply/activity/adapters/slack.py:148
+#, python-brace-format
+msgid ""
+"{user} has updated author from {old_author} to {source.user} for submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:151
+#, python-brace-format
+msgid ""
+"A new comment has been assigned to {assignee} by {user} on submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:251
 #, python-brace-format
 msgid "{user} has updated the reviewers on <{link}|{title}>"
 msgstr "{user} aktualizoval hodnotitele na <{link}|{title}>"
 
-#: hypha/apply/activity/adapters/slack.py:250
+#: hypha/apply/activity/adapters/slack.py:270
 #, python-brace-format
 msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
 msgstr "{user} dávkově změnil vedení na {new_lead} na:: {submissions_text}"
 
-#: hypha/apply/activity/adapters/slack.py:262
+#: hypha/apply/activity/adapters/slack.py:282
 #, python-brace-format
 msgid "{user} as {name},"
 msgstr "{user} jako {name},"
 
-#: hypha/apply/activity/adapters/slack.py:268
+#: hypha/apply/activity/adapters/slack.py:288
 #, python-brace-format
 msgid ""
 "{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
 msgstr ""
 "{user} dávkově přidal {reviewers_text} jako recenzenty na: {submissions_text}"
 
-#: hypha/apply/activity/adapters/slack.py:288
+#: hypha/apply/activity/adapters/slack.py:308
 #, python-brace-format
 msgid "{user} has transitioned the following submissions: {submissions_links}"
 msgstr "{user} převedl následující podání: {submissions_links}"
 
-#: hypha/apply/activity/adapters/slack.py:298
+#: hypha/apply/activity/adapters/slack.py:318
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was sent by email. Outcome: "
@@ -610,7 +708,7 @@ msgstr ""
 "Určení pro <{link}|{submission_title}> bylo odesláno e-mailem. Výsledek: "
 "{determination_outcome}"
 
-#: hypha/apply/activity/adapters/slack.py:305
+#: hypha/apply/activity/adapters/slack.py:325
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was saved without sending an "
@@ -619,22 +717,28 @@ msgstr ""
 "Určení pro <{link}|{submission_title}> bylo uloženo bez odeslání e-mailu. "
 "Výsledek: {determination_outcome}"
 
-#: hypha/apply/activity/adapters/slack.py:321
+#: hypha/apply/activity/adapters/slack.py:341
 #, python-brace-format
 msgid "Determinations of {outcome} was sent for: {submissions_links}"
 msgstr "Stanovení {outcome} bylo odesláno: {submissions_links}"
 
-#: hypha/apply/activity/adapters/slack.py:332
+#: hypha/apply/activity/adapters/slack.py:352
 #, python-brace-format
 msgid "{user} has deleted submissions: {title}"
 msgstr "{user} smazal příspěvky: {title}"
 
-#: hypha/apply/activity/adapters/slack.py:339
+#: hypha/apply/activity/adapters/slack.py:361
+#, fuzzy, python-brace-format
+#| msgid "{user} has archived submissions: {title}"
+msgid "{user} has anonymized submissions: {title}"
+msgstr "{user} má archivované příspěvky: {title}"
+
+#: hypha/apply/activity/adapters/slack.py:368
 #, python-brace-format
 msgid "{user} has archived submissions: {title}"
 msgstr "{user} má archivované příspěvky: {title}"
 
-#: hypha/apply/activity/adapters/slack.py:353
+#: hypha/apply/activity/adapters/slack.py:382
 #, python-brace-format
 msgid ""
 "<{link}|{title}> is ready for review. The following are assigned as "
@@ -668,34 +772,40 @@ msgstr "Tento měsíc"
 msgid "Last 3 months"
 msgstr "Poslední 3 měsíce"
 
-#: hypha/apply/activity/forms.py:16
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:70
+#: hypha/apply/activity/forms.py:17
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:47
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: hypha/apply/activity/forms.py:20 hypha/apply/funds/forms.py:102
-#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:371
+#: hypha/apply/activity/forms.py:21 hypha/apply/funds/forms.py:102
+#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:389
 msgid "Select..."
 msgstr "Vyberte..."
 
-#: hypha/apply/activity/forms.py:21
+#: hypha/apply/activity/forms.py:22
 msgid "Assign to"
 msgstr "Přiřadit k"
 
-#: hypha/apply/activity/forms.py:33
+#: hypha/apply/activity/forms.py:39
 #, fuzzy
 #| msgid "Visibility"
 msgid "Visible to"
 msgstr "Viditelnost"
 
-#: hypha/apply/activity/forms.py:34
+#: hypha/apply/activity/forms.py:40
 msgid "Message"
 msgstr "Zpráva"
 
-#: hypha/apply/activity/forms.py:38
+#: hypha/apply/activity/forms.py:44
 msgid "Select a relevant user role. Staff can view every comment."
 msgstr ""
 
+#: hypha/apply/activity/forms.py:73
+#, fuzzy
+#| msgid "made a comment"
+msgid "Write a comment..."
+msgstr "učinil komentář"
+
 #: hypha/apply/activity/management/commands/send_staff_email_digest.py:146
 msgid "Summary of all activities"
 msgstr "Shrnutí všech aktivit"
@@ -705,7 +815,8 @@ msgid "Activities Summary - "
 msgstr "Shrnutí aktivit - "
 
 #: hypha/apply/activity/models.py:25
-#: hypha/apply/funds/models/co_applicants.py:9 hypha/apply/todo/options.py:69
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:12
+#: hypha/apply/funds/models/co_applicants.py:10 hypha/apply/todo/options.py:76
 msgid "Comment"
 msgstr "Komentář"
 
@@ -713,7 +824,7 @@ msgstr "Komentář"
 msgid "Action"
 msgstr "Akce"
 
-#: hypha/apply/activity/models.py:36
+#: hypha/apply/activity/models.py:36 hypha/apply/funds/forms.py:336
 msgid "Applicants"
 msgstr "Žadatelé"
 
@@ -721,9 +832,9 @@ msgstr "Žadatelé"
 msgid "Staff only"
 msgstr "Pouze zaměstnanci"
 
-#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:231
-#: hypha/apply/funds/tables.py:469
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:81
+#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:245
+#: hypha/apply/funds/tables.py:533
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:86
 #: hypha/apply/funds/templates/submissions/all.html:437
 #: hypha/apply/funds/templates/submissions/all.html:478
 msgid "Reviewers"
@@ -745,7 +856,7 @@ msgstr "Přílohy návrhu"
 msgid "activity attachments"
 msgstr "Přílohy návrhu"
 
-#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:379
+#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:384
 #, fuzzy
 #| msgid "Message"
 msgid "message"
@@ -769,19 +880,19 @@ msgstr "Podávání informací o aktivitách"
 msgid "activities"
 msgstr "Další aktivity"
 
-#: hypha/apply/activity/models.py:329
+#: hypha/apply/activity/models.py:334
 msgid "verb"
 msgstr "sloveso"
 
-#: hypha/apply/activity/models.py:340
+#: hypha/apply/activity/models.py:345
 msgid "event"
 msgstr ""
 
-#: hypha/apply/activity/models.py:341
+#: hypha/apply/activity/models.py:346
 msgid "events"
 msgstr ""
 
-#: hypha/apply/activity/models.py:380
+#: hypha/apply/activity/models.py:385
 #, fuzzy
 #| msgid "Message"
 msgid "messages"
@@ -876,151 +987,211 @@ msgid "deleted submission"
 msgstr "smazané podání"
 
 #: hypha/apply/activity/options.py:35
+#, fuzzy
+#| msgid "archived submission"
+msgid "anonymized submission"
+msgstr "archivované podání"
+
+#: hypha/apply/activity/options.py:36
 msgid "deleted review"
 msgstr "smazané hodnocení"
 
-#: hypha/apply/activity/options.py:36
+#: hypha/apply/activity/options.py:37
 msgid "deleted review opinion"
 msgstr "smazaný názor hodnocení"
 
-#: hypha/apply/activity/options.py:37
+#: hypha/apply/activity/options.py:38
 msgid "created project"
 msgstr "vytvořený projekt"
 
-#: hypha/apply/activity/options.py:38
+#: hypha/apply/activity/options.py:39
+#, fuzzy
+#| msgid "created project"
+msgid "created a project SOW"
+msgstr "vytvořený projekt"
+
+#: hypha/apply/activity/options.py:40
+#, fuzzy
+#| msgid "project"
+msgid "edited a project SOW"
+msgstr "projekt"
+
+#: hypha/apply/activity/options.py:41
+#, fuzzy
+#| msgid "created project"
+msgid "created a project form"
+msgstr "vytvořený projekt"
+
+#: hypha/apply/activity/options.py:42
+#, fuzzy
+#| msgid "Project form"
+msgid "edited a project form"
+msgstr "Formulář projektu"
+
+#: hypha/apply/activity/options.py:43
 msgid "updated project lead"
 msgstr "aktualizováno vedení projektu"
 
-#: hypha/apply/activity/options.py:39
+#: hypha/apply/activity/options.py:44
 msgid "updated project title"
 msgstr "aktualizován název projektu"
 
-#: hypha/apply/activity/options.py:40
+#: hypha/apply/activity/options.py:47
+#, fuzzy
+#| msgid "updated project title"
+msgid "updated project contract number"
+msgstr "aktualizován název projektu"
+
+#: hypha/apply/activity/options.py:49
 msgid "edited review"
 msgstr "upraveno hodnocení"
 
-#: hypha/apply/activity/options.py:41
+#: hypha/apply/activity/options.py:50
 msgid "sent for approval"
 msgstr "odesláno ke schválení"
 
-#: hypha/apply/activity/options.py:42
+#: hypha/apply/activity/options.py:51
 msgid "approved project"
 msgstr "schválený projekt"
 
-#: hypha/apply/activity/options.py:43
+#: hypha/apply/activity/options.py:52
 msgid "assign project form approver"
 msgstr "přiřadit schvalovatele formuláře projektu"
 
-#: hypha/apply/activity/options.py:44
+#: hypha/apply/activity/options.py:53
 msgid "approved project form"
 msgstr "schválený formulář projektu"
 
-#: hypha/apply/activity/options.py:45
+#: hypha/apply/activity/options.py:54
 msgid "transitioned project"
 msgstr "převedený projekt"
 
-#: hypha/apply/activity/options.py:46
+#: hypha/apply/activity/options.py:55
 msgid "requested project change"
 msgstr "požadovaná změna projektu"
 
-#: hypha/apply/activity/options.py:49
+#: hypha/apply/activity/options.py:58
 msgid "submitted contract documents"
 msgstr "předložená zadávací dokumentace"
 
-#: hypha/apply/activity/options.py:51
+#: hypha/apply/activity/options.py:60
 msgid "uploaded document to project"
 msgstr "nahraný dokument do projektu"
 
-#: hypha/apply/activity/options.py:52
+#: hypha/apply/activity/options.py:61
 msgid "uploaded contract to project"
 msgstr "nahraná smlouva do projektu"
 
-#: hypha/apply/activity/options.py:53
+#: hypha/apply/activity/options.py:62
 msgid "approved contract"
 msgstr "schválená smlouva"
 
-#: hypha/apply/activity/options.py:54
+#: hypha/apply/activity/options.py:63
 msgid "created invoice for project"
 msgstr "vytvořená faktura za projekt"
 
-#: hypha/apply/activity/options.py:55
+#: hypha/apply/activity/options.py:64
 msgid "updated invoice status"
 msgstr "aktualizovaný stav faktury"
 
-#: hypha/apply/activity/options.py:56
+#: hypha/apply/activity/options.py:65
 msgid "approve invoice"
 msgstr "schválit fakturu"
 
-#: hypha/apply/activity/options.py:57
+#: hypha/apply/activity/options.py:66
 msgid "deleted invoice"
 msgstr "smazaná faktura"
 
-#: hypha/apply/activity/options.py:58
+#: hypha/apply/activity/options.py:67
 msgid "sent project to compliance"
 msgstr "poslal projekt k posouzení shody"
 
-#: hypha/apply/activity/options.py:59
+#: hypha/apply/activity/options.py:68
 msgid "updated invoice"
 msgstr "aktualizovaná faktura"
 
-#: hypha/apply/activity/options.py:60
+#: hypha/apply/activity/options.py:69
 msgid "submitted report"
 msgstr "předložená zpráva"
 
-#: hypha/apply/activity/options.py:61
+#: hypha/apply/activity/options.py:70
+#, fuzzy
+#| msgid "deleted review"
+msgid "deleted report"
+msgstr "smazané hodnocení"
+
+#: hypha/apply/activity/options.py:71
 msgid "skipped report"
 msgstr "přeskočená zpráva"
 
-#: hypha/apply/activity/options.py:62
+#: hypha/apply/activity/options.py:72
 msgid "changed report frequency"
 msgstr "změněna frekvence zpráv"
 
-#: hypha/apply/activity/options.py:64
+#: hypha/apply/activity/options.py:74
 msgid "notified report"
 msgstr "oznámená zpráva"
 
-#: hypha/apply/activity/options.py:65
+#: hypha/apply/activity/options.py:75
 msgid "reminder to review"
 msgstr "připomínka k přezkoumání"
 
-#: hypha/apply/activity/options.py:66
+#: hypha/apply/activity/options.py:76
 msgid "batch deleted submissions"
 msgstr "dávkově smazaná podání"
 
-#: hypha/apply/activity/options.py:69
+#: hypha/apply/activity/options.py:79
+#, fuzzy
+#| msgid "batch archive submissions"
+msgid "batch anonymized submissions"
+msgstr "dávkově archivovaná podání"
+
+#: hypha/apply/activity/options.py:83
 msgid "batch archive submissions"
 msgstr "dávkově archivovaná podání"
 
-#: hypha/apply/activity/options.py:73
+#: hypha/apply/activity/options.py:87
 msgid "batch update invoice status"
 msgstr "dávková aktualizace stavu faktury"
 
-#: hypha/apply/activity/options.py:75
+#: hypha/apply/activity/options.py:89
 msgid "created new account"
 msgstr "vytvořen nový účet"
 
-#: hypha/apply/activity/options.py:76
+#: hypha/apply/activity/options.py:90
 msgid "edited account"
 msgstr "upravený účet"
 
-#: hypha/apply/activity/options.py:77
+#: hypha/apply/activity/options.py:91
 msgid "archived submission"
 msgstr "archivované podání"
 
-#: hypha/apply/activity/options.py:78
+#: hypha/apply/activity/options.py:92
 msgid "unarchived submission"
 msgstr "nearchivované podání"
 
-#: hypha/apply/activity/options.py:79
+#: hypha/apply/activity/options.py:93
 msgid "remove task"
 msgstr "odebrat úlohu"
 
-#: hypha/apply/activity/options.py:80
+#: hypha/apply/activity/options.py:94
 #, fuzzy
 #| msgid "edited applicant"
 msgid "invite co-applicant"
 msgstr "upravený žadatel"
 
+#: hypha/apply/activity/options.py:95
+#, fuzzy
+#| msgid "updated partners"
+msgid "updated author"
+msgstr "aktualizovaní partneři"
+
+#: hypha/apply/activity/options.py:96
+#, fuzzy
+#| msgid "Comment"
+msgid "comment assigned"
+msgstr "Komentář"
+
 #: hypha/apply/activity/templates/activity/include/action_list.html:6
 msgid "There are no actions."
 msgstr "Nejsou zde žádné akce."
@@ -1052,13 +1223,13 @@ msgid "Filter"
 msgstr "Filtr"
 
 #: hypha/apply/activity/templates/activity/notifications.html:79
-#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:44
+#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:61
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:46
-#: hypha/apply/funds/models/co_applicants.py:8
+#: hypha/apply/funds/models/co_applicants.py:9
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:62
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:76
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:83
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:99
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:133
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:120
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:159
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:72
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:19
@@ -1086,57 +1257,87 @@ msgstr "Upraveno od"
 msgid "deleted"
 msgstr "Smazat"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:28
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:23
+#, fuzzy
+#| msgid "Add determination"
+msgid "Additional options"
+msgstr "Přidat rozhodnutí"
+
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:35
+#: hypha/apply/funds/templates/funds/comments.html:68
+#: hypha/apply/funds/templates/funds/comments.html:82
+msgid "Add Comment"
+msgstr "Přidat komentář"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:36
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:150
 #, python-format
 msgid "This user is a %(role)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:37
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:48
+#, fuzzy
+#| msgid "Ready for Determination"
+msgid "message from determination"
+msgstr "Připraveno k rozhodnutí"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:50
+#, python-format
+msgid "commented on %(related_name)s"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:53
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:159
 #, fuzzy
 #| msgid "Comment"
 msgid "commented"
 msgstr "Komentář"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:52
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:69
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:173
 msgid "Assigned to you"
 msgstr "Přiřazeno vám"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:54
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:71
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:175
 #, python-format
 msgid "Assigned to %(assigned_to)s"
 msgstr "Přiřazeno k %(assigned_to)s"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:61
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:78
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:182
 #, python-format
 msgid "This is visible to %(visibility_text)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:72
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:193
 #, fuzzy
 #| msgid "View comment"
 msgid "Edit comment"
 msgstr "Zobrazit komentář"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:76
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:93
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:197
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:40
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:36
-#: hypha/apply/funds/models/co_applicants.py:10
+#: hypha/apply/funds/models/co_applicants.py:11
 #: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:10
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:118
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:55
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:90
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:98
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:122
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:106
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:97
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:76
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:130
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:170
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:29
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:148
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:50
 #: hypha/apply/review/templates/review/review_detail.html:82
 msgid "Edit"
 msgstr "Upravit"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:84
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:101
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:205
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to delete the selected submissions? This action "
@@ -1145,41 +1346,45 @@ msgid ""
 "Are you sure you want to delete this comment? This action cannot be undone."
 msgstr "Opravdu chcete vybraná podání odstranit? Tuto akci nelze vzít zpět."
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:85
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:102
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:206
 #, fuzzy
 #| msgid "Other comments"
 msgid "Delete comment"
 msgstr "Další připomínky"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:106
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:210
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:59
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:120
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:182
 #: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:21
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:26
 #: hypha/apply/funds/templates/funds/modals/edit_co_applicant_form.html:75
-#: hypha/apply/funds/templates/submissions/all.html:502
-#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:59
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
-#: hypha/apply/projects/views/payment.py:356
+#: hypha/apply/funds/templates/submissions/all.html:504
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:71
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:41
+#: hypha/apply/projects/views/invoice.py:361
 #: hypha/apply/review/templates/review/review_detail.html:92
-#: hypha/templates/cotton/modal/confirm.html:43
 #: hypha/templates/includes/dialog_form_base.html:28
 msgid "Delete"
 msgstr "Smazat"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:97
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:114
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:218
 msgid "updated"
 msgstr "aktualizováno"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:109
-msgid "View "
-msgstr "Zobrazit "
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:125
+#, python-format
+msgid "View %(related_name)s"
+msgstr ""
 
 #: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:27
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:78
-#: hypha/apply/funds/views/submission_edit.py:131
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:130
+#: hypha/apply/funds/views/submission_edit.py:318
 #: hypha/apply/funds/workflows/definitions/double_stage.py:20
 #: hypha/apply/funds/workflows/definitions/double_stage.py:48
 #: hypha/apply/funds/workflows/definitions/double_stage.py:98
@@ -1194,6 +1399,10 @@ msgstr "Zobrazit "
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:50
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:120
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:164
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:19
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:46
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:105
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:20
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:47
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:93
@@ -1203,18 +1412,18 @@ msgstr "Zobrazit "
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
 #: hypha/apply/projects/reports/templates/reports/report_form.html:60
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:30
-#: hypha/apply/projects/views/project.py:309
-#: hypha/apply/projects/views/project.py:345
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
-#: hypha/apply/projects/views/project.py:903
-#: hypha/apply/projects/views/project.py:942
-#: hypha/apply/projects/views/project.py:976
-#: hypha/apply/projects/views/project.py:1009
-#: hypha/apply/projects/views/project.py:1363
-#: hypha/apply/projects/views/project.py:1436
-#: hypha/apply/projects/views/project.py:1467
-#: hypha/apply/projects/views/project.py:1622
+#: hypha/apply/projects/views/project.py:313
+#: hypha/apply/projects/views/project.py:349
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
+#: hypha/apply/projects/views/project.py:954
+#: hypha/apply/projects/views/project.py:993
+#: hypha/apply/projects/views/project.py:1027
+#: hypha/apply/projects/views/project.py:1060
+#: hypha/apply/projects/views/project.py:1414
+#: hypha/apply/projects/views/project.py:1487
+#: hypha/apply/projects/views/project.py:1518
+#: hypha/apply/projects/views/project.py:1673
 #: hypha/apply/review/templates/review/review_edit_form.html:67
 #: hypha/apply/review/templates/review/review_form.html:84
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1229,6 +1438,8 @@ msgstr "Odeslat"
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:58
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:59
 #: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:40
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:37
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:17
 #: hypha/apply/projects/templates/application_projects/project_form.html:33
 #: hypha/apply/users/templates/users/become.html:33
 #: hypha/templates/cotton/modal/confirm.html:48
@@ -1265,12 +1476,13 @@ msgid "Submissions"
 msgstr "Podání"
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:17
-#: hypha/apply/funds/tables.py:76
+#: hypha/apply/funds/tables.py:77
 #: hypha/apply/funds/templates/cotton/submission_list.html:38
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:41
-#: hypha/apply/funds/templates/funds/comments.html:37
-#: hypha/apply/projects/templates/application_projects/project_detail.html:31
-#: hypha/apply/review/views.py:432
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:29
+#: hypha/apply/funds/templates/funds/comments.html:25
+#: hypha/apply/projects/templates/application_projects/project_detail.html:26
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:24
+#: hypha/apply/review/views.py:441
 msgid "Comments"
 msgstr "Komentáře"
 
@@ -1279,7 +1491,7 @@ msgstr "Komentáře"
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
 #: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:62
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:68
 #: hypha/apply/review/templates/review/review_list.html:4
 #: hypha/apply/review/templates/review/review_list.html:9
 #: hypha/core/navigation.py:80
@@ -1317,6 +1529,7 @@ msgid "View your submission here"
 msgstr "Prohlédněte si své podání"
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:16
+#: hypha/apply/activity/templates/messages/email/author_updated.html:11
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:29
 #: hypha/apply/activity/templates/messages/email/invited_to_proposal.html:11
 #: hypha/apply/activity/templates/messages/email/submission_confirmation.html:10
@@ -1324,6 +1537,7 @@ msgid "If you have any questions, please submit them here"
 msgstr "Pokud máte nějaké dotazy, napište je sem"
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:18
+#: hypha/apply/activity/templates/messages/email/author_updated.html:13
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:31
 msgid "See our guide for more information"
 msgstr "Další informace najdete v našem průvodci"
@@ -1352,8 +1566,8 @@ msgstr "Projektová dokumentace je připravena ke schválení."
 #: hypha/apply/funds/templates/funds/revisions_compare.html:42
 #: hypha/apply/funds/templates/funds/revisions_compare.html:43
 #: hypha/core/models/system_settings.py:21
-#: hypha/core/models/system_settings.py:79
-#: hypha/core/models/system_settings.py:89
+#: hypha/core/models/system_settings.py:81
+#: hypha/core/models/system_settings.py:91
 msgid "Title"
 msgstr "Název"
 
@@ -1376,11 +1590,38 @@ msgstr "Odkaz"
 msgid "Please contact %(lead)s - %(email)s if you have any questions."
 msgstr "V případě dotazů kontaktujte %(lead)s - %(email)s."
 
+#: hypha/apply/activity/templates/messages/email/author_updated.html:6
+#, fuzzy, python-format
+#| msgid "You have been added as a partner the following submission."
+msgid "You have been assigned as an Applicant to submission \"%(title)s\"."
+msgstr "Byli jste přidáni jako partner následujícího podání."
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:10
+#, fuzzy
+#| msgid "View your submission"
+msgid "Link to your submission"
+msgstr "Prohlédněte si své podání"
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:15
+#, fuzzy, python-format
+#| msgid ""
+#| "If you have any issues accessing the submission system or other general "
+#| "inquiries, please email us at %(ORG_EMAIL)s"
+msgid ""
+"If you have any issues accessing the submission or other general inquiries, "
+"please email us at %(ORG_EMAIL)s"
+msgstr ""
+"V případě jakýchkoli problémů s přístupem do systému pro podávání žádostí "
+"nebo jiných obecných dotazů nám prosím napište na adresu %(ORG_EMAIL)s"
+
 #: hypha/apply/activity/templates/messages/email/base.html:5
 #: hypha/apply/users/templates/users/activation/email.txt:2
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:2
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:2
 #: hypha/apply/users/templates/users/emails/confirm_access.md:2
+#: hypha/apply/users/templates/users/emails/login_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:2
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:2
 #: hypha/apply/users/templates/users/emails/set_password.txt:2
 #: hypha/apply/users/templates/users/password_reset/email.txt:2
@@ -1393,6 +1634,9 @@ msgstr "Vážený %(user)s,"
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:7
 #: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/login_notification.md:14
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:15
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:15
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
 #: hypha/apply/users/templates/users/emails/set_password.txt:10
@@ -1427,6 +1671,22 @@ msgstr "Byl přidán nový komentář k „%(title)s“ od %(display_user)s."
 msgid "Read the full comment here"
 msgstr "Celý komentář si přečtěte zde"
 
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:5
+msgid "Hey there,"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:8
+#, fuzzy, python-format
+#| msgid "There has been a new comment on \"%(title)s\" by %(display_user)s."
+msgid "You have been assigned to a comment on \"%(title)s\"."
+msgstr "Byl přidán nový komentář k „%(title)s“ od %(display_user)s."
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:12
+#, fuzzy
+#| msgid "View project page"
+msgid "View it here"
+msgstr "Zobrazit stránku projektu"
+
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:13
 msgid "A new contract has been added to your Project"
 msgstr "Do vašeho projektu byla přidána nová smlouva"
@@ -1705,8 +1965,8 @@ msgid "no longer required"
 msgstr "již není vyžadováno"
 
 #: hypha/apply/activity/templates/messages/email/report_skipped.html:6
-#: hypha/apply/projects/models/project.py:818
-#: hypha/apply/projects/models/project.py:855
+#: hypha/apply/projects/models/project.py:847
+#: hypha/apply/projects/models/project.py:884
 msgid "required"
 msgstr "vyžadováno"
 
@@ -1825,7 +2085,7 @@ msgid "Please submit any questions related to your application here"
 msgstr "Případné dotazy týkající se vaší žádosti zasílejte zde"
 
 #: hypha/apply/activity/templatetags/activity_tags.py:50
-#: hypha/apply/funds/tables.py:498
+#: hypha/apply/funds/tables.py:562
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:12
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:28
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:44
@@ -1836,7 +2096,7 @@ msgstr "Recenzent"
 
 #: hypha/apply/activity/templatetags/activity_tags.py:61
 #: hypha/apply/funds/templates/cotton/submission_list.html:24
-#: hypha/apply/funds/templatetags/workflow_tags.py:72
+#: hypha/apply/funds/templatetags/workflow_tags.py:126
 #: hypha/apply/users/roles.py:5
 msgid "Applicant"
 msgstr "Žadatel"
@@ -1856,24 +2116,30 @@ msgstr ""
 msgid "You can begin submitting invoices and reports for your project."
 msgstr ""
 
-#: hypha/apply/activity/views.py:61
+#: hypha/apply/activity/views.py:99
 #, fuzzy
 #| msgid "You can only approve a signed contract"
 msgid "You can only edit your own comments"
 msgstr "Schválit můžete pouze podepsanou smlouvu"
 
-#: hypha/apply/activity/views.py:64
+#: hypha/apply/activity/views.py:102
 msgid "You can not edit a deleted comment"
 msgstr ""
 
-#: hypha/apply/activity/views.py:92
+#: hypha/apply/activity/views.py:130
 msgid "You can only delete your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:95
+#: hypha/apply/activity/views.py:133
 msgid "You can not delete a deleted comment"
 msgstr ""
 
+#: hypha/apply/activity/views.py:183
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment added!"
+msgstr "Komentář"
+
 #: hypha/apply/categories/admin.py:13
 #, fuzzy
 #| msgid "Category"
@@ -1895,27 +2161,27 @@ msgstr ""
 msgid "{title} {child_verbose_name} {verbose_name} for {parent}"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:31
+#: hypha/apply/categories/blocks.py:37
 msgid "Multi select"
 msgstr "Vícenásobný výběr"
 
-#: hypha/apply/categories/blocks.py:35 hypha/apply/funds/blocks.py:96
-#: hypha/apply/funds/blocks.py:153 hypha/apply/funds/blocks.py:199
+#: hypha/apply/categories/blocks.py:41 hypha/apply/funds/blocks.py:113
+#: hypha/apply/funds/blocks.py:170 hypha/apply/funds/blocks.py:216
 #: hypha/apply/stream_forms/blocks.py:36
 msgid "Label"
 msgstr "Štítek"
 
-#: hypha/apply/categories/blocks.py:37
+#: hypha/apply/categories/blocks.py:43
 msgid "Leave blank to use the default Category label"
 msgstr "Nechte prázdné, chcete-li použít výchozí štítek kategorie"
 
-#: hypha/apply/categories/blocks.py:40 hypha/apply/funds/blocks.py:100
-#: hypha/apply/funds/blocks.py:157 hypha/apply/funds/blocks.py:202
+#: hypha/apply/categories/blocks.py:46 hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:174 hypha/apply/funds/blocks.py:219
 #: hypha/apply/stream_forms/blocks.py:37
 msgid "Help text"
 msgstr "Text nápovědy"
 
-#: hypha/apply/categories/blocks.py:42
+#: hypha/apply/categories/blocks.py:48
 msgid "Leave blank to use the default Category help text"
 msgstr "Nechte prázdné, chcete-li použít výchozí text nápovědy kategorie"
 
@@ -1940,7 +2206,8 @@ msgstr "Zpřístupnění filtrování na ovládacím panelu"
 msgid "Options"
 msgstr "Možnosti"
 
-#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:234
+#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:248
+#: hypha/apply/funds/tables.py:333
 #: hypha/apply/funds/templates/submissions/all.html:419
 #: hypha/apply/projects/templates/application_projects/modals/contracting_documents_upload.html:7
 #: hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html:7
@@ -1988,11 +2255,15 @@ msgstr ""
 msgid "Tag"
 msgstr "Značka"
 
-#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:373
-#: hypha/apply/funds/tables.py:236
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:121
+#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:390
+#: hypha/apply/funds/tables.py:250
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:126
 #: hypha/apply/funds/templates/submissions/all.html:425
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:5
+#: hypha/apply/projects/forms/invoice.py:238 hypha/apply/projects/tables.py:115
+#: hypha/apply/projects/tables.py:152
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:58
+#: hypha/apply/projects/templates/application_projects/partials/invoice_tags.html:4
 msgid "Tags"
 msgstr "Značky"
 
@@ -2066,12 +2337,12 @@ msgstr "Moje aktivní faktury"
 
 #: hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html:91
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:24
-#: hypha/apply/funds/tables.py:68
+#: hypha/apply/funds/tables.py:69
 #: hypha/apply/funds/templates/submissions/all.html:328
-#: hypha/apply/projects/models/payment.py:26
-#: hypha/apply/projects/models/project.py:218
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:56
-#: hypha/apply/projects/tables.py:42
+#: hypha/apply/projects/models/invoice.py:37
+#: hypha/apply/projects/models/project.py:219
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:63
+#: hypha/apply/projects/tables.py:40
 msgid "Submitted"
 msgstr "Odesláno"
 
@@ -2113,7 +2384,7 @@ msgstr "Vaše předchozí hodnocení"
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:13
 #: hypha/apply/dashboard/templates/dashboard/staff_dashboard.html:16
 #: hypha/apply/users/templates/users/account.html:35
-#: hypha/templates/includes/user_menu.html:57
+#: hypha/apply/users/templates/users/includes/user_menu.html:57
 msgid "Administration"
 msgstr "Správa"
 
@@ -2130,7 +2401,7 @@ msgid "You don't have any PAFs for review right now"
 msgstr "Zatím nemáte žádné záložní kódy."
 
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:27
-#: hypha/apply/funds/models/co_applicants.py:16
+#: hypha/apply/funds/models/co_applicants.py:17
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:6
 #: hypha/core/navigation.py:109
@@ -2224,11 +2495,12 @@ msgstr "Žádné aktivní projekty"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:27
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
 #: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:79
-#: hypha/apply/todo/options.py:87 hypha/apply/todo/options.py:95
+#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:86
+#: hypha/apply/todo/options.py:94 hypha/apply/todo/options.py:102
 #: hypha/apply/todo/templates/todo/todolist_item.html:16
 msgid "Draft"
 msgstr "Pracovní"
@@ -2242,11 +2514,9 @@ msgstr "Navrženo "
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:30
 #: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:11
 #: hypha/apply/determinations/templates/determinations/includes/determination_block.html:18
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:104
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:84
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:79
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:28
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:40
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "by"
 msgstr "od"
@@ -2356,30 +2626,38 @@ msgstr "Odeslat oznámení"
 #: hypha/apply/determinations/blocks.py:77
 #: hypha/apply/determinations/blocks.py:78
 #: hypha/apply/determinations/blocks.py:79
-#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:276
-#: hypha/apply/review/blocks.py:172 hypha/apply/review/blocks.py:173
-#: hypha/apply/review/blocks.py:174 hypha/apply/review/blocks.py:175
-#: hypha/apply/review/blocks.py:176 hypha/apply/review/blocks.py:177
-#: hypha/apply/review/blocks.py:178 hypha/apply/stream_forms/blocks.py:475
-#: hypha/apply/stream_forms/blocks.py:476
-#: hypha/apply/stream_forms/blocks.py:477
-#: hypha/apply/stream_forms/blocks.py:478
-#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482
-#: hypha/apply/stream_forms/blocks.py:483
-#: hypha/apply/stream_forms/blocks.py:484
-#: hypha/apply/stream_forms/blocks.py:485
-#: hypha/apply/stream_forms/blocks.py:486
-#: hypha/apply/stream_forms/blocks.py:487
-#: hypha/apply/stream_forms/blocks.py:488 hypha/apply/utils/blocks.py:74
+#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:303
+#: hypha/apply/funds/blocks.py:304 hypha/apply/funds/blocks.py:305
+#: hypha/apply/funds/blocks.py:306 hypha/apply/funds/blocks.py:307
+#: hypha/apply/funds/blocks.py:308 hypha/apply/funds/blocks.py:309
+#: hypha/apply/funds/blocks.py:310 hypha/apply/funds/blocks.py:311
+#: hypha/apply/funds/blocks.py:312 hypha/apply/funds/blocks.py:313
+#: hypha/apply/funds/blocks.py:314 hypha/apply/funds/blocks.py:315
+#: hypha/apply/funds/blocks.py:316 hypha/apply/funds/blocks.py:317
+#: hypha/apply/funds/blocks.py:318 hypha/apply/review/blocks.py:172
+#: hypha/apply/review/blocks.py:173 hypha/apply/review/blocks.py:174
+#: hypha/apply/review/blocks.py:175 hypha/apply/review/blocks.py:176
+#: hypha/apply/review/blocks.py:177 hypha/apply/review/blocks.py:178
+#: hypha/apply/stream_forms/blocks.py:513
+#: hypha/apply/stream_forms/blocks.py:514
+#: hypha/apply/stream_forms/blocks.py:515
+#: hypha/apply/stream_forms/blocks.py:516
+#: hypha/apply/stream_forms/blocks.py:517
+#: hypha/apply/stream_forms/blocks.py:518
+#: hypha/apply/stream_forms/blocks.py:519
+#: hypha/apply/stream_forms/blocks.py:520
+#: hypha/apply/stream_forms/blocks.py:521
+#: hypha/apply/stream_forms/blocks.py:522
+#: hypha/apply/stream_forms/blocks.py:523
+#: hypha/apply/stream_forms/blocks.py:524
+#: hypha/apply/stream_forms/blocks.py:525
+#: hypha/apply/stream_forms/blocks.py:526 hypha/apply/utils/blocks.py:74
 #: hypha/apply/utils/blocks.py:75
 msgid "Fields"
 msgstr "Pole"
 
 #: hypha/apply/determinations/blocks.py:78 hypha/apply/review/blocks.py:174
-#: hypha/apply/stream_forms/blocks.py:473
+#: hypha/apply/stream_forms/blocks.py:511
 msgid "Paragraph"
 msgstr "Paragraf"
 
@@ -2401,7 +2679,7 @@ msgid "Do you recommend requesting a proposal based on this concept note?"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:305
-#: hypha/apply/determinations/views.py:99
+#: hypha/apply/determinations/views.py:100
 msgid "-- No determination selected -- "
 msgstr "-- Nebylo vybráno žádné určení -- "
 
@@ -2482,22 +2760,22 @@ msgid "Rationale and appropriateness questions and comments"
 msgstr "Otázky a připomínky k odůvodnění a vhodnosti"
 
 #: hypha/apply/determinations/forms.py:592
-#: hypha/apply/determinations/views.py:389
+#: hypha/apply/determinations/views.py:394
 msgid "-- No proposal form selected -- "
 msgstr "-- Nebyl vybrán žádný formulář návrhu -- "
 
 #: hypha/apply/determinations/forms.py:595
-#: hypha/apply/determinations/views.py:392
+#: hypha/apply/determinations/views.py:397
 msgid "Select the proposal form only for determination approval"
 msgstr "Zvolte formulář návrhu pouze pro schválení určení"
 
 #: hypha/apply/determinations/forms.py:599
-#: hypha/apply/determinations/views.py:396
+#: hypha/apply/determinations/views.py:401
 msgid "Select the proposal form to use for proposal stage."
 msgstr "Vyberte formulář návrhu, který chcete použít pro fázi návrhu."
 
 #: hypha/apply/determinations/forms.py:602
-#: hypha/apply/determinations/views.py:399
+#: hypha/apply/determinations/views.py:404
 msgid "Proposal Form"
 msgstr "Formulář pro návrh"
 
@@ -2569,11 +2847,12 @@ msgstr "Zpráva o určení"
 #: hypha/apply/determinations/models.py:214
 #: hypha/apply/determinations/models.py:218
 #: hypha/apply/determinations/options.py:10
-#: hypha/apply/funds/workflows/constants.py:93
+#: hypha/apply/funds/workflows/constants.py:97
 #: hypha/apply/funds/workflows/definitions/double_stage.py:147
 #: hypha/apply/funds/workflows/definitions/double_stage.py:326
 #: hypha/apply/funds/workflows/definitions/single_stage.py:149
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:214
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:198
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:138
 msgid "Dismissed"
@@ -2588,7 +2867,7 @@ msgid "Needs more info"
 msgstr "0. Je třeba více informací"
 
 #: hypha/apply/determinations/models.py:255
-#: hypha/apply/funds/workflows/registry.py:66
+#: hypha/apply/funds/workflows/registry.py:67
 msgid "Request"
 msgstr "Žádost"
 
@@ -2651,9 +2930,9 @@ msgstr "Skrýt žádost"
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:85
 #: hypha/apply/funds/templates/funds/application_base.html:125
 #: hypha/apply/funds/templates/funds/applicationsubmission_form.html:49
-#: hypha/apply/funds/views/submission_edit.py:129
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:320
+#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:319
 #: hypha/apply/projects/reports/templates/reports/report_form.html:69
 #: hypha/apply/projects/templates/application_projects/project_approval_form.html:52
 #: hypha/apply/projects/templates/application_projects/project_sow_form.html:48
@@ -2663,7 +2942,7 @@ msgid "Save draft"
 msgstr "Uložit návrh"
 
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:108
-#: hypha/apply/funds/templates/funds/comments.html:108
+#: hypha/apply/funds/templates/funds/comments.html:96
 #: hypha/apply/review/templates/review/review_form.html:107
 #: hypha/templates/cotton/dropdown_menu.html:99
 msgid "Loading…"
@@ -2720,8 +2999,8 @@ msgstr "Staňte se"
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:34
 #: hypha/apply/funds/templates/funds/application_preview.html:66
 #: hypha/apply/funds/templates/funds/submission-success.html:65
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:88
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:96
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:95
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:74
 msgid "Continue editing"
 msgstr "Pokračujte v úpravách"
 
@@ -2750,37 +3029,37 @@ msgstr "Aktualizace návrhu"
 msgid "Add determination"
 msgstr "Přidat rozhodnutí"
 
-#: hypha/apply/determinations/views.py:120
+#: hypha/apply/determinations/views.py:121
 msgid "Improperly configured request, please try again."
 msgstr "Nesprávně nakonfigurovaný požadavek, zkuste to prosím znovu."
 
-#: hypha/apply/determinations/views.py:213
+#: hypha/apply/determinations/views.py:214
 #, python-brace-format
 msgid "Successfully determined as {outcome}: "
 msgstr "Úspěšně určeno jako {outcome}: "
 
-#: hypha/apply/determinations/views.py:234
+#: hypha/apply/determinations/views.py:235
 #, python-brace-format
 msgid "Unable to determine submission \"{title}\" as already determined"
 msgstr "Nelze určit podání \"{title}\" jako již určené"
 
-#: hypha/apply/determinations/views.py:286
+#: hypha/apply/determinations/views.py:291
 msgid "You do not have permission to create that determination."
 msgstr "K vytvoření tohoto rozhodnutí nemáte oprávnění."
 
-#: hypha/apply/determinations/views.py:291
+#: hypha/apply/determinations/views.py:296
 msgid "A final determination has already been submitted."
 msgstr "Konečné rozhodnutí již bylo předloženo."
 
-#: hypha/apply/determinations/views.py:304
+#: hypha/apply/determinations/views.py:309
 msgid "There is a draft determination you do not have permission to edit."
 msgstr "Existuje návrh rozhodnutí, který nemáte oprávnění upravovat."
 
-#: hypha/apply/determinations/views.py:460
+#: hypha/apply/determinations/views.py:469
 msgid "A project was automatically created."
 msgstr "Projekt byl automaticky vytvořen."
 
-#: hypha/apply/determinations/views.py:504
+#: hypha/apply/determinations/views.py:513
 #, python-brace-format
 msgid ""
 "A determination of \"{current}\" exists but you tried to progress as "
@@ -2789,7 +3068,7 @@ msgstr ""
 "Rozhodnutí o \"{current}\" existuje, ale pokusili jste se postoupit jako "
 "\"{target}\""
 
-#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:554
+#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:626
 #: hypha/apply/users/roles.py:6
 msgid "Staff"
 msgstr "Tým"
@@ -2858,10 +3137,11 @@ msgstr "Označení zaměstnanců"
 msgid "Sealed Rounds"
 msgstr "Kola a zapečetěná Kola"
 
-#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:40
-#: hypha/apply/funds/tables.py:223 hypha/apply/funds/tables.py:314
-#: hypha/apply/funds/tables.py:437 hypha/apply/funds/tables.py:474
-#: hypha/apply/projects/filters.py:35 hypha/apply/projects/filters.py:51
+#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:41
+#: hypha/apply/funds/tables.py:237 hypha/apply/funds/tables.py:325
+#: hypha/apply/funds/tables.py:372 hypha/apply/funds/tables.py:501
+#: hypha/apply/funds/tables.py:538 hypha/apply/projects/filters.py:39
+#: hypha/apply/projects/filters.py:55
 msgid "Funds"
 msgstr "Fondy"
 
@@ -2872,7 +3152,7 @@ msgid "Request For Partners"
 msgstr "Žádost o změnu"
 
 #: hypha/apply/funds/admin.py:118 hypha/apply/funds/admin_helpers.py:73
-#: hypha/apply/funds/models/__init__.py:74
+#: hypha/apply/funds/models/__init__.py:75
 msgid "Labs"
 msgstr "Laboratoře"
 
@@ -2934,8 +3214,8 @@ msgstr "Fond nebo RFP"
 
 #: hypha/apply/funds/admin_helpers.py:47
 #: hypha/apply/funds/templates/funds/application_base.html:135
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:321
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:320
 msgid "Preview"
 msgstr "Náhled"
 
@@ -2963,7 +3243,7 @@ msgstr "Kola a zapečetěná Kola"
 msgid "state"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:413
+#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:477
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:22
 #: hypha/apply/funds/templates/funds/includes/round-block.html:12
 #: hypha/apply/funds/templates/funds/includes/round-block.html:20
@@ -2972,7 +3252,7 @@ msgstr ""
 msgid "Open"
 msgstr "Otevřeno"
 
-#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:414
+#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:478
 #: hypha/apply/funds/templates/funds/includes/round-block.html:30
 #: hypha/apply/funds/templates/funds/includes/round-block.html:37
 #: hypha/apply/funds/templates/funds/includes/round-block.html:39
@@ -2981,14 +3261,14 @@ msgid "Closed"
 msgstr "Uzavřeno"
 
 #: hypha/apply/funds/admin_helpers.py:92
-#: hypha/apply/projects/models/project.py:220
-#: hypha/apply/projects/models/project.py:226
+#: hypha/apply/projects/models/project.py:221
+#: hypha/apply/projects/models/project.py:227
 #, fuzzy
 #| msgid "Project start date: "
 msgid "Not started"
 msgstr "Datum zahájení projektu: "
 
-#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:416
+#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:480
 msgid "Unpublished"
 msgstr ""
 
@@ -3003,118 +3283,124 @@ msgstr "Kopírovat"
 msgid "Copy {form_name}"
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:79
+#: hypha/apply/funds/admin_views.py:68
+msgid ""
+"Please select the date in the copied page. Newly copied pages have NONE "
+"value for the start and end date"
+msgstr ""
+
+#: hypha/apply/funds/admin_views.py:77
 #, python-brace-format
 msgid "Page '{0}' and {1} subpages copied."
 msgstr "Stránka '{0}' a podstránky {1} zkopírovány."
 
-#: hypha/apply/funds/admin_views.py:85
+#: hypha/apply/funds/admin_views.py:83
 #, python-brace-format
 msgid "Page '{0}' copied."
 msgstr "Stránka '{0}' zkopírována."
 
-#: hypha/apply/funds/blocks.py:94
+#: hypha/apply/funds/blocks.py:111
 #, fuzzy
 #| msgid "The title of the main news feed."
 msgid "The title of the project"
 msgstr "Název hlavního informačního kanálu."
 
-#: hypha/apply/funds/blocks.py:96
+#: hypha/apply/funds/blocks.py:113
 msgid "What is the title of your application?"
 msgstr "Jaký je název vaší žádosti?"
 
-#: hypha/apply/funds/blocks.py:101
+#: hypha/apply/funds/blocks.py:118
 msgid "This project name can be changed if a full proposal is requested."
 msgstr "Tento název projektu lze změnit, pokud je požadován úplný návrh."
 
-#: hypha/apply/funds/blocks.py:103
+#: hypha/apply/funds/blocks.py:120
 msgid "Max length"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:106
+#: hypha/apply/funds/blocks.py:123
 msgid "Application title"
 msgstr "Název žádosti"
 
-#: hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:134
 #, fuzzy
 #| msgid "Create project"
 msgid "The value of the project"
 msgstr "Vytvořit projekt"
 
-#: hypha/apply/funds/blocks.py:126
+#: hypha/apply/funds/blocks.py:143
 msgid "Requested amount"
 msgstr "Požadovaná částka"
 
-#: hypha/apply/funds/blocks.py:142
+#: hypha/apply/funds/blocks.py:159
 msgid "The name of the organization"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:146
+#: hypha/apply/funds/blocks.py:163
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:73
 #: hypha/apply/projects/reports/tables.py:24
 msgid "Organization name"
 msgstr "Název organizace"
 
-#: hypha/apply/funds/blocks.py:151
+#: hypha/apply/funds/blocks.py:168
 #, fuzzy
 #| msgid "email address"
 msgid "The applicant email address"
 msgstr "e-mailová adresa"
 
-#: hypha/apply/funds/blocks.py:153
+#: hypha/apply/funds/blocks.py:170
 msgid "What email address should we use to contact you?"
 msgstr "Jakou e-mailovou adresu máme použít pro kontakt s vámi?"
 
-#: hypha/apply/funds/blocks.py:159
+#: hypha/apply/funds/blocks.py:176
 msgid ""
 "We will use this email address to communicate with you about your proposal."
 msgstr ""
 "Tuto e-mailovou adresu budeme používat ke komunikaci s vámi ohledně vašeho "
 "návrhu."
 
-#: hypha/apply/funds/blocks.py:172
+#: hypha/apply/funds/blocks.py:189
 msgid "The postal address of the user"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:177
+#: hypha/apply/funds/blocks.py:194
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:66
 #: hypha/apply/funds/templates/funds/revisions_compare.html:57
 #: hypha/apply/funds/templates/funds/revisions_compare.html:58
 msgid "Address"
 msgstr "Adresa"
 
-#: hypha/apply/funds/blocks.py:198 hypha/apply/funds/blocks.py:215
+#: hypha/apply/funds/blocks.py:215 hypha/apply/funds/blocks.py:232
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: hypha/apply/funds/blocks.py:199
+#: hypha/apply/funds/blocks.py:216
 msgid "What is your name?"
 msgstr "Jak se jmenujete?"
 
-#: hypha/apply/funds/blocks.py:204
+#: hypha/apply/funds/blocks.py:221
 msgid "We will use this name when we communicate with you about your proposal."
 msgstr ""
 "Toto jméno budeme používat při komunikaci s vámi ohledně vašeho návrhu."
 
-#: hypha/apply/funds/blocks.py:221
+#: hypha/apply/funds/blocks.py:238
 #, fuzzy
 #| msgid "Project Duration"
 msgid "Duration"
 msgstr "Doba trvání projektu"
 
-#: hypha/apply/funds/blocks.py:227
+#: hypha/apply/funds/blocks.py:244
 msgid "Days"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:228 hypha/apply/projects/reports/models.py:244
+#: hypha/apply/funds/blocks.py:245 hypha/apply/projects/reports/models.py:249
 msgid "Weeks"
 msgstr "Týdny"
 
-#: hypha/apply/funds/blocks.py:229 hypha/apply/projects/reports/models.py:245
+#: hypha/apply/funds/blocks.py:246 hypha/apply/projects/reports/models.py:250
 msgid "Months"
 msgstr "Měsíce"
 
-#: hypha/apply/funds/blocks.py:232
+#: hypha/apply/funds/blocks.py:249
 #, python-brace-format
 msgid "{} day"
 msgid_plural "{} days"
@@ -3122,7 +3408,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hypha/apply/funds/blocks.py:235
+#: hypha/apply/funds/blocks.py:252
 #, fuzzy, python-brace-format
 #| msgid "week"
 msgid "{} week"
@@ -3131,7 +3417,7 @@ msgstr[0] "týden"
 msgstr[1] "týden"
 msgstr[2] "týden"
 
-#: hypha/apply/funds/blocks.py:238
+#: hypha/apply/funds/blocks.py:255
 #, fuzzy, python-brace-format
 #| msgid "month"
 msgid "{} month"
@@ -3140,17 +3426,17 @@ msgstr[0] "měsíc"
 msgstr[1] "měsíc"
 msgstr[2] "měsíc"
 
-#: hypha/apply/funds/blocks.py:244
+#: hypha/apply/funds/blocks.py:261
 msgid ""
 "Duration type is used to display duration choices in Days, Weeks or Months "
 "in application forms. Be careful, changing the duration type in the active "
 "round can result in data inconsistency."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:275 hypha/apply/stream_forms/blocks.py:473
-#: hypha/apply/stream_forms/blocks.py:474
-#: hypha/apply/stream_forms/blocks.py:489
-#: hypha/apply/stream_forms/blocks.py:490 hypha/apply/utils/blocks.py:85
+#: hypha/apply/funds/blocks.py:319 hypha/apply/stream_forms/blocks.py:511
+#: hypha/apply/stream_forms/blocks.py:512
+#: hypha/apply/stream_forms/blocks.py:527
+#: hypha/apply/stream_forms/blocks.py:528 hypha/apply/utils/blocks.py:85
 msgid "Custom"
 msgstr "Přizpůsobení"
 
@@ -3158,7 +3444,7 @@ msgstr "Přizpůsobení"
 msgid "Take action"
 msgstr "Podnikněte kroky"
 
-#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:448
+#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:458
 #, python-brace-format
 msgid "Update lead from {lead} to"
 msgstr "Aktualizace vedení z {lead} na"
@@ -3193,46 +3479,46 @@ msgstr "---"
 msgid "{role_name} Reviewer"
 msgstr "{role_name} Recenzent"
 
-#: hypha/apply/funds/forms.py:376
+#: hypha/apply/funds/forms.py:393
 msgid "Tags are hierarchical in nature."
 msgstr "Značky mají hierarchickou povahu."
 
-#: hypha/apply/funds/forms.py:425 hypha/apply/stream_forms/blocks.py:118
+#: hypha/apply/funds/forms.py:442 hypha/apply/stream_forms/blocks.py:156
 msgid "Email"
 msgstr "E-mail"
 
-#: hypha/apply/funds/forms.py:427 hypha/apply/funds/forms.py:460
+#: hypha/apply/funds/forms.py:444 hypha/apply/funds/forms.py:477
 msgid "Role"
 msgstr "Role"
 
-#: hypha/apply/funds/forms.py:433 hypha/apply/funds/forms.py:466
+#: hypha/apply/funds/forms.py:450 hypha/apply/funds/forms.py:483
 #, fuzzy
 #| msgid "Project Duration"
 msgid "Project permissions"
 msgstr "Doba trvání projektu"
 
-#: hypha/apply/funds/forms.py:435 hypha/apply/funds/forms.py:468
+#: hypha/apply/funds/forms.py:452 hypha/apply/funds/forms.py:485
 msgid ""
 "Enable same access level to these sections. Example: View role + Contracting "
 "= read-only contracting access."
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:39 hypha/apply/funds/tables.py:75
+#: hypha/apply/funds/models/__init__.py:40 hypha/apply/funds/tables.py:76
 #: hypha/apply/funds/templates/submissions/all.html:410
-#: hypha/apply/projects/tables.py:185 hypha/apply/projects/tables.py:262
+#: hypha/apply/projects/tables.py:203 hypha/apply/projects/tables.py:284
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
 msgid "Fund"
 msgstr "Fond"
 
-#: hypha/apply/funds/models/__init__.py:47
+#: hypha/apply/funds/models/__init__.py:48
 msgid "RFP"
 msgstr "RFP"
 
-#: hypha/apply/funds/models/__init__.py:48
+#: hypha/apply/funds/models/__init__.py:49
 msgid "RFPs"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:55
+#: hypha/apply/funds/models/__init__.py:56
 #: hypha/apply/funds/templates/cotton/submission_list.html:31
 #: hypha/apply/funds/templates/submissions/all.html:414
 #, fuzzy
@@ -3240,26 +3526,27 @@ msgstr ""
 msgid "Round"
 msgstr "Kola"
 
-#: hypha/apply/funds/models/__init__.py:56 hypha/apply/funds/tables.py:225
-#: hypha/apply/funds/tables.py:312 hypha/apply/funds/tables.py:479
+#: hypha/apply/funds/models/__init__.py:57 hypha/apply/funds/tables.py:239
+#: hypha/apply/funds/tables.py:327 hypha/apply/funds/tables.py:370
+#: hypha/apply/funds/tables.py:543
 #: hypha/apply/funds/templates/funds/rounds.html:5
 #: hypha/apply/funds/templates/funds/rounds.html:10
 msgid "Rounds"
 msgstr "Kola"
 
-#: hypha/apply/funds/models/__init__.py:63
+#: hypha/apply/funds/models/__init__.py:64
 #, fuzzy
 #| msgid "Sealed"
 msgid "Sealed round"
 msgstr "Zapečetěno"
 
-#: hypha/apply/funds/models/__init__.py:64
+#: hypha/apply/funds/models/__init__.py:65
 #, fuzzy
 #| msgid "Rounds and Sealed Rounds"
 msgid "Sealed rounds"
 msgstr "Kola a zapečetěná Kola"
 
-#: hypha/apply/funds/models/__init__.py:73
+#: hypha/apply/funds/models/__init__.py:74
 msgid "Lab"
 msgstr "Lab"
 
@@ -3511,92 +3798,93 @@ msgstr "Přiřadit hodnotitele"
 msgid "assigned reviewers"
 msgstr "Přiřadit hodnotitele"
 
-#: hypha/apply/funds/models/co_applicants.py:14
+#: hypha/apply/funds/models/co_applicants.py:15
 #, fuzzy
 #| msgid "Project documents"
 msgid "Project Document"
 msgstr "Projektové dokumenty"
 
-#: hypha/apply/funds/models/co_applicants.py:15
+#: hypha/apply/funds/models/co_applicants.py:16
 #, fuzzy
 #| msgid "Contracting documents"
 msgid "Contracting Document"
 msgstr "Zadávací dokumentace"
 
-#: hypha/apply/funds/models/co_applicants.py:17
+#: hypha/apply/funds/models/co_applicants.py:18
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:10
 #: hypha/apply/projects/reports/templates/reports/report_list.html:6
 #: hypha/core/navigation.py:114
 msgid "Reports"
 msgstr "Zprávy"
 
-#: hypha/apply/funds/models/co_applicants.py:21
+#: hypha/apply/funds/models/co_applicants.py:22
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:22
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:53
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
 msgid "Pending"
 msgstr "Čekající"
 
-#: hypha/apply/funds/models/co_applicants.py:22
-#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/workflows/constants.py:93
 #: hypha/apply/funds/workflows/definitions/double_stage.py:311
 #: hypha/apply/funds/workflows/definitions/single_stage.py:134
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:197
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:182
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:123
 msgid "Accepted"
 msgstr "Přijato"
 
-#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/models/co_applicants.py:24
 #, fuzzy
 #| msgid "Selected"
 msgid "Rejected"
 msgstr "Vybráno"
 
-#: hypha/apply/funds/models/co_applicants.py:24
+#: hypha/apply/funds/models/co_applicants.py:25
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:14
 msgid "Expired"
 msgstr "Vypršela platnost"
 
-#: hypha/apply/funds/models/co_applicants.py:33
+#: hypha/apply/funds/models/co_applicants.py:34
 #, fuzzy
 #| msgid "Send reset email"
 msgid "invited user email"
 msgstr "Odeslat e-mail pro obnovení"
 
-#: hypha/apply/funds/models/co_applicants.py:42
-#: hypha/apply/funds/models/submissions.py:487
-#: hypha/apply/projects/models/payment.py:137
-#: hypha/apply/projects/models/project.py:262
+#: hypha/apply/funds/models/co_applicants.py:43
+#: hypha/apply/funds/models/submissions.py:495
+#: hypha/apply/projects/models/invoice.py:160
+#: hypha/apply/projects/models/project.py:267
 #, fuzzy
 #| msgid "Status"
 msgid "status"
 msgstr "Stav"
 
-#: hypha/apply/funds/models/co_applicants.py:48
-#: hypha/apply/funds/models/co_applicants.py:77
+#: hypha/apply/funds/models/co_applicants.py:49
+#: hypha/apply/funds/models/co_applicants.py:83
 msgid "role"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:57
+#: hypha/apply/funds/models/co_applicants.py:58
 #, fuzzy
 #| msgid "Remove applicant filter"
 msgid "co-applicant invite"
 msgstr "Odebrat filtr žadatel"
 
-#: hypha/apply/funds/models/co_applicants.py:58
+#: hypha/apply/funds/models/co_applicants.py:59
 #, fuzzy
 #| msgid "Remove applicant filter"
 msgid "co-applicant invites"
 msgstr "Odebrat filtr žadatel"
 
-#: hypha/apply/funds/models/co_applicants.py:84
+#: hypha/apply/funds/models/co_applicants.py:90
 #, fuzzy
 #| msgid "applicant"
 msgid "co-applicant"
 msgstr "žadatel"
 
-#: hypha/apply/funds/models/co_applicants.py:85
+#: hypha/apply/funds/models/co_applicants.py:91
 #, fuzzy
 #| msgid "applicant"
 msgid "co-applicants"
@@ -3972,23 +4260,24 @@ msgstr "Rozhodnutí o prověření"
 msgid "screening decisions"
 msgstr "Rozhodnutí o prověření"
 
-#: hypha/apply/funds/models/submissions.py:439
+#: hypha/apply/funds/models/submissions.py:447
 #, fuzzy
 #| msgid "Summary"
 msgid "summary"
 msgstr "Shrnutí"
 
-#: hypha/apply/funds/models/submissions.py:502
+#: hypha/apply/funds/models/submissions.py:510
+#: hypha/apply/funds/models/submissions.py:1119
 msgid "submit time"
 msgstr "čas předložení"
 
-#: hypha/apply/funds/models/submissions.py:531
+#: hypha/apply/funds/models/submissions.py:539
 #, fuzzy
 #| msgid "Applied submissions"
 msgid "application submission"
 msgstr "Uplatněná podání"
 
-#: hypha/apply/funds/models/submissions.py:532
+#: hypha/apply/funds/models/submissions.py:540
 #, fuzzy
 #| msgid "Applied submissions"
 msgid "application submissions"
@@ -4038,14 +4327,17 @@ msgid "Confirmation email"
 msgstr "Potvrzovací e-mail"
 
 #: hypha/apply/funds/models/utils.py:211
+#: hypha/apply/projects/models/invoice.py:21
 msgid "Failed"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:212
+#: hypha/apply/projects/models/invoice.py:22
 msgid "Success"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:213
+#: hypha/apply/projects/models/invoice.py:23
 msgid "In Progress"
 msgstr "Probíhá"
 
@@ -4061,8 +4353,8 @@ msgstr "Podání: Stáhnout jako CSV"
 msgid "submission export managers"
 msgstr "Podání: Stáhnout jako CSV"
 
-#: hypha/apply/funds/permissions.py:24 hypha/apply/funds/permissions.py:34
-#: hypha/apply/funds/permissions.py:208 hypha/apply/projects/permissions.py:44
+#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
+#: hypha/apply/funds/permissions.py:212 hypha/apply/projects/permissions.py:44
 #: hypha/apply/projects/permissions.py:57
 #: hypha/apply/projects/permissions.py:124
 #: hypha/apply/projects/permissions.py:179
@@ -4070,42 +4362,44 @@ msgstr "Podání: Stáhnout jako CSV"
 #: hypha/apply/projects/permissions.py:261
 #: hypha/apply/projects/permissions.py:327
 #: hypha/apply/projects/permissions.py:346
+#: hypha/apply/projects/permissions.py:423
+#: hypha/apply/projects/permissions.py:441
 #, fuzzy
 #| msgid " Required"
 msgid "Login Required"
 msgstr " Vyžadováno"
 
-#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
-#: hypha/apply/funds/permissions.py:211
+#: hypha/apply/funds/permissions.py:30 hypha/apply/funds/permissions.py:40
+#: hypha/apply/funds/permissions.py:215
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:25
 #: hypha/apply/funds/templates/funds/includes/submission-table-row.html:26
 msgid "Archived Submission"
 msgstr "Archivované podání"
 
-#: hypha/apply/funds/permissions.py:43
+#: hypha/apply/funds/permissions.py:46
 msgid "Co-applicant with edit role can edit submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:44
+#: hypha/apply/funds/permissions.py:47
 #, fuzzy
 #| msgid "Remove applicant filter"
 msgid "Co-applicant does not have edit role"
 msgstr "Odebrat filtr žadatel"
 
-#: hypha/apply/funds/permissions.py:45
+#: hypha/apply/funds/permissions.py:48
 msgid "User can edit in current phase"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:155
+#: hypha/apply/funds/permissions.py:159
 msgid "Staff is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:157
+#: hypha/apply/funds/permissions.py:161
 msgid "Staff Admin is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:158 hypha/apply/funds/permissions.py:255
-#: hypha/apply/funds/permissions.py:263 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:162 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:289 hypha/apply/funds/permissions.py:305
 #: hypha/apply/projects/permissions.py:49
 #: hypha/apply/projects/permissions.py:77
 #: hypha/apply/projects/permissions.py:85
@@ -4126,190 +4420,198 @@ msgstr ""
 msgid "Forbidden Error"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:231
+#: hypha/apply/funds/permissions.py:259
 #, fuzzy
 #| msgid "No active submissions"
 msgid "No access to view submission"
 msgstr "Žádná aktivní podání"
 
-#: hypha/apply/funds/permissions.py:233
+#: hypha/apply/funds/permissions.py:261
 msgid "Applicant cannot view submission screening"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:239
+#: hypha/apply/funds/permissions.py:267
 #, fuzzy
 #| msgid "New partner(s) has been added to your submission."
 msgid "Co-applicant can't be added to archived submission"
 msgstr "K vašemu podání byl přidán nový partner (noví partneři)."
 
-#: hypha/apply/funds/permissions.py:245
+#: hypha/apply/funds/permissions.py:271
 msgid "Co-applicants can't be invited to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:250
+#: hypha/apply/funds/permissions.py:276
 #, fuzzy
 #| msgid "archived this submission"
 msgid "Limit reached for this submission"
 msgstr "archivoval toto podání"
 
-#: hypha/apply/funds/permissions.py:252
+#: hypha/apply/funds/permissions.py:278
 msgid "Applicants can invite co-applicants to their application"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:254
+#: hypha/apply/funds/permissions.py:280
 msgid "Staff can invite co-applicant on behalf of applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:260
+#: hypha/apply/funds/permissions.py:286
 msgid "Submission user can access their submission's co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:262
+#: hypha/apply/funds/permissions.py:288
 msgid "Staff can access each submissions' co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:268
+#: hypha/apply/funds/permissions.py:294
 msgid "Co-applicant can't be updated to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:274
+#: hypha/apply/funds/permissions.py:298
 msgid "Co-applicants can't be updated to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:276
+#: hypha/apply/funds/permissions.py:300
 #, fuzzy
 #| msgid "Are you sure you want to delete"
 msgid "Same user who invited can delete the co-applicant"
 msgstr "Opravdu chcete odstranit"
 
-#: hypha/apply/funds/permissions.py:278
+#: hypha/apply/funds/permissions.py:302
 #, fuzzy
 #| msgid "Are you sure you want to delete"
 msgid "Submission owner can delete the co-applicant"
 msgstr "Opravdu chcete odstranit"
 
-#: hypha/apply/funds/permissions.py:280
+#: hypha/apply/funds/permissions.py:304
 msgid "Staff can delete any co-applicant of any submission"
 msgstr ""
 
-#: hypha/apply/funds/services.py:45
+#: hypha/apply/funds/services.py:47
 #, fuzzy, python-brace-format
 #| msgid "{number} submissions archived."
 msgid "{count} submissions archived."
 msgstr "{number} podání archivováno."
 
-#: hypha/apply/funds/services.py:78
+#: hypha/apply/funds/services.py:80
 #, fuzzy, python-brace-format
 #| msgid "{number} submissions deleted."
 msgid "{count} submissions deleted."
 msgstr "{number} podání archivováno."
 
-#: hypha/apply/funds/services.py:108
+#: hypha/apply/funds/services.py:150
+#, fuzzy, python-brace-format
+#| msgid "{number} submissions archived."
+msgid "{sub_number} submission anonymized"
+msgid_plural "{sub_number} submissions anonymized"
+msgstr[0] "{number} podání archivováno."
+msgstr[1] "{number} podání archivováno."
+msgstr[2] "{number} podání archivováno."
+
+#: hypha/apply/funds/services.py:175
 #, python-brace-format
 msgid "Lead set to {lead} on "
 msgstr "Vedení nastavené na {lead} na "
 
-#: hypha/apply/funds/services.py:158
+#: hypha/apply/funds/services.py:225
 #, python-brace-format
 msgid "{user} as {name}"
 msgstr "{user} jako {name}"
 
-#: hypha/apply/funds/services.py:166
+#: hypha/apply/funds/services.py:233
 #, python-brace-format
 msgid "Batch reviewers updated: {reviewers_text} on "
 msgstr "Skupina hodnotitelů přidala: {reviewers_text} v "
 
-#: hypha/apply/funds/tables.py:70
+#: hypha/apply/funds/tables.py:71
 #: hypha/apply/funds/templates/cotton/submission_list.html:22
 #: hypha/apply/funds/templates/submissions/all.html:344
 #: hypha/apply/funds/templates/submissions/all.html:470
-#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
-#: hypha/apply/projects/forms/payment.py:208
+#: hypha/apply/projects/filters.py:43 hypha/apply/projects/filters.py:64
+#: hypha/apply/projects/forms/invoice.py:210
 #: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:183
-#: hypha/apply/projects/tables.py:260
+#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:200
+#: hypha/apply/projects/tables.py:282
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:58
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:6
 #: hypha/apply/users/admin_views.py:55 hypha/apply/users/admin_views.py:128
 msgid "Status"
 msgstr "Stav"
 
-#: hypha/apply/funds/tables.py:74
+#: hypha/apply/funds/tables.py:75
 msgid "Type"
 msgstr "Typ"
 
-#: hypha/apply/funds/tables.py:78
+#: hypha/apply/funds/tables.py:79
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "Last updated"
 msgstr "Naposledy aktualizováno"
 
-#: hypha/apply/funds/tables.py:100
+#: hypha/apply/funds/tables.py:101
 msgid "No submissions available"
 msgstr "Žádná podání nejsou k dispozici"
 
-#: hypha/apply/funds/tables.py:210
+#: hypha/apply/funds/tables.py:224
 msgid "Statuses"
 msgstr "Stavy"
 
-#: hypha/apply/funds/tables.py:226 hypha/apply/funds/tables.py:438
+#: hypha/apply/funds/tables.py:240 hypha/apply/funds/tables.py:502
 msgid "Leads"
 msgstr "Vedoucí pracovníci"
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 #: hypha/apply/funds/templates/submissions/all.html:382
 msgid "Screening"
 msgstr "Prověřování"
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 msgid "No Status"
 msgstr "Žádný stav"
 
-#: hypha/apply/funds/tables.py:345
+#: hypha/apply/funds/tables.py:403
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:46
 msgid "Determined"
 msgstr "Určeno"
 
-#: hypha/apply/funds/tables.py:346
+#: hypha/apply/funds/tables.py:404
 #, fuzzy
 #| msgid "Start your"
 msgid "Start"
 msgstr "Začněte"
 
-#: hypha/apply/funds/tables.py:347
+#: hypha/apply/funds/tables.py:405
 msgid "End"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/funds/tables.py:439
+#: hypha/apply/funds/tables.py:456 hypha/apply/funds/tables.py:503
 #: hypha/apply/users/admin_views.py:125
 msgid "Active"
 msgstr "Aktivní"
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/users/admin_views.py:125
+#: hypha/apply/funds/tables.py:456 hypha/apply/users/admin_views.py:125
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: hypha/apply/funds/tables.py:415
+#: hypha/apply/funds/tables.py:479
 #, fuzzy
 #| msgid "No Status"
 msgid "Not Started"
 msgstr "Žádný stav"
 
-#: hypha/apply/funds/tables.py:440
+#: hypha/apply/funds/tables.py:504
 #, fuzzy
 #| msgid "Statuses"
 msgid "State"
 msgstr "Stavy"
 
-#: hypha/apply/funds/tables.py:516 hypha/apply/funds/tables.py:547
+#: hypha/apply/funds/tables.py:580 hypha/apply/funds/tables.py:619
 msgid "No reviews available"
 msgstr "Žádné dostupné recenze"
 
-#: hypha/apply/funds/tables.py:525
+#: hypha/apply/funds/tables.py:597
 msgid "Submission"
 msgstr "Podání"
 
-#: hypha/apply/funds/tables.py:564
+#: hypha/apply/funds/tables.py:636
 msgid "No staff available"
 msgstr "Není k dispozici žádný tým"
 
@@ -4320,13 +4622,13 @@ msgid "Organization"
 msgstr "Název organizace"
 
 #: hypha/apply/funds/templates/cotton/submission_list.html:35
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:87
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
 #: hypha/apply/funds/templates/funds/submission_sealed.html:14
 #: hypha/apply/funds/templates/submissions/all.html:431
 #: hypha/apply/funds/templates/submissions/all.html:474
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:10
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:14
-#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
+#: hypha/apply/projects/filters.py:45 hypha/apply/projects/filters.py:58
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:46
 #: hypha/apply/projects/templates/application_projects/project_sow_detail.html:10
 msgid "Lead"
@@ -4408,7 +4710,7 @@ msgid "(selected)"
 msgstr "Vybráno"
 
 #: hypha/apply/funds/templates/funds/application_base.html:105
-#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:127
 msgid "Preview and submit"
 msgstr "Náhled a odeslání"
 
@@ -4471,7 +4773,6 @@ msgid "Reviews & assignees"
 msgstr "Posudky a přiřazení"
 
 #: hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html:50
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:66
 msgid "View all"
 msgstr "Zobrazit vše"
 
@@ -4485,6 +4786,19 @@ msgstr "Připomenutí"
 msgid "Create new reminder"
 msgstr "Vytvořit připomínku"
 
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:3
+#, fuzzy
+#| msgid "Hide application"
+msgid "Anonymize application"
+msgstr "Skrýt žádost"
+
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:5
+msgid ""
+"Are you sure you want to anonymize this application? Personal data will be "
+"removed and the application will only be accessible via statistics in the "
+"Results view. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:3
 #, fuzzy
 #| msgid "Screen application"
@@ -4498,80 +4812,71 @@ msgid ""
 "action cannot be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:22
-#: hypha/apply/funds/templates/funds/comments.html:18
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:18
+#: hypha/apply/funds/templates/funds/comments.html:14
 #: hypha/apply/projects/templates/application_projects/paf_export.html:76
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:107
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:109
 #: hypha/apply/projects/templates/application_projects/project_detail.html:17
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:15
 msgid "Application"
 msgstr "Žádost"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:32
-#: hypha/apply/funds/templates/funds/comments.html:28
-#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
-#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
-#: hypha/apply/projects/templates/application_projects/project_detail.html:24
-msgid "Project"
-msgstr "Projekt"
-
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:50
-#: hypha/apply/funds/templates/funds/comments.html:46
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:38
+#: hypha/apply/funds/templates/funds/comments.html:34
 msgid "View message log"
 msgstr "Zobrazit protokol zpráv"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:61
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:49
 msgid "Congratulations!"
 msgstr "Gratulujeme!"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:63
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:51
 #, python-format
 msgid "Your %(stage)s application has been accepted."
 msgstr "Vaše žádost o %(stage)s byla přijata."
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:68
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:56
 #, python-format
 msgid "Start your %(stage)s application."
 msgstr "Zahajte %(stage)s žádosti."
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:77
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:65
 #, fuzzy
 #| msgid "This application has been archived. This is visible to the roles "
 msgid "This application has been archived. This is visible to accounts with "
 msgstr "Tato žádost byla archivována. To je viditelné pro role "
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:85
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:73
 msgid "This application is sealed."
 msgstr "Tato žádost je zapečetěná."
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Drafted "
 msgstr "Navrženo "
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:22
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Submitted "
 msgstr "Odesláno "
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:100
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:88
 #: hypha/apply/funds/templates/submissions/all.html:336
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:34
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:129
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:117
 msgid "Delete Submission"
 msgstr "Smazat podání"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:195
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:183
 msgid "Related submissions"
 msgstr "Související podání"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:203
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:214
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:191
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:202
 msgid "View linked"
 msgstr "Zobrazit propojené"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:223
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:211
 msgid "Other Submissions"
 msgstr "Další podání"
 
@@ -4634,6 +4939,10 @@ msgstr "Odmítnout"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:154
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:204
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:94
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:140
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:171
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:189
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:127
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:160
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:177
@@ -4660,95 +4969,108 @@ msgstr ""
 msgid "Comments: %(title)s"
 msgstr "Revize pro %(title)s"
 
-#: hypha/apply/funds/templates/funds/comments.html:57
+#: hypha/apply/funds/templates/funds/comments.html:45
 msgid "Add communication"
 msgstr "Přidat komunikaci"
 
-#: hypha/apply/funds/templates/funds/comments.html:80
-#: hypha/apply/funds/templates/funds/comments.html:94
-msgid "Add Comment"
-msgstr "Přidat komentář"
-
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:4
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:5
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:6
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:88
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:66
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:4
 #: hypha/apply/projects/templates/application_projects/project_admin_detail.html:10
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:128
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:35
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:131
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:41
 msgid "Actions to take"
 msgstr "Akce, které je třeba provést"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:15
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:16
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:12
 msgid "Unarchive Submission"
 msgstr "Odarchivovat podání"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:26
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:28
+#, fuzzy
+#| msgid "Create project"
+msgid "Add another project"
+msgstr "Vytvořit projekt"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:30
 #: hypha/apply/funds/templates/funds/modals/create_project_form.html:2
 msgid "Create project"
 msgstr "Vytvořit projekt"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:32
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
 msgid "Complete draft determination"
 msgstr "Úplný návrh rozhodnutí"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:42
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:9
 msgid "Complete draft review"
 msgstr "Dokončete návrh hodnocení"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:45
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:50
 msgid "Assign reviewers"
 msgstr "Přiřadit hodnotitele"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:60
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:19
 msgid "View determination"
 msgstr "Zobrazit rozhodnutí"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:68
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
 #: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:34
-#: hypha/apply/projects/views/payment.py:138
+#: hypha/apply/projects/views/invoice.py:147
 msgid "Update status"
 msgstr "Aktualizovat stav"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:78
 msgid "Assign"
 msgstr "Přiřadit"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:97
 msgid "More actions"
 msgstr "Další akce"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:101
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:106
 #: hypha/apply/funds/templates/funds/revisions_compare.html:88
 msgid "Revisions"
 msgstr "Revize"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:111
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:116
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:69
 msgid "Translate"
 msgstr "Přeložit"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:130
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:135
 #: hypha/apply/funds/views/reminders.py:69
 msgid "Create Reminder"
 msgstr "Vytvořit připomínku"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:138
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:178
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:53
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:140
+#, fuzzy
+#| msgid "Change Approver"
+msgid "Change Author"
+msgstr "Schvalovatel změn"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:181
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:59
 msgid "Download as PDF"
 msgstr "Stáhnout jako PDF"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:158
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:30
-#: hypha/apply/funds/templates/submissions/all.html:490
+#: hypha/apply/funds/templates/submissions/all.html:491
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:32
 msgid "Archive"
 msgstr "Archivovat"
 
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:172
+#: hypha/apply/funds/templates/submissions/all.html:515
+msgid "Anonymize"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:8
 #, fuzzy
 #| msgid "applicant"
@@ -4770,8 +5092,8 @@ msgid "Not allowed"
 msgstr "Nenalezeno"
 
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:25
-#: hypha/apply/funds/views/co_applicants.py:58
-#: hypha/apply/funds/views/co_applicants.py:102
+#: hypha/apply/funds/views/co_applicants.py:57
+#: hypha/apply/funds/views/co_applicants.py:101
 msgid "Invite"
 msgstr ""
 
@@ -4806,7 +5128,8 @@ msgstr "Archivovat podání"
 #| "                    "
 msgid ""
 "Are you sure you want to archive submission? Archived submissions will be "
-"hidden from the main list of submissions and can not be edited."
+"hidden from the main list of submissions and can not be edited. Submissions "
+"can be unarchived at any time."
 msgstr ""
 "\n"
 "                        Opravdu chcete podání archivovat? Archivovaná podání "
@@ -4842,6 +5165,23 @@ msgstr "Vyjmout z archivu"
 msgid "You have no %(type)s rounds or labs assigned to you."
 msgstr "Nemáte přiřazeny žádné %(type)s kola ani laboratoře."
 
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:18
+#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
+#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
+msgid "Project"
+msgstr "Projekt"
+
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:30
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:18
+#, fuzzy, python-format
+#| msgid "Project"
+msgctxt "project tab"
+msgid "Project"
+msgid_plural "Projects (%(counter)s)"
+msgstr[0] "Projekt"
+msgstr[1] "Projekt"
+msgstr[2] "Projekt"
+
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:34
 msgid "No reminders yet."
 msgstr "Zatím žádné připomenutí."
@@ -4881,6 +5221,12 @@ msgstr "Doba trvání projektu"
 msgid "Legal Name"
 msgstr "Právní název"
 
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:54
+#, fuzzy
+#| msgid "edited account"
+msgid "Edit user account"
+msgstr "upravený účet"
+
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:61
 #: hypha/apply/funds/templates/funds/revisions_compare.html:52
 #: hypha/apply/funds/templates/funds/revisions_compare.html:53
@@ -4915,7 +5261,7 @@ msgstr ""
 "obsahovat citlivé informace, proto s ním zacházejte opatrně."
 
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:69
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:49
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:55
 msgid "Export"
 msgstr "Exportovat"
 
@@ -5001,7 +5347,7 @@ msgid "selected"
 msgstr "Vybráno"
 
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:43
-#: hypha/templates/base.html:159
+#: hypha/templates/base.html:160
 #, fuzzy
 #| msgid "Search"
 msgid "Search..."
@@ -5011,19 +5357,19 @@ msgstr "Hledat"
 msgid "Search input"
 msgstr "Zadání vyhledávání"
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:60
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:73
 #: hypha/apply/funds/templates/submissions/all.html:202
 #, fuzzy
 #| msgid "Clear current search query, filters and sorts"
 msgid "Clear current filters & sorts"
 msgstr "Vymazat aktuální vyhledávací dotaz, filtry a řazení"
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:108
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:121
 #: hypha/templates/cotton/pagination.html:12
 msgid "Previous"
 msgstr "Předchozí"
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:109
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:122
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:6
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:10
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:47
@@ -5038,9 +5384,8 @@ msgid "Translate application"
 msgstr "Kontrola žádosti"
 
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:38
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:10
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:26
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 #: hypha/apply/projects/templates/application_projects/filters/widgets/date_range_input_widget.html:5
 msgid "to"
@@ -5061,22 +5406,25 @@ msgstr "Aktualizace hodnotitelů"
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:20
 #: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:51
-#: hypha/apply/funds/views/submission_edit.py:535
-#: hypha/apply/funds/views/submission_edit.py:566
-#: hypha/apply/funds/views/submission_edit.py:595
-#: hypha/apply/funds/views/submission_edit.py:639
-#: hypha/apply/funds/views/submission_edit.py:669
-#: hypha/apply/funds/views/submission_edit.py:695
-#: hypha/apply/funds/views/translate.py:60
-#: hypha/apply/funds/views/translate.py:95
+#: hypha/apply/funds/views/submission_edit.py:536
+#: hypha/apply/funds/views/submission_edit.py:567
+#: hypha/apply/funds/views/submission_edit.py:596
+#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:670
+#: hypha/apply/funds/views/submission_edit.py:696
+#: hypha/apply/funds/views/submission_edit.py:726
+#: hypha/apply/funds/views/submission_edit.py:752
+#: hypha/apply/funds/views/translate.py:58
+#: hypha/apply/funds/views/translate.py:93
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:28
-#: hypha/apply/projects/views/payment.py:354
-#: hypha/apply/projects/views/project.py:423
-#: hypha/apply/projects/views/project.py:462
-#: hypha/apply/projects/views/project.py:506
-#: hypha/apply/projects/views/project.py:542
-#: hypha/apply/projects/views/project.py:1289
-#: hypha/apply/projects/views/project.py:1328
+#: hypha/apply/projects/views/invoice.py:359
+#: hypha/apply/projects/views/project.py:427
+#: hypha/apply/projects/views/project.py:466
+#: hypha/apply/projects/views/project.py:510
+#: hypha/apply/projects/views/project.py:546
+#: hypha/apply/projects/views/project.py:588
+#: hypha/apply/projects/views/project.py:1340
+#: hypha/apply/projects/views/project.py:1379
 msgid "Update"
 msgstr "Aktualizovat"
 
@@ -5156,10 +5504,10 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:15
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:20
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:25
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:46
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:137
-#: hypha/apply/projects/views/project.py:1043
-#: hypha/apply/projects/views/project.py:1260
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:47
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
+#: hypha/apply/projects/views/project.py:1094
+#: hypha/apply/projects/views/project.py:1311
 msgid "Update Status"
 msgstr "Aktualizace stavu"
 
@@ -5169,6 +5517,18 @@ msgstr "Aktualizace stavu"
 msgid "Current status"
 msgstr "Aktuální stav"
 
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:2
+#, fuzzy
+#| msgid "Update tags"
+msgid "Update Author"
+msgstr "Aktualizace štítků"
+
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:6
+#, fuzzy
+#| msgid "current"
+msgid "Current Author"
+msgstr "aktuální"
+
 #: hypha/apply/funds/templates/funds/modals/update_lead_form.html:2
 #: hypha/apply/projects/templates/application_projects/modals/lead_update.html:2
 msgid "Update Lead"
@@ -5182,6 +5542,7 @@ msgstr "Aktuální vedení"
 #: hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html:2
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:12
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:13
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:2
 msgid "Update tags"
 msgstr "Aktualizace štítků"
 
@@ -5241,7 +5602,7 @@ msgid "Reviews by %(object)s"
 msgstr "Hodnocení podle %(object)s"
 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:3
-#: hypha/apply/review/views.py:473
+#: hypha/apply/review/views.py:482
 msgid "Compare"
 msgstr "Porovnat"
 
@@ -5354,11 +5715,11 @@ msgstr "Prohlédněte si své podání"
 
 #: hypha/apply/funds/templates/funds/submission-success.html:77
 #: hypha/apply/users/templates/users/activation/confirm.html:43
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
 #: hypha/apply/users/templates/users/login.html:4
 #: hypha/apply/users/templates/users/login.html:86
 #: hypha/apply/users/templates/users/password_reset/complete.html:14
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:5
-#: hypha/templates/includes/user_menu.html:101
 msgid "Log in"
 msgstr "Přihlášení"
 
@@ -5424,6 +5785,13 @@ msgstr ""
 "*%(count_diff)s podání neobsahují požadovaná pole nebo údaje o množství a "
 "nejsou zahrnuty."
 
+#: hypha/apply/funds/templates/funds/submissions_result.html:53
+#, python-format
+msgid ""
+"%(count)s anonymized submission(s) are excluded because the active filter "
+"does not apply to anonymized data."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/tables/table.html:24
 #: hypha/apply/projects/templates/application_projects/tables/table.html:18
 msgid "Show"
@@ -5627,32 +5995,78 @@ msgstr "Příjemce"
 msgid "Assign Reviewer(s)"
 msgstr "Přiřadit hodnotitele"
 
-#: hypha/apply/funds/templates/submissions/all.html:486
-msgid "Are you sure you want to archive the selected submissions?"
-msgstr "Opravdu chcete vybrané příspěvky archivovat?"
-
-#: hypha/apply/funds/templates/submissions/all.html:498
-msgid ""
-"Are you sure you want to delete the selected submissions? This action cannot "
-"be undone."
-msgstr "Opravdu chcete vybraná podání odstranit? Tuto akci nelze vzít zpět."
-
-#: hypha/apply/funds/templates/submissions/all.html:524
+#: hypha/apply/funds/templates/submissions/all.html:538
 msgid "No results matched your search"
 msgstr "Žádné výsledky neodpovídají vašemu vyhledávání"
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "Try"
 msgstr "Zkusit"
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "clearing"
 msgstr "vyčištění"
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "the current query and try again"
 msgstr "aktuálního dotazu a zkuste to znovu"
 
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:4
+#, fuzzy
+#| msgid "Hide application"
+msgid "Anonymize applications"
+msgstr "Skrýt žádost"
+
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:9
+#, python-format
+msgid ""
+"Are you sure you want to anonymize %(count)s submission(s)? Personal data "
+"will be removed and applications will only be accessible via statistics in "
+"the Results view. All draft submissions will be deleted. This action cannot "
+"be undone."
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:11
+#, fuzzy
+#| msgid "Archive Submission"
+msgid "Archive submissions"
+msgstr "Archivovat podání"
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:14
+#, fuzzy, python-format
+#| msgid ""
+#| "\n"
+#| "                        Are you sure you want to archive submission? "
+#| "Archived submissions will be hidden from the\n"
+#| "                        main list of submissions and can not be edited.\n"
+#| "                    "
+msgid ""
+"Are you sure you want to archive %(count)s submission(s)? Archived "
+"submissions will be hidden from the main list and cannot be edited. "
+"Submissions can be unarchived at any time."
+msgstr ""
+"\n"
+"                        Opravdu chcete podání archivovat? Archivovaná podání "
+"budou skryta \n"
+"                        v hlavním seznamu podání a nelze je upravovat.\n"
+"                    "
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:4
+#, fuzzy
+#| msgid "Screen application"
+msgid "Delete applications"
+msgstr "Kontrola žádosti"
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:8
+#, fuzzy, python-format
+#| msgid ""
+#| "Are you sure you want to delete the selected submissions? This action "
+#| "cannot be undone."
+msgid ""
+"Are you sure you want to permanently delete %(count)s submission(s)? All "
+"data will be permanently removed. This action cannot be undone."
+msgstr "Opravdu chcete vybraná podání odstranit? Tuto akci nelze vzít zpět."
+
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:9
 #, fuzzy
 #| msgid "Submissions: Download as CSV"
@@ -5660,6 +6074,7 @@ msgid "Submissions: Export as CSV"
 msgstr "Podání: Stáhnout jako CSV"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:11
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:11
 msgid "Export as CSV"
 msgstr "Exportovat jako CSV"
 
@@ -5684,6 +6099,8 @@ msgstr "Podání: Stáhnout jako CSV"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:23
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:24
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:23
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:24
 msgid "Generating downloadable CSV..."
 msgstr ""
 
@@ -5694,6 +6111,7 @@ msgid "Submissions: Download generated CSV"
 msgstr "Podání: Stáhnout jako CSV"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:42
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:42
 #, fuzzy
 #| msgid "Download as DOCX"
 msgid "Download generated CSV"
@@ -5706,10 +6124,12 @@ msgid "Submissions: Generate downloadable CSV"
 msgstr "Podání: Stáhnout jako CSV"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:64
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:64
 msgid "Generation failed, click to retry generating downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:66
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:66
 #, fuzzy
 #| msgid "Generate Codes"
 msgid "Generate downloadable CSV"
@@ -5720,6 +6140,7 @@ msgid "Add tags"
 msgstr "Přidat štítky"
 
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:38
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 msgid "Add"
@@ -5885,14 +6306,14 @@ msgstr "Žádná Kola k dispozici"
 msgid "Filter by {label}"
 msgstr "Filtrovat podle"
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:123
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
 #, fuzzy
 #| msgid "Application"
 msgid "Application #"
 msgstr "Žádost"
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
-#: hypha/apply/stream_forms/blocks.py:119
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:125
+#: hypha/apply/stream_forms/blocks.py:157
 msgid "URL"
 msgstr "URL"
 
@@ -5905,39 +6326,39 @@ msgstr "Zkopírováno v {copy_time}"
 msgid "No screening"
 msgstr "Bez screeningu"
 
-#: hypha/apply/funds/views/all.py:251
+#: hypha/apply/funds/views/all.py:244
 msgid "Newest"
 msgstr "Nejnovější"
 
-#: hypha/apply/funds/views/all.py:252
+#: hypha/apply/funds/views/all.py:245
 msgid "Oldest"
 msgstr "Nejstarší"
 
-#: hypha/apply/funds/views/all.py:253
+#: hypha/apply/funds/views/all.py:246
 msgid "Most Commented"
 msgstr "Nejvíce komentářů"
 
-#: hypha/apply/funds/views/all.py:254
+#: hypha/apply/funds/views/all.py:247
 msgid "Least Commented"
 msgstr "Nejméně komentářů"
 
-#: hypha/apply/funds/views/all.py:255
+#: hypha/apply/funds/views/all.py:248
 msgid "Recently Updated"
 msgstr "Nedávno aktualizováno"
 
-#: hypha/apply/funds/views/all.py:256
+#: hypha/apply/funds/views/all.py:249
 msgid "Least Recently Updated"
 msgstr "Nejméně aktualizováno"
 
-#: hypha/apply/funds/views/all.py:257
+#: hypha/apply/funds/views/all.py:250
 msgid "Best Match"
 msgstr "Nejlepší shoda"
 
-#: hypha/apply/funds/views/all.py:304
+#: hypha/apply/funds/views/all.py:297 hypha/apply/projects/views/invoice.py:671
 msgid "Started CSV generation."
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:405
+#: hypha/apply/funds/views/all.py:469
 #, python-brace-format
 msgid ""
 "A determination already exists for the following submissions and they have "
@@ -5946,51 +6367,53 @@ msgstr ""
 "Pro následující podání již existuje rozhodnutí a byla vyloučena: "
 "{submissions}"
 
-#: hypha/apply/funds/views/all.py:418
+#: hypha/apply/funds/views/all.py:482
 msgid "Submissions expect different forms - please contact admin"
 msgstr "Podání očekávají různé formuláře - kontaktujte administrátora"
 
-#: hypha/apply/funds/views/all.py:431
+#: hypha/apply/funds/views/all.py:495
 msgid "Inconsistent states provided - please talk to an admin"
 msgstr "Podané nekonzistentní stavy - obraťte se na administrátora"
 
-#: hypha/apply/funds/views/all.py:458
+#: hypha/apply/funds/views/all.py:522
 msgid "Failed to update: "
 msgstr "Aktualizace se nezdařila: "
 
-#: hypha/apply/funds/views/all.py:463
+#: hypha/apply/funds/views/all.py:527
 #, python-brace-format
 msgid "Successfully updated status to {status}: "
 msgstr "Stav byl úspěšně aktualizován na {status}: "
 
-#: hypha/apply/funds/views/co_applicants.py:94
+#: hypha/apply/funds/views/co_applicants.py:93
 #, fuzzy
 #| msgid "Remove applicant filter"
 msgid "Co-applicant invited"
 msgstr "Odebrat filtr žadatel"
 
-#: hypha/apply/funds/views/co_applicants.py:234
+#: hypha/apply/funds/views/co_applicants.py:229
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:18
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:74
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:14
 #: hypha/apply/projects/templates/application_projects/project_form.html:29
-#: hypha/apply/projects/views/payment.py:285
-#: hypha/apply/projects/views/project.py:2040
+#: hypha/apply/projects/views/invoice.py:290
+#: hypha/apply/projects/views/project.py:2131
 #: hypha/apply/users/templates/users/account.html:54
 msgid "Save"
 msgstr "Uložit"
 
-#: hypha/apply/funds/views/co_applicants.py:254
+#: hypha/apply/funds/views/co_applicants.py:249
 #, fuzzy
 #| msgid "Last updated"
 msgid "Co-applicant updated"
 msgstr "Naposledy aktualizováno"
 
-#: hypha/apply/funds/views/co_applicants.py:282
+#: hypha/apply/funds/views/co_applicants.py:277
 #, fuzzy
 #| msgid "Remove applicant filter"
 msgid "Co-applicant re-invited"
 msgstr "Odebrat filtr žadatel"
 
-#: hypha/apply/funds/views/co_applicants.py:304
+#: hypha/apply/funds/views/co_applicants.py:299
 #, fuzzy
 #| msgid "Remove applicant filter"
 msgid "Co-applicant deleted"
@@ -6008,40 +6431,51 @@ msgstr "Vytvořit"
 msgid "Reminder deleted"
 msgstr "Připomínka smazána"
 
-#: hypha/apply/funds/views/submission_detail.py:311
+#: hypha/apply/funds/views/submission_delete.py:47
+#, fuzzy
+#| msgid "Submission lead"
+msgid "Submission anonymized."
+msgstr "Vedoucí podání"
+
+#: hypha/apply/funds/views/submission_detail.py:301
 #, fuzzy
 #| msgid "Submission lead"
 msgid "Submission details"
 msgstr "Vedoucí podání"
 
-#: hypha/apply/funds/views/submission_edit.py:97
-#: hypha/apply/funds/views/submission_edit.py:276
+#: hypha/apply/funds/views/submission_edit.py:96
+#: hypha/apply/funds/views/submission_edit.py:275
 msgid "Draft saved"
 msgstr "Návrh uložen"
 
-#: hypha/apply/funds/views/submission_edit.py:366
-#: hypha/apply/funds/views/submission_edit.py:392
+#: hypha/apply/funds/views/submission_edit.py:365
+#: hypha/apply/funds/views/submission_edit.py:391
 #: hypha/apply/funds/workflows/definitions/double_stage.py:133
 msgid "Progress"
 msgstr "Pokrok"
 
-#: hypha/apply/funds/views/submission_edit.py:419
-#: hypha/apply/funds/views/submission_edit.py:461
-#: hypha/apply/projects/views/project.py:605
-#: hypha/apply/projects/views/project.py:664
+#: hypha/apply/funds/views/submission_edit.py:410
+msgid "This submission already has a project."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_edit.py:421
+#: hypha/apply/funds/views/submission_edit.py:463
+#: hypha/apply/projects/views/project.py:651
+#: hypha/apply/projects/views/project.py:710
 #: hypha/apply/review/templates/review/review_confirm_delete.html:23
 #: hypha/apply/users/templates/elevate/elevate.html:39
 #: hypha/apply/users/templates/two_factor/admin/disable.html:24
 #: hypha/apply/users/templates/two_factor/profile/disable.html:39
 #: hypha/apply/users/templates/users/partials/confirmation_code_sent.html:43
+#: hypha/templates/cotton/modal/confirm.html:43
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: hypha/apply/funds/views/submission_edit.py:558
+#: hypha/apply/funds/views/submission_edit.py:559
 msgid "Submission Lead updated."
 msgstr "Vedoucí podání aktualizován."
 
-#: hypha/apply/funds/views/submission_edit.py:687
+#: hypha/apply/funds/views/submission_edit.py:744
 #, fuzzy
 #| msgid "Partners updated successfully."
 msgid "Tags updated successfully."
@@ -6051,56 +6485,86 @@ msgstr "Partneři úspěšně aktualizováni."
 msgid "User attempted to translate submission but is not org faculty"
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:154
+#: hypha/apply/funds/views/translate.py:152
 #, python-brace-format
 msgid "Submission translated from {fl} to {tl}."
 msgstr "Podání přeloženo z {fl} na {tl}."
 
-#: hypha/apply/funds/views/translate.py:167
+#: hypha/apply/funds/views/translate.py:165
 msgid "Submission translation failed. Contact your Administrator."
 msgstr "Překlad podání se nezdařil.Obraťte se na administrátora."
 
-#: hypha/apply/funds/views/translate.py:174
+#: hypha/apply/funds/views/translate.py:172
 msgid "Translation cleared."
 msgstr "Překlad vymazán."
 
-#: hypha/apply/funds/workflows/constants.py:59
+#: hypha/apply/funds/workflows/constants.py:63
 msgid "Received"
 msgstr "Obdrženo"
 
-#: hypha/apply/funds/workflows/constants.py:63
+#: hypha/apply/funds/workflows/constants.py:67
 #: hypha/apply/funds/workflows/definitions/double_stage.py:74
 #: hypha/apply/funds/workflows/definitions/double_stage.py:211
 #: hypha/apply/funds/workflows/definitions/single_stage.py:74
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:83
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:129
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:69
 msgid "Internal Review"
 msgstr "Interní hodnocení"
 
-#: hypha/apply/funds/workflows/constants.py:67
+#: hypha/apply/funds/workflows/constants.py:71
+#: hypha/apply/funds/workflows/definitions/double_stage.py:91
+#: hypha/apply/funds/workflows/definitions/double_stage.py:228
+#: hypha/apply/funds/workflows/definitions/double_stage.py:273
+#: hypha/apply/funds/workflows/definitions/single_stage.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:98
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
 msgid "Ready for Discussion"
 msgstr "Připraveno k diskusi"
 
-#: hypha/apply/funds/workflows/constants.py:73
+#: hypha/apply/funds/workflows/constants.py:77
 msgid "More Information Requested"
 msgstr "Další informace vyžádány"
 
-#: hypha/apply/funds/workflows/constants.py:77
+#: hypha/apply/funds/workflows/constants.py:81
 #: hypha/apply/funds/workflows/definitions/double_stage.py:165
 msgid "Invited for Proposal"
 msgstr "Pozván k Návrhu"
 
-#: hypha/apply/funds/workflows/constants.py:81
+#: hypha/apply/funds/workflows/constants.py:85
 #: hypha/apply/funds/workflows/definitions/double_stage.py:258
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:115
 msgid "External Review"
 msgstr "Externí hodnocení"
 
-#: hypha/apply/funds/workflows/constants.py:85
+#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/workflows/definitions/single_stage.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage.py:58
+#: hypha/apply/funds/workflows/definitions/single_stage.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage.py:109
 #: hypha/apply/funds/workflows/definitions/single_stage.py:127
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:190
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:66
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:138
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:163
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:116
 msgid "Ready for Determination"
 msgstr "Připraveno k rozhodnutí"
@@ -6115,6 +6579,9 @@ msgstr "Připraveno k rozhodnutí"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:35
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:107
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:150
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:33
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:90
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:137
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:34
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:80
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:123
@@ -6135,7 +6602,8 @@ msgstr "Otevřít hodnocení"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:36
 #: hypha/apply/funds/workflows/definitions/double_stage.py:60
 #: hypha/apply/funds/workflows/definitions/double_stage.py:86
-msgid "Ready For Preliminary Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:122
+msgid "Ready for Preliminary Determination"
 msgstr "Připraveno k předběžnému rozhodnutí"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:37
@@ -6169,6 +6637,12 @@ msgstr "Pozvání k Návrhu"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:155
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:188
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:67
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:96
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:173
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:190
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:37
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:84
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:128
@@ -6182,6 +6656,7 @@ msgstr "Odmítnout"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:42
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:38
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:39
 msgid "Need screening"
@@ -6201,6 +6676,9 @@ msgstr "Poznámka je konceptu přijata"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:61
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:131
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:57
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:116
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:162
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:58
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:104
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:148
@@ -6216,6 +6694,8 @@ msgstr "Je třeba více informací"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:79
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:92
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:139
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:78
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:66
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:112
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:66
@@ -6226,6 +6706,7 @@ msgstr "Závěrečné hodnocení"
 #: hypha/apply/funds/workflows/definitions/single_stage.py:72
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:80
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:68
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:67
 msgid "Need screening (revert)"
@@ -6248,18 +6729,6 @@ msgstr "Hodnocení {ORG_SHORT_NAME}"
 msgid "Open Review (revert)"
 msgstr "Otevřít hodnocení (vrátit)"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:91
-#: hypha/apply/funds/workflows/definitions/double_stage.py:228
-#: hypha/apply/funds/workflows/definitions/double_stage.py:273
-#: hypha/apply/funds/workflows/definitions/single_stage.py:92
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
-msgid "Ready For Discussion"
-msgstr "Připraveno k diskusi"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:118
 #: hypha/apply/funds/workflows/definitions/double_stage.py:256
 #: hypha/apply/funds/workflows/definitions/double_stage.py:299
@@ -6269,18 +6738,18 @@ msgstr "Připraveno k diskusi"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:140
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:184
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:206
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:126
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:113
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:157
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:179
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:131
-msgid "Ready For Discussion (revert)"
+#, fuzzy
+#| msgid "Ready For Discussion (revert)"
+msgid "Ready for Discussion (revert)"
 msgstr "Připraveno k diskusi (vrátit)"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:122
-msgid "Ready for Preliminary Determination"
-msgstr "Připraveno k předběžnému rozhodnutí"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:129
 msgid "Concept Accepted"
 msgstr "Koncept přijat"
@@ -6295,6 +6764,7 @@ msgstr "Předběžné rozhodnutí"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:223
 #: hypha/apply/funds/workflows/definitions/double_stage.py:245
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:108
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:65
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:81
 msgid "Open External Review"
 msgstr "Otevřít externí hodnocení"
@@ -6304,7 +6774,8 @@ msgstr "Otevřít externí hodnocení"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:197
 #: hypha/apply/funds/workflows/definitions/double_stage.py:224
 #: hypha/apply/funds/workflows/definitions/double_stage.py:267
-msgid "Ready For Final Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:304
+msgid "Ready for Final Determination"
 msgstr "Připraveno ke konečnému rozhodnutí"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:179
@@ -6318,12 +6789,14 @@ msgstr "Obdržený Návrh (vrátit)"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:225
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:110
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:139
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:83
 msgid "Open Internal Review (revert)"
 msgstr "Otevřít interní hodnocení (vrátit)"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:268
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:152
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:125
 msgid "Open External Review (revert)"
 msgstr "Otevřít externí hodnocení (vrátit)"
@@ -6343,10 +6816,6 @@ msgstr "Otevřít externí hodnocení (vrátit)"
 msgid "Accept but additional info required"
 msgstr "Přijmout, ale jsou požadovány další informace"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:304
-msgid "Ready for Final Determination"
-msgstr "Připraveno ke konečnému rozhodnutí"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:312
 msgid "Final Determination"
 msgstr "Konečné rozhodnutí"
@@ -6359,23 +6828,9 @@ msgstr "Konečné rozhodnutí"
 msgid "Accepted but additional info required"
 msgstr "Přijato, ale jsou požadovány další informace"
 
-#: hypha/apply/funds/workflows/definitions/single_stage.py:35
-#: hypha/apply/funds/workflows/definitions/single_stage.py:58
-#: hypha/apply/funds/workflows/definitions/single_stage.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
-msgid "Ready For Determination"
-msgstr "Připraveno k rozhodnutí"
-
 #: hypha/apply/funds/workflows/definitions/single_stage.py:41
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:43
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:40
 msgid "Application Received"
@@ -6383,6 +6838,7 @@ msgstr "Obdržená žádost"
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:135
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:198
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:183
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:171
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:124
 msgid "Application Outcome"
@@ -6397,28 +6853,81 @@ msgstr "Otevřít komunitní hodnocení"
 msgid "Community Review"
 msgstr "Komunitní hodnocení"
 
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:34
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:70
+#, fuzzy
+#| msgid "marked ready for review"
+msgid "Ready for Review"
+msgstr "označeno jako připravené k hodnocení"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:79
+#, fuzzy
+#| msgid "Open Review (revert)"
+msgid "Ready for Review (revert)"
+msgstr "Otevřít hodnocení (vrátit)"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:82
+#, fuzzy
+#| msgid "Application Received"
+msgid "Application Review"
+msgstr "Obdržená žádost"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:91
+#, fuzzy
+#| msgid "Open External Review"
+msgid "Open Internal Review"
+msgstr "Otevřít externí hodnocení"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:95
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:141
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:172
+msgid "Waitlist"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:191
+#, fuzzy
+#| msgid "Ready for Determination"
+msgid "Ready for Determination (revert)"
+msgstr "Připraveno k rozhodnutí"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:193
+msgid "Waitlisted"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:199
+#, fuzzy
+#| msgid "Accepted"
+msgid "Not Accepted"
+msgstr "Přijato"
+
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:69
 #: hypha/apply/review/templates/review/review_detail.html:10
 msgid "Review"
 msgstr "Hodnocení"
 
-#: hypha/apply/funds/workflows/registry.py:69
+#: hypha/apply/funds/workflows/registry.py:70
 msgid "Request with same time review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:75
+#: hypha/apply/funds/workflows/registry.py:76
 #, fuzzy
 #| msgid "Open External Review"
 msgid "Request with external review"
 msgstr "Otevřít externí hodnocení"
 
-#: hypha/apply/funds/workflows/registry.py:81
+#: hypha/apply/funds/workflows/registry.py:82
 #, fuzzy
 #| msgid "Open Community Review"
 msgid "Request with community review"
 msgstr "Otevřít komunitní hodnocení"
 
-#: hypha/apply/funds/workflows/registry.py:87
+#: hypha/apply/funds/workflows/registry.py:88
+#, fuzzy
+#| msgid "Open External Review"
+msgid "Request external then internal review"
+msgstr "Otevřít externí hodnocení"
+
+#: hypha/apply/funds/workflows/registry.py:94
 #, fuzzy
 #| msgid "Invite to Proposal"
 msgid "Concept & Proposal"
@@ -6436,26 +6945,33 @@ msgstr ""
 "Objekt, který se snažíte odstranit, je někde použit. Odstraňte prosím "
 "všechna použití a zkuste to znovu!."
 
-#: hypha/apply/projects/admin.py:45
+#: hypha/apply/projects/admin.py:46
 #, fuzzy
 #| msgid "Project Form"
 msgid "Project Forms"
 msgstr "Formulář Projektu"
 
-#: hypha/apply/projects/admin.py:62
+#: hypha/apply/projects/admin.py:63
 #, fuzzy
 #| msgid "Forms"
 msgid "SOW Forms"
 msgstr "Formuláře"
 
-#: hypha/apply/projects/admin.py:79
+#: hypha/apply/projects/admin.py:80
 #, fuzzy
 #| msgid "Reports"
 msgid "Report Forms"
 msgstr "Zprávy"
 
-#: hypha/apply/projects/admin.py:99
+#: hypha/apply/projects/admin.py:101
+#, fuzzy
+#| msgid "Invoices"
+msgid "Invoice Tags"
+msgstr "Faktury"
+
+#: hypha/apply/projects/admin.py:107
 #: hypha/apply/projects/templates/application_projects/project_list.html:6
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:4
 #: hypha/core/navigation.py:98 hypha/core/navigation.py:133
 msgid "Projects"
 msgstr "Projekty"
@@ -6473,17 +6989,17 @@ msgid "Vendor pending"
 msgstr "Dodavatel čekající"
 
 #: hypha/apply/projects/constants.py:22
-#: hypha/apply/projects/models/payment.py:34 hypha/apply/projects/utils.py:91
+#: hypha/apply/projects/models/invoice.py:45 hypha/apply/projects/utils.py:94
 msgid "Declined"
 msgstr "Odmítnuto"
 
 #: hypha/apply/projects/constants.py:23
-#: hypha/apply/projects/models/payment.py:32 hypha/apply/projects/utils.py:93
+#: hypha/apply/projects/models/invoice.py:43 hypha/apply/projects/utils.py:96
 msgid "Paid"
 msgstr "Zaplaceno"
 
 #: hypha/apply/projects/constants.py:24
-#: hypha/apply/projects/models/payment.py:33 hypha/apply/projects/utils.py:95
+#: hypha/apply/projects/models/invoice.py:44 hypha/apply/projects/utils.py:98
 msgid "Payment failed"
 msgstr "Platba selhala"
 
@@ -6496,7 +7012,7 @@ msgstr "{} čekající"
 msgid "Request for change"
 msgstr "Žádost o změnu"
 
-#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:224
 #, fuzzy
 #| msgid "Update"
 msgid "Up to date"
@@ -6508,22 +7024,27 @@ msgstr "Aktualizovat"
 msgid "Behind schedule"
 msgstr "Nový rozvrh je následující"
 
-#: hypha/apply/projects/filters.py:66
+#: hypha/apply/projects/filters.py:61 hypha/apply/projects/tables.py:202
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
+msgid "Contractor"
+msgstr "Dodavatel"
+
+#: hypha/apply/projects/filters.py:73
 #: hypha/apply/projects/reports/templates/reports/reporting.html:6
 #: hypha/apply/projects/reports/templates/reports/reporting.html:11
-#: hypha/apply/projects/tables.py:186
+#: hypha/apply/projects/tables.py:205
 msgid "Reporting"
 msgstr "Hlášení"
 
-#: hypha/apply/projects/forms/payment.py:108
+#: hypha/apply/projects/forms/invoice.py:110
 msgid "Invoice file"
 msgstr "Soubor faktury"
 
-#: hypha/apply/projects/forms/payment.py:110
+#: hypha/apply/projects/forms/invoice.py:112
 msgid "The invoice must be a PDF."
 msgstr "Faktura musí být ve formátu PDF."
 
-#: hypha/apply/projects/forms/payment.py:115
+#: hypha/apply/projects/forms/invoice.py:117
 msgid ""
 "Files that are related to the invoice. They could be xls, microsoft office "
 "documents, open office documents, pdfs, txt files."
@@ -6531,16 +7052,16 @@ msgstr ""
 "Soubory, které souvisejí s fakturou.Mohou to být soubory xls, dokumenty "
 "Microsoft Office, dokumenty Open Office, pdf, txt."
 
-#: hypha/apply/projects/forms/payment.py:142
+#: hypha/apply/projects/forms/invoice.py:144
 msgid "Invoice File"
 msgstr "Soubor faktury"
 
-#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:408
+#: hypha/apply/projects/forms/invoice.py:179
+#: hypha/apply/projects/forms/project.py:418
 msgid "Document"
 msgstr "Dokument"
 
-#: hypha/apply/projects/forms/payment.py:200
+#: hypha/apply/projects/forms/invoice.py:202
 msgid "File not found on submission"
 msgstr "Soubor nebyl při podání nalezen"
 
@@ -6557,120 +7078,150 @@ msgid "You can only approve a signed contract"
 msgstr "Schválit můžete pouze podepsanou smlouvu"
 
 #: hypha/apply/projects/forms/project.py:93
+#: hypha/apply/projects/templates/application_projects/paf_export.html:6
+#: hypha/apply/projects/templates/application_projects/sow_export.html:6
+msgid "Project title"
+msgstr "Nadpis projektu"
+
+#: hypha/apply/projects/forms/project.py:95
+msgid ""
+"A submission can have several projects. Give this one a name so it can be "
+"told apart from the others."
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:101
 msgid "Select project lead"
 msgstr "Vyberte vedení projektu"
 
-#: hypha/apply/projects/forms/project.py:98
+#: hypha/apply/projects/forms/project.py:106
 msgid "Initial project status"
 msgstr "Počáteční stav projektu"
 
-#: hypha/apply/projects/forms/project.py:104
+#: hypha/apply/projects/forms/project.py:112
 msgid "Project end date"
 msgstr "Konečné datum projektu"
 
-#: hypha/apply/projects/forms/project.py:123
+#: hypha/apply/projects/forms/project.py:132
 msgid "Project lead is a required field"
 msgstr "Vedoucí projektu je povinné pole"
 
-#: hypha/apply/projects/forms/project.py:222
+#: hypha/apply/projects/forms/project.py:232
 msgid "Project form status"
 msgstr "Stav formuláře projektu"
 
-#: hypha/apply/projects/forms/project.py:307
+#: hypha/apply/projects/forms/project.py:317
 msgid "A Project can only be sent for Approval when Drafted."
 msgstr "Projekt lze odeslat ke schválení, pouze pokud je navržen."
 
-#: hypha/apply/projects/forms/project.py:385
-#: hypha/apply/projects/forms/project.py:400
+#: hypha/apply/projects/forms/project.py:395
+#: hypha/apply/projects/forms/project.py:410
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:78
 msgid "Contract"
 msgstr "Smlouva"
 
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:397
 msgid "Signed and approved"
 msgstr "Podepsáno a schváleno"
 
-#: hypha/apply/projects/forms/project.py:424
+#: hypha/apply/projects/forms/project.py:434
 msgid "Contract Document"
 msgstr "Smluvní dokument"
 
-#: hypha/apply/projects/forms/project.py:482
+#: hypha/apply/projects/forms/project.py:492
 msgid "The end date must be after the start date."
 msgstr "Datum ukončení musí být po datu zahájení."
 
-#: hypha/apply/projects/models/payment.py:27
+#: hypha/apply/projects/models/invoice.py:38
 msgid "Resubmitted"
 msgstr "Znovu předložené"
 
-#: hypha/apply/projects/models/payment.py:28
+#: hypha/apply/projects/models/invoice.py:39
 msgid "Changes requested by staff"
 msgstr "Změny požadované zaměstnanci"
 
-#: hypha/apply/projects/models/payment.py:29
+#: hypha/apply/projects/models/invoice.py:40
 msgid "Changes requested by finance"
 msgstr "Změny požadované financemi"
 
-#: hypha/apply/projects/models/payment.py:30
+#: hypha/apply/projects/models/invoice.py:41
 msgid "Approved by staff"
 msgstr "Schváleno zaměstnanci"
 
-#: hypha/apply/projects/models/payment.py:31
+#: hypha/apply/projects/models/invoice.py:42
 msgid "Approved by finance"
 msgstr "Schváleno finančním odborem"
 
-#: hypha/apply/projects/models/payment.py:109
+#: hypha/apply/projects/models/invoice.py:82
+#, fuzzy
+#| msgid "Invoice date"
+msgid "invoice tag"
+msgstr "Datum faktury"
+
+#: hypha/apply/projects/models/invoice.py:83
+#, fuzzy
+#| msgid "invoices"
+msgid "invoice tags"
+msgstr "faktury"
+
+#: hypha/apply/projects/models/invoice.py:132
 #, fuzzy
 #| msgid "Total value"
 msgid "paid value"
 msgstr "Celková hodnota"
 
-#: hypha/apply/projects/models/payment.py:116
-#: hypha/apply/projects/models/payment.py:289
-#: hypha/apply/projects/models/project.py:763
-#: hypha/apply/projects/models/project.py:795
+#: hypha/apply/projects/models/invoice.py:139
+#: hypha/apply/projects/models/invoice.py:319
+#: hypha/apply/projects/models/project.py:792
+#: hypha/apply/projects/models/project.py:824
 #, fuzzy
 #| msgid "Document"
 msgid "document"
 msgstr "Dokument"
 
-#: hypha/apply/projects/models/payment.py:120
-#: hypha/apply/projects/models/payment.py:123
+#: hypha/apply/projects/models/invoice.py:143
+#: hypha/apply/projects/models/invoice.py:146
 #, fuzzy
 #| msgid "Comment"
 msgid "comment"
 msgstr "Komentář"
 
-#: hypha/apply/projects/models/payment.py:121
+#: hypha/apply/projects/models/invoice.py:144
 #, fuzzy
 #| msgid "The title to be displayed on the homepage."
 msgid "This will be displayed as a comment in the comments tab"
 msgstr "Název, který se zobrazí na domovské stránce."
 
-#: hypha/apply/projects/models/payment.py:125
+#: hypha/apply/projects/models/invoice.py:148
 #, fuzzy
 #| msgid "Invoice number"
 msgid "invoice number"
 msgstr "Číslo faktury"
 
-#: hypha/apply/projects/models/payment.py:132
+#: hypha/apply/projects/models/invoice.py:155
 #, fuzzy
 #| msgid "Invoice amount"
 msgid "invoice amount"
 msgstr "Výše faktury"
 
-#: hypha/apply/projects/models/payment.py:134
+#: hypha/apply/projects/models/invoice.py:157
 #, fuzzy
 #| msgid "Invoice date"
 msgid "invoice date"
 msgstr "Datum faktury"
 
-#: hypha/apply/projects/models/payment.py:135
+#: hypha/apply/projects/models/invoice.py:158
 #, fuzzy
 #| msgid "Paid date"
 msgid "paid date"
 msgstr "Datum zaplacení"
 
-#: hypha/apply/projects/models/payment.py:146
+#: hypha/apply/projects/models/invoice.py:168
+#, fuzzy
+#| msgid "Add tags"
+msgid "tags"
+msgstr "Přidat štítky"
+
+#: hypha/apply/projects/models/invoice.py:175
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 #, fuzzy
@@ -6678,28 +7229,47 @@ msgstr "Datum zaplacení"
 msgid "invoice"
 msgstr "faktury"
 
-#: hypha/apply/projects/models/payment.py:147
+#: hypha/apply/projects/models/invoice.py:176
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:20
 msgid "invoices"
 msgstr "faktury"
 
-#: hypha/apply/projects/models/payment.py:150
-#, python-brace-format
-msgid "Invoice requested for {project}"
+#: hypha/apply/projects/models/invoice.py:180
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Invoice for {project}"
+msgstr "Faktura požadovaná za {project}"
+
+#: hypha/apply/projects/models/invoice.py:181
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Invoice {number} for {project}"
 msgstr "Faktura požadovaná za {project}"
 
-#: hypha/apply/projects/models/payment.py:298
+#: hypha/apply/projects/models/invoice.py:328
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "supporting document"
 msgstr "Podpůrné dokumenty"
 
-#: hypha/apply/projects/models/payment.py:299
+#: hypha/apply/projects/models/invoice.py:329
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "supporting documents"
 msgstr "Podpůrné dokumenty"
 
+#: hypha/apply/projects/models/invoice.py:359
+#, fuzzy
+#| msgid "Submissions: Download as CSV"
+msgid "invoice export manager"
+msgstr "Podání: Stáhnout jako CSV"
+
+#: hypha/apply/projects/models/invoice.py:360
+#, fuzzy
+#| msgid "Submissions: Download as CSV"
+msgid "invoice export managers"
+msgstr "Podání: Stáhnout jako CSV"
+
 #: hypha/apply/projects/models/project.py:75
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:41
 msgid "Approve"
@@ -6740,218 +7310,250 @@ msgstr "Dokončit"
 msgid "{} approval"
 msgstr "{} schvalování"
 
-#: hypha/apply/projects/models/project.py:215
+#: hypha/apply/projects/models/project.py:216
 #, fuzzy
 #| msgid "In Progress"
 msgid "In progress"
 msgstr "Probíhá"
 
-#: hypha/apply/projects/models/project.py:248
-#: hypha/apply/projects/models/project.py:761
-#: hypha/apply/projects/models/project.py:793
+#: hypha/apply/projects/models/project.py:251
+#: hypha/apply/projects/models/project.py:790
+#: hypha/apply/projects/models/project.py:822
 #, fuzzy
 #| msgid "Title"
 msgid "title"
 msgstr "Název"
 
-#: hypha/apply/projects/models/project.py:250
+#: hypha/apply/projects/models/project.py:253
 #, fuzzy
 #| msgid "Value"
 msgid "value"
 msgstr "Hodnota"
 
-#: hypha/apply/projects/models/project.py:257
+#: hypha/apply/projects/models/project.py:260
 #, fuzzy
 #| msgid "Proposed start date"
 msgid "proposed start date"
 msgstr "Navrhované datum zahájení"
 
-#: hypha/apply/projects/models/project.py:259
+#: hypha/apply/projects/models/project.py:262
 #, fuzzy
 #| msgid "Proposed end date"
 msgid "proposed end date"
 msgstr "Navrhované datum ukončení"
 
-#: hypha/apply/projects/models/project.py:269
+#: hypha/apply/projects/models/project.py:264
+#, fuzzy
+#| msgid "Contract number"
+msgid "contract number"
+msgstr "Číslo smlouvy"
+
+#: hypha/apply/projects/models/project.py:274
 msgid "locked"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:272
+#: hypha/apply/projects/models/project.py:277
 #, fuzzy
 #| msgid "Submit contracting documents"
 msgid "submit contracting documents"
 msgstr "Předložit smluvní dokumentaci"
 
-#: hypha/apply/projects/models/project.py:285
+#: hypha/apply/projects/models/project.py:290
 msgid "ID of this project at integrated payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:289
+#: hypha/apply/projects/models/project.py:294
 msgid "More details of the project integrated at payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:294
+#: hypha/apply/projects/models/project.py:299
 #, fuzzy
 #| msgid "Review invoice and take action"
 msgid "Reviewers role and their actions/comments"
 msgstr "Zkontrolujte fakturu a přijměte opatření"
 
-#: hypha/apply/projects/models/project.py:302 hypha/apply/todo/options.py:105
-#: hypha/apply/todo/options.py:113 hypha/apply/todo/options.py:121
-#: hypha/apply/todo/options.py:129 hypha/apply/todo/options.py:138
-#: hypha/apply/todo/options.py:146 hypha/apply/todo/options.py:155
-#: hypha/apply/todo/options.py:163 hypha/apply/todo/options.py:171
-#: hypha/apply/todo/options.py:180 hypha/apply/todo/options.py:188
-#: hypha/apply/todo/options.py:196 hypha/apply/todo/options.py:204
-#: hypha/apply/todo/options.py:212
+#: hypha/apply/projects/models/project.py:307 hypha/apply/todo/options.py:112
+#: hypha/apply/todo/options.py:120 hypha/apply/todo/options.py:128
+#: hypha/apply/todo/options.py:136 hypha/apply/todo/options.py:145
+#: hypha/apply/todo/options.py:153 hypha/apply/todo/options.py:162
+#: hypha/apply/todo/options.py:170 hypha/apply/todo/options.py:178
+#: hypha/apply/todo/options.py:187 hypha/apply/todo/options.py:195
+#: hypha/apply/todo/options.py:203 hypha/apply/todo/options.py:211
+#: hypha/apply/todo/options.py:219
 msgid "project"
 msgstr "projekt"
 
-#: hypha/apply/projects/models/project.py:303
+#: hypha/apply/projects/models/project.py:308
 #, fuzzy
 #| msgid "project"
 msgid "projects"
 msgstr "projekt"
 
-#: hypha/apply/projects/models/project.py:411
+#: hypha/apply/projects/models/project.py:418
 msgid "Proposed End Date must be after Proposed Start Date"
 msgstr "Navrhované datum ukončení musí následovat po navrhovaném datu zahájení"
 
 #. Translators: SOW = Statement of Work
-#: hypha/apply/projects/models/project.py:518
+#: hypha/apply/projects/models/project.py:525
 #, fuzzy
 #| msgid "project"
 msgctxt "singular"
 msgid "project SOW"
 msgstr "projekt"
 
-#: hypha/apply/projects/models/project.py:519
+#: hypha/apply/projects/models/project.py:526
 #, fuzzy
 #| msgid "project"
 msgctxt "plural"
 msgid "project SOW"
 msgstr "projekt"
 
-#: hypha/apply/projects/models/project.py:541
+#: hypha/apply/projects/models/project.py:532
+#, fuzzy, python-brace-format
+#| msgid "Scope of Work"
+msgid "Scope of Work for {project}"
+msgstr "Rozsah práce"
+
+#: hypha/apply/projects/models/project.py:543
 #, fuzzy
 #| msgid "Project form"
+msgctxt "singular"
 msgid "project form"
 msgstr "Formulář projektu"
 
-#: hypha/apply/projects/models/project.py:542
+#: hypha/apply/projects/models/project.py:544
 #, fuzzy
 #| msgid "Project form"
+msgctxt "plural"
 msgid "project forms"
 msgstr "Formulář projektu"
 
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:550
+#, fuzzy, python-brace-format
+#| msgid "Project forms for review"
+msgid "Project form for {project}"
+msgstr "Projektové formuláře ke kontrole"
+
+#: hypha/apply/projects/models/project.py:572
+#, fuzzy
+#| msgid "Project form"
+msgid "project form"
+msgstr "Formulář projektu"
+
+#: hypha/apply/projects/models/project.py:573
+#, fuzzy
+#| msgid "Project form"
+msgid "project forms"
+msgstr "Formulář projektu"
+
+#: hypha/apply/projects/models/project.py:579
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "project SOW form"
 msgstr "Formulář pracovního výkazu projektu"
 
-#: hypha/apply/projects/models/project.py:549
+#: hypha/apply/projects/models/project.py:580
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "project SOW forms"
 msgstr "Formulář pracovního výkazu projektu"
 
-#: hypha/apply/projects/models/project.py:561
+#: hypha/apply/projects/models/project.py:592
 #, fuzzy
 #| msgid "Project Report Form"
 msgid "project report form"
 msgstr "Formulář zprávy o projektu"
 
-#: hypha/apply/projects/models/project.py:562
+#: hypha/apply/projects/models/project.py:593
 #, fuzzy
 #| msgid "Project Report Form"
 msgid "project report forms"
 msgstr "Formulář zprávy o projektu"
 
-#: hypha/apply/projects/models/project.py:569
+#: hypha/apply/projects/models/project.py:600
 msgid "user groups"
 msgstr "skupiny uživatelů"
 
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:602
 msgid ""
 "Only selected group's users will be listed for this ProjectFormReviewerRole"
 msgstr ""
 "Pro tuto roli ProjectFormReviewerRole budou uvedeni pouze uživatelé vybrané "
 "skupiny"
 
-#: hypha/apply/projects/models/project.py:583
+#: hypha/apply/projects/models/project.py:614
 #, fuzzy
 #| msgid "All reviewers"
 msgid "PAF reviewers role"
 msgstr "Všichni hodnotitelé"
 
-#: hypha/apply/projects/models/project.py:584
+#: hypha/apply/projects/models/project.py:615
 #, fuzzy
 #| msgid "Project Reviewers Roles"
 msgid "PAF reviewers roles"
 msgstr "Role hodnotitelů projektu"
 
-#: hypha/apply/projects/models/project.py:595
+#: hypha/apply/projects/models/project.py:626
 msgid "Before"
 msgstr "Před"
 
-#: hypha/apply/projects/models/project.py:596
+#: hypha/apply/projects/models/project.py:627
 msgid "After"
 msgstr "Po"
 
-#: hypha/apply/projects/models/project.py:605
+#: hypha/apply/projects/models/project.py:636
 msgid "Number of days"
 msgstr "Počet dní"
 
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:637
 msgid "Relation to report due date"
 msgstr "Vztah k datu podání zprávy"
 
-#: hypha/apply/projects/models/project.py:610
+#: hypha/apply/projects/models/project.py:641
 #, fuzzy
 #| msgid "Report reminder frequency"
 msgid "project reminder frequency"
 msgstr "Frekvence připomínání hlášení"
 
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:642
 #, fuzzy
 #| msgid "Report reminder frequency"
 msgid "project reminder frequencies"
 msgstr "Frekvence připomínání hlášení"
 
-#: hypha/apply/projects/models/project.py:617
+#: hypha/apply/projects/models/project.py:648
 #, fuzzy
 #| msgid "Contact email"
 msgid "contracting group email"
 msgstr "Kontaktní e-mail"
 
-#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:650
 msgid "finance group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:620
+#: hypha/apply/projects/models/project.py:651
 msgid "staff group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:622
+#: hypha/apply/projects/models/project.py:653
 msgid "Uncheck it to approve project parallelly"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:632
+#: hypha/apply/projects/models/project.py:663
 #, fuzzy
 #| msgid "approved project form"
 msgid "Approve Project Sequentially"
 msgstr "schválený formulář projektu"
 
-#: hypha/apply/projects/models/project.py:635
+#: hypha/apply/projects/models/project.py:666
 msgid "Project Form Reviewers Roles"
 msgstr "Role hodnotitelů projektového formuláře"
 
-#: hypha/apply/projects/models/project.py:638
+#: hypha/apply/projects/models/project.py:669
 msgid "Project Reviewers Roles"
 msgstr "Role hodnotitelů projektu"
 
-#: hypha/apply/projects/models/project.py:640
+#: hypha/apply/projects/models/project.py:671
 msgid ""
 "Reviewer Roles are needed to move projects to 'Internal Approval' stage. "
 "Delete all roles to skip internal approval process and to move all internal "
@@ -6962,12 +7564,12 @@ msgstr ""
 "a všechny projekty s interním schvalováním přesunete zpět do fáze \"Návrh\" "
 "s odstraněním všech schválení."
 
-#: hypha/apply/projects/models/project.py:647
-#: hypha/apply/projects/models/project.py:648
+#: hypha/apply/projects/models/project.py:678
+#: hypha/apply/projects/models/project.py:679
 msgid "Report reminder frequency"
 msgstr "Frekvence připomínání hlášení"
 
-#: hypha/apply/projects/models/project.py:650
+#: hypha/apply/projects/models/project.py:681
 msgid ""
 "Set up a cron job to run `notify_report_due.py`. The script will use these "
 "reminder settings."
@@ -6975,150 +7577,150 @@ msgstr ""
 "Nastavte úlohu cronu, která bude spouštět soubor `notify_report_due.py`. "
 "Skript bude používat tato nastavení připomínek."
 
-#: hypha/apply/projects/models/project.py:656
+#: hypha/apply/projects/models/project.py:687
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:35
 msgid "project settings"
 msgstr "nastavení projektu"
 
-#: hypha/apply/projects/models/project.py:681
+#: hypha/apply/projects/models/project.py:712
 #, fuzzy
 #| msgid "{} approval"
 msgid "PAF approval"
 msgstr "{} schvalování"
 
-#: hypha/apply/projects/models/project.py:682
+#: hypha/apply/projects/models/project.py:713
 #, fuzzy
 #| msgid "Approvals"
 msgid "PAF approvals"
 msgstr "Schválení"
 
-#: hypha/apply/projects/models/project.py:685
+#: hypha/apply/projects/models/project.py:716
 #, python-brace-format
 msgid "Approval of {project} by {user}"
 msgstr "Schválení {project} od {user}"
 
-#: hypha/apply/projects/models/project.py:713
+#: hypha/apply/projects/models/project.py:744
 #, fuzzy
 #| msgid "Profile"
 msgid "file"
 msgstr "Profil"
 
-#: hypha/apply/projects/models/project.py:716
+#: hypha/apply/projects/models/project.py:747
 #, fuzzy
 #| msgid "Signed and approved"
 msgid "signed and approved"
 msgstr "Podepsáno a schváleno"
 
-#: hypha/apply/projects/models/project.py:718
+#: hypha/apply/projects/models/project.py:749
 #, fuzzy
 #| msgid "Counter Signed"
 msgid "counter signed?"
 msgstr "Podepsaný protikus"
 
-#: hypha/apply/projects/models/project.py:728
+#: hypha/apply/projects/models/project.py:759
 #, fuzzy
 #| msgid "Contract"
 msgid "contract"
 msgstr "Smlouva"
 
-#: hypha/apply/projects/models/project.py:729
+#: hypha/apply/projects/models/project.py:760
 #, fuzzy
 #| msgid "Contract"
 msgid "contracts"
 msgstr "Smlouva"
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Counter Signed"
 msgstr "Podepsaný protikus"
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Unsigned"
 msgstr "Nepodepsáno"
 
-#: hypha/apply/projects/models/project.py:740
+#: hypha/apply/projects/models/project.py:771
 #, python-brace-format
 msgid "Contract for {project} ({state})"
 msgstr "Smlouva na {project} ({state})"
 
-#: hypha/apply/projects/models/project.py:768
+#: hypha/apply/projects/models/project.py:797
 #, python-brace-format
 msgid "Project file: {title}"
 msgstr "Soubor projektu: {title}"
 
-#: hypha/apply/projects/models/project.py:772
-#: hypha/apply/projects/models/project.py:773
+#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:802
 #, fuzzy
 #| msgid "Update Profile"
 msgid "packet files"
 msgstr "Aktualizovat profil"
 
-#: hypha/apply/projects/models/project.py:800
+#: hypha/apply/projects/models/project.py:829
 #, fuzzy
 #| msgid "Contact Details"
 msgid "contract packet file"
 msgstr "Kontaktní údaje"
 
-#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:830
 #, fuzzy
 #| msgid "Contact Details"
 msgid "contract packet files"
 msgstr "Kontaktní údaje"
 
-#: hypha/apply/projects/models/project.py:804
+#: hypha/apply/projects/models/project.py:833
 #, python-brace-format
 msgid "Contract file: {title}"
 msgstr "Soubor smluv: {title}"
 
-#: hypha/apply/projects/models/project.py:814
 #: hypha/apply/projects/models/project.py:843
+#: hypha/apply/projects/models/project.py:872
 #, fuzzy
 #| msgid "Username"
 msgid "name"
 msgstr "Uživatelské jméno"
 
-#: hypha/apply/projects/models/project.py:816
 #: hypha/apply/projects/models/project.py:845
+#: hypha/apply/projects/models/project.py:874
 #, fuzzy
 #| msgid "Recommendation"
 msgid "recommended minimum"
 msgstr "Doporučení"
 
-#: hypha/apply/projects/models/project.py:820
-#: hypha/apply/projects/models/project.py:857
+#: hypha/apply/projects/models/project.py:849
+#: hypha/apply/projects/models/project.py:886
 #, fuzzy
 #| msgid "View template"
 msgid "template"
 msgstr "Zobrazit šablonu"
 
-#: hypha/apply/projects/models/project.py:832
+#: hypha/apply/projects/models/project.py:861
 #, fuzzy
 #| msgid "Category"
 msgid "Document Category"
 msgstr "Kategorie"
 
-#: hypha/apply/projects/models/project.py:833
+#: hypha/apply/projects/models/project.py:862
 #, fuzzy
 #| msgid "Project documents"
 msgid "Project Document Categories"
 msgstr "Projektové dokumenty"
 
-#: hypha/apply/projects/models/project.py:850
+#: hypha/apply/projects/models/project.py:879
 #, fuzzy
 #| msgid "Allow document access for groups"
 msgid "allow document access for groups"
 msgstr "Povolení přístupu k dokumentům pro skupiny"
 
-#: hypha/apply/projects/models/project.py:851
+#: hypha/apply/projects/models/project.py:880
 msgid "Only selected group's users can access the document"
 msgstr "Přístup k dokumentu mají pouze uživatelé vybrané skupiny"
 
-#: hypha/apply/projects/models/project.py:869
+#: hypha/apply/projects/models/project.py:898
 #, fuzzy
 #| msgid "Contract Document"
 msgid "Contrat Document Category"
 msgstr "Smluvní dokument"
 
-#: hypha/apply/projects/models/project.py:870
+#: hypha/apply/projects/models/project.py:899
 #, fuzzy
 #| msgid "Contract Document"
 msgid "Contract Document Categories"
@@ -7336,17 +7938,40 @@ msgstr ""
 msgid "Access allowed"
 msgstr "Přijmout vše"
 
-#: hypha/apply/projects/permissions.py:424
+#: hypha/apply/projects/permissions.py:426
+#, fuzzy
+#| msgid "Projects in contracting"
+msgid "Project is not in Draft state"
+msgstr "Projekty ve smluvním procesu"
+
+#: hypha/apply/projects/permissions.py:429
+#, fuzzy
+#| msgid "You can only approve a signed contract"
+msgid "Only Staff can skip the PAF approval process"
+msgstr "Schválit můžete pouze podepsanou smlouvu"
+
+#: hypha/apply/projects/permissions.py:433
+msgid "Staff can skip PAF approval when no reviewer roles are configured"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:436
+#, fuzzy
+#| msgid "No reviewer roles configured. Please add roles in "
+msgid "PAF reviewer roles are configured, cannot skip approval process"
+msgstr ""
+"Nejsou nakonfigurovány žádné role hodnotitele. Přidejte prosím role do "
+
+#: hypha/apply/projects/permissions.py:445
 msgid "Project form is editable for active projects if no reviewer roles"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:427
+#: hypha/apply/projects/permissions.py:448
 #, fuzzy
 #| msgid "Your project is not editable at this point."
 msgid "Project form is editable in Draft by this user"
 msgstr "Váš projekt v tuto chvíli nelze upravovat."
 
-#: hypha/apply/projects/permissions.py:428
+#: hypha/apply/projects/permissions.py:449
 msgid "You are not allowed to edit the project at this time"
 msgstr "V tuto chvíli nemůžete projekt upravovat"
 
@@ -7354,7 +7979,21 @@ msgstr "V tuto chvíli nemůžete projekt upravovat"
 msgid "Reporting Period"
 msgstr "Období, za které se podává zpráva"
 
-#: hypha/apply/projects/reports/forms.py:100
+#: hypha/apply/projects/reports/forms.py:101
+#: hypha/apply/projects/reports/forms.py:120
+#, fuzzy
+#| msgid "Report"
+msgid "Report due date"
+msgstr "Zpráva"
+
+#: hypha/apply/projects/reports/forms.py:112
+#: hypha/apply/projects/reports/forms.py:131
+#, fuzzy
+#| msgid "A user with that email already exists."
+msgid "A report for this date already exists."
+msgstr "Uživatel s tímto e-mailem již existuje."
+
+#: hypha/apply/projects/reports/forms.py:136
 #, fuzzy
 #| msgid "Report"
 msgid "Report on:"
@@ -7374,105 +8013,111 @@ msgctxt "project report (noun)"
 msgid "reports"
 msgstr "Zprávy"
 
-#: hypha/apply/projects/reports/models.py:204
+#: hypha/apply/projects/reports/models.py:131
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Report due {due_date} for {project}"
+msgstr "Faktura požadovaná za {project}"
+
+#: hypha/apply/projects/reports/models.py:209
 #, fuzzy
 #| msgid "For Conversion"
 msgid "report version"
 msgstr "Pro konverzi"
 
-#: hypha/apply/projects/reports/models.py:205
+#: hypha/apply/projects/reports/models.py:210
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report versions"
 msgstr "vykazované období je"
 
-#: hypha/apply/projects/reports/models.py:220
+#: hypha/apply/projects/reports/models.py:225
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report private file"
 msgstr "vykazované období je"
 
-#: hypha/apply/projects/reports/models.py:221
+#: hypha/apply/projects/reports/models.py:226
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report private files"
 msgstr "vykazované období je"
 
-#: hypha/apply/projects/reports/models.py:240
+#: hypha/apply/projects/reports/models.py:245
 msgid "week"
 msgstr "týden"
 
-#: hypha/apply/projects/reports/models.py:241
+#: hypha/apply/projects/reports/models.py:246
 msgid "month"
 msgstr "měsíc"
 
-#: hypha/apply/projects/reports/models.py:242
+#: hypha/apply/projects/reports/models.py:247
 msgid "year"
 msgstr "rok"
 
-#: hypha/apply/projects/reports/models.py:246
+#: hypha/apply/projects/reports/models.py:251
 msgid "Years"
 msgstr "Roky"
 
-#: hypha/apply/projects/reports/models.py:262
+#: hypha/apply/projects/reports/models.py:267
 #, fuzzy
 #| msgid "Reporting"
 msgid "report config"
 msgstr "Hlášení"
 
-#: hypha/apply/projects/reports/models.py:263
+#: hypha/apply/projects/reports/models.py:268
 #, fuzzy
 #| msgid "Reporting"
 msgid "report configs"
 msgstr "Hlášení"
 
-#: hypha/apply/projects/reports/models.py:267
+#: hypha/apply/projects/reports/models.py:272
 #, fuzzy
 #| msgid "Disable"
 msgid "Disabled"
 msgstr "Vypnout"
 
-#: hypha/apply/projects/reports/models.py:272
+#: hypha/apply/projects/reports/models.py:277
 #, python-brace-format
 msgid "One time, that already has reported on {date}"
 msgstr "Jednou, který se již ohlásil v {date}"
 
-#: hypha/apply/projects/reports/models.py:277
+#: hypha/apply/projects/reports/models.py:282
 #, python-brace-format
 msgid "One time on {date}"
 msgstr "Jednou v {date}"
 
-#: hypha/apply/projects/reports/models.py:285
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:316
 msgid "last day"
 msgstr "poslední den"
 
-#: hypha/apply/projects/reports/models.py:291
+#: hypha/apply/projects/reports/models.py:307
 #, python-brace-format
 msgid "Once a year on {month} {day}"
 msgstr "Jednou ročně {day} {month}"
 
-#: hypha/apply/projects/reports/models.py:294
+#: hypha/apply/projects/reports/models.py:310
 #, python-brace-format
 msgid "Every {occurrence} years on {month} {day}"
 msgstr "Každý {occurrence} rok {day} {month}"
 
-#: hypha/apply/projects/reports/models.py:304
+#: hypha/apply/projects/reports/models.py:320
 #, python-brace-format
 msgid "Once a month on the {day}"
 msgstr "Jednou měsíčně {day}"
 
-#: hypha/apply/projects/reports/models.py:305
+#: hypha/apply/projects/reports/models.py:321
 #, python-brace-format
 msgid "Every {occurrence} months on the {day}"
 msgstr "Každých {occurrence} měsíců {day}"
 
-#: hypha/apply/projects/reports/models.py:312
+#: hypha/apply/projects/reports/models.py:328
 #, python-brace-format
 msgid "Once a week on {weekday}"
 msgstr "Jednou týdně v {weekday}"
 
-#: hypha/apply/projects/reports/models.py:313
+#: hypha/apply/projects/reports/models.py:329
 #, python-brace-format
 msgid "Every {occurrence} weeks on {weekday}"
 msgstr "Každý {occurrence} týden v {weekday}"
@@ -7495,35 +8140,35 @@ msgstr "Data"
 msgid "Last Notified"
 msgstr "Nejméně komentářů"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "The"
-msgstr " "
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "current"
-msgstr "aktuální"
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "next"
-msgstr "další"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:11
+#, fuzzy
+#| msgid "Relation to report due date"
+msgid "Edit this report date"
+msgstr "Vztah k datu podání zprávy"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "reporting period is"
-msgstr "vykazované období je"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:12
+#, fuzzy
+#| msgid "Edited by"
+msgid "edit"
+msgstr "Upraveno od"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:8
-msgid "A report is due for the period"
-msgstr "Je třeba předložit zprávu za období"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:16
+#, fuzzy
+#| msgid "Past 7 days"
+msgid "Past due"
+msgstr "Minulých 7 dní"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
 msgid "Continue Editing"
 msgstr "Pokračovat v úpravách"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
-msgid "Add Report"
-msgstr "Přidat zprávu"
-
 #: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+#, fuzzy
+#| msgid "Save report"
+msgid "Create report"
+msgstr "Uložit zprávu"
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:33
 #, python-format
 msgid ""
 " You're skipping the report for %(start_date)s - %(end_date)s. This will "
@@ -7533,37 +8178,77 @@ msgstr ""
 "následek mezeru ve vykazování projektu. Tento krok můžete kdykoli vrátit "
 "zpět. "
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:29
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:32
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:34
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:38
 msgid "Skip"
 msgstr "Přeskočit"
 
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:36
+#, fuzzy
+#| msgid "Relation to report due date"
+msgid "Skip this report date"
+msgstr "Vztah k datu podání zprávy"
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:48
+#, fuzzy
+#| msgid "Other comments"
+msgid "Delete report requirement"
+msgstr "Další připomínky"
+
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:26
 msgid "Enable"
 msgstr "Povolit"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:55
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:62
 msgid "Period End"
 msgstr "Konec období"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:101
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:108
 msgid "Unskip"
 msgstr "Zrušení přeskočení"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 #, fuzzy
 #| msgid "Show less..."
 msgid "Show less"
 msgstr "Zobrazit méně..."
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show more"
 msgstr "Zobrazit více"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:130
 msgid "No reports submitted yet."
 msgstr "Zatím nebyly podány žádné zprávy."
 
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:2
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:18
+#, fuzzy
+#| msgid "Add Report"
+msgid "Add report date"
+msgstr "Přidat zprávu"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:2
+#, fuzzy
+#| msgid "Delete user"
+msgid "Delete report"
+msgstr "Smazat uživatele"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:4
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to delete the selected submissions? This action "
+#| "cannot be undone."
+msgid ""
+"Are you sure you want to delete this report? This action cannot be undone."
+msgstr "Opravdu chcete vybraná podání odstranit? Tuto akci nelze vzít zpět."
+
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:2
+#, fuzzy
+#| msgid "Relation to report due date"
+msgid "Edit report due date"
+msgstr "Vztah k datu podání zprávy"
+
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:2
 msgid "Change reporting frequency"
 msgstr "Změna frekvence podávání zpráv"
@@ -7631,24 +8316,24 @@ msgstr "Zpráva"
 msgid "View project"
 msgstr "Zobrazit stránku projektu"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 msgid "This report is for the period"
 msgstr "Tato zpráva se týká období"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:56
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:32
 msgid "Report Skipped"
 msgstr "Zpráva přeskočena"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:58
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:37
 msgid "Public Report"
 msgstr "Veřejná zpráva"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:107
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:85
 msgid "View previous report"
 msgstr "Zobrazit předchozí zprávu"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:115
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:93
 msgid "View next report"
 msgstr "Zobrazit další zprávu"
 
@@ -7729,73 +8414,102 @@ msgstr "předložená zpráva"
 msgid "No Projects Currently Reporting."
 msgstr "V současné době nemají hlášení žádné projekty."
 
-#: hypha/apply/projects/reports/views.py:78
-#: hypha/apply/projects/reports/views.py:100
+#: hypha/apply/projects/reports/views.py:83
+#: hypha/apply/projects/reports/views.py:105
 msgid "You do not have permission to access this report."
 msgstr "K přístupu k této zprávě nemáte oprávnění."
 
-#: hypha/apply/projects/reports/views.py:125
+#: hypha/apply/projects/reports/views.py:130
 msgid "You do not have permission to update this report."
 msgstr "K aktualizaci této zprávy nemáte oprávnění."
 
-#: hypha/apply/projects/reports/views.py:372
+#: hypha/apply/projects/reports/views.py:377
 msgid "You do not have permission to update reporting configurations."
 msgstr "Nemáte oprávnění aktualizovat konfigurace hlášení."
 
-#: hypha/apply/projects/reports/views.py:491
+#: hypha/apply/projects/reports/views.py:496
 msgid "Reporting disabled"
 msgstr "Hlášení vypnuto"
 
-#: hypha/apply/projects/tables.py:31
+#: hypha/apply/projects/reports/views.py:532
+#, fuzzy
+#| msgid "You do not have permission to access this report."
+msgid "You do not have permission to add reports."
+msgstr "K přístupu k této zprávě nemáte oprávnění."
+
+#: hypha/apply/projects/reports/views.py:572
+#, fuzzy
+#| msgid "You do not have permission to update this report."
+msgid "You do not have permission to edit report due dates."
+msgstr "K aktualizaci této zprávy nemáte oprávnění."
+
+#: hypha/apply/projects/reports/views.py:583
+msgid "A submitted report's due date cannot be edited."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:607
+#, fuzzy
+#| msgid "You do not have permission to update this report."
+msgid "You do not have permission to delete reports."
+msgstr "K aktualizaci této zprávy nemáte oprávnění."
+
+#: hypha/apply/projects/tables.py:29
 #, fuzzy
 #| msgid "Invoice"
 msgid "Invoice #"
 msgstr "Faktura"
 
-#: hypha/apply/projects/tables.py:43
+#: hypha/apply/projects/tables.py:41
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
 msgid "Invoice date"
 msgstr "Datum faktury"
 
-#: hypha/apply/projects/tables.py:45
+#: hypha/apply/projects/tables.py:43
 #, fuzzy
 #| msgid "Project title"
 msgid "Project Title"
 msgstr "Nadpis projektu"
 
-#: hypha/apply/projects/tables.py:103
+#: hypha/apply/projects/tables.py:114
 msgid "Vendor Name"
 msgstr "Název dodavatele"
 
-#: hypha/apply/projects/tables.py:137
+#: hypha/apply/projects/tables.py:151
 msgid "Project Name"
 msgstr "Název Projektu"
 
-#: hypha/apply/projects/tables.py:188
+#: hypha/apply/projects/tables.py:204
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:66
+#, fuzzy
+#| msgid "Contract"
+msgid "Contract #"
+msgstr "Smlouva"
+
+#: hypha/apply/projects/tables.py:207
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:48
 msgid "End date"
 msgstr "Datum ukončení"
 
-#: hypha/apply/projects/tables.py:213
+#: hypha/apply/projects/tables.py:232
 #, python-brace-format
 msgid "{count} outstanding"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:251
+#: hypha/apply/projects/tables.py:270
 msgid "Date requested"
 msgstr "Datum žádosti"
 
-#: hypha/apply/projects/tables.py:266
+#: hypha/apply/projects/tables.py:288
 msgid "Assignee"
 msgstr "Příjemce"
 
-#: hypha/apply/projects/tables.py:286
+#: hypha/apply/projects/tables.py:308
 msgid "Waiting for approval"
 msgstr "Čekání na schválení"
 
-#: hypha/apply/projects/tables.py:288
+#: hypha/apply/projects/tables.py:310
 msgid "Waiting for assignee"
 msgstr "Čekání na příjemce"
 
@@ -7842,8 +8556,8 @@ msgstr "Tým zadavatele "
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:170
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:60
 #: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:56
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
 #: hypha/apply/templates/forms/includes/field.html:55
 msgid "Upload"
 msgstr "Nahrát"
@@ -7920,12 +8634,12 @@ msgid "Update approvers"
 msgstr "Zobrazit/aktualizovat schvalovatele"
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:55
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:156
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:159
 msgid "Change approver"
 msgstr "Schvalovatel změn"
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:67
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:168
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:171
 msgid "Assign approver"
 msgstr "Přiřadit schvalovatele"
 
@@ -7936,7 +8650,7 @@ msgstr "Přiřadit schvalovatele"
 msgid "Project form"
 msgstr "Formulář projektu"
 
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:124
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:132
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:172
 msgid "Fill in"
 msgstr "Vyplňte"
@@ -7959,7 +8673,7 @@ msgstr "Zobrazit žádost"
 
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:69
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:70
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -7975,15 +8689,15 @@ msgstr "Datum zaplacení"
 msgid "Vendor"
 msgstr "Dodavatel"
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:74
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:76
 #, fuzzy
 #| msgid "deleted invoice"
 msgid "Download invoice"
 msgstr "smazaná faktura"
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:90
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:94
 #: hypha/apply/projects/templates/application_projects/paf_export.html:63
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:101
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:106
 msgid "Supporting Documents"
 msgstr "Podkladové dokumenty"
 
@@ -8074,6 +8788,12 @@ msgstr "Aktualizace stavu faktury"
 msgid "Project documents status"
 msgstr "Projektové dokumenty"
 
+#: hypha/apply/projects/templates/application_projects/modals/project_contract_number_update.html:2
+#, fuzzy
+#| msgid "Contract number"
+msgid "Update contract number"
+msgstr "Číslo smlouvy"
+
 #: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
 msgid "Update project dates"
 msgstr "Aktualizovat datumy projektu"
@@ -8207,38 +8927,33 @@ msgid ""
 "invoicing & reporting stage."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/paf_export.html:6
-#: hypha/apply/projects/templates/application_projects/sow_export.html:6
-msgid "Project title"
-msgstr "Nadpis projektu"
-
 #: hypha/apply/projects/templates/application_projects/paf_export.html:7
 #: hypha/apply/projects/templates/application_projects/sow_export.html:7
 msgid "Project ID"
 msgstr "ID projektu"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:18
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:49
 msgid "Approvals"
 msgstr "Schválení"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:32
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:66
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
 msgid "Submission lead"
 msgstr "Vedoucí podání"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:34
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:72
 msgid "Staff reviewers"
 msgstr "Hodnotitelé z řad zaměstnanců"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:41
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:75
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:78
 msgid "as"
 msgstr "jako"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:51
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:89
 msgid "Advisory council"
 msgstr "Poradní sbor"
 
@@ -8262,6 +8977,43 @@ msgstr "Opravdu chcete předložit smluvní dokumenty?"
 msgid "Submit contract documents"
 msgstr "Předložit smluvní dokumenty"
 
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:9
+#, fuzzy
+#| msgid "Export as CSV"
+msgid "Invoices: Export as CSV"
+msgstr "Exportovat jako CSV"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:12
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:72
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to download the submissions as a csv file? This "
+#| "file may contain sensitive information, so please handle it carefully."
+msgid ""
+"Are you sure you want to export the invoices as a CSV file? This file may "
+"contain sensitive information, so please handle it carefully."
+msgstr ""
+"Opravdu si přejete stáhnout podání jako soubor csv? Tento soubor může "
+"obsahovat citlivé informace, proto s ním zacházejte opatrně."
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:22
+#, fuzzy
+#| msgid "Submissions: Download as CSV"
+msgid "Invoices: Generating downloadable CSV"
+msgstr "Podání: Stáhnout jako CSV"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:40
+#, fuzzy
+#| msgid "Download as DOCX"
+msgid "Invoices: Download generated CSV"
+msgstr "Stáhnout jako DOCX"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:62
+#, fuzzy
+#| msgid "Generate Codes"
+msgid "Invoices: Generate downloadable CSV"
+msgstr "Generovat kódy"
+
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:35
 #, fuzzy
 #| msgid ""
@@ -8275,21 +9027,16 @@ msgstr ""
 msgid "Edit Invoice"
 msgstr "Upravit fakturu"
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:29
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:52
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
-msgid "View comment"
-msgstr "Zobrazit komentář"
-
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:69
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:21
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:43
 #, fuzzy
-#| msgid "Show less..."
-msgid "show less"
-msgstr "Zobrazit méně..."
+#| msgid "Activity feed"
+msgid "Status & Activity"
+msgstr "Podávání informací o aktivitách"
 
-#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
-msgid "Contractor"
-msgstr "Dodavatel"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:48
+msgid "When you leave a comment or change the statuses, it'll show up here!"
+msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:22
 msgid "Start date"
@@ -8304,6 +9051,29 @@ msgstr "upravit datumy"
 msgid "Awaiting contract finalization..."
 msgstr "Čeká se na dokončení smlouvy..."
 
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:75
+#, fuzzy
+#| msgid "Contract number"
+msgid "edit contract number"
+msgstr "Číslo smlouvy"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
+msgid "Copied!"
+msgstr "Zkopírováno!"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#, fuzzy
+#| msgid "Contract number"
+msgid "Copy contract number"
+msgstr "Číslo smlouvy"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:91
+#, fuzzy
+#| msgid "Contract number"
+msgid "copy contract number"
+msgstr "Číslo smlouvy"
+
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:10
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:14
 #, fuzzy
@@ -8345,24 +9115,24 @@ msgstr "Pokračovat na další stav"
 msgid "Update project status"
 msgstr "Aktualizovat stav projektu"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:23
-#: hypha/apply/projects/templates/application_projects/project_detail.html:54
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:49
 msgid "Project Information"
 msgstr "Informace o projektu"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:83
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:94
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:97
 msgid "No reviews"
 msgstr "Žádné hodnocení"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:174
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:177
 #, fuzzy
 #| msgid "Download PDF"
 msgid "Download"
 msgstr "Stáhnout PDF"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:182
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:57
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:185
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:63
 msgid "Download as DOCX"
 msgstr "Stáhnout jako DOCX"
 
@@ -8376,29 +9146,33 @@ msgstr ""
 msgid "Proposal attachments"
 msgstr "Přílohy návrhu"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:45
+#: hypha/apply/projects/templates/application_projects/project_detail.html:40
 #, fuzzy, python-format
 #| msgid " This project is in %(status)s state. "
 msgid "This project is in %(status)s state."
 msgstr " Tento projekt je ve stavu %(status)s. "
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:119
+#: hypha/apply/projects/templates/application_projects/project_detail.html:114
 msgid "Project form approvals"
 msgstr "Schvalování formulářů projektu"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#: hypha/apply/projects/templates/application_projects/project_detail.html:127
 msgid "Request changes or more information by "
 msgstr "Požádat o změny nebo další informace od "
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:149
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+msgid "View comment"
+msgstr "Zobrazit komentář"
+
+#: hypha/apply/projects/templates/application_projects/project_detail.html:144
 msgid "Pending approval from "
 msgstr "Čeká se na schválení od "
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:153
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
 msgid "nobody assigned yet"
 msgstr "zatím nebyl nikdo přidělen"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:161
+#: hypha/apply/projects/templates/application_projects/project_detail.html:156
 msgid "approved"
 msgstr "schváleno"
 
@@ -8415,7 +9189,7 @@ msgstr "Zobrazení, vyhledávání a filtrování všech projektů"
 msgid "No Projects Available."
 msgstr "Nejsou k dispozici žádné projekty."
 
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:25
 #: hypha/apply/projects/templates/application_projects/sow_export.html:5
 msgid "Scope of Work"
 msgstr "Rozsah práce"
@@ -8445,57 +9219,57 @@ msgstr "Potvrdit"
 msgid "{status} by {user_role}"
 msgstr "{status} od {user_role}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:104
-#: hypha/apply/projects/templatetags/project_tags.py:109
-#: hypha/apply/projects/templatetags/project_tags.py:115
-#: hypha/apply/projects/templatetags/project_tags.py:119
-#: hypha/apply/projects/templatetags/project_tags.py:237
-#: hypha/apply/projects/templatetags/project_tags.py:249
-#: hypha/apply/projects/templatetags/project_tags.py:259
-#: hypha/apply/projects/templatetags/project_tags.py:278
-#: hypha/apply/projects/templatetags/project_tags.py:283
+#: hypha/apply/projects/templatetags/project_tags.py:117
+#: hypha/apply/projects/templatetags/project_tags.py:122
+#: hypha/apply/projects/templatetags/project_tags.py:128
+#: hypha/apply/projects/templatetags/project_tags.py:132
+#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:262
+#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:291
+#: hypha/apply/projects/templatetags/project_tags.py:296
 msgid "To do"
 msgstr "Jak udělat"
 
-#: hypha/apply/projects/templatetags/project_tags.py:105
+#: hypha/apply/projects/templatetags/project_tags.py:118
 msgid "Fill in the Project Form"
 msgstr "Vyplnit formulář projektu"
 
-#: hypha/apply/projects/templatetags/project_tags.py:110
+#: hypha/apply/projects/templatetags/project_tags.py:123
 msgid "Move project to next stage"
 msgstr "Posun projektu do další fáze"
 
-#: hypha/apply/projects/templatetags/project_tags.py:116
+#: hypha/apply/projects/templatetags/project_tags.py:129
 msgid "Resubmit project documents for approval"
 msgstr "Znovu předložit projektovou dokumentaci ke schválení"
 
-#: hypha/apply/projects/templatetags/project_tags.py:120
+#: hypha/apply/projects/templatetags/project_tags.py:133
 msgid "Submit project documents for approval"
 msgstr "Předložit projektovou dokumentaci ke schválení"
 
-#: hypha/apply/projects/templatetags/project_tags.py:124
-#: hypha/apply/projects/templatetags/project_tags.py:132
-#: hypha/apply/projects/templatetags/project_tags.py:136
-#: hypha/apply/projects/templatetags/project_tags.py:142
-#: hypha/apply/projects/templatetags/project_tags.py:158
-#: hypha/apply/projects/templatetags/project_tags.py:164
-#: hypha/apply/projects/templatetags/project_tags.py:179
-#: hypha/apply/projects/templatetags/project_tags.py:188
-#: hypha/apply/projects/templatetags/project_tags.py:194
-#: hypha/apply/projects/templatetags/project_tags.py:202
-#: hypha/apply/projects/templatetags/project_tags.py:211
-#: hypha/apply/projects/templatetags/project_tags.py:218
-#: hypha/apply/projects/templatetags/project_tags.py:225
-#: hypha/apply/projects/templatetags/project_tags.py:229
-#: hypha/apply/projects/templatetags/project_tags.py:243
-#: hypha/apply/projects/templatetags/project_tags.py:253
+#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:145
+#: hypha/apply/projects/templatetags/project_tags.py:149
+#: hypha/apply/projects/templatetags/project_tags.py:155
+#: hypha/apply/projects/templatetags/project_tags.py:171
+#: hypha/apply/projects/templatetags/project_tags.py:177
+#: hypha/apply/projects/templatetags/project_tags.py:192
+#: hypha/apply/projects/templatetags/project_tags.py:201
+#: hypha/apply/projects/templatetags/project_tags.py:207
+#: hypha/apply/projects/templatetags/project_tags.py:215
+#: hypha/apply/projects/templatetags/project_tags.py:224
+#: hypha/apply/projects/templatetags/project_tags.py:231
+#: hypha/apply/projects/templatetags/project_tags.py:238
+#: hypha/apply/projects/templatetags/project_tags.py:242
+#: hypha/apply/projects/templatetags/project_tags.py:256
 #: hypha/apply/projects/templatetags/project_tags.py:266
-#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:285
 msgid "Waiting for"
 msgstr "Čekání na"
 
-#: hypha/apply/projects/templatetags/project_tags.py:126
-#: hypha/apply/projects/templatetags/project_tags.py:144
+#: hypha/apply/projects/templatetags/project_tags.py:139
+#: hypha/apply/projects/templatetags/project_tags.py:157
 #, python-brace-format
 msgid ""
 "Awaiting project documents to be created and approved by {ORG_SHORT_NAME} "
@@ -8506,166 +9280,178 @@ msgstr ""
 "{ORG_SHORT_NAME}.Zkontrolujte prosím, až projekt přejde do fáze uzavírání "
 "smluv."
 
-#: hypha/apply/projects/templatetags/project_tags.py:133
+#: hypha/apply/projects/templatetags/project_tags.py:146
 msgid "Changes requested. Awaiting documents to be resubmitted."
 msgstr "Požadované změny. Čeká se na opětovné předložení dokumentů."
 
-#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:150
 msgid "Awaiting project form to be created."
 msgstr "Čeká se na vytvoření projektového formuláře."
 
-#: hypha/apply/projects/templatetags/project_tags.py:160
-#: hypha/apply/projects/templatetags/project_tags.py:196
+#: hypha/apply/projects/templatetags/project_tags.py:173
+#: hypha/apply/projects/templatetags/project_tags.py:209
 #, python-brace-format
 msgid "Awaiting approval. Assigned to {approver}"
 msgstr "Čeká se na schválení. Přiděleno {approver}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:166
-#: hypha/apply/projects/templatetags/project_tags.py:204
+#: hypha/apply/projects/templatetags/project_tags.py:179
+#: hypha/apply/projects/templatetags/project_tags.py:217
 #, python-brace-format
 msgid "Awaiting {reviewer_role} to assign an approver"
 msgstr "Čeká se na přiřazení {reviewer_role} schvalovateli"
 
-#: hypha/apply/projects/templatetags/project_tags.py:180
+#: hypha/apply/projects/templatetags/project_tags.py:193
 msgid "Awaiting project form to be approved"
 msgstr "Čeká se na schválení formuláře projektu"
 
-#: hypha/apply/projects/templatetags/project_tags.py:189
+#: hypha/apply/projects/templatetags/project_tags.py:202
 msgid "Awaiting approval from other approvers teams"
 msgstr "Čeká se na schválení ostatními schvalovacími týmy"
 
-#: hypha/apply/projects/templatetags/project_tags.py:212
+#: hypha/apply/projects/templatetags/project_tags.py:225
 msgid "Awaiting project from assigned approvers"
 msgstr "Čeká se na projekt od přiřazených schvalovatelů"
 
-#: hypha/apply/projects/templatetags/project_tags.py:219
+#: hypha/apply/projects/templatetags/project_tags.py:232
 #, python-brace-format
 msgid "Awaiting signed contract from {ORG_SHORT_NAME}"
 msgstr "Čeká se na podepsanou smlouvu od {ORG_SHORT_NAME}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:226
+#: hypha/apply/projects/templatetags/project_tags.py:239
 msgid "Awaiting signed contract from Staff/Contracting team"
 msgstr "Čeká se na podepsanou smlouvu od zaměstnanců / týmu zadavatelů"
 
-#: hypha/apply/projects/templatetags/project_tags.py:230
+#: hypha/apply/projects/templatetags/project_tags.py:243
 msgid "Awaiting signed contract from Contracting team"
 msgstr "Čeká se na podepsanou smlouvu od zadavatelů"
 
-#: hypha/apply/projects/templatetags/project_tags.py:239
+#: hypha/apply/projects/templatetags/project_tags.py:252
 msgid "Awaiting contract documents to be submitted by you."
 msgstr "Čekáme na zadávací dokumentaci, kterou předložíte."
 
-#: hypha/apply/projects/templatetags/project_tags.py:244
+#: hypha/apply/projects/templatetags/project_tags.py:257
 msgid "Awaiting countersigned contract from Vendor"
 msgstr "Čeká se na spolupodepsanou smlouvu od dodavatele"
 
-#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:263
 msgid "Awaiting contract documents submission by you"
 msgstr "Čeká se na předložení zadávací dokumentace od vás"
 
-#: hypha/apply/projects/templatetags/project_tags.py:254
+#: hypha/apply/projects/templatetags/project_tags.py:267
 msgid "Awaiting contract documents submission from Vendor"
 msgstr "Čeká se na předložení zadávací dokumentace od dodavatele"
 
-#: hypha/apply/projects/templatetags/project_tags.py:261
+#: hypha/apply/projects/templatetags/project_tags.py:274
 msgid "Review the contract for all relevant details and approve."
 msgstr ""
 "Zkontrolujte, zda jsou ve smlouvě uvedeny všechny důležité údaje, a schvalte "
 "ji."
 
-#: hypha/apply/projects/templatetags/project_tags.py:268
+#: hypha/apply/projects/templatetags/project_tags.py:281
 #, python-brace-format
 msgid "Awaiting contract approval from {ORG_SHORT_NAME}"
 msgstr "Čeká se na schválení smlouvy od {ORG_SHORT_NAME}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:273
+#: hypha/apply/projects/templatetags/project_tags.py:286
 msgid "Awaiting contract approval from Staff"
 msgstr "Čeká se na schválení smlouvy zaměstnanci"
 
-#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:292
 msgid "Add invoices"
 msgstr "Přidat faktury"
 
-#: hypha/apply/projects/templatetags/project_tags.py:284
+#: hypha/apply/projects/templatetags/project_tags.py:297
 msgid "Review invoice and take action"
 msgstr "Zkontrolujte fakturu a přijměte opatření"
 
-#: hypha/apply/projects/templatetags/project_tags.py:303
+#: hypha/apply/projects/templatetags/project_tags.py:316
 #, python-brace-format
 msgid "Please download the signed contract uploaded by {ORG_SHORT_NAME}"
 msgstr "Stáhněte si podepsanou smlouvu nahranou od {ORG_SHORT_NAME}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:305
+#: hypha/apply/projects/templatetags/project_tags.py:318
 msgid "Countersign"
 msgstr "Kontrasign"
 
-#: hypha/apply/projects/templatetags/project_tags.py:306
+#: hypha/apply/projects/templatetags/project_tags.py:319
 msgid "Upload it back"
 msgstr "Nahrát zpět"
 
-#: hypha/apply/projects/templatetags/project_tags.py:308
+#: hypha/apply/projects/templatetags/project_tags.py:321
 msgid "Please also make sure to upload other required contracting documents"
 msgstr "Nezapomeňte nahrát i další požadované dokumenty k uzavření smlouvy"
 
-#: hypha/apply/projects/utils.py:85
+#: hypha/apply/projects/utils.py:88
 msgid "Pending approval"
 msgstr "Čeká na schválení"
 
-#: hypha/apply/projects/utils.py:89
+#: hypha/apply/projects/utils.py:92
 msgid "Request for change or more information"
 msgstr "Žádost o změnu nebo další informace"
 
-#: hypha/apply/projects/views/payment.py:166
-#: hypha/apply/projects/views/payment.py:396
+#: hypha/apply/projects/views/invoice.py:175
+#: hypha/apply/projects/views/invoice.py:397
 #, python-brace-format
 msgid "<p>Invoice status updated to: {status}.</p>"
 msgstr "<p>Stav faktury aktualizován na: {status}.</p>"
 
-#: hypha/apply/projects/views/payment.py:209
+#: hypha/apply/projects/views/invoice.py:218
 msgid "Invoice updated."
 msgstr "Faktura aktualizována."
 
-#: hypha/apply/projects/views/payment.py:299
+#: hypha/apply/projects/views/invoice.py:304
 msgid "<p>Invoice added.</p>"
 msgstr "<p>Faktura byla přidána.</p>"
 
-#: hypha/apply/projects/views/payment.py:575
+#: hypha/apply/projects/views/invoice.py:574
 msgid "Sorry something went wrong"
 msgstr "Omlouváme se, ale něco se pokazilo"
 
-#: hypha/apply/projects/views/project.py:265
+#: hypha/apply/projects/views/invoice.py:712
+#, fuzzy
+#| msgid "Invoice updated."
+msgid "Invoice tags updated."
+msgstr "Faktura aktualizována."
+
+#: hypha/apply/projects/views/project.py:269
 msgid "PAF has been submitted for approval"
 msgstr "PAF byl předložen ke schválení"
 
-#: hypha/apply/projects/views/project.py:337
+#: hypha/apply/projects/views/project.py:341
 msgid "Document has been uploaded"
 msgstr "Dokument byl nahrán"
 
-#: hypha/apply/projects/views/project.py:365
+#: hypha/apply/projects/views/project.py:369
 msgid "Document has been removed"
 msgstr "Dokument byl odebrán"
 
-#: hypha/apply/projects/views/project.py:396
+#: hypha/apply/projects/views/project.py:400
 msgid "Contracting document has been removed"
 msgstr "Zadávací dokument byl odstraněn"
 
-#: hypha/apply/projects/views/project.py:443
+#: hypha/apply/projects/views/project.py:447
 msgid "Unassigned"
 msgstr "Nepřiřazeno"
 
-#: hypha/apply/projects/views/project.py:452
+#: hypha/apply/projects/views/project.py:456
 msgid "Lead has been updated."
 msgstr "Vedení bylo aktualizováno."
 
-#: hypha/apply/projects/views/project.py:498
+#: hypha/apply/projects/views/project.py:502
 msgid "Title has been updated"
 msgstr "Název byl aktualizován"
 
-#: hypha/apply/projects/views/project.py:534
+#: hypha/apply/projects/views/project.py:538
 msgid "Dates has been updated"
 msgstr "Data byla aktualizována"
 
-#: hypha/apply/projects/views/project.py:655
+#: hypha/apply/projects/views/project.py:580
+#, fuzzy
+#| msgid "Contracting document has been uploaded"
+msgid "Contract number has been updated"
+msgstr "Zadávací dokument byl nahrán"
+
+#: hypha/apply/projects/views/project.py:701
 msgid ""
 "Contractor documents have been approved.  You can receive invoices from "
 "vendor now."
@@ -8673,50 +9459,56 @@ msgstr ""
 "Dokumenty dodavatele byly schváleny.  Nyní můžete od dodavatele přijímat "
 "faktury."
 
-#: hypha/apply/projects/views/project.py:721
+#: hypha/apply/projects/views/project.py:766
 msgid "Countersigned contract uploaded"
 msgstr "Kontrasignovaná smlouva nahrána"
 
-#: hypha/apply/projects/views/project.py:724
+#: hypha/apply/projects/views/project.py:769
 msgid "Signed contract uploaded"
 msgstr "Podepsaná smlouva nahrána"
 
-#: hypha/apply/projects/views/project.py:935
+#: hypha/apply/projects/views/project.py:986
 msgid "Contract documents submitted"
 msgstr "Smluvní dokumentace předložena"
 
-#: hypha/apply/projects/views/project.py:999
+#: hypha/apply/projects/views/project.py:1050
 msgid "Contracting document has been uploaded"
 msgstr "Zadávací dokument byl nahrán"
 
-#: hypha/apply/projects/views/project.py:1077
+#: hypha/apply/projects/views/project.py:1128
 #, fuzzy
 #| msgid "assign project form approver"
 msgid "User don't have project form approver roles"
 msgstr "přiřadit schvalovatele formuláře projektu"
 
-#: hypha/apply/projects/views/project.py:1083
+#: hypha/apply/projects/views/project.py:1134
 #, fuzzy, python-brace-format
 #| msgid "updated project form status to {paf_status}."
 msgid "Updated project form status to: {paf_status}"
 msgstr "aktualizován stav formuláře projektu na {paf_status}."
 
-#: hypha/apply/projects/views/project.py:1173
+#: hypha/apply/projects/views/project.py:1224
 msgid "Project form status has been updated"
 msgstr "Stav projektového formuláře byl aktualizován"
 
-#: hypha/apply/projects/views/project.py:1226
+#: hypha/apply/projects/views/project.py:1277
 msgid "Project form has been approved"
 msgstr "Projektový formulář byl schválen"
 
-#: hypha/apply/projects/views/project.py:1321
+#: hypha/apply/projects/views/project.py:1372
 msgid "Project status has been updated"
 msgstr "Stav projektu byl aktualizován"
 
-#: hypha/apply/projects/views/project.py:1614
+#: hypha/apply/projects/views/project.py:1665
 msgid "Project form approvers have been updated"
 msgstr "Schvalovatelé projektových formulářů byli aktualizováni"
 
+#: hypha/apply/projects/views/project.py:1799
+#, fuzzy
+#| msgid "archived this submission"
+msgid "No projects for this submission"
+msgstr "archivoval toto podání"
+
 #: hypha/apply/review/admin_helpers.py:11
 msgid "Clone"
 msgstr ""
@@ -8749,7 +9541,7 @@ msgstr "Doporučení"
 
 #: hypha/apply/review/blocks.py:149
 #: hypha/apply/review/templates/review/review_detail.html:48
-#: hypha/apply/review/views.py:431
+#: hypha/apply/review/views.py:440
 msgid "Visibility"
 msgstr "Viditelnost"
 
@@ -8828,7 +9620,7 @@ msgstr "4. Dobré"
 msgid "5. Excellent"
 msgstr "5. Vynikající"
 
-#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:245
+#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:283
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:11
 msgid "No"
 msgstr "Ne"
@@ -8837,7 +9629,7 @@ msgstr "Ne"
 msgid "Maybe"
 msgstr "Možná"
 
-#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:244
+#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:282
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:8
 msgid "Yes"
 msgstr "Ano"
@@ -8900,13 +9692,13 @@ msgid "View Changes"
 msgstr "Vyžádat změny"
 
 #: hypha/apply/review/templates/review/review_detail.html:40
-#: hypha/apply/review/views.py:429
+#: hypha/apply/review/views.py:438
 msgid "Recommendation"
 msgstr "Doporučení"
 
 #: hypha/apply/review/templates/review/review_detail.html:66
 #: hypha/apply/review/templates/review/review_list.html:30
-#: hypha/apply/review/views.py:427
+#: hypha/apply/review/views.py:436
 #, fuzzy
 #| msgid "Options"
 msgid "Opinions"
@@ -8978,165 +9770,179 @@ msgstr "Doporučení"
 msgid "Avg. score: {average}"
 msgstr "Průměrné skóre: {average}"
 
-#: hypha/apply/review/views.py:74
+#: hypha/apply/review/views.py:76
 msgid "Edit Review"
 msgstr "Upravit hodnocení"
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Update Review draft"
 msgstr "Aktualizace návrhu hodnocení"
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Create Review"
 msgstr "Vytvořit hodnocení"
 
-#: hypha/apply/review/views.py:428
+#: hypha/apply/review/views.py:437
 #, fuzzy
 #| msgid "Total Score:"
 msgid "Overall Score"
 msgstr "Celkové skóre:"
 
-#: hypha/apply/review/views.py:430
+#: hypha/apply/review/views.py:439
 #, fuzzy
 #| msgid "Revisions"
 msgid "Revision"
 msgstr "Revize"
 
-#: hypha/apply/review/views.py:470
+#: hypha/apply/review/views.py:479
 #, fuzzy
 #| msgid "current"
 msgid "Current"
 msgstr "aktuální"
 
-#: hypha/apply/stream_forms/blocks.py:114
-#: hypha/apply/stream_forms/blocks.py:217
+#: hypha/apply/stream_forms/blocks.py:123
+#: hypha/apply/stream_forms/blocks.py:255
 msgid "Required"
 msgstr "Vyžadováno"
 
-#: hypha/apply/stream_forms/blocks.py:124
+#: hypha/apply/stream_forms/blocks.py:142
+#, fuzzy
+#| msgid "Proposal Information"
+msgid "Personal information"
+msgstr "Informace k Návrhu"
+
+#: hypha/apply/stream_forms/blocks.py:146
+msgid ""
+"Tick this if the answer will contain personally identifiable information, "
+"such as a name, address, phone number or date of birth. Only the applicant, "
+"their co-applicants and staff will be able to see the answer. Reviewers and "
+"other users will see that the question was asked, but not the answer."
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:162
 msgid "Format"
 msgstr "Formát"
 
-#: hypha/apply/stream_forms/blocks.py:125
-#: hypha/apply/stream_forms/blocks.py:156
-#: hypha/apply/stream_forms/blocks.py:171
+#: hypha/apply/stream_forms/blocks.py:163
+#: hypha/apply/stream_forms/blocks.py:194
+#: hypha/apply/stream_forms/blocks.py:209
 msgid "Default value"
 msgstr "Výchozí hodnota"
 
-#: hypha/apply/stream_forms/blocks.py:128
+#: hypha/apply/stream_forms/blocks.py:166
 msgid "Text field (single line)"
 msgstr "Textové pole (jednořádkové)"
 
-#: hypha/apply/stream_forms/blocks.py:147
+#: hypha/apply/stream_forms/blocks.py:185
 msgid "Max number of inputs"
 msgstr "Maximální počet vstupů"
 
-#: hypha/apply/stream_forms/blocks.py:148
+#: hypha/apply/stream_forms/blocks.py:186
 msgid "Add new item"
 msgstr "Přidat novou položku"
 
-#: hypha/apply/stream_forms/blocks.py:151
+#: hypha/apply/stream_forms/blocks.py:189
 msgid "Text field (single line) (multiple inputs)"
 msgstr "Textové pole (jednořádkové) (více vstupů)"
 
-#: hypha/apply/stream_forms/blocks.py:157
+#: hypha/apply/stream_forms/blocks.py:195
 msgid "Word limit"
 msgstr "Omezení počtu slov"
 
-#: hypha/apply/stream_forms/blocks.py:162
+#: hypha/apply/stream_forms/blocks.py:200
 msgid "Text field (multi line)"
 msgstr "Textové pole (víceřádkové)"
 
-#: hypha/apply/stream_forms/blocks.py:176
+#: hypha/apply/stream_forms/blocks.py:214
 msgid "Number field"
 msgstr "Číselné pole"
 
-#: hypha/apply/stream_forms/blocks.py:189
+#: hypha/apply/stream_forms/blocks.py:227
 msgid "Checkbox field"
 msgstr "Zaškrtávací pole"
 
-#: hypha/apply/stream_forms/blocks.py:201
-#: hypha/apply/stream_forms/blocks.py:219
+#: hypha/apply/stream_forms/blocks.py:239
+#: hypha/apply/stream_forms/blocks.py:257
 msgid "Choice"
 msgstr "Volba"
 
-#: hypha/apply/stream_forms/blocks.py:207
+#: hypha/apply/stream_forms/blocks.py:245
 msgid "Radio buttons"
 msgstr "Rádiová tlačítka"
 
-#: hypha/apply/stream_forms/blocks.py:221
+#: hypha/apply/stream_forms/blocks.py:259
 msgid ""
 "Please create only two choices for toggle. First choice will revel the group "
 "and the second hide it. Additional choices will be ignored."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:231
+#: hypha/apply/stream_forms/blocks.py:269
 msgid "Group fields"
 msgstr "Skupinová pole"
 
-#: hypha/apply/stream_forms/blocks.py:233
+#: hypha/apply/stream_forms/blocks.py:271
 msgid "Remember to end group using Group fields end block."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:253
+#: hypha/apply/stream_forms/blocks.py:291
 #, fuzzy
 #| msgid "Group fields"
 msgid "Group fields end"
 msgstr "Skupinová pole"
 
-#: hypha/apply/stream_forms/blocks.py:255
+#: hypha/apply/stream_forms/blocks.py:293
 #, fuzzy
 #| msgid "Group fields"
 msgid "End of Group fields Block"
 msgstr "Skupinová pole"
 
-#: hypha/apply/stream_forms/blocks.py:262
+#: hypha/apply/stream_forms/blocks.py:300
 msgid "Dropdown field"
 msgstr "Rozbalovací pole"
 
-#: hypha/apply/stream_forms/blocks.py:272
+#: hypha/apply/stream_forms/blocks.py:310
 msgid "Checkbox"
 msgstr "Zaškrtávací políčko"
 
-#: hypha/apply/stream_forms/blocks.py:278
+#: hypha/apply/stream_forms/blocks.py:316
 msgid "Multiple checkboxes field"
 msgstr "Pole s více zaškrtávacími políčky"
 
-#: hypha/apply/stream_forms/blocks.py:319
+#: hypha/apply/stream_forms/blocks.py:357
 msgid "Date field"
 msgstr "Pole s datem"
 
-#: hypha/apply/stream_forms/blocks.py:341
+#: hypha/apply/stream_forms/blocks.py:379
 msgid "Time field"
 msgstr "Pole času"
 
-#: hypha/apply/stream_forms/blocks.py:373
+#: hypha/apply/stream_forms/blocks.py:411
 msgid "Date+time field"
 msgstr "Pole Datum+čas"
 
-#: hypha/apply/stream_forms/blocks.py:405
+#: hypha/apply/stream_forms/blocks.py:443
 msgid "Image field"
 msgstr "Obrázkové pole"
 
-#: hypha/apply/stream_forms/blocks.py:418
+#: hypha/apply/stream_forms/blocks.py:456
 msgid "Single File field"
 msgstr "Pole pro jeden soubor"
 
-#: hypha/apply/stream_forms/blocks.py:424
-#: hypha/apply/stream_forms/blocks.py:443
+#: hypha/apply/stream_forms/blocks.py:462
+#: hypha/apply/stream_forms/blocks.py:481
 #, python-brace-format
 msgid "{help_text} Accepted file types are {file_types}"
 msgstr "{help_text}Akceptované typy souborů jsou {file_types}"
 
-#: hypha/apply/stream_forms/blocks.py:437
+#: hypha/apply/stream_forms/blocks.py:475
 msgid "Multiple File field"
 msgstr "Pole pro více souborů"
 
-#: hypha/apply/stream_forms/blocks.py:474
+#: hypha/apply/stream_forms/blocks.py:512
 msgid "Section header"
 msgstr "Záhlaví sekce"
 
-#: hypha/apply/stream_forms/blocks.py:493
+#: hypha/apply/stream_forms/blocks.py:531
 msgid "Form fields"
 msgstr "Pole formuláře"
 
@@ -9181,31 +9987,26 @@ msgstr ""
 "Jste přihlášeni, ale váš uživatelský účet nemá celé jméno. Váš uživatelský "
 "účet aktualizujeme na jméno, které zde uvedete."
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:8
-#, python-format
-msgid "View file - %(filename)s"
-msgstr ""
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:14
-msgid "uploaded"
-msgstr "nahráno"
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:25
-#, fuzzy
-#| msgid "File not found on submission"
-msgid "File not found"
-msgstr "Soubor nebyl při podání nalezen"
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:32
-msgid "Missing file"
-msgstr ""
-
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
 #, fuzzy
 #| msgid "No screening"
 msgid "No selection"
 msgstr "Bez screeningu"
 
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+#, fuzzy
+#| msgid "Contact information"
+msgid "Contains personal information."
+msgstr "Kontaktní informace"
+
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "(PII)"
+msgstr ""
+
+#: hypha/apply/stream_forms/templates/stream_forms/render_redacted_field.html:12
+msgid "Hidden — contains personal information."
+msgstr ""
+
 #: hypha/apply/templates/forms/includes/field.html:11
 msgid "This field is required."
 msgstr ""
@@ -9245,131 +10046,143 @@ msgstr "Moje úlohy"
 msgid "tasks"
 msgstr "Moje úlohy"
 
-#: hypha/apply/todo/options.py:30
+#: hypha/apply/todo/options.py:32
 #, fuzzy
 #| msgid "Comments"
 msgid "Comment Task"
 msgstr "Komentáře"
 
-#: hypha/apply/todo/options.py:31
+#: hypha/apply/todo/options.py:33
 #, fuzzy
 #| msgid "Submission #"
 msgid "Submission Draft"
 msgstr "Podání č"
 
-#: hypha/apply/todo/options.py:32
+#: hypha/apply/todo/options.py:34
 #, fuzzy
 #| msgid "Update Determination draft"
 msgid "Determination draft"
 msgstr "Aktualizace návrhu rozhodnutí"
 
-#: hypha/apply/todo/options.py:33
+#: hypha/apply/todo/options.py:35
 #, fuzzy
 #| msgid "Review for"
 msgid "Review Draft"
 msgstr "Hodnocení pro"
 
-#: hypha/apply/todo/options.py:34
+#: hypha/apply/todo/options.py:36
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting project form"
 msgstr "Projekt čeká na uzavření smlouvy"
 
-#: hypha/apply/todo/options.py:35
+#: hypha/apply/todo/options.py:37
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting scope of work"
 msgstr "Projekt čeká na uzavření smlouvy"
 
-#: hypha/apply/todo/options.py:36
+#: hypha/apply/todo/options.py:38
 #, fuzzy
 #| msgid "approved project form"
 msgid "Project submit project form(s)"
 msgstr "schválený formulář projektu"
 
-#: hypha/apply/todo/options.py:37
+#: hypha/apply/todo/options.py:39
 msgid "Project submit scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:38
+#: hypha/apply/todo/options.py:40
 #, fuzzy
 #| msgid "Project forms for review"
 msgid "Project form required changes"
 msgstr "Projektové formuláře ke kontrole"
 
-#: hypha/apply/todo/options.py:39
+#: hypha/apply/todo/options.py:41
 #, fuzzy
 #| msgid "Project form assigned to {}"
 msgid "Project form waiting assignee"
 msgstr "Formulář projektu přiřazený k {}"
 
-#: hypha/apply/todo/options.py:40
+#: hypha/apply/todo/options.py:42
 #, fuzzy
 #| msgid "Project form approvals"
 msgid "Project form waiting approval"
 msgstr "Schvalování formulářů projektu"
 
-#: hypha/apply/todo/options.py:41
+#: hypha/apply/todo/options.py:43
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting contract"
 msgstr "Projekt čeká na uzavření smlouvy"
 
-#: hypha/apply/todo/options.py:44
+#: hypha/apply/todo/options.py:46
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting contract document"
 msgstr "Projekt čeká na uzavření smlouvy"
 
-#: hypha/apply/todo/options.py:46
+#: hypha/apply/todo/options.py:48
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting contract review"
 msgstr "Projekt čeká na uzavření smlouvy"
 
-#: hypha/apply/todo/options.py:47
+#: hypha/apply/todo/options.py:49
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting invoice"
 msgstr "Projekt čeká na uzavření smlouvy"
 
-#: hypha/apply/todo/options.py:48
+#: hypha/apply/todo/options.py:50
 #, fuzzy
 #| msgid "Invoice reference"
 msgid "Invoice required changes"
 msgstr "Odkaz na fakturu"
 
-#: hypha/apply/todo/options.py:49
+#: hypha/apply/todo/options.py:51
 #, fuzzy
 #| msgid "Currently awaiting approval"
 msgid "Invoice waiting approval"
 msgstr "V současné době čeká na schválení"
 
-#: hypha/apply/todo/options.py:50
+#: hypha/apply/todo/options.py:52
 #, fuzzy
 #| msgid "Invoice date"
 msgid "Invoice waiting paid"
 msgstr "Datum faktury"
 
-#: hypha/apply/todo/options.py:51
+#: hypha/apply/todo/options.py:53
 #, fuzzy
 #| msgid "Report"
 msgid "Report due"
 msgstr "Zpráva"
 
-#: hypha/apply/todo/options.py:52
+#: hypha/apply/todo/options.py:54
 #, fuzzy
 #| msgid "Related submissions"
 msgid "Download exported submissions"
 msgstr "Související podání"
 
-#: hypha/apply/todo/options.py:55
+#: hypha/apply/todo/options.py:57
 #, fuzzy
 #| msgid "Filter submissions to calculate values"
 msgid "Failed to generate submissions export file"
 msgstr "Filtrování podání pro výpočet hodnot"
 
-#: hypha/apply/todo/options.py:65
+#: hypha/apply/todo/options.py:59
+#, fuzzy
+#| msgid "Related submissions"
+msgid "Download exported invoices"
+msgstr "Související podání"
+
+#: hypha/apply/todo/options.py:62
+#, fuzzy
+#| msgid "Filter submissions to calculate values"
+msgid "Failed to generate invoices export file"
+msgstr "Filtrování podání pro výpočet hodnot"
+
+#: hypha/apply/todo/options.py:72
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.source.fund_name} "
@@ -9380,7 +10193,7 @@ msgstr ""
 "#{related.source.application_id}</span><br>{related.user} vám přidělil "
 "komentář: <q class=\"text-fg-muted italic align-bottom\">{msg}</q>"
 
-#: hypha/apply/todo/options.py:75
+#: hypha/apply/todo/options.py:82
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9391,7 +10204,7 @@ msgstr ""
 "span><br>Koncept žádosti <span class=\"truncate inline-block max-w-32 align-"
 "bottom \">\"{related.title}\"</span> čeká na odeslání"
 
-#: hypha/apply/todo/options.py:83
+#: hypha/apply/todo/options.py:90
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -9404,7 +10217,7 @@ msgstr ""
 "<span class=\"truncate inline-block max-w-32 align-"
 "bottom\">\"{related.submission.title}\"</span> čeká na odeslání"
 
-#: hypha/apply/todo/options.py:91
+#: hypha/apply/todo/options.py:98
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -9417,7 +10230,7 @@ msgstr ""
 "<span class=\"truncate inline-block max-w-32 align-"
 "bottom\">\"{related.submission.title}\"</span> čeká na odeslání"
 
-#: hypha/apply/todo/options.py:101
+#: hypha/apply/todo/options.py:108
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9426,7 +10239,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Projekt čeká na formulář projektu"
 
-#: hypha/apply/todo/options.py:109
+#: hypha/apply/todo/options.py:116
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9435,7 +10248,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Projekt čeká na rozsah práce"
 
-#: hypha/apply/todo/options.py:117
+#: hypha/apply/todo/options.py:124
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9444,7 +10257,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Projekt čeká na odeslání projektových formulářů"
 
-#: hypha/apply/todo/options.py:125
+#: hypha/apply/todo/options.py:132
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9453,7 +10266,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Formulář projektu vyžaduje změny nebo další informace"
 
-#: hypha/apply/todo/options.py:134
+#: hypha/apply/todo/options.py:141
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9462,7 +10275,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Formulář projektu čeká na příjemce"
 
-#: hypha/apply/todo/options.py:142
+#: hypha/apply/todo/options.py:149
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9471,7 +10284,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br> Formulář projektu čeká na vaše schválení"
 
-#: hypha/apply/todo/options.py:151
+#: hypha/apply/todo/options.py:158
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9480,7 +10293,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Projekt čeká na smlouvu"
 
-#: hypha/apply/todo/options.py:159
+#: hypha/apply/todo/options.py:166
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9489,7 +10302,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Projekt čeká na smluvní dokumenty"
 
-#: hypha/apply/todo/options.py:167
+#: hypha/apply/todo/options.py:174
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9498,7 +10311,7 @@ msgstr ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Smlouva na projekt čeká na kontrolu"
 
-#: hypha/apply/todo/options.py:176
+#: hypha/apply/todo/options.py:183
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "<span class=\"text-sm\">{related.fund_name} #{related.application_id}</"
@@ -9513,7 +10326,7 @@ msgstr ""
 "span><br>Projekt <span class=\"truncate inline-block max-w-32 align-"
 "bottom\">\"{related.title}\"</span> čeká na fakturu"
 
-#: hypha/apply/todo/options.py:184
+#: hypha/apply/todo/options.py:191
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9524,7 +10337,7 @@ msgstr ""
 "#{related.project.application_id}</span><br>Č. faktury "
 "{related.invoice_number} vyžaduje změny nebo další informace"
 
-#: hypha/apply/todo/options.py:192
+#: hypha/apply/todo/options.py:199
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9535,7 +10348,7 @@ msgstr ""
 "#{related.project.application_id}</span><br>Č. faktury "
 "{related.invoice_number} čeká na vaše schválení"
 
-#: hypha/apply/todo/options.py:200
+#: hypha/apply/todo/options.py:207
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9546,7 +10359,7 @@ msgstr ""
 "#{related.project.application_id}</span><br>Č. faktury "
 "{related.invoice_number} čeká na zaplacení"
 
-#: hypha/apply/todo/options.py:208
+#: hypha/apply/todo/options.py:215
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.project.fund_name} "
@@ -9559,21 +10372,31 @@ msgstr ""
 "class=\"truncate inline-block max-w-32 align-bottom "
 "\">\"{related.project.title}\"</span> je po termínu"
 
-#: hypha/apply/todo/options.py:216
+#: hypha/apply/todo/options.py:223
 msgid "Your generated submission export file is ready for download"
 msgstr ""
 
-#: hypha/apply/todo/options.py:219 hypha/apply/todo/options.py:227
+#: hypha/apply/todo/options.py:226 hypha/apply/todo/options.py:234
+#: hypha/apply/todo/options.py:241 hypha/apply/todo/options.py:249
 #, fuzzy
 #| msgid "Export"
 msgid "export"
 msgstr "Exportovat"
 
-#: hypha/apply/todo/options.py:223
+#: hypha/apply/todo/options.py:230
 msgid ""
 "There was an issue generating your submission export file, please try again."
 msgstr ""
 
+#: hypha/apply/todo/options.py:238
+msgid "Your generated invoice export file is ready for download"
+msgstr ""
+
+#: hypha/apply/todo/options.py:245
+msgid ""
+"There was an issue generating your invoice export file, please try again."
+msgstr ""
+
 #: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
 #, fuzzy
 #| msgid "You don't have any backup codes yet."
@@ -9646,27 +10469,27 @@ msgstr "Poslední přihlášení"
 msgid "View users in this group"
 msgstr ""
 
-#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:63
+#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:67
 msgid "Remember me"
 msgstr "Pamatuj si mě"
 
-#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:65
+#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:69
 msgid "On trusted devices only, keeps you logged in for a longer period."
 msgstr "Pouze na důvěryhodných zařízeních vás udrží přihlášené po delší dobu."
 
-#: hypha/apply/users/forms.py:55
+#: hypha/apply/users/forms.py:57
 msgid "Email address"
 msgstr "E-mailová adresa"
 
-#: hypha/apply/users/forms.py:86
+#: hypha/apply/users/forms.py:90
 msgid "A user with that email already exists."
 msgstr "Uživatel s tímto e-mailem již existuje."
 
-#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/forms.py:91
 msgid "The two password fields didn't match."
 msgstr "Obě pole hesla se neshodovala."
 
-#: hypha/apply/users/forms.py:200
+#: hypha/apply/users/forms.py:208
 msgid ""
 "You are registered using OAuth, please contact an admin if you need to "
 "change your email address."
@@ -9674,137 +10497,176 @@ msgstr ""
 "Jste zaregistrováni pomocí OAuth, pokud potřebujete změnit e-mailovou "
 "adresu, kontaktujte prosím správce."
 
-#: hypha/apply/users/forms.py:208
+#: hypha/apply/users/forms.py:216
 msgid "Slack names must not include spaces"
 msgstr ""
 
-#: hypha/apply/users/forms.py:251
+#: hypha/apply/users/forms.py:259
 msgid "Only includes active, non-superusers"
 msgstr "Zahrnuje pouze aktivní uživatele, kteří nejsou superuživateli"
 
-#: hypha/apply/users/forms.py:261
-#: hypha/apply/users/templates/users/account.html:64
+#: hypha/apply/users/forms.py:269
+#: hypha/apply/users/templates/users/account.html:67
 #: hypha/apply/users/templates/users/activation/email.txt:13
 #: hypha/elevate/forms.py:20
 msgid "Password"
 msgstr "Heslo"
 
-#: hypha/apply/users/forms.py:262
+#: hypha/apply/users/forms.py:270
 msgid "Email change requires you to put password."
 msgstr "Změna e-mailu vyžaduje zadání hesla."
 
-#: hypha/apply/users/forms.py:275
+#: hypha/apply/users/forms.py:283
 msgid "Incorrect password. Please try again."
 msgstr "Nesprávné heslo. Zkuste to prosím znovu."
 
-#: hypha/apply/users/forms.py:291
+#: hypha/apply/users/forms.py:299
 msgid "To proceed, type \"disable\" below and then click on \"confirm\":"
 msgstr ""
 "Chcete-li pokračovat, zadejte níže příkaz \"disable\" a klikněte na "
 "\"confirm\":"
 
-#: hypha/apply/users/forms.py:301
+#: hypha/apply/users/forms.py:309
 msgid "Incorrect input."
 msgstr "Nesprávné zadání."
 
-#: hypha/apply/users/middleware.py:52
+#: hypha/apply/users/middleware.py:56
 msgid "Two factor authentication required"
 msgstr "Vyžaduje se dvoufaktorové ověřování"
 
-#: hypha/apply/users/models.py:195
+#: hypha/apply/users/models.py:230
 msgid "email address"
 msgstr "e-mailová adresa"
 
-#: hypha/apply/users/models.py:197
+#: hypha/apply/users/models.py:232
 #, fuzzy
 #| msgid "Full name"
 msgid "full name"
 msgstr "Celé jméno"
 
-#: hypha/apply/users/models.py:200
+#: hypha/apply/users/models.py:235
 #, fuzzy
 #| msgid "Slack name"
 msgid "slack name"
 msgstr "Uživatelské jméno na Slack"
 
-#: hypha/apply/users/models.py:202
+#: hypha/apply/users/models.py:237
 msgid "This is the name we should \"@mention\" when sending notifications"
 msgstr "Toto je jméno, které bychom měli \"@mention\" při odesílání oznámení"
 
-#: hypha/apply/users/models.py:321
+#: hypha/apply/users/models.py:391
 msgid "user"
 msgstr ""
 
-#: hypha/apply/users/models.py:322
+#: hypha/apply/users/models.py:392
 #, fuzzy
 #| msgid "user groups"
 msgid "users"
 msgstr "skupiny uživatelů"
 
-#: hypha/apply/users/models.py:333
+#: hypha/apply/users/models.py:403
 #, fuzzy
 #| msgid "fund settings"
 msgid "Auth Settings"
 msgstr "nastavení fondu"
 
-#: hypha/apply/users/models.py:335
+#: hypha/apply/users/models.py:405
 #, fuzzy
 #| msgid "Show consent checkbox?"
 msgid "show consent checkbox?"
 msgstr "Zobrazit zaškrtávací políčko souhlasu?"
 
-#: hypha/apply/users/models.py:336
+#: hypha/apply/users/models.py:406
 #, fuzzy
 #| msgid "Section text"
 msgid "consent text"
 msgstr "Text oddílu"
 
-#: hypha/apply/users/models.py:337
+#: hypha/apply/users/models.py:407
 msgid "consent help"
 msgstr ""
 
-#: hypha/apply/users/models.py:339
+#: hypha/apply/users/models.py:409
 #, fuzzy
 #| msgid "Login extra text"
 msgid "login extra text"
 msgstr "Přihlašovací text navíc"
 
-#: hypha/apply/users/models.py:341
+#: hypha/apply/users/models.py:411
 msgid "Displayed along side login form"
 msgstr "Zobrazuje se vedle přihlašovacího formuláře"
 
-#: hypha/apply/users/models.py:351
+#: hypha/apply/users/models.py:421
 msgid "User consent on login & register forms"
 msgstr "Souhlas uživatele v přihlašovacích a registračních formulářích"
 
-#: hypha/apply/users/models.py:357
+#: hypha/apply/users/models.py:427
 msgid "Login form customizations"
 msgstr "Přizpůsobení přihlašovacího formuláře"
 
-#: hypha/apply/users/models.py:382
+#: hypha/apply/users/models.py:452
 #, fuzzy
 #| msgid "Pending "
 msgid "Pending signup"
 msgstr "Čekající "
 
-#: hypha/apply/users/models.py:383
+#: hypha/apply/users/models.py:453
 #, fuzzy
 #| msgid "Pending submissions"
 msgid "Pending signups"
 msgstr "Čekající podání"
 
-#: hypha/apply/users/models.py:401
+#: hypha/apply/users/models.py:471
 #, fuzzy
 #| msgid "Confirm access"
 msgid "Confirm Access Token"
 msgstr "Potvrdit přístup"
 
-#: hypha/apply/users/models.py:402
+#: hypha/apply/users/models.py:472
 #, fuzzy
 #| msgid "Confirm access"
 msgid "Confirm Access Tokens"
 msgstr "Potvrdit přístup"
 
+#: hypha/apply/users/passkey_views.py:160
+#, python-brace-format
+msgid "Maximum of {max} passkeys allowed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:197
+#: hypha/apply/users/passkey_views.py:278
+msgid "Invalid JSON"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:202
+#: hypha/apply/users/passkey_views.py:283
+msgid "No active WebAuthn challenge"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:230
+#: hypha/apply/users/passkey_views.py:351
+#: hypha/apply/users/passkey_views.py:358
+#, fuzzy
+#| msgid "Verification code"
+msgid "Verification failed"
+msgstr "Ověřovací kód"
+
+#: hypha/apply/users/passkey_views.py:248
+msgid "Could not save passkey"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:292
+#, fuzzy
+#| msgid "Invalid activation"
+msgid "Invalid credential"
+msgstr "Neplatná aktivace"
+
+#: hypha/apply/users/passkey_views.py:336
+#, fuzzy
+#| msgid "Enter your credentials."
+msgid "Unknown credential"
+msgstr "Zadejte své přihlašovací údaje."
+
 #: hypha/apply/users/roles.py:4
 msgid "Administrator"
 msgstr "Správce"
@@ -9886,17 +10748,32 @@ msgstr ""
 "Může zkontrolovat/schválit formulář projektu a získat přístup k dokumentům "
 "souvisejícím se zadáváním zakázek."
 
-#: hypha/apply/users/services.py:110
+#: hypha/apply/users/services.py:36
+#, python-format
+msgid "A passkey was added to your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:41
+#, python-format
+msgid "A passkey was removed from your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:152
 #, fuzzy, python-brace-format
 #| msgid "Log in to %(ORG_SHORT_NAME)s"
 msgid "Log in to {user} at {ORG_LONG_NAME}"
 msgstr "Přihlaste se do %(ORG_SHORT_NAME)s"
 
-#: hypha/apply/users/services.py:134
+#: hypha/apply/users/services.py:176
 #, python-brace-format
 msgid "Welcome to {ORG_LONG_NAME}"
 msgstr ""
 
+#: hypha/apply/users/signals.py:31
+#, python-format
+msgid "Successful login to %(org)s"
+msgstr ""
+
 #: hypha/apply/users/templates/elevate/elevate.html:4
 #: hypha/apply/users/templates/elevate/elevate.html:10
 msgid "Confirm access"
@@ -9947,13 +10824,19 @@ msgstr ""
 "hodinách nečinnosti.\n"
 "            "
 
+#: hypha/apply/users/templates/includes/delete_user_submissions_form.html:20
+#, fuzzy
+#| msgid "Delete"
+msgid "Yes, delete"
+msgstr "Smazat"
+
 #: hypha/apply/users/templates/two_factor/_base.html:8
 #: hypha/apply/users/templates/users/change_password.html:9
 msgid "Back to account"
 msgstr "Zpět na účet"
 
 #: hypha/apply/users/templates/two_factor/_base.html:9
-#: hypha/apply/users/templates/users/account.html:85
+#: hypha/apply/users/templates/users/account.html:88
 msgid "Two-Factor Authentication (2FA)"
 msgstr "Dvoufaktorové ověřování (2FA)"
 
@@ -9995,13 +10878,9 @@ msgstr ""
 "Tyto kódy byste si nyní měli vytisknout nebo zkopírovat \n"
 "                    do schránky a uložit do správce hesel."
 
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:30
-msgid "Print"
-msgstr "Tisk"
-
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
-msgid "Copied!"
-msgstr "Zkopírováno!"
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:30
+msgid "Print"
+msgstr "Tisk"
 
 #: hypha/apply/users/templates/two_factor/core/backup_tokens.html:41
 msgid "Copy to Clipboard"
@@ -10270,32 +11149,42 @@ msgstr "Správa údajů a zabezpečení účtu."
 msgid "Profile"
 msgstr "Profil"
 
-#: hypha/apply/users/templates/users/account.html:60
+#: hypha/apply/users/templates/users/account.html:63
 msgid "Account Security"
 msgstr "Zabezpečení účtu"
 
-#: hypha/apply/users/templates/users/account.html:69
+#: hypha/apply/users/templates/users/account.html:72
 #: hypha/apply/users/templates/users/change_password.html:3
 msgid "Update password"
 msgstr "Aktualizovat heslo"
 
-#: hypha/apply/users/templates/users/account.html:77
+#: hypha/apply/users/templates/users/account.html:80
 msgid "Set Password"
 msgstr "Nastavit heslo"
 
-#: hypha/apply/users/templates/users/account.html:89
+#: hypha/apply/users/templates/users/account.html:92
 msgid "Backup codes"
 msgstr "Záložní kódy"
 
-#: hypha/apply/users/templates/users/account.html:90
+#: hypha/apply/users/templates/users/account.html:93
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:9
 msgid "Disable 2FA"
 msgstr "Vypnout 2FA"
 
-#: hypha/apply/users/templates/users/account.html:92
+#: hypha/apply/users/templates/users/account.html:95
 msgid "Enable 2FA"
 msgstr "Zapnout 2FA"
 
+#: hypha/apply/users/templates/users/account.html:100
+msgid "Passkeys"
+msgstr ""
+
+#: hypha/apply/users/templates/users/account.html:102
+msgid ""
+"With passkeys you can use your fingerprint, face, or screen lock to login "
+"securely without a password."
+msgstr ""
+
 #: hypha/apply/users/templates/users/activation/confirm.html:4
 #, fuzzy
 #| msgid "Confirmation email"
@@ -10428,7 +11317,7 @@ msgid "Select User:"
 msgstr "Vyberte uživatele:"
 
 #: hypha/apply/users/templates/users/become.html:26
-#: hypha/templates/includes/user_menu.html:69
+#: hypha/apply/users/templates/users/includes/user_menu.html:69
 msgid "Switch User"
 msgstr "Přepnout uživatele"
 
@@ -10464,7 +11353,7 @@ msgid "Email Change - Verify Email"
 msgstr "Změna e-mailu - Ověření e-mailu"
 
 #: hypha/apply/users/templates/users/email_change/done.html:4
-#: hypha/apply/users/views.py:230
+#: hypha/apply/users/views.py:235
 msgid "Verify Email"
 msgstr "Ověřit e-mail"
 
@@ -10541,12 +11430,80 @@ msgid "If you did not request this email, please ignore it."
 msgstr "Pokud jste si tento e-mail nevyžádali, ignorujte jej."
 
 #: hypha/apply/users/templates/users/emails/confirm_access.md:11
+#: hypha/apply/users/templates/users/emails/login_notification.md:11
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:12
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:12
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
 #, python-format
 msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
 msgstr "V případě jakýchkoli dotazů nás prosím kontaktujte na %(ORG_EMAIL)s."
 
+#: hypha/apply/users/templates/users/emails/login_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that your account was successfully logged in to "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:6
+#, python-format
+msgid "Login time: %(login_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:8
+msgid ""
+"If you did not log in, please contact us immediately and consider changing "
+"your password."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a new passkey was added to your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:6
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:6
+#, python-format
+msgid "Passkey: %(passkey_name)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:7
+#, python-format
+msgid "Added: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:9
+msgid ""
+"If you did not add this passkey, please contact us immediately and consider "
+"removing it from your account."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this email because you requested a password reset for "
+#| "your user account at %(ORG_LONG_NAME)s."
+msgid ""
+"This is to notify you that a passkey was removed from your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+"Tento e-mail jste obdrželi, protože jste požádali o obnovení hesla ke svému "
+"uživatelskému účtu na %(ORG_LONG_NAME)s."
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:7
+#, python-format
+msgid "Removed: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:9
+msgid ""
+"If you did not remove this passkey, please contact us immediately and "
+"consider changing your password if you have one."
+msgstr ""
+
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
 #, python-format
 msgid ""
@@ -10605,6 +11562,89 @@ msgstr ""
 msgid "Set password for %(username)s at %(ORG_LONG_NAME)s"
 msgstr "Nastavte heslo pro %(username)s na %(ORG_LONG_NAME)s"
 
+#: hypha/apply/users/templates/users/includes/okta_login_button.html:7
+#, fuzzy
+#| msgid "Log in with password"
+msgid "Log in with Okta"
+msgstr "Přihlášení pomocí hesla"
+
+#: hypha/apply/users/templates/users/includes/org_login_button.html:7
+#, python-format
+msgid "Log in with your %(ORG_SHORT_NAME)s email"
+msgstr "Přihlaste se pomocí e-mailu %(ORG_SHORT_NAME)s"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:14
+#, fuzzy
+#| msgid "Log in with password"
+msgid "Log in with passkey"
+msgstr "Přihlášení pomocí hesla"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:18
+#, fuzzy
+#| msgid "Enable Two-Factor Authentication"
+msgid "Failed to begin authentication"
+msgstr "Povolit dvoufaktorové ověřování"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:19
+#, fuzzy
+#| msgid "Application title"
+msgid "Authentication failed"
+msgstr "Název žádosti"
+
+#: hypha/apply/users/templates/users/includes/password_login_button.html:7
+msgid "Log in with password"
+msgstr "Přihlášení pomocí hesla"
+
+#: hypha/apply/users/templates/users/includes/passwordless_login_button.html:7
+msgid "Log in without password"
+msgstr "Přihlášení bez hesla"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:27
+#, fuzzy
+#| msgid "your account"
+msgid "Goto your account"
+msgstr "váš účet"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:31
+msgid "My account"
+msgstr "Můj účet"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:36
+#, fuzzy
+#| msgid "The slack #channel for notifications."
+msgid "Check latest notifications"
+msgstr "Slack #kanál pro oznámení."
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:40
+msgid "Activity feed"
+msgstr "Podávání informací o aktivitách"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:44
+#, fuzzy
+#| msgid "Your flagged submissions"
+msgid "Goto your flagged submissions"
+msgstr "Vaše označená podání"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:48
+msgid "My flagged"
+msgstr "Moje označení"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:53
+msgid "Goto wagtail admin"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:84
+msgid "Release User"
+msgstr "Vydání uživatele"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:92
+msgid "Log out"
+msgstr "Odhlášení"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
+msgid " or Sign up"
+msgstr " nebo se zaregistrujte"
+
 #: hypha/apply/users/templates/users/login.html:23
 #: hypha/apply/users/templates/users/login.html:31
 msgid "Two factor verification"
@@ -10644,29 +11684,29 @@ msgstr "Zapomněli jste heslo?"
 msgid "OR"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:109
+#: hypha/apply/users/templates/users/login.html:115
 msgid "Or, alternatively, use one of your backup phones:"
 msgstr "Případně použijte některý ze záložních telefonů:"
 
-#: hypha/apply/users/templates/users/login.html:125
+#: hypha/apply/users/templates/users/login.html:131
 msgid "As a last resort, you can use a backup codes: "
 msgstr "V krajním případě můžete použít záložní kódy: "
 
-#: hypha/apply/users/templates/users/login.html:130
+#: hypha/apply/users/templates/users/login.html:136
 #, fuzzy
 #| msgid "As a last resort, you can use a backup codes: "
 msgid "Click here to use a backup code"
 msgstr "V krajním případě můžete použít záložní kódy: "
 
-#: hypha/apply/users/templates/users/login.html:133
+#: hypha/apply/users/templates/users/login.html:139
 msgid "Use a Backup Code"
 msgstr "Použijte záložní kód"
 
-#: hypha/apply/users/templates/users/login.html:149
+#: hypha/apply/users/templates/users/login.html:163
 msgid "Verification Code"
 msgstr "Ověřovací kód"
 
-#: hypha/apply/users/templates/users/login.html:153
+#: hypha/apply/users/templates/users/login.html:167
 msgid "Backup Code"
 msgstr "Záložní kód"
 
@@ -10705,6 +11745,72 @@ msgstr "Znovu poslat kód?"
 msgid "Use your password"
 msgstr "Použijte své heslo"
 
+#: hypha/apply/users/templates/users/partials/passkey-list.html:22
+#: hypha/apply/users/templates/users/partials/passkey-list.html:70
+#, fuzzy
+#| msgid "Slack name"
+msgid "Passkey name"
+msgstr "Uživatelské jméno na Slack"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:23
+msgid "Click to edit name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:26
+#, fuzzy
+#| msgid "Save draft"
+msgid "Save name"
+msgstr "Uložit návrh"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:32
+#, python-format
+msgid "Used %(when)s ago"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:34
+msgid "Never used"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:41
+msgid "Delete this passkey?"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:44
+#, fuzzy
+#| msgid "Delete user"
+msgid "Delete passkey"
+msgstr "Smazat uživatele"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:52
+msgid "No passkeys registered."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:59
+msgid "Server error"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:60
+#, fuzzy
+#| msgid "Revisions"
+msgid "Registration failed"
+msgstr "Revize"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:61
+msgid ""
+"This authenticator already has a passkey registered. Try a different "
+"authenticator or device."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:69
+msgid "e.g. MacBook Touch ID"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:75
+#, fuzzy
+#| msgid "Add tags"
+msgid "Add passkey"
+msgstr "Přidat štítky"
+
 #: hypha/apply/users/templates/users/password_reset/complete.html:3
 #: hypha/apply/users/templates/users/password_reset/confirm.html:10
 #: hypha/apply/users/templates/users/password_reset/form.html:4
@@ -10863,6 +11969,46 @@ msgid ""
 "email."
 msgstr "byl úspěšně vytvořen!Zaslali jsme vám aktivační e-mail."
 
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:6
+#, fuzzy
+#| msgid "Are you sure you want to delete"
+msgid "Are you sure you want to delete these users?"
+msgstr "Opravdu chcete odstranit"
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:20
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:22
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:5
+#, fuzzy
+#| msgid "Are you sure you want to delete"
+msgid "Are you sure you want to delete this user?"
+msgstr "Opravdu chcete odstranit"
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:12
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:14
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted!"
+msgstr ""
+
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:12
 #, fuzzy
 #| msgid "This account do not have 2FA enabled."
@@ -10875,51 +12021,51 @@ msgstr "Tento účet nemá povolenou funkci 2FA."
 msgid "2FA is disabled"
 msgstr "2FA je již vypnutá"
 
-#: hypha/apply/users/utils.py:40
+#: hypha/apply/users/utils.py:43
 msgid "Email is already in use."
 msgstr "E-mail se již používá."
 
-#: hypha/apply/users/utils.py:130
+#: hypha/apply/users/utils.py:137
 #, fuzzy, python-brace-format
 #| msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgid "Confirmation email for {unverified_email} at {ORG_LONG_NAME}"
 msgstr "Potvrzovací kód pro {ORG_LONG_NAME}:{token}"
 
-#: hypha/apply/users/views.py:117
+#: hypha/apply/users/views.py:120
 msgid "Profile updated."
 msgstr "Profil aktualizován."
 
-#: hypha/apply/users/views.py:161 hypha/apply/users/views.py:236
+#: hypha/apply/users/views.py:164 hypha/apply/users/views.py:241
 msgid "Hijack feature is not enabled."
 msgstr "Funkce hijack není povolena."
 
-#: hypha/apply/users/views.py:190
+#: hypha/apply/users/views.py:193
 msgid "Password Page timed out. Try changing the email again."
 msgstr "Stránka s heslem vypršela. Zkuste znovu změnit e-mail."
 
-#: hypha/apply/users/views.py:211
+#: hypha/apply/users/views.py:216
 msgid "Alert! An attempt to update your email."
 msgstr "Pozor! Pokus o aktualizaci vašeho e-mailu."
 
-#: hypha/apply/users/views.py:270
+#: hypha/apply/users/views.py:285
 #, python-brace-format
 msgid "Your email has been successfully updated to {email}!"
 msgstr "Váš e-mail byl úspěšně aktualizován na {email}!"
 
-#: hypha/apply/users/views.py:372
+#: hypha/apply/users/views.py:387
 msgid "Your password was successfully updated!"
 msgstr "Vaše heslo bylo úspěšně aktualizováno!"
 
-#: hypha/apply/users/views.py:377
+#: hypha/apply/users/views.py:392
 msgid "Please correct the errors below."
 msgstr "Opravte prosím níže uvedené chyby."
 
-#: hypha/apply/users/views.py:809
+#: hypha/apply/users/views.py:824
 #, python-brace-format
 msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgstr "Potvrzovací kód pro {ORG_LONG_NAME}:{token}"
 
-#: hypha/apply/users/views.py:870
+#: hypha/apply/users/views.py:885
 msgid "✓ Check your email for password set link."
 msgstr "✓ Podívejte se do e-mailu na odkaz pro nastavení hesla."
 
@@ -11170,7 +12316,7 @@ msgstr "Výchozí logo webu"
 msgid "Mobile site logo (if not set default will be used)"
 msgstr "Logo mobilního webu (pokud není nastaveno, použije se výchozí)"
 
-#: hypha/core/models/system_settings.py:60
+#: hypha/core/models/system_settings.py:61
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "Link for the site logo, e.g. \"https://www.example.org/\". If not set, "
@@ -11182,11 +12328,11 @@ msgstr ""
 "Odkaz na logo webu, např. \"https://www.example.org/\".Pokud není nastaveno, "
 "výchozí hodnota je stránka se slugem nastaveným na \"home\"."
 
-#: hypha/core/models/system_settings.py:64
+#: hypha/core/models/system_settings.py:66
 msgid "Front page navigation content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:66
+#: hypha/core/models/system_settings.py:68
 msgid ""
 "This will overwrite the default front page navigation bar, html tags is "
 "allowed."
@@ -11194,40 +12340,40 @@ msgstr ""
 "Tím se přepíše výchozí navigační panel titulní stránky, html značky jsou "
 "povoleny."
 
-#: hypha/core/models/system_settings.py:72
+#: hypha/core/models/system_settings.py:74
 #, fuzzy
 #| msgid "Other comments"
 msgid "Footer content"
 msgstr "Další připomínky"
 
-#: hypha/core/models/system_settings.py:74
+#: hypha/core/models/system_settings.py:76
 msgid "This will be added to the footer, html tags is allowed."
 msgstr "Toto bude přidáno do patičky, html značky jsou povoleny."
 
-#: hypha/core/models/system_settings.py:84
-#: hypha/core/models/system_settings.py:94
+#: hypha/core/models/system_settings.py:86
+#: hypha/core/models/system_settings.py:96
 msgid "Text"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:105
+#: hypha/core/models/system_settings.py:107
 #, fuzzy
 #| msgid "Per page"
 msgid "Homepage"
 msgstr "Na stránku"
 
-#: hypha/core/models/system_settings.py:113
+#: hypha/core/models/system_settings.py:115
 #, fuzzy
 #| msgid "Default site logo"
 msgid "Site logo"
 msgstr "Výchozí logo webu"
 
-#: hypha/core/models/system_settings.py:122
+#: hypha/core/models/system_settings.py:124
 #, fuzzy
 #| msgid "Per page"
 msgid "404 page"
 msgstr "Na stránku"
 
-#: hypha/core/models/system_settings.py:129
+#: hypha/core/models/system_settings.py:131
 #, fuzzy
 #| msgid "Per page"
 msgid "403 page"
@@ -11300,7 +12446,7 @@ msgstr "převedeno"
 msgid "renditions"
 msgstr "převedeno"
 
-#: hypha/settings/django.py:164 hypha/settings/local.py:105
+#: hypha/settings/django.py:163 hypha/settings/local.py:105
 msgid ""
 "This password has previously appeared in a data breach and should not be "
 "used. Please choose a different password."
@@ -11308,7 +12454,7 @@ msgstr ""
 "Toto heslo se již dříve objevilo při úniku dat a nemělo by se používat. "
 "Zvolte si prosím jiné heslo."
 
-#: hypha/settings/django.py:167 hypha/settings/local.py:108
+#: hypha/settings/django.py:166 hypha/settings/local.py:108
 msgid "Your password must not have been detected in a major security breach."
 msgstr "Vaše heslo nesmí být odhaleno při závažném narušení bezpečnosti."
 
@@ -11365,25 +12511,21 @@ msgstr ""
 msgid "current theme"
 msgstr "aktuální"
 
-#: hypha/templates/base-apply.html:32
-msgid "Toggle Light / Dark / Auto color theme"
-msgstr ""
-
-#: hypha/templates/base-apply.html:54
+#: hypha/templates/base-apply.html:50
 msgid "Menu"
 msgstr "Nabídka"
 
-#: hypha/templates/base-apply.html:76
+#: hypha/templates/base-apply.html:72
 #, fuzzy
 #| msgid "Copy"
 msgid "Copyright"
 msgstr "Kopírovat"
 
-#: hypha/templates/base-apply.html:79
+#: hypha/templates/base-apply.html:75
 msgid "Built with"
 msgstr ""
 
-#: hypha/templates/base-apply.html:85
+#: hypha/templates/base-apply.html:81
 msgid "Manage cookies"
 msgstr ""
 
@@ -11398,6 +12540,25 @@ msgstr "Exportováno %(export_user)s dne %(export_date)s"
 msgid "Page:"
 msgstr "Strana"
 
+#: hypha/templates/cotton/card_attachment.html:13
+#, python-format
+msgid "View file - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:21
+msgid "uploaded"
+msgstr "nahráno"
+
+#: hypha/templates/cotton/card_attachment.html:33
+#, fuzzy, python-format
+#| msgid "File not found on submission"
+msgid "File not found - %(filename)s"
+msgstr "Soubor nebyl při podání nalezen"
+
+#: hypha/templates/cotton/card_attachment.html:40
+msgid "Missing file"
+msgstr ""
+
 #: hypha/templates/cotton/dropdown_menu.html:69
 #: hypha/templates/cotton/dropdown_menu.html:77
 #, fuzzy, python-format
@@ -11405,18 +12566,28 @@ msgstr "Strana"
 msgid "Filter %(title)s"
 msgstr "Revize pro %(title)s"
 
-#. Translators: "delete" should match msgid "delete" (with context "confirm-delete")
-#: hypha/templates/cotton/modal/confirm.html:25
-msgid "Type <em>delete</em> below to confirm"
-msgstr ""
-
-#: hypha/templates/cotton/modal/confirm.html:41
+#: hypha/templates/cotton/modal/confirm.html:7
 #, fuzzy
 #| msgid "Delete"
-msgctxt "confirm-delete"
 msgid "delete"
 msgstr "Smazat"
 
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "anonymize"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:24
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">delete</pre> below to "
+"confirm"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:25
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">anonymize</pre> below to "
+"confirm"
+msgstr ""
+
 #: hypha/templates/cotton/modal/header.html:11
 #, fuzzy
 #| msgid "Closed"
@@ -11447,25 +12618,25 @@ msgstr "Zpět na začátek"
 msgid "* This must be a number"
 msgstr "Musí to být číslo"
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 #, fuzzy
 #| msgid "Update password"
 msgid "Hide password"
 msgstr "Aktualizovat heslo"
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 #, fuzzy
 #| msgid "Set Password"
 msgid "Show password"
 msgstr "Nastavit heslo"
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently visible"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently hidden"
 msgstr ""
 
@@ -11521,73 +12692,52 @@ msgstr "Kliknutím otevřete seznam úkolů"
 msgid "Your Tasks"
 msgstr "Vaše úkoly"
 
-#: hypha/templates/includes/org_login_button.html:7
-#, python-format
-msgid "Log in with your %(ORG_SHORT_NAME)s email"
-msgstr "Přihlaste se pomocí e-mailu %(ORG_SHORT_NAME)s"
-
-#: hypha/templates/includes/password_login_button.html:7
-msgid "Log in with password"
-msgstr "Přihlášení pomocí hesla"
+#: hypha/templates/password_required.html:4
+#: hypha/templates/password_required.html:9
+msgid "Password required"
+msgstr "Vyžadováno heslo"
 
-#: hypha/templates/includes/passwordless_login_button.html:7
-msgid "Log in without password"
-msgstr "Přihlášení bez hesla"
+#: hypha/templates/password_required.html:11
+msgid "Please enter the password to proceed."
+msgstr "Pro pokračování zadejte heslo."
 
-#: hypha/templates/includes/user_menu.html:27
-#, fuzzy
-#| msgid "your account"
-msgid "Goto your account"
-msgstr "váš účet"
+#~ msgid "View "
+#~ msgstr "Zobrazit "
 
-#: hypha/templates/includes/user_menu.html:31
-msgid "My account"
-msgstr "Můj účet"
+#~ msgid "Are you sure you want to archive the selected submissions?"
+#~ msgstr "Opravdu chcete vybrané příspěvky archivovat?"
 
-#: hypha/templates/includes/user_menu.html:36
-#, fuzzy
-#| msgid "The slack #channel for notifications."
-msgid "Check latest notifications"
-msgstr "Slack #kanál pro oznámení."
+#~ msgid "Ready For Preliminary Determination"
+#~ msgstr "Připraveno k předběžnému rozhodnutí"
 
-#: hypha/templates/includes/user_menu.html:40
-msgid "Activity feed"
-msgstr "Podávání informací o aktivitách"
+#~ msgid "Ready For Discussion"
+#~ msgstr "Připraveno k diskusi"
 
-#: hypha/templates/includes/user_menu.html:44
-#, fuzzy
-#| msgid "Your flagged submissions"
-msgid "Goto your flagged submissions"
-msgstr "Vaše označená podání"
+#~ msgid "Ready For Final Determination"
+#~ msgstr "Připraveno ke konečnému rozhodnutí"
 
-#: hypha/templates/includes/user_menu.html:48
-msgid "My flagged"
-msgstr "Moje označení"
+#~ msgid "Ready For Determination"
+#~ msgstr "Připraveno k rozhodnutí"
 
-#: hypha/templates/includes/user_menu.html:53
-msgid "Goto wagtail admin"
-msgstr ""
+#~ msgid "The"
+#~ msgstr " "
 
-#: hypha/templates/includes/user_menu.html:84
-msgid "Release User"
-msgstr "Vydání uživatele"
+#~ msgid "current"
+#~ msgstr "aktuální"
 
-#: hypha/templates/includes/user_menu.html:91
-msgid "Log out"
-msgstr "Odhlášení"
+#~ msgid "next"
+#~ msgstr "další"
 
-#: hypha/templates/includes/user_menu.html:101
-msgid " or Sign up"
-msgstr " nebo se zaregistrujte"
+#~ msgid "reporting period is"
+#~ msgstr "vykazované období je"
 
-#: hypha/templates/password_required.html:4
-#: hypha/templates/password_required.html:9
-msgid "Password required"
-msgstr "Vyžadováno heslo"
+#~ msgid "A report is due for the period"
+#~ msgstr "Je třeba předložit zprávu za období"
 
-#: hypha/templates/password_required.html:11
-msgid "Please enter the password to proceed."
-msgstr "Pro pokračování zadejte heslo."
+#, fuzzy
+#~| msgid "Show less..."
+#~ msgid "show less"
+#~ msgstr "Zobrazit méně..."
 
 #~ msgid "Partners updated."
 #~ msgstr "Partneři aktualizováni."
@@ -11616,12 +12766,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ msgid "Applicants & Partners"
 #~ msgstr "Žadatelé a partneři"
 
-#~ msgid "updated partners"
-#~ msgstr "aktualizovaní partneři"
-
-#~ msgid "You have been added as a partner the following submission."
-#~ msgstr "Byli jste přidáni jako partner následujícího podání."
-
 #~ msgid "Your active submissions"
 #~ msgstr "Vaše aktivní podání"
 
@@ -11923,9 +13067,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ msgid "Back to Account"
 #~ msgstr "Zpět na účet"
 
-#~ msgid "Invalid activation"
-#~ msgstr "Neplatná aktivace"
-
 #~ msgid "Invalid activation URL"
 #~ msgstr "Neplatná aktivační adresa URL"
 
@@ -11938,9 +13079,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ msgid "Possible reason:"
 #~ msgstr "Možný důvod:"
 
-#~ msgid "Delete user"
-#~ msgstr "Smazat uživatele"
-
 #~ msgid "Select all users in listing"
 #~ msgstr "Vybrat všechny uživatele ve výpisu"
 
@@ -11985,9 +13123,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ "Vykazování bylo zakázáno, stačí uložit formulář s příslušným datem a "
 #~ "frekvencí vykazování, aby bylo opět povoleno."
 
-#~ msgid "made a comment"
-#~ msgstr "učinil komentář"
-
 #~ msgid "No notifications available."
 #~ msgstr "Nejsou k dispozici žádná oznámení."
 
@@ -12019,9 +13154,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ msgid "Project #"
 #~ msgstr "Projekt č"
 
-#~ msgid "Contract number"
-#~ msgstr "Číslo smlouvy"
-
 #~ msgid "Pay to"
 #~ msgstr "Zaplatit"
 
@@ -12515,9 +13647,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ msgid "Private Report"
 #~ msgstr "Soukromá zpráva"
 
-#~ msgid "Save report"
-#~ msgstr "Uložit zprávu"
-
 #~ msgid "Submit report"
 #~ msgstr "Odeslat zprávu"
 
@@ -12658,12 +13787,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ "Přestože vám to důrazně nedoporučujeme, můžete\n"
 #~ "      také vypnout dvoufaktorové ověřování svého účtu."
 
-#~ msgid "Enable Two-Factor Authentication"
-#~ msgstr "Povolit dvoufaktorové ověřování"
-
-#~ msgid "Enter your credentials."
-#~ msgstr "Zadejte své přihlašovací údaje."
-
 #~ msgid ""
 #~ "Use this form for entering backup tokens for logging in.\n"
 #~ "            These tokens have been generated for you to print and keep "
@@ -12822,9 +13945,6 @@ msgstr "Pro pokračování zadejte heslo."
 #~ msgid "Other Contact Methods"
 #~ msgstr "Další způsoby kontaktu"
 
-#~ msgid "Contact information"
-#~ msgstr "Kontaktní informace"
-
 #~ msgid "Person types"
 #~ msgstr "Typy osob"
 
diff --git a/hypha/locale/django.pot b/hypha/locale/django.pot
index 7b8da10284..d8e5785a6c 100644
--- a/hypha/locale/django.pot
+++ b/hypha/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-22 16:12+0000\n"
+"POT-Creation-Date: 2026-09-17 11:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,300 +27,351 @@ msgstr ""
 msgid "Please provide data for: {fields}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:28
+#: hypha/apply/activity/adapters/activity_feed.py:27
 #, python-brace-format
 msgid "Submitted {source.title_text_display} for {source.page.title}"
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:29
 #: hypha/apply/activity/adapters/activity_feed.py:30
-#: hypha/apply/activity/adapters/activity_feed.py:31
 msgid "edited the submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:32
+#: hypha/apply/activity/adapters/activity_feed.py:31
 #, python-brace-format
 msgid "updated Lead from {old_lead} to {source.lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:33
+#: hypha/apply/activity/adapters/activity_feed.py:32
 #, python-brace-format
 msgid "batch updated Lead to {new_lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:35
+#: hypha/apply/activity/adapters/activity_feed.py:34
 #, python-brace-format
 msgid "sent a determination. Outcome: {determination.clean_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:38
+#: hypha/apply/activity/adapters/activity_feed.py:37
 msgid "Invited to submit a proposal"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:41
+#: hypha/apply/activity/adapters/activity_feed.py:40
 msgid "Submitted a review"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:42
+#: hypha/apply/activity/adapters/activity_feed.py:41
 msgid "Opened the submission while still sealed"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:45
+#: hypha/apply/activity/adapters/activity_feed.py:44
 #, python-brace-format
 msgid ""
 "{opinion.opinion_display}s with {opinion.review.author}s review of {source}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:48
+#: hypha/apply/activity/adapters/activity_feed.py:47
 #, python-brace-format
 msgid "deleted the opinion for review: {review_opinion.review}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:51
+#: hypha/apply/activity/adapters/activity_feed.py:50
 #, python-brace-format
 msgid "Created project with initial status of \"{status}\""
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:52
+#, python-brace-format
+msgid "Created SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:53
+#, python-brace-format
+msgid "Edited SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:54
+#, python-brace-format
+msgid "Created project form for project \"{related.project}\""
+msgstr ""
+
 #: hypha/apply/activity/adapters/activity_feed.py:55
 #, python-brace-format
+msgid "Edited project form for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:58
+#, python-brace-format
 msgid "updated the project title from {old_title} to {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:57
+#: hypha/apply/activity/adapters/activity_feed.py:61
+#, python-brace-format
+msgid "updated contract number to {source.contract_number}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:63
 #, python-brace-format
 msgid "update Lead from {old_lead} to {source.lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:58
+#: hypha/apply/activity/adapters/activity_feed.py:64
 msgid "Requested approval"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:60
+#: hypha/apply/activity/adapters/activity_feed.py:66
 #: hypha/apply/determinations/models.py:209
 #: hypha/apply/determinations/models.py:213
 #: hypha/apply/determinations/models.py:217
 #: hypha/apply/determinations/options.py:12
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
-#: hypha/apply/projects/utils.py:87
+#: hypha/apply/projects/utils.py:90
 msgid "Approved"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:61
+#: hypha/apply/activity/adapters/activity_feed.py:67
 msgid "requested changes for acceptance"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:62
+#: hypha/apply/activity/adapters/activity_feed.py:68
 msgid "Submitted Contract Documents"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:69
 #, python-brace-format
 msgid "Uploaded a {contract.state} contract"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:64
+#: hypha/apply/activity/adapters/activity_feed.py:70
 msgid "Approved contract"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:66
-#: hypha/apply/projects/views/payment.py:275
+#: hypha/apply/activity/adapters/activity_feed.py:72
+#: hypha/apply/projects/views/invoice.py:280
 msgid "Invoice added"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:67
+#: hypha/apply/activity/adapters/activity_feed.py:73
 msgid "Submitted a report"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:70
-#: hypha/apply/activity/options.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:74
+msgid "deleted a report"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:77
+#: hypha/apply/activity/options.py:73
 msgid "disabled reporting"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:74
+#: hypha/apply/activity/adapters/activity_feed.py:81
 msgid "archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:75
+#: hypha/apply/activity/adapters/activity_feed.py:82
 msgid "un-archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:76
+#: hypha/apply/activity/adapters/activity_feed.py:83
 msgid "deleted an invoice"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:131
-#: hypha/apply/funds/views/submission_edit.py:630
+#: hypha/apply/activity/adapters/activity_feed.py:85
+#, python-brace-format
+msgid "updated author from {old_author} to {source.user}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:145
+#: hypha/apply/funds/views/submission_edit.py:631
 msgid "Reviewers updated."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:133
-#: hypha/apply/activity/adapters/slack.py:237
+#: hypha/apply/activity/adapters/activity_feed.py:147
+#: hypha/apply/activity/adapters/slack.py:257
 msgid "Added:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:137
-#: hypha/apply/activity/adapters/slack.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:151
+#: hypha/apply/activity/adapters/slack.py:261
 msgid "Removed:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:143
+#: hypha/apply/activity/adapters/activity_feed.py:157
 msgid "Batch reviewers updated:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:146
+#: hypha/apply/activity/adapters/activity_feed.py:160
 #, python-brace-format
 msgid "{user} as {name}."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:165
+#: hypha/apply/activity/adapters/activity_feed.py:179
 #, python-brace-format
 msgid "Successfully deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:174
+#: hypha/apply/activity/adapters/activity_feed.py:188
 #, python-brace-format
 msgid "Successfully archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:187
+#: hypha/apply/activity/adapters/activity_feed.py:201
 #, python-brace-format
 msgid ""
 "Successfully updated status to {invoice_status} for invoices: "
 "{invoice_numbers}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:204
+#: hypha/apply/activity/adapters/activity_feed.py:218
 #, python-brace-format
 msgid "assigned Project form to {}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:210
+#: hypha/apply/activity/adapters/activity_feed.py:224
 #, python-brace-format
 msgid "removed the task {task.code} for {source} from the task list"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:215
+#: hypha/apply/activity/adapters/activity_feed.py:229
 #, python-brace-format
 msgid ""
 "removed the task {task.code} for {source} from whole team's{user_groups} "
 "task list."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:228
-#: hypha/apply/activity/adapters/activity_feed.py:260
+#: hypha/apply/activity/adapters/activity_feed.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:273
 #, python-brace-format
 msgid "Progressed from {old_display} to {new_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:291
+#: hypha/apply/activity/adapters/activity_feed.py:304
 #, python-brace-format
 msgid ""
 "Updated reporting frequency. New schedule is: {new_schedule} starting on "
 "{schedule_start}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:296
+#: hypha/apply/activity/adapters/activity_feed.py:309
 msgid "Skipped a Report"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:298
+#: hypha/apply/activity/adapters/activity_feed.py:311
 msgid "Marked a Report as required"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:301
+#: hypha/apply/activity/adapters/activity_feed.py:314
 #, python-brace-format
 msgid "Updated Invoice status to: {invoice_status}."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:350
+#: hypha/apply/activity/adapters/activity_feed.py:363
 #, python-brace-format
 msgid "Updated screening decision from \"{old_status}\" to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:353
+#: hypha/apply/activity/adapters/activity_feed.py:366
 #, python-brace-format
 msgid "Added screening decision to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:357
+#: hypha/apply/activity/adapters/activity_feed.py:370
 #, python-brace-format
 msgid "Removed \"{old_status}\" screening decision."
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:196
+#: hypha/apply/activity/adapters/base.py:203
 #, python-brace-format
 msgid "{adapter} [to: {recipient}]: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:200
+#: hypha/apply/activity/adapters/base.py:207
 #, python-brace-format
 msgid "{adapter}: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:90
+#: hypha/apply/activity/adapters/emails.py:92
 #, python-brace-format
 msgid "Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:96
+#: hypha/apply/activity/adapters/emails.py:98
 msgid "Multiple applications are now ready for your review"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:99
+#: hypha/apply/activity/adapters/emails.py:101
 #, python-brace-format
 msgid "Reminder: Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:102
+#: hypha/apply/activity/adapters/emails.py:104
 msgid "You are invited as a co-applicant"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:107
+#: hypha/apply/activity/adapters/emails.py:109
 #, python-brace-format
 msgid "Project is waiting for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:111
+#: hypha/apply/activity/adapters/emails.py:113
 #, python-brace-format
 msgid "Contract uploaded for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:116
+#: hypha/apply/activity/adapters/emails.py:118
 #, python-brace-format
 msgid "Contract Documents required approval for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:126
+#: hypha/apply/activity/adapters/emails.py:128
 #, python-brace-format
 msgid "Project is waiting for the contract: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:130
+#: hypha/apply/activity/adapters/emails.py:132
 #, python-brace-format
 msgid "Project is ready for invoicing: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:134
+#: hypha/apply/activity/adapters/emails.py:136
 #, python-brace-format
 msgid "Project status has changed to {project_status}: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:140
+#: hypha/apply/activity/adapters/emails.py:142
 msgid "Project has been rejected, please update and resubmit"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:143
+#: hypha/apply/activity/adapters/emails.py:145
 #, python-brace-format
 msgid "Project documents are ready to be assigned for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:150
+#: hypha/apply/activity/adapters/emails.py:151
+#, python-brace-format
+msgid "New comment on application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:158
+#, python-brace-format
+msgid ""
+"Your application to {ORG_LONG_NAME} has been reviewed: "
+"{source.title_text_display}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:162
+#, python-brace-format
+msgid "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:167
 #, python-brace-format
 msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:153
+#: hypha/apply/activity/adapters/emails.py:170
 #, python-brace-format
-msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+msgid "Your {ORG_LONG_NAME} project: {source.title}"
 msgstr ""
 
 #: hypha/apply/activity/adapters/slack.py:31
@@ -398,183 +449,219 @@ msgstr ""
 
 #: hypha/apply/activity/adapters/slack.py:73
 #, python-brace-format
+msgid "{user} has anonymized {source.title_text_display}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:76
+#, python-brace-format
 msgid ""
 "{user} has deleted {review.author} review for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:76
+#: hypha/apply/activity/adapters/slack.py:79
 #, python-brace-format
 msgid ""
 "{user} has deleted {review_opinion.author} review opinion for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:79
+#: hypha/apply/activity/adapters/slack.py:82
 #, python-brace-format
 msgid "{user} has created a Project: <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:82
+#: hypha/apply/activity/adapters/slack.py:85
 #, python-brace-format
 msgid ""
 "The lead of project <{link}|{source.title}> has been updated from {old_lead} "
 "to {source.lead} by {user}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:85
+#: hypha/apply/activity/adapters/slack.py:88
 #, python-brace-format
 msgid ""
 "The project title has been updated from <{link}|{old_title}> to <{link}|"
 "{source.title}> by {user}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:88
+#: hypha/apply/activity/adapters/slack.py:91
+#, python-brace-format
+msgid ""
+"The contract number of project <{link}|{source.title}> has been updated to "
+"{source.contract_number} by {user}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:94
 #, python-brace-format
 msgid ""
 "{user} has edited {review.author} review for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:91
+#: hypha/apply/activity/adapters/slack.py:97
 #, python-brace-format
 msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:94
+#: hypha/apply/activity/adapters/slack.py:100
 #, python-brace-format
 msgid "{user} has approved project <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:97
+#: hypha/apply/activity/adapters/slack.py:103
 #, python-brace-format
 msgid ""
 "{user} has requested changes for project acceptance on <{link}|{source.title}"
 ">"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:100
+#: hypha/apply/activity/adapters/slack.py:106
 #, python-brace-format
 msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:103
+#: hypha/apply/activity/adapters/slack.py:109
 #, python-brace-format
 msgid ""
 "{user} has submitted the contracting document for project <{link}|"
 "{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:106
+#: hypha/apply/activity/adapters/slack.py:112
 #, python-brace-format
 msgid "{user} has approved contract for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:109
+#: hypha/apply/activity/adapters/slack.py:115
 #, python-brace-format
 msgid "{user} has created invoice for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:112
+#: hypha/apply/activity/adapters/slack.py:118
 #, python-brace-format
 msgid ""
 "{user} has changed the status of <{link_related}|invoice> on <{link}|"
 "{source.title}> to {invoice.status_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:115
+#: hypha/apply/activity/adapters/slack.py:121
 #, python-brace-format
 msgid "{user} has deleted invoice from <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:118
+#: hypha/apply/activity/adapters/slack.py:124
 #, python-brace-format
 msgid "{user} has updated invoice for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:121
+#: hypha/apply/activity/adapters/slack.py:127
 #, python-brace-format
 msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:125
+#: hypha/apply/activity/adapters/slack.py:130
+#, python-brace-format
+msgid "{user} has deleted a report for <{link}|{source.title}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:135
 #, python-brace-format
 msgid "{user} has created a new account for <{link}|{source}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:128
+#: hypha/apply/activity/adapters/slack.py:138
 #, python-brace-format
 msgid ""
 "{user} has edited account for <{link}|{source}> that now has following "
 "roles: {roles}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:132
+#: hypha/apply/activity/adapters/slack.py:142
 #, python-brace-format
 msgid "{user} has archived the submission: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:135
+#: hypha/apply/activity/adapters/slack.py:145
 #, python-brace-format
 msgid "{user} has unarchived the submission: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:231
+#: hypha/apply/activity/adapters/slack.py:148
+#, python-brace-format
+msgid ""
+"{user} has updated author from {old_author} to {source.user} for submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:151
+#, python-brace-format
+msgid ""
+"A new comment has been assigned to {assignee} by {user} on submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:251
 #, python-brace-format
 msgid "{user} has updated the reviewers on <{link}|{title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:250
+#: hypha/apply/activity/adapters/slack.py:270
 #, python-brace-format
 msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:262
+#: hypha/apply/activity/adapters/slack.py:282
 #, python-brace-format
 msgid "{user} as {name},"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:268
+#: hypha/apply/activity/adapters/slack.py:288
 #, python-brace-format
 msgid ""
 "{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:288
+#: hypha/apply/activity/adapters/slack.py:308
 #, python-brace-format
 msgid "{user} has transitioned the following submissions: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:298
+#: hypha/apply/activity/adapters/slack.py:318
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was sent by email. Outcome: "
 "{determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:305
+#: hypha/apply/activity/adapters/slack.py:325
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was saved without sending an "
 "email. Outcome: {determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:321
+#: hypha/apply/activity/adapters/slack.py:341
 #, python-brace-format
 msgid "Determinations of {outcome} was sent for: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:332
+#: hypha/apply/activity/adapters/slack.py:352
 #, python-brace-format
 msgid "{user} has deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:339
+#: hypha/apply/activity/adapters/slack.py:361
+#, python-brace-format
+msgid "{user} has anonymized submissions: {title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:368
 #, python-brace-format
 msgid "{user} has archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:353
+#: hypha/apply/activity/adapters/slack.py:382
 #, python-brace-format
 msgid ""
 "<{link}|{title}> is ready for review. The following are assigned as "
@@ -606,32 +693,36 @@ msgstr ""
 msgid "Last 3 months"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:16
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:70
+#: hypha/apply/activity/forms.py:17
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:47
 msgid "Attachments"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:20 hypha/apply/funds/forms.py:102
-#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:371
+#: hypha/apply/activity/forms.py:21 hypha/apply/funds/forms.py:102
+#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:389
 msgid "Select..."
 msgstr ""
 
-#: hypha/apply/activity/forms.py:21
+#: hypha/apply/activity/forms.py:22
 msgid "Assign to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:33
+#: hypha/apply/activity/forms.py:39
 msgid "Visible to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:34
+#: hypha/apply/activity/forms.py:40
 msgid "Message"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:38
+#: hypha/apply/activity/forms.py:44
 msgid "Select a relevant user role. Staff can view every comment."
 msgstr ""
 
+#: hypha/apply/activity/forms.py:73
+msgid "Write a comment..."
+msgstr ""
+
 #: hypha/apply/activity/management/commands/send_staff_email_digest.py:146
 msgid "Summary of all activities"
 msgstr ""
@@ -641,7 +732,8 @@ msgid "Activities Summary - "
 msgstr ""
 
 #: hypha/apply/activity/models.py:25
-#: hypha/apply/funds/models/co_applicants.py:9 hypha/apply/todo/options.py:69
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:12
+#: hypha/apply/funds/models/co_applicants.py:10 hypha/apply/todo/options.py:76
 msgid "Comment"
 msgstr ""
 
@@ -649,7 +741,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: hypha/apply/activity/models.py:36
+#: hypha/apply/activity/models.py:36 hypha/apply/funds/forms.py:336
 msgid "Applicants"
 msgstr ""
 
@@ -657,9 +749,9 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:231
-#: hypha/apply/funds/tables.py:469
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:81
+#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:245
+#: hypha/apply/funds/tables.py:533
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:86
 #: hypha/apply/funds/templates/submissions/all.html:437
 #: hypha/apply/funds/templates/submissions/all.html:478
 msgid "Reviewers"
@@ -677,7 +769,7 @@ msgstr ""
 msgid "activity attachments"
 msgstr ""
 
-#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:379
+#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:384
 msgid "message"
 msgstr ""
 
@@ -693,19 +785,19 @@ msgstr ""
 msgid "activities"
 msgstr ""
 
-#: hypha/apply/activity/models.py:329
+#: hypha/apply/activity/models.py:334
 msgid "verb"
 msgstr ""
 
-#: hypha/apply/activity/models.py:340
+#: hypha/apply/activity/models.py:345
 msgid "event"
 msgstr ""
 
-#: hypha/apply/activity/models.py:341
+#: hypha/apply/activity/models.py:346
 msgid "events"
 msgstr ""
 
-#: hypha/apply/activity/models.py:380
+#: hypha/apply/activity/models.py:385
 msgid "messages"
 msgstr ""
 
@@ -798,149 +890,189 @@ msgid "deleted submission"
 msgstr ""
 
 #: hypha/apply/activity/options.py:35
-msgid "deleted review"
+msgid "anonymized submission"
 msgstr ""
 
 #: hypha/apply/activity/options.py:36
-msgid "deleted review opinion"
+msgid "deleted review"
 msgstr ""
 
 #: hypha/apply/activity/options.py:37
-msgid "created project"
+msgid "deleted review opinion"
 msgstr ""
 
 #: hypha/apply/activity/options.py:38
-msgid "updated project lead"
+msgid "created project"
 msgstr ""
 
 #: hypha/apply/activity/options.py:39
-msgid "updated project title"
+msgid "created a project SOW"
 msgstr ""
 
 #: hypha/apply/activity/options.py:40
-msgid "edited review"
+msgid "edited a project SOW"
 msgstr ""
 
 #: hypha/apply/activity/options.py:41
-msgid "sent for approval"
+msgid "created a project form"
 msgstr ""
 
 #: hypha/apply/activity/options.py:42
-msgid "approved project"
+msgid "edited a project form"
 msgstr ""
 
 #: hypha/apply/activity/options.py:43
-msgid "assign project form approver"
+msgid "updated project lead"
 msgstr ""
 
 #: hypha/apply/activity/options.py:44
+msgid "updated project title"
+msgstr ""
+
+#: hypha/apply/activity/options.py:47
+msgid "updated project contract number"
+msgstr ""
+
+#: hypha/apply/activity/options.py:49
+msgid "edited review"
+msgstr ""
+
+#: hypha/apply/activity/options.py:50
+msgid "sent for approval"
+msgstr ""
+
+#: hypha/apply/activity/options.py:51
+msgid "approved project"
+msgstr ""
+
+#: hypha/apply/activity/options.py:52
+msgid "assign project form approver"
+msgstr ""
+
+#: hypha/apply/activity/options.py:53
 msgid "approved project form"
 msgstr ""
 
-#: hypha/apply/activity/options.py:45
+#: hypha/apply/activity/options.py:54
 msgid "transitioned project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:46
+#: hypha/apply/activity/options.py:55
 msgid "requested project change"
 msgstr ""
 
-#: hypha/apply/activity/options.py:49
+#: hypha/apply/activity/options.py:58
 msgid "submitted contract documents"
 msgstr ""
 
-#: hypha/apply/activity/options.py:51
+#: hypha/apply/activity/options.py:60
 msgid "uploaded document to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:52
+#: hypha/apply/activity/options.py:61
 msgid "uploaded contract to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:53
+#: hypha/apply/activity/options.py:62
 msgid "approved contract"
 msgstr ""
 
-#: hypha/apply/activity/options.py:54
+#: hypha/apply/activity/options.py:63
 msgid "created invoice for project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:55
+#: hypha/apply/activity/options.py:64
 msgid "updated invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:56
+#: hypha/apply/activity/options.py:65
 msgid "approve invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:57
+#: hypha/apply/activity/options.py:66
 msgid "deleted invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:58
+#: hypha/apply/activity/options.py:67
 msgid "sent project to compliance"
 msgstr ""
 
-#: hypha/apply/activity/options.py:59
+#: hypha/apply/activity/options.py:68
 msgid "updated invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:60
+#: hypha/apply/activity/options.py:69
 msgid "submitted report"
 msgstr ""
 
-#: hypha/apply/activity/options.py:61
+#: hypha/apply/activity/options.py:70
+msgid "deleted report"
+msgstr ""
+
+#: hypha/apply/activity/options.py:71
 msgid "skipped report"
 msgstr ""
 
-#: hypha/apply/activity/options.py:62
+#: hypha/apply/activity/options.py:72
 msgid "changed report frequency"
 msgstr ""
 
-#: hypha/apply/activity/options.py:64
+#: hypha/apply/activity/options.py:74
 msgid "notified report"
 msgstr ""
 
-#: hypha/apply/activity/options.py:65
+#: hypha/apply/activity/options.py:75
 msgid "reminder to review"
 msgstr ""
 
-#: hypha/apply/activity/options.py:66
+#: hypha/apply/activity/options.py:76
 msgid "batch deleted submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:69
+#: hypha/apply/activity/options.py:79
+msgid "batch anonymized submissions"
+msgstr ""
+
+#: hypha/apply/activity/options.py:83
 msgid "batch archive submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:73
+#: hypha/apply/activity/options.py:87
 msgid "batch update invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:75
+#: hypha/apply/activity/options.py:89
 msgid "created new account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:76
+#: hypha/apply/activity/options.py:90
 msgid "edited account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:77
+#: hypha/apply/activity/options.py:91
 msgid "archived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:78
+#: hypha/apply/activity/options.py:92
 msgid "unarchived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:79
+#: hypha/apply/activity/options.py:93
 msgid "remove task"
 msgstr ""
 
-#: hypha/apply/activity/options.py:80
+#: hypha/apply/activity/options.py:94
 msgid "invite co-applicant"
 msgstr ""
 
+#: hypha/apply/activity/options.py:95
+msgid "updated author"
+msgstr ""
+
+#: hypha/apply/activity/options.py:96
+msgid "comment assigned"
+msgstr ""
+
 #: hypha/apply/activity/templates/activity/include/action_list.html:6
 msgid "There are no actions."
 msgstr ""
@@ -972,13 +1104,13 @@ msgid "Filter"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/notifications.html:79
-#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:44
+#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:61
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:46
-#: hypha/apply/funds/models/co_applicants.py:8
+#: hypha/apply/funds/models/co_applicants.py:9
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:62
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:76
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:83
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:99
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:133
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:120
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:159
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:72
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:19
@@ -1002,90 +1134,120 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:28
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:23
+msgid "Additional options"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:35
+#: hypha/apply/funds/templates/funds/comments.html:68
+#: hypha/apply/funds/templates/funds/comments.html:82
+msgid "Add Comment"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:36
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:150
 #, python-format
 msgid "This user is a %(role)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:37
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:48
+msgid "message from determination"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:50
+#, python-format
+msgid "commented on %(related_name)s"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:53
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:159
 msgid "commented"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:52
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:69
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:173
 msgid "Assigned to you"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:54
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:71
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:175
 #, python-format
 msgid "Assigned to %(assigned_to)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:61
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:78
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:182
 #, python-format
 msgid "This is visible to %(visibility_text)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:72
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:193
 msgid "Edit comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:76
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:93
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:197
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:40
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:36
-#: hypha/apply/funds/models/co_applicants.py:10
+#: hypha/apply/funds/models/co_applicants.py:11
 #: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:10
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:118
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:55
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:90
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:98
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:122
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:106
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:97
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:76
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:130
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:170
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:29
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:148
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:50
 #: hypha/apply/review/templates/review/review_detail.html:82
 msgid "Edit"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:84
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:101
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:205
 msgid ""
 "Are you sure you want to delete this comment? This action cannot be undone."
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:85
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:102
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:206
 msgid "Delete comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:106
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:210
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:59
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:120
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:182
 #: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:21
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:26
 #: hypha/apply/funds/templates/funds/modals/edit_co_applicant_form.html:75
-#: hypha/apply/funds/templates/submissions/all.html:502
-#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:59
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
-#: hypha/apply/projects/views/payment.py:356
+#: hypha/apply/funds/templates/submissions/all.html:504
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:71
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:41
+#: hypha/apply/projects/views/invoice.py:361
 #: hypha/apply/review/templates/review/review_detail.html:92
-#: hypha/templates/cotton/modal/confirm.html:43
 #: hypha/templates/includes/dialog_form_base.html:28
 msgid "Delete"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:97
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:114
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:218
 msgid "updated"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:109
-msgid "View "
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:125
+#, python-format
+msgid "View %(related_name)s"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:27
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:78
-#: hypha/apply/funds/views/submission_edit.py:131
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:130
+#: hypha/apply/funds/views/submission_edit.py:318
 #: hypha/apply/funds/workflows/definitions/double_stage.py:20
 #: hypha/apply/funds/workflows/definitions/double_stage.py:48
 #: hypha/apply/funds/workflows/definitions/double_stage.py:98
@@ -1100,6 +1262,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:50
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:120
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:164
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:19
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:46
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:105
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:20
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:47
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:93
@@ -1109,18 +1275,18 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
 #: hypha/apply/projects/reports/templates/reports/report_form.html:60
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:30
-#: hypha/apply/projects/views/project.py:309
-#: hypha/apply/projects/views/project.py:345
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
-#: hypha/apply/projects/views/project.py:903
-#: hypha/apply/projects/views/project.py:942
-#: hypha/apply/projects/views/project.py:976
-#: hypha/apply/projects/views/project.py:1009
-#: hypha/apply/projects/views/project.py:1363
-#: hypha/apply/projects/views/project.py:1436
-#: hypha/apply/projects/views/project.py:1467
-#: hypha/apply/projects/views/project.py:1622
+#: hypha/apply/projects/views/project.py:313
+#: hypha/apply/projects/views/project.py:349
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
+#: hypha/apply/projects/views/project.py:954
+#: hypha/apply/projects/views/project.py:993
+#: hypha/apply/projects/views/project.py:1027
+#: hypha/apply/projects/views/project.py:1060
+#: hypha/apply/projects/views/project.py:1414
+#: hypha/apply/projects/views/project.py:1487
+#: hypha/apply/projects/views/project.py:1518
+#: hypha/apply/projects/views/project.py:1673
 #: hypha/apply/review/templates/review/review_edit_form.html:67
 #: hypha/apply/review/templates/review/review_form.html:84
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1135,6 +1301,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:58
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:59
 #: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:40
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:37
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:17
 #: hypha/apply/projects/templates/application_projects/project_form.html:33
 #: hypha/apply/users/templates/users/become.html:33
 #: hypha/templates/cotton/modal/confirm.html:48
@@ -1164,12 +1332,13 @@ msgid "Submissions"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:17
-#: hypha/apply/funds/tables.py:76
+#: hypha/apply/funds/tables.py:77
 #: hypha/apply/funds/templates/cotton/submission_list.html:38
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:41
-#: hypha/apply/funds/templates/funds/comments.html:37
-#: hypha/apply/projects/templates/application_projects/project_detail.html:31
-#: hypha/apply/review/views.py:432
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:29
+#: hypha/apply/funds/templates/funds/comments.html:25
+#: hypha/apply/projects/templates/application_projects/project_detail.html:26
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:24
+#: hypha/apply/review/views.py:441
 msgid "Comments"
 msgstr ""
 
@@ -1178,7 +1347,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
 #: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:62
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:68
 #: hypha/apply/review/templates/review/review_list.html:4
 #: hypha/apply/review/templates/review/review_list.html:9
 #: hypha/core/navigation.py:80
@@ -1212,6 +1381,7 @@ msgid "View your submission here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:16
+#: hypha/apply/activity/templates/messages/email/author_updated.html:11
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:29
 #: hypha/apply/activity/templates/messages/email/invited_to_proposal.html:11
 #: hypha/apply/activity/templates/messages/email/submission_confirmation.html:10
@@ -1219,6 +1389,7 @@ msgid "If you have any questions, please submit them here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:18
+#: hypha/apply/activity/templates/messages/email/author_updated.html:13
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:31
 msgid "See our guide for more information"
 msgstr ""
@@ -1245,8 +1416,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/revisions_compare.html:42
 #: hypha/apply/funds/templates/funds/revisions_compare.html:43
 #: hypha/core/models/system_settings.py:21
-#: hypha/core/models/system_settings.py:79
-#: hypha/core/models/system_settings.py:89
+#: hypha/core/models/system_settings.py:81
+#: hypha/core/models/system_settings.py:91
 msgid "Title"
 msgstr ""
 
@@ -1269,11 +1440,30 @@ msgstr ""
 msgid "Please contact %(lead)s - %(email)s if you have any questions."
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/author_updated.html:6
+#, python-format
+msgid "You have been assigned as an Applicant to submission \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:10
+msgid "Link to your submission"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:15
+#, python-format
+msgid ""
+"If you have any issues accessing the submission or other general inquiries, "
+"please email us at %(ORG_EMAIL)s"
+msgstr ""
+
 #: hypha/apply/activity/templates/messages/email/base.html:5
 #: hypha/apply/users/templates/users/activation/email.txt:2
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:2
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:2
 #: hypha/apply/users/templates/users/emails/confirm_access.md:2
+#: hypha/apply/users/templates/users/emails/login_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:2
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:2
 #: hypha/apply/users/templates/users/emails/set_password.txt:2
 #: hypha/apply/users/templates/users/password_reset/email.txt:2
@@ -1286,6 +1476,9 @@ msgstr ""
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:7
 #: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/login_notification.md:14
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:15
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:15
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
 #: hypha/apply/users/templates/users/emails/set_password.txt:10
@@ -1318,6 +1511,19 @@ msgstr ""
 msgid "Read the full comment here"
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:5
+msgid "Hey there,"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:8
+#, python-format
+msgid "You have been assigned to a comment on \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:12
+msgid "View it here"
+msgstr ""
+
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:13
 msgid "A new contract has been added to your Project"
 msgstr ""
@@ -1541,8 +1747,8 @@ msgid "no longer required"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/report_skipped.html:6
-#: hypha/apply/projects/models/project.py:818
-#: hypha/apply/projects/models/project.py:855
+#: hypha/apply/projects/models/project.py:847
+#: hypha/apply/projects/models/project.py:884
 msgid "required"
 msgstr ""
 
@@ -1640,7 +1846,7 @@ msgid "Please submit any questions related to your application here"
 msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:50
-#: hypha/apply/funds/tables.py:498
+#: hypha/apply/funds/tables.py:562
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:12
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:28
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:44
@@ -1651,7 +1857,7 @@ msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:61
 #: hypha/apply/funds/templates/cotton/submission_list.html:24
-#: hypha/apply/funds/templatetags/workflow_tags.py:72
+#: hypha/apply/funds/templatetags/workflow_tags.py:126
 #: hypha/apply/users/roles.py:5
 msgid "Applicant"
 msgstr ""
@@ -1666,22 +1872,26 @@ msgstr ""
 msgid "You can begin submitting invoices and reports for your project."
 msgstr ""
 
-#: hypha/apply/activity/views.py:61
+#: hypha/apply/activity/views.py:99
 msgid "You can only edit your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:64
+#: hypha/apply/activity/views.py:102
 msgid "You can not edit a deleted comment"
 msgstr ""
 
-#: hypha/apply/activity/views.py:92
+#: hypha/apply/activity/views.py:130
 msgid "You can only delete your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:95
+#: hypha/apply/activity/views.py:133
 msgid "You can not delete a deleted comment"
 msgstr ""
 
+#: hypha/apply/activity/views.py:183
+msgid "Comment added!"
+msgstr ""
+
 #: hypha/apply/categories/admin.py:13
 msgid "Category Questions"
 msgstr ""
@@ -1701,27 +1911,27 @@ msgstr ""
 msgid "{title} {child_verbose_name} {verbose_name} for {parent}"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:31
+#: hypha/apply/categories/blocks.py:37
 msgid "Multi select"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:35 hypha/apply/funds/blocks.py:96
-#: hypha/apply/funds/blocks.py:153 hypha/apply/funds/blocks.py:199
+#: hypha/apply/categories/blocks.py:41 hypha/apply/funds/blocks.py:113
+#: hypha/apply/funds/blocks.py:170 hypha/apply/funds/blocks.py:216
 #: hypha/apply/stream_forms/blocks.py:36
 msgid "Label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:37
+#: hypha/apply/categories/blocks.py:43
 msgid "Leave blank to use the default Category label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:40 hypha/apply/funds/blocks.py:100
-#: hypha/apply/funds/blocks.py:157 hypha/apply/funds/blocks.py:202
+#: hypha/apply/categories/blocks.py:46 hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:174 hypha/apply/funds/blocks.py:219
 #: hypha/apply/stream_forms/blocks.py:37
 msgid "Help text"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:42
+#: hypha/apply/categories/blocks.py:48
 msgid "Leave blank to use the default Category help text"
 msgstr ""
 
@@ -1742,7 +1952,8 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:234
+#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:248
+#: hypha/apply/funds/tables.py:333
 #: hypha/apply/funds/templates/submissions/all.html:419
 #: hypha/apply/projects/templates/application_projects/modals/contracting_documents_upload.html:7
 #: hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html:7
@@ -1786,11 +1997,15 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:373
-#: hypha/apply/funds/tables.py:236
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:121
+#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:390
+#: hypha/apply/funds/tables.py:250
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:126
 #: hypha/apply/funds/templates/submissions/all.html:425
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:5
+#: hypha/apply/projects/forms/invoice.py:238 hypha/apply/projects/tables.py:115
+#: hypha/apply/projects/tables.py:152
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:58
+#: hypha/apply/projects/templates/application_projects/partials/invoice_tags.html:4
 msgid "Tags"
 msgstr ""
 
@@ -1864,12 +2079,12 @@ msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html:91
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:24
-#: hypha/apply/funds/tables.py:68
+#: hypha/apply/funds/tables.py:69
 #: hypha/apply/funds/templates/submissions/all.html:328
-#: hypha/apply/projects/models/payment.py:26
-#: hypha/apply/projects/models/project.py:218
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:56
-#: hypha/apply/projects/tables.py:42
+#: hypha/apply/projects/models/invoice.py:37
+#: hypha/apply/projects/models/project.py:219
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:63
+#: hypha/apply/projects/tables.py:40
 msgid "Submitted"
 msgstr ""
 
@@ -1911,7 +2126,7 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:13
 #: hypha/apply/dashboard/templates/dashboard/staff_dashboard.html:16
 #: hypha/apply/users/templates/users/account.html:35
-#: hypha/templates/includes/user_menu.html:57
+#: hypha/apply/users/templates/users/includes/user_menu.html:57
 msgid "Administration"
 msgstr ""
 
@@ -1926,7 +2141,7 @@ msgid "You don't have any PAFs for review right now"
 msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:27
-#: hypha/apply/funds/models/co_applicants.py:16
+#: hypha/apply/funds/models/co_applicants.py:17
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:6
 #: hypha/core/navigation.py:109
@@ -2010,11 +2225,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:27
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
 #: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:79
-#: hypha/apply/todo/options.py:87 hypha/apply/todo/options.py:95
+#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:86
+#: hypha/apply/todo/options.py:94 hypha/apply/todo/options.py:102
 #: hypha/apply/todo/templates/todo/todolist_item.html:16
 msgid "Draft"
 msgstr ""
@@ -2026,11 +2242,9 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:30
 #: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:11
 #: hypha/apply/determinations/templates/determinations/includes/determination_block.html:18
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:104
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:84
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:79
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:28
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:40
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "by"
 msgstr ""
@@ -2126,30 +2340,38 @@ msgstr ""
 #: hypha/apply/determinations/blocks.py:77
 #: hypha/apply/determinations/blocks.py:78
 #: hypha/apply/determinations/blocks.py:79
-#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:276
-#: hypha/apply/review/blocks.py:172 hypha/apply/review/blocks.py:173
-#: hypha/apply/review/blocks.py:174 hypha/apply/review/blocks.py:175
-#: hypha/apply/review/blocks.py:176 hypha/apply/review/blocks.py:177
-#: hypha/apply/review/blocks.py:178 hypha/apply/stream_forms/blocks.py:475
-#: hypha/apply/stream_forms/blocks.py:476
-#: hypha/apply/stream_forms/blocks.py:477
-#: hypha/apply/stream_forms/blocks.py:478
-#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482
-#: hypha/apply/stream_forms/blocks.py:483
-#: hypha/apply/stream_forms/blocks.py:484
-#: hypha/apply/stream_forms/blocks.py:485
-#: hypha/apply/stream_forms/blocks.py:486
-#: hypha/apply/stream_forms/blocks.py:487
-#: hypha/apply/stream_forms/blocks.py:488 hypha/apply/utils/blocks.py:74
+#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:303
+#: hypha/apply/funds/blocks.py:304 hypha/apply/funds/blocks.py:305
+#: hypha/apply/funds/blocks.py:306 hypha/apply/funds/blocks.py:307
+#: hypha/apply/funds/blocks.py:308 hypha/apply/funds/blocks.py:309
+#: hypha/apply/funds/blocks.py:310 hypha/apply/funds/blocks.py:311
+#: hypha/apply/funds/blocks.py:312 hypha/apply/funds/blocks.py:313
+#: hypha/apply/funds/blocks.py:314 hypha/apply/funds/blocks.py:315
+#: hypha/apply/funds/blocks.py:316 hypha/apply/funds/blocks.py:317
+#: hypha/apply/funds/blocks.py:318 hypha/apply/review/blocks.py:172
+#: hypha/apply/review/blocks.py:173 hypha/apply/review/blocks.py:174
+#: hypha/apply/review/blocks.py:175 hypha/apply/review/blocks.py:176
+#: hypha/apply/review/blocks.py:177 hypha/apply/review/blocks.py:178
+#: hypha/apply/stream_forms/blocks.py:513
+#: hypha/apply/stream_forms/blocks.py:514
+#: hypha/apply/stream_forms/blocks.py:515
+#: hypha/apply/stream_forms/blocks.py:516
+#: hypha/apply/stream_forms/blocks.py:517
+#: hypha/apply/stream_forms/blocks.py:518
+#: hypha/apply/stream_forms/blocks.py:519
+#: hypha/apply/stream_forms/blocks.py:520
+#: hypha/apply/stream_forms/blocks.py:521
+#: hypha/apply/stream_forms/blocks.py:522
+#: hypha/apply/stream_forms/blocks.py:523
+#: hypha/apply/stream_forms/blocks.py:524
+#: hypha/apply/stream_forms/blocks.py:525
+#: hypha/apply/stream_forms/blocks.py:526 hypha/apply/utils/blocks.py:74
 #: hypha/apply/utils/blocks.py:75
 msgid "Fields"
 msgstr ""
 
 #: hypha/apply/determinations/blocks.py:78 hypha/apply/review/blocks.py:174
-#: hypha/apply/stream_forms/blocks.py:473
+#: hypha/apply/stream_forms/blocks.py:511
 msgid "Paragraph"
 msgstr ""
 
@@ -2169,7 +2391,7 @@ msgid "Do you recommend requesting a proposal based on this concept note?"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:305
-#: hypha/apply/determinations/views.py:99
+#: hypha/apply/determinations/views.py:100
 msgid "-- No determination selected -- "
 msgstr ""
 
@@ -2250,22 +2472,22 @@ msgid "Rationale and appropriateness questions and comments"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:592
-#: hypha/apply/determinations/views.py:389
+#: hypha/apply/determinations/views.py:394
 msgid "-- No proposal form selected -- "
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:595
-#: hypha/apply/determinations/views.py:392
+#: hypha/apply/determinations/views.py:397
 msgid "Select the proposal form only for determination approval"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:599
-#: hypha/apply/determinations/views.py:396
+#: hypha/apply/determinations/views.py:401
 msgid "Select the proposal form to use for proposal stage."
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:602
-#: hypha/apply/determinations/views.py:399
+#: hypha/apply/determinations/views.py:404
 msgid "Proposal Form"
 msgstr ""
 
@@ -2319,11 +2541,12 @@ msgstr ""
 #: hypha/apply/determinations/models.py:214
 #: hypha/apply/determinations/models.py:218
 #: hypha/apply/determinations/options.py:10
-#: hypha/apply/funds/workflows/constants.py:93
+#: hypha/apply/funds/workflows/constants.py:97
 #: hypha/apply/funds/workflows/definitions/double_stage.py:147
 #: hypha/apply/funds/workflows/definitions/double_stage.py:326
 #: hypha/apply/funds/workflows/definitions/single_stage.py:149
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:214
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:198
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:138
 msgid "Dismissed"
@@ -2336,7 +2559,7 @@ msgid "Needs more info"
 msgstr ""
 
 #: hypha/apply/determinations/models.py:255
-#: hypha/apply/funds/workflows/registry.py:66
+#: hypha/apply/funds/workflows/registry.py:67
 msgid "Request"
 msgstr ""
 
@@ -2399,9 +2622,9 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:85
 #: hypha/apply/funds/templates/funds/application_base.html:125
 #: hypha/apply/funds/templates/funds/applicationsubmission_form.html:49
-#: hypha/apply/funds/views/submission_edit.py:129
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:320
+#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:319
 #: hypha/apply/projects/reports/templates/reports/report_form.html:69
 #: hypha/apply/projects/templates/application_projects/project_approval_form.html:52
 #: hypha/apply/projects/templates/application_projects/project_sow_form.html:48
@@ -2411,7 +2634,7 @@ msgid "Save draft"
 msgstr ""
 
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:108
-#: hypha/apply/funds/templates/funds/comments.html:108
+#: hypha/apply/funds/templates/funds/comments.html:96
 #: hypha/apply/review/templates/review/review_form.html:107
 #: hypha/templates/cotton/dropdown_menu.html:99
 msgid "Loading…"
@@ -2461,8 +2684,8 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:34
 #: hypha/apply/funds/templates/funds/application_preview.html:66
 #: hypha/apply/funds/templates/funds/submission-success.html:65
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:88
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:96
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:95
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:74
 msgid "Continue editing"
 msgstr ""
 
@@ -2489,44 +2712,44 @@ msgstr ""
 msgid "Add determination"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:120
+#: hypha/apply/determinations/views.py:121
 msgid "Improperly configured request, please try again."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:213
+#: hypha/apply/determinations/views.py:214
 #, python-brace-format
 msgid "Successfully determined as {outcome}: "
 msgstr ""
 
-#: hypha/apply/determinations/views.py:234
+#: hypha/apply/determinations/views.py:235
 #, python-brace-format
 msgid "Unable to determine submission \"{title}\" as already determined"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:286
+#: hypha/apply/determinations/views.py:291
 msgid "You do not have permission to create that determination."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:291
+#: hypha/apply/determinations/views.py:296
 msgid "A final determination has already been submitted."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:304
+#: hypha/apply/determinations/views.py:309
 msgid "There is a draft determination you do not have permission to edit."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:460
+#: hypha/apply/determinations/views.py:469
 msgid "A project was automatically created."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:504
+#: hypha/apply/determinations/views.py:513
 #, python-brace-format
 msgid ""
 "A determination of \"{current}\" exists but you tried to progress as "
 "\"{target}\""
 msgstr ""
 
-#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:554
+#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:626
 #: hypha/apply/users/roles.py:6
 msgid "Staff"
 msgstr ""
@@ -2581,10 +2804,11 @@ msgstr ""
 msgid "Sealed Rounds"
 msgstr ""
 
-#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:40
-#: hypha/apply/funds/tables.py:223 hypha/apply/funds/tables.py:314
-#: hypha/apply/funds/tables.py:437 hypha/apply/funds/tables.py:474
-#: hypha/apply/projects/filters.py:35 hypha/apply/projects/filters.py:51
+#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:41
+#: hypha/apply/funds/tables.py:237 hypha/apply/funds/tables.py:325
+#: hypha/apply/funds/tables.py:372 hypha/apply/funds/tables.py:501
+#: hypha/apply/funds/tables.py:538 hypha/apply/projects/filters.py:39
+#: hypha/apply/projects/filters.py:55
 msgid "Funds"
 msgstr ""
 
@@ -2593,7 +2817,7 @@ msgid "Request For Partners"
 msgstr ""
 
 #: hypha/apply/funds/admin.py:118 hypha/apply/funds/admin_helpers.py:73
-#: hypha/apply/funds/models/__init__.py:74
+#: hypha/apply/funds/models/__init__.py:75
 msgid "Labs"
 msgstr ""
 
@@ -2644,8 +2868,8 @@ msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:47
 #: hypha/apply/funds/templates/funds/application_base.html:135
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:321
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:320
 msgid "Preview"
 msgstr ""
 
@@ -2670,7 +2894,7 @@ msgstr ""
 msgid "state"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:413
+#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:477
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:22
 #: hypha/apply/funds/templates/funds/includes/round-block.html:12
 #: hypha/apply/funds/templates/funds/includes/round-block.html:20
@@ -2679,7 +2903,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:414
+#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:478
 #: hypha/apply/funds/templates/funds/includes/round-block.html:30
 #: hypha/apply/funds/templates/funds/includes/round-block.html:37
 #: hypha/apply/funds/templates/funds/includes/round-block.html:39
@@ -2688,12 +2912,12 @@ msgid "Closed"
 msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:92
-#: hypha/apply/projects/models/project.py:220
-#: hypha/apply/projects/models/project.py:226
+#: hypha/apply/projects/models/project.py:221
+#: hypha/apply/projects/models/project.py:227
 msgid "Not started"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:416
+#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:480
 msgid "Unpublished"
 msgstr ""
 
@@ -2706,138 +2930,144 @@ msgstr ""
 msgid "Copy {form_name}"
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:79
+#: hypha/apply/funds/admin_views.py:68
+msgid ""
+"Please select the date in the copied page. Newly copied pages have NONE "
+"value for the start and end date"
+msgstr ""
+
+#: hypha/apply/funds/admin_views.py:77
 #, python-brace-format
 msgid "Page '{0}' and {1} subpages copied."
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:85
+#: hypha/apply/funds/admin_views.py:83
 #, python-brace-format
 msgid "Page '{0}' copied."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:94
+#: hypha/apply/funds/blocks.py:111
 msgid "The title of the project"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:96
+#: hypha/apply/funds/blocks.py:113
 msgid "What is the title of your application?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:101
+#: hypha/apply/funds/blocks.py:118
 msgid "This project name can be changed if a full proposal is requested."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:103
+#: hypha/apply/funds/blocks.py:120
 msgid "Max length"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:106
+#: hypha/apply/funds/blocks.py:123
 msgid "Application title"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:134
 msgid "The value of the project"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:126
+#: hypha/apply/funds/blocks.py:143
 msgid "Requested amount"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:142
+#: hypha/apply/funds/blocks.py:159
 msgid "The name of the organization"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:146
+#: hypha/apply/funds/blocks.py:163
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:73
 #: hypha/apply/projects/reports/tables.py:24
 msgid "Organization name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:151
+#: hypha/apply/funds/blocks.py:168
 msgid "The applicant email address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:153
+#: hypha/apply/funds/blocks.py:170
 msgid "What email address should we use to contact you?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:159
+#: hypha/apply/funds/blocks.py:176
 msgid ""
 "We will use this email address to communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:172
+#: hypha/apply/funds/blocks.py:189
 msgid "The postal address of the user"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:177
+#: hypha/apply/funds/blocks.py:194
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:66
 #: hypha/apply/funds/templates/funds/revisions_compare.html:57
 #: hypha/apply/funds/templates/funds/revisions_compare.html:58
 msgid "Address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:198 hypha/apply/funds/blocks.py:215
+#: hypha/apply/funds/blocks.py:215 hypha/apply/funds/blocks.py:232
 msgid "Full name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:199
+#: hypha/apply/funds/blocks.py:216
 msgid "What is your name?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:204
+#: hypha/apply/funds/blocks.py:221
 msgid "We will use this name when we communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:221
+#: hypha/apply/funds/blocks.py:238
 msgid "Duration"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:227
+#: hypha/apply/funds/blocks.py:244
 msgid "Days"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:228 hypha/apply/projects/reports/models.py:244
+#: hypha/apply/funds/blocks.py:245 hypha/apply/projects/reports/models.py:249
 msgid "Weeks"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:229 hypha/apply/projects/reports/models.py:245
+#: hypha/apply/funds/blocks.py:246 hypha/apply/projects/reports/models.py:250
 msgid "Months"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:232
+#: hypha/apply/funds/blocks.py:249
 #, python-brace-format
 msgid "{} day"
 msgid_plural "{} days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:235
+#: hypha/apply/funds/blocks.py:252
 #, python-brace-format
 msgid "{} week"
 msgid_plural "{} weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:238
+#: hypha/apply/funds/blocks.py:255
 #, python-brace-format
 msgid "{} month"
 msgid_plural "{} months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:244
+#: hypha/apply/funds/blocks.py:261
 msgid ""
 "Duration type is used to display duration choices in Days, Weeks or Months "
 "in application forms. Be careful, changing the duration type in the active "
 "round can result in data inconsistency."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:275 hypha/apply/stream_forms/blocks.py:473
-#: hypha/apply/stream_forms/blocks.py:474
-#: hypha/apply/stream_forms/blocks.py:489
-#: hypha/apply/stream_forms/blocks.py:490 hypha/apply/utils/blocks.py:85
+#: hypha/apply/funds/blocks.py:319 hypha/apply/stream_forms/blocks.py:511
+#: hypha/apply/stream_forms/blocks.py:512
+#: hypha/apply/stream_forms/blocks.py:527
+#: hypha/apply/stream_forms/blocks.py:528 hypha/apply/utils/blocks.py:85
 msgid "Custom"
 msgstr ""
 
@@ -2845,7 +3075,7 @@ msgstr ""
 msgid "Take action"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:448
+#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:458
 #, python-brace-format
 msgid "Update lead from {lead} to"
 msgstr ""
@@ -2877,65 +3107,66 @@ msgstr ""
 msgid "{role_name} Reviewer"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:376
+#: hypha/apply/funds/forms.py:393
 msgid "Tags are hierarchical in nature."
 msgstr ""
 
-#: hypha/apply/funds/forms.py:425 hypha/apply/stream_forms/blocks.py:118
+#: hypha/apply/funds/forms.py:442 hypha/apply/stream_forms/blocks.py:156
 msgid "Email"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:427 hypha/apply/funds/forms.py:460
+#: hypha/apply/funds/forms.py:444 hypha/apply/funds/forms.py:477
 msgid "Role"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:433 hypha/apply/funds/forms.py:466
+#: hypha/apply/funds/forms.py:450 hypha/apply/funds/forms.py:483
 msgid "Project permissions"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:435 hypha/apply/funds/forms.py:468
+#: hypha/apply/funds/forms.py:452 hypha/apply/funds/forms.py:485
 msgid ""
 "Enable same access level to these sections. Example: View role + Contracting "
 "= read-only contracting access."
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:39 hypha/apply/funds/tables.py:75
+#: hypha/apply/funds/models/__init__.py:40 hypha/apply/funds/tables.py:76
 #: hypha/apply/funds/templates/submissions/all.html:410
-#: hypha/apply/projects/tables.py:185 hypha/apply/projects/tables.py:262
+#: hypha/apply/projects/tables.py:203 hypha/apply/projects/tables.py:284
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
 msgid "Fund"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:47
+#: hypha/apply/funds/models/__init__.py:48
 msgid "RFP"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:48
+#: hypha/apply/funds/models/__init__.py:49
 msgid "RFPs"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:55
+#: hypha/apply/funds/models/__init__.py:56
 #: hypha/apply/funds/templates/cotton/submission_list.html:31
 #: hypha/apply/funds/templates/submissions/all.html:414
 msgid "Round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:56 hypha/apply/funds/tables.py:225
-#: hypha/apply/funds/tables.py:312 hypha/apply/funds/tables.py:479
+#: hypha/apply/funds/models/__init__.py:57 hypha/apply/funds/tables.py:239
+#: hypha/apply/funds/tables.py:327 hypha/apply/funds/tables.py:370
+#: hypha/apply/funds/tables.py:543
 #: hypha/apply/funds/templates/funds/rounds.html:5
 #: hypha/apply/funds/templates/funds/rounds.html:10
 msgid "Rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:63
+#: hypha/apply/funds/models/__init__.py:64
 msgid "Sealed round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:64
+#: hypha/apply/funds/models/__init__.py:65
 msgid "Sealed rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:73
+#: hypha/apply/funds/models/__init__.py:74
 msgid "Lab"
 msgstr ""
 
@@ -3139,76 +3370,77 @@ msgstr ""
 msgid "assigned reviewers"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:14
+#: hypha/apply/funds/models/co_applicants.py:15
 msgid "Project Document"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:15
+#: hypha/apply/funds/models/co_applicants.py:16
 msgid "Contracting Document"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:17
+#: hypha/apply/funds/models/co_applicants.py:18
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:10
 #: hypha/apply/projects/reports/templates/reports/report_list.html:6
 #: hypha/core/navigation.py:114
 msgid "Reports"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:21
+#: hypha/apply/funds/models/co_applicants.py:22
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:22
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:53
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
 msgid "Pending"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:22
-#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/workflows/constants.py:93
 #: hypha/apply/funds/workflows/definitions/double_stage.py:311
 #: hypha/apply/funds/workflows/definitions/single_stage.py:134
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:197
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:182
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:123
 msgid "Accepted"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/models/co_applicants.py:24
 msgid "Rejected"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:24
+#: hypha/apply/funds/models/co_applicants.py:25
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:14
 msgid "Expired"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:33
+#: hypha/apply/funds/models/co_applicants.py:34
 msgid "invited user email"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:42
-#: hypha/apply/funds/models/submissions.py:487
-#: hypha/apply/projects/models/payment.py:137
-#: hypha/apply/projects/models/project.py:262
+#: hypha/apply/funds/models/co_applicants.py:43
+#: hypha/apply/funds/models/submissions.py:495
+#: hypha/apply/projects/models/invoice.py:160
+#: hypha/apply/projects/models/project.py:267
 msgid "status"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:48
-#: hypha/apply/funds/models/co_applicants.py:77
+#: hypha/apply/funds/models/co_applicants.py:49
+#: hypha/apply/funds/models/co_applicants.py:83
 msgid "role"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:57
+#: hypha/apply/funds/models/co_applicants.py:58
 msgid "co-applicant invite"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:58
+#: hypha/apply/funds/models/co_applicants.py:59
 msgid "co-applicant invites"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:84
+#: hypha/apply/funds/models/co_applicants.py:90
 msgid "co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:85
+#: hypha/apply/funds/models/co_applicants.py:91
 msgid "co-applicants"
 msgstr ""
 
@@ -3483,19 +3715,20 @@ msgstr ""
 msgid "screening decisions"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:439
+#: hypha/apply/funds/models/submissions.py:447
 msgid "summary"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:502
+#: hypha/apply/funds/models/submissions.py:510
+#: hypha/apply/funds/models/submissions.py:1119
 msgid "submit time"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:531
+#: hypha/apply/funds/models/submissions.py:539
 msgid "application submission"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:532
+#: hypha/apply/funds/models/submissions.py:540
 msgid "application submissions"
 msgstr ""
 
@@ -3541,14 +3774,17 @@ msgid "Confirmation email"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:211
+#: hypha/apply/projects/models/invoice.py:21
 msgid "Failed"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:212
+#: hypha/apply/projects/models/invoice.py:22
 msgid "Success"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:213
+#: hypha/apply/projects/models/invoice.py:23
 msgid "In Progress"
 msgstr ""
 
@@ -3560,8 +3796,8 @@ msgstr ""
 msgid "submission export managers"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:24 hypha/apply/funds/permissions.py:34
-#: hypha/apply/funds/permissions.py:208 hypha/apply/projects/permissions.py:44
+#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
+#: hypha/apply/funds/permissions.py:212 hypha/apply/projects/permissions.py:44
 #: hypha/apply/projects/permissions.py:57
 #: hypha/apply/projects/permissions.py:124
 #: hypha/apply/projects/permissions.py:179
@@ -3569,38 +3805,40 @@ msgstr ""
 #: hypha/apply/projects/permissions.py:261
 #: hypha/apply/projects/permissions.py:327
 #: hypha/apply/projects/permissions.py:346
+#: hypha/apply/projects/permissions.py:423
+#: hypha/apply/projects/permissions.py:441
 msgid "Login Required"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
-#: hypha/apply/funds/permissions.py:211
+#: hypha/apply/funds/permissions.py:30 hypha/apply/funds/permissions.py:40
+#: hypha/apply/funds/permissions.py:215
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:25
 #: hypha/apply/funds/templates/funds/includes/submission-table-row.html:26
 msgid "Archived Submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:43
+#: hypha/apply/funds/permissions.py:46
 msgid "Co-applicant with edit role can edit submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:44
+#: hypha/apply/funds/permissions.py:47
 msgid "Co-applicant does not have edit role"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:45
+#: hypha/apply/funds/permissions.py:48
 msgid "User can edit in current phase"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:155
+#: hypha/apply/funds/permissions.py:159
 msgid "Staff is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:157
+#: hypha/apply/funds/permissions.py:161
 msgid "Staff Admin is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:158 hypha/apply/funds/permissions.py:255
-#: hypha/apply/funds/permissions.py:263 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:162 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:289 hypha/apply/funds/permissions.py:305
 #: hypha/apply/projects/permissions.py:49
 #: hypha/apply/projects/permissions.py:77
 #: hypha/apply/projects/permissions.py:85
@@ -3621,172 +3859,178 @@ msgstr ""
 msgid "Forbidden Error"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:231
+#: hypha/apply/funds/permissions.py:259
 msgid "No access to view submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:233
+#: hypha/apply/funds/permissions.py:261
 msgid "Applicant cannot view submission screening"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:239
+#: hypha/apply/funds/permissions.py:267
 msgid "Co-applicant can't be added to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:245
+#: hypha/apply/funds/permissions.py:271
 msgid "Co-applicants can't be invited to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:250
+#: hypha/apply/funds/permissions.py:276
 msgid "Limit reached for this submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:252
+#: hypha/apply/funds/permissions.py:278
 msgid "Applicants can invite co-applicants to their application"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:254
+#: hypha/apply/funds/permissions.py:280
 msgid "Staff can invite co-applicant on behalf of applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:260
+#: hypha/apply/funds/permissions.py:286
 msgid "Submission user can access their submission's co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:262
+#: hypha/apply/funds/permissions.py:288
 msgid "Staff can access each submissions' co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:268
+#: hypha/apply/funds/permissions.py:294
 msgid "Co-applicant can't be updated to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:274
+#: hypha/apply/funds/permissions.py:298
 msgid "Co-applicants can't be updated to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:276
+#: hypha/apply/funds/permissions.py:300
 msgid "Same user who invited can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:278
+#: hypha/apply/funds/permissions.py:302
 msgid "Submission owner can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:280
+#: hypha/apply/funds/permissions.py:304
 msgid "Staff can delete any co-applicant of any submission"
 msgstr ""
 
-#: hypha/apply/funds/services.py:45
+#: hypha/apply/funds/services.py:47
 #, python-brace-format
 msgid "{count} submissions archived."
 msgstr ""
 
-#: hypha/apply/funds/services.py:78
+#: hypha/apply/funds/services.py:80
 #, python-brace-format
 msgid "{count} submissions deleted."
 msgstr ""
 
-#: hypha/apply/funds/services.py:108
+#: hypha/apply/funds/services.py:150
+#, python-brace-format
+msgid "{sub_number} submission anonymized"
+msgid_plural "{sub_number} submissions anonymized"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/funds/services.py:175
 #, python-brace-format
 msgid "Lead set to {lead} on "
 msgstr ""
 
-#: hypha/apply/funds/services.py:158
+#: hypha/apply/funds/services.py:225
 #, python-brace-format
 msgid "{user} as {name}"
 msgstr ""
 
-#: hypha/apply/funds/services.py:166
+#: hypha/apply/funds/services.py:233
 #, python-brace-format
 msgid "Batch reviewers updated: {reviewers_text} on "
 msgstr ""
 
-#: hypha/apply/funds/tables.py:70
+#: hypha/apply/funds/tables.py:71
 #: hypha/apply/funds/templates/cotton/submission_list.html:22
 #: hypha/apply/funds/templates/submissions/all.html:344
 #: hypha/apply/funds/templates/submissions/all.html:470
-#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
-#: hypha/apply/projects/forms/payment.py:208
+#: hypha/apply/projects/filters.py:43 hypha/apply/projects/filters.py:64
+#: hypha/apply/projects/forms/invoice.py:210
 #: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:183
-#: hypha/apply/projects/tables.py:260
+#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:200
+#: hypha/apply/projects/tables.py:282
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:58
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:6
 #: hypha/apply/users/admin_views.py:55 hypha/apply/users/admin_views.py:128
 msgid "Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:74
+#: hypha/apply/funds/tables.py:75
 msgid "Type"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:78
+#: hypha/apply/funds/tables.py:79
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "Last updated"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:100
+#: hypha/apply/funds/tables.py:101
 msgid "No submissions available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:210
+#: hypha/apply/funds/tables.py:224
 msgid "Statuses"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:226 hypha/apply/funds/tables.py:438
+#: hypha/apply/funds/tables.py:240 hypha/apply/funds/tables.py:502
 msgid "Leads"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 #: hypha/apply/funds/templates/submissions/all.html:382
 msgid "Screening"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 msgid "No Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:345
+#: hypha/apply/funds/tables.py:403
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:46
 msgid "Determined"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:346
+#: hypha/apply/funds/tables.py:404
 msgid "Start"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:347
+#: hypha/apply/funds/tables.py:405
 msgid "End"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/funds/tables.py:439
+#: hypha/apply/funds/tables.py:456 hypha/apply/funds/tables.py:503
 #: hypha/apply/users/admin_views.py:125
 msgid "Active"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/users/admin_views.py:125
+#: hypha/apply/funds/tables.py:456 hypha/apply/users/admin_views.py:125
 msgid "Inactive"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:415
+#: hypha/apply/funds/tables.py:479
 msgid "Not Started"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:440
+#: hypha/apply/funds/tables.py:504
 msgid "State"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:516 hypha/apply/funds/tables.py:547
+#: hypha/apply/funds/tables.py:580 hypha/apply/funds/tables.py:619
 msgid "No reviews available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:525
+#: hypha/apply/funds/tables.py:597
 msgid "Submission"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:564
+#: hypha/apply/funds/tables.py:636
 msgid "No staff available"
 msgstr ""
 
@@ -3795,13 +4039,13 @@ msgid "Organization"
 msgstr ""
 
 #: hypha/apply/funds/templates/cotton/submission_list.html:35
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:87
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
 #: hypha/apply/funds/templates/funds/submission_sealed.html:14
 #: hypha/apply/funds/templates/submissions/all.html:431
 #: hypha/apply/funds/templates/submissions/all.html:474
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:10
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:14
-#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
+#: hypha/apply/projects/filters.py:45 hypha/apply/projects/filters.py:58
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:46
 #: hypha/apply/projects/templates/application_projects/project_sow_detail.html:10
 msgid "Lead"
@@ -3872,7 +4116,7 @@ msgid "(selected)"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/application_base.html:105
-#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:127
 msgid "Preview and submit"
 msgstr ""
 
@@ -3930,7 +4174,6 @@ msgid "Reviews & assignees"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html:50
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:66
 msgid "View all"
 msgstr ""
 
@@ -3942,6 +4185,17 @@ msgstr ""
 msgid "Create new reminder"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:3
+msgid "Anonymize application"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:5
+msgid ""
+"Are you sure you want to anonymize this application? Personal data will be "
+"removed and the application will only be accessible via statistics in the "
+"Results view. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:3
 msgid "Delete application"
 msgstr ""
@@ -3953,78 +4207,69 @@ msgid ""
 "action cannot be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:22
-#: hypha/apply/funds/templates/funds/comments.html:18
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:18
+#: hypha/apply/funds/templates/funds/comments.html:14
 #: hypha/apply/projects/templates/application_projects/paf_export.html:76
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:107
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:109
 #: hypha/apply/projects/templates/application_projects/project_detail.html:17
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:15
 msgid "Application"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:32
-#: hypha/apply/funds/templates/funds/comments.html:28
-#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
-#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
-#: hypha/apply/projects/templates/application_projects/project_detail.html:24
-msgid "Project"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:50
-#: hypha/apply/funds/templates/funds/comments.html:46
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:38
+#: hypha/apply/funds/templates/funds/comments.html:34
 msgid "View message log"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:61
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:49
 msgid "Congratulations!"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:63
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:51
 #, python-format
 msgid "Your %(stage)s application has been accepted."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:68
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:56
 #, python-format
 msgid "Start your %(stage)s application."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:77
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:65
 msgid "This application has been archived. This is visible to accounts with "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:85
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:73
 msgid "This application is sealed."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Drafted "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:22
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Submitted "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:100
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:88
 #: hypha/apply/funds/templates/submissions/all.html:336
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:34
 msgid "Updated"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:129
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:117
 msgid "Delete Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:195
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:183
 msgid "Related submissions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:203
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:214
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:191
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:202
 msgid "View linked"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:223
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:211
 msgid "Other Submissions"
 msgstr ""
 
@@ -4083,6 +4328,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:154
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:204
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:94
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:140
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:171
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:189
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:127
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:160
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:177
@@ -4106,95 +4355,104 @@ msgstr ""
 msgid "Comments: %(title)s"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/comments.html:57
+#: hypha/apply/funds/templates/funds/comments.html:45
 msgid "Add communication"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/comments.html:80
-#: hypha/apply/funds/templates/funds/comments.html:94
-msgid "Add Comment"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:4
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:5
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:6
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:88
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:66
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:4
 #: hypha/apply/projects/templates/application_projects/project_admin_detail.html:10
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:128
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:35
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:131
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:41
 msgid "Actions to take"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:15
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:16
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:12
 msgid "Unarchive Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:26
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:28
+msgid "Add another project"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:30
 #: hypha/apply/funds/templates/funds/modals/create_project_form.html:2
 msgid "Create project"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:32
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
 msgid "Complete draft determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:42
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:9
 msgid "Complete draft review"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:45
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:50
 msgid "Assign reviewers"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:60
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:19
 msgid "View determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:68
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
 #: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:34
-#: hypha/apply/projects/views/payment.py:138
+#: hypha/apply/projects/views/invoice.py:147
 msgid "Update status"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:78
 msgid "Assign"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:97
 msgid "More actions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:101
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:106
 #: hypha/apply/funds/templates/funds/revisions_compare.html:88
 msgid "Revisions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:111
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:116
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:69
 msgid "Translate"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:130
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:135
 #: hypha/apply/funds/views/reminders.py:69
 msgid "Create Reminder"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:138
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:178
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:53
-msgid "Download as PDF"
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:140
+msgid "Change Author"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:181
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:59
+msgid "Download as PDF"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:158
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:30
-#: hypha/apply/funds/templates/submissions/all.html:490
+#: hypha/apply/funds/templates/submissions/all.html:491
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:32
 msgid "Archive"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:172
+#: hypha/apply/funds/templates/submissions/all.html:515
+msgid "Anonymize"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:8
 msgid "Co-applicants"
 msgstr ""
@@ -4210,8 +4468,8 @@ msgid "Not allowed"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:25
-#: hypha/apply/funds/views/co_applicants.py:58
-#: hypha/apply/funds/views/co_applicants.py:102
+#: hypha/apply/funds/views/co_applicants.py:57
+#: hypha/apply/funds/views/co_applicants.py:101
 msgid "Invite"
 msgstr ""
 
@@ -4237,7 +4495,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:16
 msgid ""
 "Are you sure you want to archive submission? Archived submissions will be "
-"hidden from the main list of submissions and can not be edited."
+"hidden from the main list of submissions and can not be edited. Submissions "
+"can be unarchived at any time."
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:16
@@ -4255,6 +4514,21 @@ msgstr ""
 msgid "You have no %(type)s rounds or labs assigned to you."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:18
+#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
+#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
+msgid "Project"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:30
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:18
+#, python-format
+msgctxt "project tab"
+msgid "Project"
+msgid_plural "Projects (%(counter)s)"
+msgstr[0] ""
+msgstr[1] ""
+
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:34
 msgid "No reminders yet."
 msgstr ""
@@ -4291,6 +4565,10 @@ msgstr ""
 msgid "Legal Name"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:54
+msgid "Edit user account"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:61
 #: hypha/apply/funds/templates/funds/revisions_compare.html:52
 #: hypha/apply/funds/templates/funds/revisions_compare.html:53
@@ -4321,7 +4599,7 @@ msgid ""
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:69
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:49
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:55
 msgid "Export"
 msgstr ""
 
@@ -4397,7 +4675,7 @@ msgid "selected"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:43
-#: hypha/templates/base.html:159
+#: hypha/templates/base.html:160
 msgid "Search..."
 msgstr ""
 
@@ -4405,17 +4683,17 @@ msgstr ""
 msgid "Search input"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:60
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:73
 #: hypha/apply/funds/templates/submissions/all.html:202
 msgid "Clear current filters & sorts"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:108
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:121
 #: hypha/templates/cotton/pagination.html:12
 msgid "Previous"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:109
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:122
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:6
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:10
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:47
@@ -4428,9 +4706,8 @@ msgid "Translate application"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:38
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:10
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:26
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 #: hypha/apply/projects/templates/application_projects/filters/widgets/date_range_input_widget.html:5
 msgid "to"
@@ -4451,22 +4728,25 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:20
 #: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:51
-#: hypha/apply/funds/views/submission_edit.py:535
-#: hypha/apply/funds/views/submission_edit.py:566
-#: hypha/apply/funds/views/submission_edit.py:595
-#: hypha/apply/funds/views/submission_edit.py:639
-#: hypha/apply/funds/views/submission_edit.py:669
-#: hypha/apply/funds/views/submission_edit.py:695
-#: hypha/apply/funds/views/translate.py:60
-#: hypha/apply/funds/views/translate.py:95
+#: hypha/apply/funds/views/submission_edit.py:536
+#: hypha/apply/funds/views/submission_edit.py:567
+#: hypha/apply/funds/views/submission_edit.py:596
+#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:670
+#: hypha/apply/funds/views/submission_edit.py:696
+#: hypha/apply/funds/views/submission_edit.py:726
+#: hypha/apply/funds/views/submission_edit.py:752
+#: hypha/apply/funds/views/translate.py:58
+#: hypha/apply/funds/views/translate.py:93
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:28
-#: hypha/apply/projects/views/payment.py:354
-#: hypha/apply/projects/views/project.py:423
-#: hypha/apply/projects/views/project.py:462
-#: hypha/apply/projects/views/project.py:506
-#: hypha/apply/projects/views/project.py:542
-#: hypha/apply/projects/views/project.py:1289
-#: hypha/apply/projects/views/project.py:1328
+#: hypha/apply/projects/views/invoice.py:359
+#: hypha/apply/projects/views/project.py:427
+#: hypha/apply/projects/views/project.py:466
+#: hypha/apply/projects/views/project.py:510
+#: hypha/apply/projects/views/project.py:546
+#: hypha/apply/projects/views/project.py:588
+#: hypha/apply/projects/views/project.py:1340
+#: hypha/apply/projects/views/project.py:1379
 msgid "Update"
 msgstr ""
 
@@ -4540,10 +4820,10 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:15
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:20
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:25
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:46
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:137
-#: hypha/apply/projects/views/project.py:1043
-#: hypha/apply/projects/views/project.py:1260
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:47
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
+#: hypha/apply/projects/views/project.py:1094
+#: hypha/apply/projects/views/project.py:1311
 msgid "Update Status"
 msgstr ""
 
@@ -4553,6 +4833,14 @@ msgstr ""
 msgid "Current status"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:2
+msgid "Update Author"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:6
+msgid "Current Author"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/modals/update_lead_form.html:2
 #: hypha/apply/projects/templates/application_projects/modals/lead_update.html:2
 msgid "Update Lead"
@@ -4566,6 +4854,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html:2
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:12
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:13
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:2
 msgid "Update tags"
 msgstr ""
 
@@ -4615,7 +4904,7 @@ msgid "Reviews by %(object)s"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:3
-#: hypha/apply/review/views.py:473
+#: hypha/apply/review/views.py:482
 msgid "Compare"
 msgstr ""
 
@@ -4704,11 +4993,11 @@ msgstr ""
 
 #: hypha/apply/funds/templates/funds/submission-success.html:77
 #: hypha/apply/users/templates/users/activation/confirm.html:43
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
 #: hypha/apply/users/templates/users/login.html:4
 #: hypha/apply/users/templates/users/login.html:86
 #: hypha/apply/users/templates/users/password_reset/complete.html:14
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:5
-#: hypha/templates/includes/user_menu.html:101
 msgid "Log in"
 msgstr ""
 
@@ -4767,6 +5056,13 @@ msgid ""
 "amount fields or data and are not included."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/submissions_result.html:53
+#, python-format
+msgid ""
+"%(count)s anonymized submission(s) are excluded because the active filter "
+"does not apply to anonymized data."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/tables/table.html:24
 #: hypha/apply/projects/templates/application_projects/tables/table.html:18
 msgid "Show"
@@ -4940,30 +5236,56 @@ msgstr ""
 msgid "Assign Reviewer(s)"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:486
-msgid "Are you sure you want to archive the selected submissions?"
+#: hypha/apply/funds/templates/submissions/all.html:538
+msgid "No results matched your search"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "Try"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "clearing"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "the current query and try again"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:4
+msgid "Anonymize applications"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:498
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:9
+#, python-format
 msgid ""
-"Are you sure you want to delete the selected submissions? This action cannot "
+"Are you sure you want to anonymize %(count)s submission(s)? Personal data "
+"will be removed and applications will only be accessible via statistics in "
+"the Results view. All draft submissions will be deleted. This action cannot "
 "be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:524
-msgid "No results matched your search"
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:11
+msgid "Archive submissions"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "Try"
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:14
+#, python-format
+msgid ""
+"Are you sure you want to archive %(count)s submission(s)? Archived "
+"submissions will be hidden from the main list and cannot be edited. "
+"Submissions can be unarchived at any time."
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "clearing"
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:4
+msgid "Delete applications"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "the current query and try again"
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:8
+#, python-format
+msgid ""
+"Are you sure you want to permanently delete %(count)s submission(s)? All "
+"data will be permanently removed. This action cannot be undone."
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:9
@@ -4971,6 +5293,7 @@ msgid "Submissions: Export as CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:11
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:11
 msgid "Export as CSV"
 msgstr ""
 
@@ -4987,6 +5310,8 @@ msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:23
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:24
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:23
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:24
 msgid "Generating downloadable CSV..."
 msgstr ""
 
@@ -4995,6 +5320,7 @@ msgid "Submissions: Download generated CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:42
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:42
 msgid "Download generated CSV"
 msgstr ""
 
@@ -5003,10 +5329,12 @@ msgid "Submissions: Generate downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:64
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:64
 msgid "Generation failed, click to retry generating downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:66
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:66
 msgid "Generate downloadable CSV"
 msgstr ""
 
@@ -5015,6 +5343,7 @@ msgid "Add tags"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:38
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 msgid "Add"
@@ -5168,12 +5497,12 @@ msgstr ""
 msgid "Filter by {label}"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:123
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
 msgid "Application #"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
-#: hypha/apply/stream_forms/blocks.py:119
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:125
+#: hypha/apply/stream_forms/blocks.py:157
 msgid "URL"
 msgstr ""
 
@@ -5186,84 +5515,86 @@ msgstr ""
 msgid "No screening"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:251
+#: hypha/apply/funds/views/all.py:244
 msgid "Newest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:252
+#: hypha/apply/funds/views/all.py:245
 msgid "Oldest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:253
+#: hypha/apply/funds/views/all.py:246
 msgid "Most Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:254
+#: hypha/apply/funds/views/all.py:247
 msgid "Least Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:255
+#: hypha/apply/funds/views/all.py:248
 msgid "Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:256
+#: hypha/apply/funds/views/all.py:249
 msgid "Least Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:257
+#: hypha/apply/funds/views/all.py:250
 msgid "Best Match"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:304
+#: hypha/apply/funds/views/all.py:297 hypha/apply/projects/views/invoice.py:671
 msgid "Started CSV generation."
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:405
+#: hypha/apply/funds/views/all.py:469
 #, python-brace-format
 msgid ""
 "A determination already exists for the following submissions and they have "
 "been excluded: {submissions}"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:418
+#: hypha/apply/funds/views/all.py:482
 msgid "Submissions expect different forms - please contact admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:431
+#: hypha/apply/funds/views/all.py:495
 msgid "Inconsistent states provided - please talk to an admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:458
+#: hypha/apply/funds/views/all.py:522
 msgid "Failed to update: "
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:463
+#: hypha/apply/funds/views/all.py:527
 #, python-brace-format
 msgid "Successfully updated status to {status}: "
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:94
+#: hypha/apply/funds/views/co_applicants.py:93
 msgid "Co-applicant invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:234
+#: hypha/apply/funds/views/co_applicants.py:229
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:18
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:74
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:14
 #: hypha/apply/projects/templates/application_projects/project_form.html:29
-#: hypha/apply/projects/views/payment.py:285
-#: hypha/apply/projects/views/project.py:2040
+#: hypha/apply/projects/views/invoice.py:290
+#: hypha/apply/projects/views/project.py:2131
 #: hypha/apply/users/templates/users/account.html:54
 msgid "Save"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:254
+#: hypha/apply/funds/views/co_applicants.py:249
 msgid "Co-applicant updated"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:282
+#: hypha/apply/funds/views/co_applicants.py:277
 msgid "Co-applicant re-invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:304
+#: hypha/apply/funds/views/co_applicants.py:299
 msgid "Co-applicant deleted"
 msgstr ""
 
@@ -5279,38 +5610,47 @@ msgstr ""
 msgid "Reminder deleted"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_detail.py:311
+#: hypha/apply/funds/views/submission_delete.py:47
+msgid "Submission anonymized."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_detail.py:301
 msgid "Submission details"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:97
-#: hypha/apply/funds/views/submission_edit.py:276
+#: hypha/apply/funds/views/submission_edit.py:96
+#: hypha/apply/funds/views/submission_edit.py:275
 msgid "Draft saved"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:366
-#: hypha/apply/funds/views/submission_edit.py:392
+#: hypha/apply/funds/views/submission_edit.py:365
+#: hypha/apply/funds/views/submission_edit.py:391
 #: hypha/apply/funds/workflows/definitions/double_stage.py:133
 msgid "Progress"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:419
-#: hypha/apply/funds/views/submission_edit.py:461
-#: hypha/apply/projects/views/project.py:605
-#: hypha/apply/projects/views/project.py:664
+#: hypha/apply/funds/views/submission_edit.py:410
+msgid "This submission already has a project."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_edit.py:421
+#: hypha/apply/funds/views/submission_edit.py:463
+#: hypha/apply/projects/views/project.py:651
+#: hypha/apply/projects/views/project.py:710
 #: hypha/apply/review/templates/review/review_confirm_delete.html:23
 #: hypha/apply/users/templates/elevate/elevate.html:39
 #: hypha/apply/users/templates/two_factor/admin/disable.html:24
 #: hypha/apply/users/templates/two_factor/profile/disable.html:39
 #: hypha/apply/users/templates/users/partials/confirmation_code_sent.html:43
+#: hypha/templates/cotton/modal/confirm.html:43
 msgid "Confirm"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:558
+#: hypha/apply/funds/views/submission_edit.py:559
 msgid "Submission Lead updated."
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:687
+#: hypha/apply/funds/views/submission_edit.py:744
 msgid "Tags updated successfully."
 msgstr ""
 
@@ -5318,56 +5658,86 @@ msgstr ""
 msgid "User attempted to translate submission but is not org faculty"
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:154
+#: hypha/apply/funds/views/translate.py:152
 #, python-brace-format
 msgid "Submission translated from {fl} to {tl}."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:167
+#: hypha/apply/funds/views/translate.py:165
 msgid "Submission translation failed. Contact your Administrator."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:174
+#: hypha/apply/funds/views/translate.py:172
 msgid "Translation cleared."
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:59
+#: hypha/apply/funds/workflows/constants.py:63
 msgid "Received"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:63
+#: hypha/apply/funds/workflows/constants.py:67
 #: hypha/apply/funds/workflows/definitions/double_stage.py:74
 #: hypha/apply/funds/workflows/definitions/double_stage.py:211
 #: hypha/apply/funds/workflows/definitions/single_stage.py:74
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:83
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:129
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:69
 msgid "Internal Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:67
+#: hypha/apply/funds/workflows/constants.py:71
+#: hypha/apply/funds/workflows/definitions/double_stage.py:91
+#: hypha/apply/funds/workflows/definitions/double_stage.py:228
+#: hypha/apply/funds/workflows/definitions/double_stage.py:273
+#: hypha/apply/funds/workflows/definitions/single_stage.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:98
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
 msgid "Ready for Discussion"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:73
+#: hypha/apply/funds/workflows/constants.py:77
 msgid "More Information Requested"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:77
+#: hypha/apply/funds/workflows/constants.py:81
 #: hypha/apply/funds/workflows/definitions/double_stage.py:165
 msgid "Invited for Proposal"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:81
+#: hypha/apply/funds/workflows/constants.py:85
 #: hypha/apply/funds/workflows/definitions/double_stage.py:258
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:115
 msgid "External Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:85
+#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/workflows/definitions/single_stage.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage.py:58
+#: hypha/apply/funds/workflows/definitions/single_stage.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage.py:109
 #: hypha/apply/funds/workflows/definitions/single_stage.py:127
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:190
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:66
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:138
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:163
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:116
 msgid "Ready for Determination"
 msgstr ""
@@ -5382,6 +5752,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:35
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:107
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:150
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:33
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:90
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:137
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:34
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:80
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:123
@@ -5402,7 +5775,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:36
 #: hypha/apply/funds/workflows/definitions/double_stage.py:60
 #: hypha/apply/funds/workflows/definitions/double_stage.py:86
-msgid "Ready For Preliminary Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:122
+msgid "Ready for Preliminary Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:37
@@ -5436,6 +5810,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:155
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:188
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:67
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:96
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:173
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:190
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:37
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:84
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:128
@@ -5449,6 +5829,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:42
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:38
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:39
 msgid "Need screening"
@@ -5468,6 +5849,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:61
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:131
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:57
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:116
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:162
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:58
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:104
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:148
@@ -5483,6 +5867,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:79
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:92
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:139
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:78
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:66
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:112
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:66
@@ -5493,6 +5879,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage.py:72
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:80
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:68
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:67
 msgid "Need screening (revert)"
@@ -5515,18 +5902,6 @@ msgstr ""
 msgid "Open Review (revert)"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:91
-#: hypha/apply/funds/workflows/definitions/double_stage.py:228
-#: hypha/apply/funds/workflows/definitions/double_stage.py:273
-#: hypha/apply/funds/workflows/definitions/single_stage.py:92
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
-msgid "Ready For Discussion"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:118
 #: hypha/apply/funds/workflows/definitions/double_stage.py:256
 #: hypha/apply/funds/workflows/definitions/double_stage.py:299
@@ -5536,16 +5911,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:140
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:184
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:206
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:126
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:113
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:157
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:179
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:131
-msgid "Ready For Discussion (revert)"
-msgstr ""
-
-#: hypha/apply/funds/workflows/definitions/double_stage.py:122
-msgid "Ready for Preliminary Determination"
+msgid "Ready for Discussion (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:129
@@ -5562,6 +5935,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:223
 #: hypha/apply/funds/workflows/definitions/double_stage.py:245
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:108
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:65
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:81
 msgid "Open External Review"
 msgstr ""
@@ -5571,7 +5945,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:197
 #: hypha/apply/funds/workflows/definitions/double_stage.py:224
 #: hypha/apply/funds/workflows/definitions/double_stage.py:267
-msgid "Ready For Final Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:304
+msgid "Ready for Final Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:179
@@ -5585,12 +5960,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:225
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:110
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:139
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:83
 msgid "Open Internal Review (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:268
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:152
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:125
 msgid "Open External Review (revert)"
 msgstr ""
@@ -5610,10 +5987,6 @@ msgstr ""
 msgid "Accept but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:304
-msgid "Ready for Final Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:312
 msgid "Final Determination"
 msgstr ""
@@ -5626,23 +5999,9 @@ msgstr ""
 msgid "Accepted but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/single_stage.py:35
-#: hypha/apply/funds/workflows/definitions/single_stage.py:58
-#: hypha/apply/funds/workflows/definitions/single_stage.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
-msgid "Ready For Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/single_stage.py:41
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:43
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:40
 msgid "Application Received"
@@ -5650,6 +6009,7 @@ msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:135
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:198
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:183
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:171
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:124
 msgid "Application Outcome"
@@ -5664,24 +6024,63 @@ msgstr ""
 msgid "Community Review"
 msgstr ""
 
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:34
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:70
+msgid "Ready for Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:79
+msgid "Ready for Review (revert)"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:82
+msgid "Application Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:91
+msgid "Open Internal Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:95
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:141
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:172
+msgid "Waitlist"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:191
+msgid "Ready for Determination (revert)"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:193
+msgid "Waitlisted"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:199
+msgid "Not Accepted"
+msgstr ""
+
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:69
 #: hypha/apply/review/templates/review/review_detail.html:10
 msgid "Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:69
+#: hypha/apply/funds/workflows/registry.py:70
 msgid "Request with same time review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:75
+#: hypha/apply/funds/workflows/registry.py:76
 msgid "Request with external review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:81
+#: hypha/apply/funds/workflows/registry.py:82
 msgid "Request with community review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:87
+#: hypha/apply/funds/workflows/registry.py:88
+msgid "Request external then internal review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/registry.py:94
 msgid "Concept & Proposal"
 msgstr ""
 
@@ -5691,20 +6090,25 @@ msgid ""
 "usages and try again!"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:45
+#: hypha/apply/projects/admin.py:46
 msgid "Project Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:62
+#: hypha/apply/projects/admin.py:63
 msgid "SOW Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:79
+#: hypha/apply/projects/admin.py:80
 msgid "Report Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:99
+#: hypha/apply/projects/admin.py:101
+msgid "Invoice Tags"
+msgstr ""
+
+#: hypha/apply/projects/admin.py:107
 #: hypha/apply/projects/templates/application_projects/project_list.html:6
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:4
 #: hypha/core/navigation.py:98 hypha/core/navigation.py:133
 msgid "Projects"
 msgstr ""
@@ -5722,17 +6126,17 @@ msgid "Vendor pending"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:22
-#: hypha/apply/projects/models/payment.py:34 hypha/apply/projects/utils.py:91
+#: hypha/apply/projects/models/invoice.py:45 hypha/apply/projects/utils.py:94
 msgid "Declined"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:23
-#: hypha/apply/projects/models/payment.py:32 hypha/apply/projects/utils.py:93
+#: hypha/apply/projects/models/invoice.py:43 hypha/apply/projects/utils.py:96
 msgid "Paid"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:24
-#: hypha/apply/projects/models/payment.py:33 hypha/apply/projects/utils.py:95
+#: hypha/apply/projects/models/invoice.py:44 hypha/apply/projects/utils.py:98
 msgid "Payment failed"
 msgstr ""
 
@@ -5745,7 +6149,7 @@ msgstr ""
 msgid "Request for change"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:224
 msgid "Up to date"
 msgstr ""
 
@@ -5753,37 +6157,42 @@ msgstr ""
 msgid "Behind schedule"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:66
+#: hypha/apply/projects/filters.py:61 hypha/apply/projects/tables.py:202
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
+msgid "Contractor"
+msgstr ""
+
+#: hypha/apply/projects/filters.py:73
 #: hypha/apply/projects/reports/templates/reports/reporting.html:6
 #: hypha/apply/projects/reports/templates/reports/reporting.html:11
-#: hypha/apply/projects/tables.py:186
+#: hypha/apply/projects/tables.py:205
 msgid "Reporting"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:108
+#: hypha/apply/projects/forms/invoice.py:110
 msgid "Invoice file"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:110
+#: hypha/apply/projects/forms/invoice.py:112
 msgid "The invoice must be a PDF."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:115
+#: hypha/apply/projects/forms/invoice.py:117
 msgid ""
 "Files that are related to the invoice. They could be xls, microsoft office "
 "documents, open office documents, pdfs, txt files."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:142
+#: hypha/apply/projects/forms/invoice.py:144
 msgid "Invoice File"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:408
+#: hypha/apply/projects/forms/invoice.py:179
+#: hypha/apply/projects/forms/project.py:418
 msgid "Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:200
+#: hypha/apply/projects/forms/invoice.py:202
 msgid "File not found on submission"
 msgstr ""
 
@@ -5800,127 +6209,164 @@ msgid "You can only approve a signed contract"
 msgstr ""
 
 #: hypha/apply/projects/forms/project.py:93
+#: hypha/apply/projects/templates/application_projects/paf_export.html:6
+#: hypha/apply/projects/templates/application_projects/sow_export.html:6
+msgid "Project title"
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:95
+msgid ""
+"A submission can have several projects. Give this one a name so it can be "
+"told apart from the others."
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:101
 msgid "Select project lead"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:98
+#: hypha/apply/projects/forms/project.py:106
 msgid "Initial project status"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:104
+#: hypha/apply/projects/forms/project.py:112
 msgid "Project end date"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:123
+#: hypha/apply/projects/forms/project.py:132
 msgid "Project lead is a required field"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:222
+#: hypha/apply/projects/forms/project.py:232
 msgid "Project form status"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:307
+#: hypha/apply/projects/forms/project.py:317
 msgid "A Project can only be sent for Approval when Drafted."
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:385
-#: hypha/apply/projects/forms/project.py:400
+#: hypha/apply/projects/forms/project.py:395
+#: hypha/apply/projects/forms/project.py:410
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:78
 msgid "Contract"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:397
 msgid "Signed and approved"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:424
+#: hypha/apply/projects/forms/project.py:434
 msgid "Contract Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:482
+#: hypha/apply/projects/forms/project.py:492
 msgid "The end date must be after the start date."
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:27
+#: hypha/apply/projects/models/invoice.py:38
 msgid "Resubmitted"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:28
+#: hypha/apply/projects/models/invoice.py:39
 msgid "Changes requested by staff"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:29
+#: hypha/apply/projects/models/invoice.py:40
 msgid "Changes requested by finance"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:30
+#: hypha/apply/projects/models/invoice.py:41
 msgid "Approved by staff"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:31
+#: hypha/apply/projects/models/invoice.py:42
 msgid "Approved by finance"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:109
+#: hypha/apply/projects/models/invoice.py:82
+msgid "invoice tag"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:83
+msgid "invoice tags"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:132
 msgid "paid value"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:116
-#: hypha/apply/projects/models/payment.py:289
-#: hypha/apply/projects/models/project.py:763
-#: hypha/apply/projects/models/project.py:795
+#: hypha/apply/projects/models/invoice.py:139
+#: hypha/apply/projects/models/invoice.py:319
+#: hypha/apply/projects/models/project.py:792
+#: hypha/apply/projects/models/project.py:824
 msgid "document"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:120
-#: hypha/apply/projects/models/payment.py:123
+#: hypha/apply/projects/models/invoice.py:143
+#: hypha/apply/projects/models/invoice.py:146
 msgid "comment"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:121
+#: hypha/apply/projects/models/invoice.py:144
 msgid "This will be displayed as a comment in the comments tab"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:125
+#: hypha/apply/projects/models/invoice.py:148
 msgid "invoice number"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:132
+#: hypha/apply/projects/models/invoice.py:155
 msgid "invoice amount"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:134
+#: hypha/apply/projects/models/invoice.py:157
 msgid "invoice date"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:135
+#: hypha/apply/projects/models/invoice.py:158
 msgid "paid date"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:146
+#: hypha/apply/projects/models/invoice.py:168
+msgid "tags"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:175
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 msgid "invoice"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:147
+#: hypha/apply/projects/models/invoice.py:176
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:20
 msgid "invoices"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:150
+#: hypha/apply/projects/models/invoice.py:180
+#, python-brace-format
+msgid "Invoice for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:181
 #, python-brace-format
-msgid "Invoice requested for {project}"
+msgid "Invoice {number} for {project}"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:298
+#: hypha/apply/projects/models/invoice.py:328
 msgid "supporting document"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:299
+#: hypha/apply/projects/models/invoice.py:329
 msgid "supporting documents"
 msgstr ""
 
+#: hypha/apply/projects/models/invoice.py:359
+msgid "invoice export manager"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:360
+msgid "invoice export managers"
+msgstr ""
+
 #: hypha/apply/projects/models/project.py:75
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:41
 msgid "Approve"
@@ -5959,299 +6405,323 @@ msgstr ""
 msgid "{} approval"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:215
+#: hypha/apply/projects/models/project.py:216
 msgid "In progress"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:248
-#: hypha/apply/projects/models/project.py:761
-#: hypha/apply/projects/models/project.py:793
+#: hypha/apply/projects/models/project.py:251
+#: hypha/apply/projects/models/project.py:790
+#: hypha/apply/projects/models/project.py:822
 msgid "title"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:250
+#: hypha/apply/projects/models/project.py:253
 msgid "value"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:257
+#: hypha/apply/projects/models/project.py:260
 msgid "proposed start date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:259
+#: hypha/apply/projects/models/project.py:262
 msgid "proposed end date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:269
+#: hypha/apply/projects/models/project.py:264
+msgid "contract number"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:274
 msgid "locked"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:272
+#: hypha/apply/projects/models/project.py:277
 msgid "submit contracting documents"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:285
+#: hypha/apply/projects/models/project.py:290
 msgid "ID of this project at integrated payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:289
+#: hypha/apply/projects/models/project.py:294
 msgid "More details of the project integrated at payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:294
+#: hypha/apply/projects/models/project.py:299
 msgid "Reviewers role and their actions/comments"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:302 hypha/apply/todo/options.py:105
-#: hypha/apply/todo/options.py:113 hypha/apply/todo/options.py:121
-#: hypha/apply/todo/options.py:129 hypha/apply/todo/options.py:138
-#: hypha/apply/todo/options.py:146 hypha/apply/todo/options.py:155
-#: hypha/apply/todo/options.py:163 hypha/apply/todo/options.py:171
-#: hypha/apply/todo/options.py:180 hypha/apply/todo/options.py:188
-#: hypha/apply/todo/options.py:196 hypha/apply/todo/options.py:204
-#: hypha/apply/todo/options.py:212
+#: hypha/apply/projects/models/project.py:307 hypha/apply/todo/options.py:112
+#: hypha/apply/todo/options.py:120 hypha/apply/todo/options.py:128
+#: hypha/apply/todo/options.py:136 hypha/apply/todo/options.py:145
+#: hypha/apply/todo/options.py:153 hypha/apply/todo/options.py:162
+#: hypha/apply/todo/options.py:170 hypha/apply/todo/options.py:178
+#: hypha/apply/todo/options.py:187 hypha/apply/todo/options.py:195
+#: hypha/apply/todo/options.py:203 hypha/apply/todo/options.py:211
+#: hypha/apply/todo/options.py:219
 msgid "project"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:303
+#: hypha/apply/projects/models/project.py:308
 msgid "projects"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:411
+#: hypha/apply/projects/models/project.py:418
 msgid "Proposed End Date must be after Proposed Start Date"
 msgstr ""
 
 #. Translators: SOW = Statement of Work
-#: hypha/apply/projects/models/project.py:518
+#: hypha/apply/projects/models/project.py:525
 msgctxt "singular"
 msgid "project SOW"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:519
+#: hypha/apply/projects/models/project.py:526
 msgctxt "plural"
 msgid "project SOW"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:541
+#: hypha/apply/projects/models/project.py:532
+#, python-brace-format
+msgid "Scope of Work for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:543
+msgctxt "singular"
+msgid "project form"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:544
+msgctxt "plural"
+msgid "project forms"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:550
+#, python-brace-format
+msgid "Project form for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:572
 msgid "project form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:542
+#: hypha/apply/projects/models/project.py:573
 msgid "project forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:579
 msgid "project SOW form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:549
+#: hypha/apply/projects/models/project.py:580
 msgid "project SOW forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:561
+#: hypha/apply/projects/models/project.py:592
 msgid "project report form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:562
+#: hypha/apply/projects/models/project.py:593
 msgid "project report forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:569
+#: hypha/apply/projects/models/project.py:600
 msgid "user groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:602
 msgid ""
 "Only selected group's users will be listed for this ProjectFormReviewerRole"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:583
+#: hypha/apply/projects/models/project.py:614
 msgid "PAF reviewers role"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:584
+#: hypha/apply/projects/models/project.py:615
 msgid "PAF reviewers roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:595
+#: hypha/apply/projects/models/project.py:626
 msgid "Before"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:596
+#: hypha/apply/projects/models/project.py:627
 msgid "After"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:605
+#: hypha/apply/projects/models/project.py:636
 msgid "Number of days"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:637
 msgid "Relation to report due date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:610
+#: hypha/apply/projects/models/project.py:641
 msgid "project reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:642
 msgid "project reminder frequencies"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:617
+#: hypha/apply/projects/models/project.py:648
 msgid "contracting group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:650
 msgid "finance group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:620
+#: hypha/apply/projects/models/project.py:651
 msgid "staff group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:622
+#: hypha/apply/projects/models/project.py:653
 msgid "Uncheck it to approve project parallelly"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:632
+#: hypha/apply/projects/models/project.py:663
 msgid "Approve Project Sequentially"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:635
+#: hypha/apply/projects/models/project.py:666
 msgid "Project Form Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:638
+#: hypha/apply/projects/models/project.py:669
 msgid "Project Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:640
+#: hypha/apply/projects/models/project.py:671
 msgid ""
 "Reviewer Roles are needed to move projects to 'Internal Approval' stage. "
 "Delete all roles to skip internal approval process and to move all internal "
 "approval projects back to the 'Draft' stage with all approvals removed."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:647
-#: hypha/apply/projects/models/project.py:648
+#: hypha/apply/projects/models/project.py:678
+#: hypha/apply/projects/models/project.py:679
 msgid "Report reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:650
+#: hypha/apply/projects/models/project.py:681
 msgid ""
 "Set up a cron job to run `notify_report_due.py`. The script will use these "
 "reminder settings."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:656
+#: hypha/apply/projects/models/project.py:687
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:35
 msgid "project settings"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:681
+#: hypha/apply/projects/models/project.py:712
 msgid "PAF approval"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:682
+#: hypha/apply/projects/models/project.py:713
 msgid "PAF approvals"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:685
+#: hypha/apply/projects/models/project.py:716
 #, python-brace-format
 msgid "Approval of {project} by {user}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:713
+#: hypha/apply/projects/models/project.py:744
 msgid "file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:716
+#: hypha/apply/projects/models/project.py:747
 msgid "signed and approved"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:718
+#: hypha/apply/projects/models/project.py:749
 msgid "counter signed?"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:728
+#: hypha/apply/projects/models/project.py:759
 msgid "contract"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:729
+#: hypha/apply/projects/models/project.py:760
 msgid "contracts"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Counter Signed"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Unsigned"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:740
+#: hypha/apply/projects/models/project.py:771
 #, python-brace-format
 msgid "Contract for {project} ({state})"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:768
+#: hypha/apply/projects/models/project.py:797
 #, python-brace-format
 msgid "Project file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:772
-#: hypha/apply/projects/models/project.py:773
+#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:802
 msgid "packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:800
+#: hypha/apply/projects/models/project.py:829
 msgid "contract packet file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:830
 msgid "contract packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:804
+#: hypha/apply/projects/models/project.py:833
 #, python-brace-format
 msgid "Contract file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:814
 #: hypha/apply/projects/models/project.py:843
+#: hypha/apply/projects/models/project.py:872
 msgid "name"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:816
 #: hypha/apply/projects/models/project.py:845
+#: hypha/apply/projects/models/project.py:874
 msgid "recommended minimum"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:820
-#: hypha/apply/projects/models/project.py:857
+#: hypha/apply/projects/models/project.py:849
+#: hypha/apply/projects/models/project.py:886
 msgid "template"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:832
+#: hypha/apply/projects/models/project.py:861
 msgid "Document Category"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:833
+#: hypha/apply/projects/models/project.py:862
 msgid "Project Document Categories"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:850
+#: hypha/apply/projects/models/project.py:879
 msgid "allow document access for groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:851
+#: hypha/apply/projects/models/project.py:880
 msgid "Only selected group's users can access the document"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:869
+#: hypha/apply/projects/models/project.py:898
 msgid "Contrat Document Category"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:870
+#: hypha/apply/projects/models/project.py:899
 msgid "Contract Document Categories"
 msgstr ""
 
@@ -6436,15 +6906,31 @@ msgstr ""
 msgid "Access allowed"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:424
-msgid "Project form is editable for active projects if no reviewer roles"
+#: hypha/apply/projects/permissions.py:426
+msgid "Project is not in Draft state"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:427
-msgid "Project form is editable in Draft by this user"
+#: hypha/apply/projects/permissions.py:429
+msgid "Only Staff can skip the PAF approval process"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:428
+#: hypha/apply/projects/permissions.py:433
+msgid "Staff can skip PAF approval when no reviewer roles are configured"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:436
+msgid "PAF reviewer roles are configured, cannot skip approval process"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:445
+msgid "Project form is editable for active projects if no reviewer roles"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:448
+msgid "Project form is editable in Draft by this user"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:449
 msgid "You are not allowed to edit the project at this time"
 msgstr ""
 
@@ -6452,7 +6938,17 @@ msgstr ""
 msgid "Reporting Period"
 msgstr ""
 
-#: hypha/apply/projects/reports/forms.py:100
+#: hypha/apply/projects/reports/forms.py:101
+#: hypha/apply/projects/reports/forms.py:120
+msgid "Report due date"
+msgstr ""
+
+#: hypha/apply/projects/reports/forms.py:112
+#: hypha/apply/projects/reports/forms.py:131
+msgid "A report for this date already exists."
+msgstr ""
+
+#: hypha/apply/projects/reports/forms.py:136
 msgid "Report on:"
 msgstr ""
 
@@ -6466,91 +6962,96 @@ msgctxt "project report (noun)"
 msgid "reports"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:204
+#: hypha/apply/projects/reports/models.py:131
+#, python-brace-format
+msgid "Report due {due_date} for {project}"
+msgstr ""
+
+#: hypha/apply/projects/reports/models.py:209
 msgid "report version"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:205
+#: hypha/apply/projects/reports/models.py:210
 msgid "report versions"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:220
+#: hypha/apply/projects/reports/models.py:225
 msgid "report private file"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:221
+#: hypha/apply/projects/reports/models.py:226
 msgid "report private files"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:240
+#: hypha/apply/projects/reports/models.py:245
 msgid "week"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:241
+#: hypha/apply/projects/reports/models.py:246
 msgid "month"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:242
+#: hypha/apply/projects/reports/models.py:247
 msgid "year"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:246
+#: hypha/apply/projects/reports/models.py:251
 msgid "Years"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:262
+#: hypha/apply/projects/reports/models.py:267
 msgid "report config"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:263
+#: hypha/apply/projects/reports/models.py:268
 msgid "report configs"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:267
+#: hypha/apply/projects/reports/models.py:272
 msgid "Disabled"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:272
+#: hypha/apply/projects/reports/models.py:277
 #, python-brace-format
 msgid "One time, that already has reported on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:277
+#: hypha/apply/projects/reports/models.py:282
 #, python-brace-format
 msgid "One time on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:285
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:316
 msgid "last day"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:291
+#: hypha/apply/projects/reports/models.py:307
 #, python-brace-format
 msgid "Once a year on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:294
+#: hypha/apply/projects/reports/models.py:310
 #, python-brace-format
 msgid "Every {occurrence} years on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:304
+#: hypha/apply/projects/reports/models.py:320
 #, python-brace-format
 msgid "Once a month on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:305
+#: hypha/apply/projects/reports/models.py:321
 #, python-brace-format
 msgid "Every {occurrence} months on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:312
+#: hypha/apply/projects/reports/models.py:328
 #, python-brace-format
 msgid "Once a week on {weekday}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:313
+#: hypha/apply/projects/reports/models.py:329
 #, python-brace-format
 msgid "Every {occurrence} weeks on {weekday}"
 msgstr ""
@@ -6567,70 +7068,88 @@ msgstr ""
 msgid "Last Notified"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "The"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "current"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "next"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:11
+msgid "Edit this report date"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "reporting period is"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:12
+msgid "edit"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:8
-msgid "A report is due for the period"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:16
+msgid "Past due"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
 msgid "Continue Editing"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
-msgid "Add Report"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+msgid "Create report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:33
 #, python-format
 msgid ""
 " You're skipping the report for %(start_date)s - %(end_date)s. This will "
 "result in a gap in reporting for the project. You can undo this at any time. "
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:29
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:32
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:34
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:38
 msgid "Skip"
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:36
+msgid "Skip this report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:48
+msgid "Delete report requirement"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:26
 msgid "Enable"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:55
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:62
 msgid "Period End"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:101
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:108
 msgid "Unskip"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show less"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show more"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:130
 msgid "No reports submitted yet."
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:2
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:18
+msgid "Add report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:2
+msgid "Delete report"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:4
+msgid ""
+"Are you sure you want to delete this report? This action cannot be undone."
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:2
+msgid "Edit report due date"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:2
 msgid "Change reporting frequency"
 msgstr ""
@@ -6693,24 +7212,24 @@ msgstr ""
 msgid "View project"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 msgid "This report is for the period"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:56
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:32
 msgid "Report Skipped"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:58
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:37
 msgid "Public Report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:107
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:85
 msgid "View previous report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:115
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:93
 msgid "View next report"
 msgstr ""
 
@@ -6774,69 +7293,90 @@ msgstr ""
 msgid "No Projects Currently Reporting."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:78
-#: hypha/apply/projects/reports/views.py:100
+#: hypha/apply/projects/reports/views.py:83
+#: hypha/apply/projects/reports/views.py:105
 msgid "You do not have permission to access this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:125
+#: hypha/apply/projects/reports/views.py:130
 msgid "You do not have permission to update this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:372
+#: hypha/apply/projects/reports/views.py:377
 msgid "You do not have permission to update reporting configurations."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:491
+#: hypha/apply/projects/reports/views.py:496
 msgid "Reporting disabled"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:31
+#: hypha/apply/projects/reports/views.py:532
+msgid "You do not have permission to add reports."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:572
+msgid "You do not have permission to edit report due dates."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:583
+msgid "A submitted report's due date cannot be edited."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:607
+msgid "You do not have permission to delete reports."
+msgstr ""
+
+#: hypha/apply/projects/tables.py:29
 msgid "Invoice #"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:43
+#: hypha/apply/projects/tables.py:41
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
 msgid "Invoice date"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:45
+#: hypha/apply/projects/tables.py:43
 msgid "Project Title"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:103
+#: hypha/apply/projects/tables.py:114
 msgid "Vendor Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:137
+#: hypha/apply/projects/tables.py:151
 msgid "Project Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:188
+#: hypha/apply/projects/tables.py:204
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:66
+msgid "Contract #"
+msgstr ""
+
+#: hypha/apply/projects/tables.py:207
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:48
 msgid "End date"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:213
+#: hypha/apply/projects/tables.py:232
 #, python-brace-format
 msgid "{count} outstanding"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:251
+#: hypha/apply/projects/tables.py:270
 msgid "Date requested"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:266
+#: hypha/apply/projects/tables.py:288
 msgid "Assignee"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:286
+#: hypha/apply/projects/tables.py:308
 msgid "Waiting for approval"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:288
+#: hypha/apply/projects/tables.py:310
 msgid "Waiting for assignee"
 msgstr ""
 
@@ -6879,8 +7419,8 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:170
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:60
 #: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:56
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
 #: hypha/apply/templates/forms/includes/field.html:55
 msgid "Upload"
 msgstr ""
@@ -6953,12 +7493,12 @@ msgid "Update approvers"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:55
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:156
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:159
 msgid "Change approver"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:67
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:168
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:171
 msgid "Assign approver"
 msgstr ""
 
@@ -6969,7 +7509,7 @@ msgstr ""
 msgid "Project form"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:124
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:132
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:172
 msgid "Fill in"
 msgstr ""
@@ -6990,7 +7530,7 @@ msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:69
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:70
 msgid "Invoice"
 msgstr ""
 
@@ -7006,13 +7546,13 @@ msgstr ""
 msgid "Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:74
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:76
 msgid "Download invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:90
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:94
 #: hypha/apply/projects/templates/application_projects/paf_export.html:63
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:101
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:106
 msgid "Supporting Documents"
 msgstr ""
 
@@ -7085,6 +7625,10 @@ msgstr ""
 msgid "Project documents status"
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/modals/project_contract_number_update.html:2
+msgid "Update contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
 msgid "Update project dates"
 msgstr ""
@@ -7205,38 +7749,33 @@ msgid ""
 "invoicing & reporting stage."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/paf_export.html:6
-#: hypha/apply/projects/templates/application_projects/sow_export.html:6
-msgid "Project title"
-msgstr ""
-
 #: hypha/apply/projects/templates/application_projects/paf_export.html:7
 #: hypha/apply/projects/templates/application_projects/sow_export.html:7
 msgid "Project ID"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:18
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:49
 msgid "Approvals"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:32
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:66
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
 msgid "Submission lead"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:34
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:72
 msgid "Staff reviewers"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:41
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:75
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:78
 msgid "as"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:51
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:89
 msgid "Advisory council"
 msgstr ""
 
@@ -7258,6 +7797,29 @@ msgstr ""
 msgid "Submit contract documents"
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:9
+msgid "Invoices: Export as CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:12
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:72
+msgid ""
+"Are you sure you want to export the invoices as a CSV file? This file may "
+"contain sensitive information, so please handle it carefully."
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:22
+msgid "Invoices: Generating downloadable CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:40
+msgid "Invoices: Download generated CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:62
+msgid "Invoices: Generate downloadable CSV"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:35
 msgid "Only editable when submitted or you have been requested to make changes"
 msgstr ""
@@ -7266,18 +7828,13 @@ msgstr ""
 msgid "Edit Invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:29
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:52
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
-msgid "View comment"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:21
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:43
+msgid "Status & Activity"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:69
-msgid "show less"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
-msgid "Contractor"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:48
+msgid "When you leave a comment or change the statuses, it'll show up here!"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:22
@@ -7293,6 +7850,23 @@ msgstr ""
 msgid "Awaiting contract finalization..."
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:75
+msgid "edit contract number"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
+msgid "Copied!"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+msgid "Copy contract number"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:91
+msgid "copy contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:10
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:14
 msgid "Project lead"
@@ -7330,22 +7904,22 @@ msgstr ""
 msgid "Update project status"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:23
-#: hypha/apply/projects/templates/application_projects/project_detail.html:54
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:49
 msgid "Project Information"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:83
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:94
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:97
 msgid "No reviews"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:174
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:177
 msgid "Download"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:182
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:57
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:185
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:63
 msgid "Download as DOCX"
 msgstr ""
 
@@ -7358,28 +7932,32 @@ msgstr ""
 msgid "Proposal attachments"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:45
+#: hypha/apply/projects/templates/application_projects/project_detail.html:40
 #, python-format
 msgid "This project is in %(status)s state."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:119
+#: hypha/apply/projects/templates/application_projects/project_detail.html:114
 msgid "Project form approvals"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#: hypha/apply/projects/templates/application_projects/project_detail.html:127
 msgid "Request changes or more information by "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:149
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+msgid "View comment"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_detail.html:144
 msgid "Pending approval from "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:153
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
 msgid "nobody assigned yet"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:161
+#: hypha/apply/projects/templates/application_projects/project_detail.html:156
 msgid "approved"
 msgstr ""
 
@@ -7396,7 +7974,7 @@ msgstr ""
 msgid "No Projects Available."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:25
 #: hypha/apply/projects/templates/application_projects/sow_export.html:5
 msgid "Scope of Work"
 msgstr ""
@@ -7422,57 +8000,57 @@ msgstr ""
 msgid "{status} by {user_role}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:104
-#: hypha/apply/projects/templatetags/project_tags.py:109
-#: hypha/apply/projects/templatetags/project_tags.py:115
-#: hypha/apply/projects/templatetags/project_tags.py:119
-#: hypha/apply/projects/templatetags/project_tags.py:237
-#: hypha/apply/projects/templatetags/project_tags.py:249
-#: hypha/apply/projects/templatetags/project_tags.py:259
-#: hypha/apply/projects/templatetags/project_tags.py:278
-#: hypha/apply/projects/templatetags/project_tags.py:283
+#: hypha/apply/projects/templatetags/project_tags.py:117
+#: hypha/apply/projects/templatetags/project_tags.py:122
+#: hypha/apply/projects/templatetags/project_tags.py:128
+#: hypha/apply/projects/templatetags/project_tags.py:132
+#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:262
+#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:291
+#: hypha/apply/projects/templatetags/project_tags.py:296
 msgid "To do"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:105
+#: hypha/apply/projects/templatetags/project_tags.py:118
 msgid "Fill in the Project Form"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:110
+#: hypha/apply/projects/templatetags/project_tags.py:123
 msgid "Move project to next stage"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:116
+#: hypha/apply/projects/templatetags/project_tags.py:129
 msgid "Resubmit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:120
+#: hypha/apply/projects/templatetags/project_tags.py:133
 msgid "Submit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:124
-#: hypha/apply/projects/templatetags/project_tags.py:132
-#: hypha/apply/projects/templatetags/project_tags.py:136
-#: hypha/apply/projects/templatetags/project_tags.py:142
-#: hypha/apply/projects/templatetags/project_tags.py:158
-#: hypha/apply/projects/templatetags/project_tags.py:164
-#: hypha/apply/projects/templatetags/project_tags.py:179
-#: hypha/apply/projects/templatetags/project_tags.py:188
-#: hypha/apply/projects/templatetags/project_tags.py:194
-#: hypha/apply/projects/templatetags/project_tags.py:202
-#: hypha/apply/projects/templatetags/project_tags.py:211
-#: hypha/apply/projects/templatetags/project_tags.py:218
-#: hypha/apply/projects/templatetags/project_tags.py:225
-#: hypha/apply/projects/templatetags/project_tags.py:229
-#: hypha/apply/projects/templatetags/project_tags.py:243
-#: hypha/apply/projects/templatetags/project_tags.py:253
+#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:145
+#: hypha/apply/projects/templatetags/project_tags.py:149
+#: hypha/apply/projects/templatetags/project_tags.py:155
+#: hypha/apply/projects/templatetags/project_tags.py:171
+#: hypha/apply/projects/templatetags/project_tags.py:177
+#: hypha/apply/projects/templatetags/project_tags.py:192
+#: hypha/apply/projects/templatetags/project_tags.py:201
+#: hypha/apply/projects/templatetags/project_tags.py:207
+#: hypha/apply/projects/templatetags/project_tags.py:215
+#: hypha/apply/projects/templatetags/project_tags.py:224
+#: hypha/apply/projects/templatetags/project_tags.py:231
+#: hypha/apply/projects/templatetags/project_tags.py:238
+#: hypha/apply/projects/templatetags/project_tags.py:242
+#: hypha/apply/projects/templatetags/project_tags.py:256
 #: hypha/apply/projects/templatetags/project_tags.py:266
-#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:285
 msgid "Waiting for"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:126
-#: hypha/apply/projects/templatetags/project_tags.py:144
+#: hypha/apply/projects/templatetags/project_tags.py:139
+#: hypha/apply/projects/templatetags/project_tags.py:157
 #, python-brace-format
 msgid ""
 "Awaiting project documents to be created and approved by {ORG_SHORT_NAME} "
@@ -7480,210 +8058,222 @@ msgid ""
 "stage."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:133
+#: hypha/apply/projects/templatetags/project_tags.py:146
 msgid "Changes requested. Awaiting documents to be resubmitted."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:150
 msgid "Awaiting project form to be created."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:160
-#: hypha/apply/projects/templatetags/project_tags.py:196
+#: hypha/apply/projects/templatetags/project_tags.py:173
+#: hypha/apply/projects/templatetags/project_tags.py:209
 #, python-brace-format
 msgid "Awaiting approval. Assigned to {approver}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:166
-#: hypha/apply/projects/templatetags/project_tags.py:204
+#: hypha/apply/projects/templatetags/project_tags.py:179
+#: hypha/apply/projects/templatetags/project_tags.py:217
 #, python-brace-format
 msgid "Awaiting {reviewer_role} to assign an approver"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:180
+#: hypha/apply/projects/templatetags/project_tags.py:193
 msgid "Awaiting project form to be approved"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:189
+#: hypha/apply/projects/templatetags/project_tags.py:202
 msgid "Awaiting approval from other approvers teams"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:212
+#: hypha/apply/projects/templatetags/project_tags.py:225
 msgid "Awaiting project from assigned approvers"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:219
+#: hypha/apply/projects/templatetags/project_tags.py:232
 #, python-brace-format
 msgid "Awaiting signed contract from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:226
+#: hypha/apply/projects/templatetags/project_tags.py:239
 msgid "Awaiting signed contract from Staff/Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:230
+#: hypha/apply/projects/templatetags/project_tags.py:243
 msgid "Awaiting signed contract from Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:239
+#: hypha/apply/projects/templatetags/project_tags.py:252
 msgid "Awaiting contract documents to be submitted by you."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:244
+#: hypha/apply/projects/templatetags/project_tags.py:257
 msgid "Awaiting countersigned contract from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:263
 msgid "Awaiting contract documents submission by you"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:254
+#: hypha/apply/projects/templatetags/project_tags.py:267
 msgid "Awaiting contract documents submission from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:261
+#: hypha/apply/projects/templatetags/project_tags.py:274
 msgid "Review the contract for all relevant details and approve."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:268
+#: hypha/apply/projects/templatetags/project_tags.py:281
 #, python-brace-format
 msgid "Awaiting contract approval from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:273
+#: hypha/apply/projects/templatetags/project_tags.py:286
 msgid "Awaiting contract approval from Staff"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:292
 msgid "Add invoices"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:284
+#: hypha/apply/projects/templatetags/project_tags.py:297
 msgid "Review invoice and take action"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:303
+#: hypha/apply/projects/templatetags/project_tags.py:316
 #, python-brace-format
 msgid "Please download the signed contract uploaded by {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:305
+#: hypha/apply/projects/templatetags/project_tags.py:318
 msgid "Countersign"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:306
+#: hypha/apply/projects/templatetags/project_tags.py:319
 msgid "Upload it back"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:308
+#: hypha/apply/projects/templatetags/project_tags.py:321
 msgid "Please also make sure to upload other required contracting documents"
 msgstr ""
 
-#: hypha/apply/projects/utils.py:85
+#: hypha/apply/projects/utils.py:88
 msgid "Pending approval"
 msgstr ""
 
-#: hypha/apply/projects/utils.py:89
+#: hypha/apply/projects/utils.py:92
 msgid "Request for change or more information"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:166
-#: hypha/apply/projects/views/payment.py:396
+#: hypha/apply/projects/views/invoice.py:175
+#: hypha/apply/projects/views/invoice.py:397
 #, python-brace-format
 msgid "<p>Invoice status updated to: {status}.</p>"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:209
+#: hypha/apply/projects/views/invoice.py:218
 msgid "Invoice updated."
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:299
+#: hypha/apply/projects/views/invoice.py:304
 msgid "<p>Invoice added.</p>"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:575
+#: hypha/apply/projects/views/invoice.py:574
 msgid "Sorry something went wrong"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:265
+#: hypha/apply/projects/views/invoice.py:712
+msgid "Invoice tags updated."
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:269
 msgid "PAF has been submitted for approval"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:337
+#: hypha/apply/projects/views/project.py:341
 msgid "Document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:365
+#: hypha/apply/projects/views/project.py:369
 msgid "Document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:396
+#: hypha/apply/projects/views/project.py:400
 msgid "Contracting document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:443
+#: hypha/apply/projects/views/project.py:447
 msgid "Unassigned"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:452
+#: hypha/apply/projects/views/project.py:456
 msgid "Lead has been updated."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:498
+#: hypha/apply/projects/views/project.py:502
 msgid "Title has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:534
+#: hypha/apply/projects/views/project.py:538
 msgid "Dates has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:655
+#: hypha/apply/projects/views/project.py:580
+msgid "Contract number has been updated"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:701
 msgid ""
 "Contractor documents have been approved.  You can receive invoices from "
 "vendor now."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:721
+#: hypha/apply/projects/views/project.py:766
 msgid "Countersigned contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:724
+#: hypha/apply/projects/views/project.py:769
 msgid "Signed contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:935
+#: hypha/apply/projects/views/project.py:986
 msgid "Contract documents submitted"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:999
+#: hypha/apply/projects/views/project.py:1050
 msgid "Contracting document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1077
+#: hypha/apply/projects/views/project.py:1128
 msgid "User don't have project form approver roles"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1083
+#: hypha/apply/projects/views/project.py:1134
 #, python-brace-format
 msgid "Updated project form status to: {paf_status}"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1173
+#: hypha/apply/projects/views/project.py:1224
 msgid "Project form status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1226
+#: hypha/apply/projects/views/project.py:1277
 msgid "Project form has been approved"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1321
+#: hypha/apply/projects/views/project.py:1372
 msgid "Project status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1614
+#: hypha/apply/projects/views/project.py:1665
 msgid "Project form approvers have been updated"
 msgstr ""
 
+#: hypha/apply/projects/views/project.py:1799
+msgid "No projects for this submission"
+msgstr ""
+
 #: hypha/apply/review/admin_helpers.py:11
 msgid "Clone"
 msgstr ""
@@ -7712,7 +8302,7 @@ msgstr ""
 
 #: hypha/apply/review/blocks.py:149
 #: hypha/apply/review/templates/review/review_detail.html:48
-#: hypha/apply/review/views.py:431
+#: hypha/apply/review/views.py:440
 msgid "Visibility"
 msgstr ""
 
@@ -7777,7 +8367,7 @@ msgstr ""
 msgid "5. Excellent"
 msgstr ""
 
-#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:245
+#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:283
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:11
 msgid "No"
 msgstr ""
@@ -7786,7 +8376,7 @@ msgstr ""
 msgid "Maybe"
 msgstr ""
 
-#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:244
+#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:282
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:8
 msgid "Yes"
 msgstr ""
@@ -7845,13 +8435,13 @@ msgid "View Changes"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:40
-#: hypha/apply/review/views.py:429
+#: hypha/apply/review/views.py:438
 msgid "Recommendation"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:66
 #: hypha/apply/review/templates/review/review_list.html:30
-#: hypha/apply/review/views.py:427
+#: hypha/apply/review/views.py:436
 msgid "Opinions"
 msgstr ""
 
@@ -7903,155 +8493,167 @@ msgstr ""
 msgid "Avg. score: {average}"
 msgstr ""
 
-#: hypha/apply/review/views.py:74
+#: hypha/apply/review/views.py:76
 msgid "Edit Review"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Update Review draft"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Create Review"
 msgstr ""
 
-#: hypha/apply/review/views.py:428
+#: hypha/apply/review/views.py:437
 msgid "Overall Score"
 msgstr ""
 
-#: hypha/apply/review/views.py:430
+#: hypha/apply/review/views.py:439
 msgid "Revision"
 msgstr ""
 
-#: hypha/apply/review/views.py:470
+#: hypha/apply/review/views.py:479
 msgid "Current"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:114
-#: hypha/apply/stream_forms/blocks.py:217
+#: hypha/apply/stream_forms/blocks.py:123
+#: hypha/apply/stream_forms/blocks.py:255
 msgid "Required"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:124
+#: hypha/apply/stream_forms/blocks.py:142
+msgid "Personal information"
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:146
+msgid ""
+"Tick this if the answer will contain personally identifiable information, "
+"such as a name, address, phone number or date of birth. Only the applicant, "
+"their co-applicants and staff will be able to see the answer. Reviewers and "
+"other users will see that the question was asked, but not the answer."
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:162
 msgid "Format"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:125
-#: hypha/apply/stream_forms/blocks.py:156
-#: hypha/apply/stream_forms/blocks.py:171
+#: hypha/apply/stream_forms/blocks.py:163
+#: hypha/apply/stream_forms/blocks.py:194
+#: hypha/apply/stream_forms/blocks.py:209
 msgid "Default value"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:128
+#: hypha/apply/stream_forms/blocks.py:166
 msgid "Text field (single line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:147
+#: hypha/apply/stream_forms/blocks.py:185
 msgid "Max number of inputs"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:148
+#: hypha/apply/stream_forms/blocks.py:186
 msgid "Add new item"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:151
+#: hypha/apply/stream_forms/blocks.py:189
 msgid "Text field (single line) (multiple inputs)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:157
+#: hypha/apply/stream_forms/blocks.py:195
 msgid "Word limit"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:162
+#: hypha/apply/stream_forms/blocks.py:200
 msgid "Text field (multi line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:176
+#: hypha/apply/stream_forms/blocks.py:214
 msgid "Number field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:189
+#: hypha/apply/stream_forms/blocks.py:227
 msgid "Checkbox field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:201
-#: hypha/apply/stream_forms/blocks.py:219
+#: hypha/apply/stream_forms/blocks.py:239
+#: hypha/apply/stream_forms/blocks.py:257
 msgid "Choice"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:207
+#: hypha/apply/stream_forms/blocks.py:245
 msgid "Radio buttons"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:221
+#: hypha/apply/stream_forms/blocks.py:259
 msgid ""
 "Please create only two choices for toggle. First choice will revel the group "
 "and the second hide it. Additional choices will be ignored."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:231
+#: hypha/apply/stream_forms/blocks.py:269
 msgid "Group fields"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:233
+#: hypha/apply/stream_forms/blocks.py:271
 msgid "Remember to end group using Group fields end block."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:253
+#: hypha/apply/stream_forms/blocks.py:291
 msgid "Group fields end"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:255
+#: hypha/apply/stream_forms/blocks.py:293
 msgid "End of Group fields Block"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:262
+#: hypha/apply/stream_forms/blocks.py:300
 msgid "Dropdown field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:272
+#: hypha/apply/stream_forms/blocks.py:310
 msgid "Checkbox"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:278
+#: hypha/apply/stream_forms/blocks.py:316
 msgid "Multiple checkboxes field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:319
+#: hypha/apply/stream_forms/blocks.py:357
 msgid "Date field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:341
+#: hypha/apply/stream_forms/blocks.py:379
 msgid "Time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:373
+#: hypha/apply/stream_forms/blocks.py:411
 msgid "Date+time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:405
+#: hypha/apply/stream_forms/blocks.py:443
 msgid "Image field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:418
+#: hypha/apply/stream_forms/blocks.py:456
 msgid "Single File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:424
-#: hypha/apply/stream_forms/blocks.py:443
+#: hypha/apply/stream_forms/blocks.py:462
+#: hypha/apply/stream_forms/blocks.py:481
 #, python-brace-format
 msgid "{help_text} Accepted file types are {file_types}"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:437
+#: hypha/apply/stream_forms/blocks.py:475
 msgid "Multiple File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:474
+#: hypha/apply/stream_forms/blocks.py:512
 msgid "Section header"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:493
+#: hypha/apply/stream_forms/blocks.py:531
 msgid "Form fields"
 msgstr ""
 
@@ -8089,25 +8691,20 @@ msgid ""
 "update your user account with the name you provide here."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:8
-#, python-format
-msgid "View file - %(filename)s"
-msgstr ""
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:14
-msgid "uploaded"
+#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
+msgid "No selection"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:25
-msgid "File not found"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "Contains personal information."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:32
-msgid "Missing file"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "(PII)"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
-msgid "No selection"
+#: hypha/apply/stream_forms/templates/stream_forms/render_redacted_field.html:12
+msgid "Hidden — contains personal information."
 msgstr ""
 
 #: hypha/apply/templates/forms/includes/field.html:11
@@ -8144,91 +8741,99 @@ msgstr ""
 msgid "tasks"
 msgstr ""
 
-#: hypha/apply/todo/options.py:30
+#: hypha/apply/todo/options.py:32
 msgid "Comment Task"
 msgstr ""
 
-#: hypha/apply/todo/options.py:31
+#: hypha/apply/todo/options.py:33
 msgid "Submission Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:32
+#: hypha/apply/todo/options.py:34
 msgid "Determination draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:33
+#: hypha/apply/todo/options.py:35
 msgid "Review Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:34
+#: hypha/apply/todo/options.py:36
 msgid "Project waiting project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:35
+#: hypha/apply/todo/options.py:37
 msgid "Project waiting scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:36
+#: hypha/apply/todo/options.py:38
 msgid "Project submit project form(s)"
 msgstr ""
 
-#: hypha/apply/todo/options.py:37
+#: hypha/apply/todo/options.py:39
 msgid "Project submit scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:38
+#: hypha/apply/todo/options.py:40
 msgid "Project form required changes"
 msgstr ""
 
-#: hypha/apply/todo/options.py:39
+#: hypha/apply/todo/options.py:41
 msgid "Project form waiting assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:40
+#: hypha/apply/todo/options.py:42
 msgid "Project form waiting approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:41
+#: hypha/apply/todo/options.py:43
 msgid "Project waiting contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:44
+#: hypha/apply/todo/options.py:46
 msgid "Project waiting contract document"
 msgstr ""
 
-#: hypha/apply/todo/options.py:46
+#: hypha/apply/todo/options.py:48
 msgid "Project waiting contract review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:47
+#: hypha/apply/todo/options.py:49
 msgid "Project waiting invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:48
+#: hypha/apply/todo/options.py:50
 msgid "Invoice required changes"
 msgstr ""
 
-#: hypha/apply/todo/options.py:49
+#: hypha/apply/todo/options.py:51
 msgid "Invoice waiting approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:50
+#: hypha/apply/todo/options.py:52
 msgid "Invoice waiting paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:51
+#: hypha/apply/todo/options.py:53
 msgid "Report due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:52
+#: hypha/apply/todo/options.py:54
 msgid "Download exported submissions"
 msgstr ""
 
-#: hypha/apply/todo/options.py:55
+#: hypha/apply/todo/options.py:57
 msgid "Failed to generate submissions export file"
 msgstr ""
 
-#: hypha/apply/todo/options.py:65
+#: hypha/apply/todo/options.py:59
+msgid "Download exported invoices"
+msgstr ""
+
+#: hypha/apply/todo/options.py:62
+msgid "Failed to generate invoices export file"
+msgstr ""
+
+#: hypha/apply/todo/options.py:72
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.source.fund_name} "
@@ -8236,7 +8841,7 @@ msgid ""
 "comment: <q class=\"text-fg-muted italic align-bottom\">{msg}</q>"
 msgstr ""
 
-#: hypha/apply/todo/options.py:75
+#: hypha/apply/todo/options.py:82
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8244,7 +8849,7 @@ msgid ""
 "align-bottom \">\"{related.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:83
+#: hypha/apply/todo/options.py:90
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8253,7 +8858,7 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:91
+#: hypha/apply/todo/options.py:98
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8262,70 +8867,70 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:101
+#: hypha/apply/todo/options.py:108
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:109
+#: hypha/apply/todo/options.py:116
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:117
+#: hypha/apply/todo/options.py:124
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form(s) submission"
 msgstr ""
 
-#: hypha/apply/todo/options.py:125
+#: hypha/apply/todo/options.py:132
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form requires changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:134
+#: hypha/apply/todo/options.py:141
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form is waiting for assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:142
+#: hypha/apply/todo/options.py:149
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br> Project form is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:151
+#: hypha/apply/todo/options.py:158
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:159
+#: hypha/apply/todo/options.py:166
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contracting documents"
 msgstr ""
 
-#: hypha/apply/todo/options.py:167
+#: hypha/apply/todo/options.py:174
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Contract for project is waiting for review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:176
+#: hypha/apply/todo/options.py:183
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8333,7 +8938,7 @@ msgid ""
 "bottom\">\"{related.title}\"</span> is waiting for invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:184
+#: hypha/apply/todo/options.py:191
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8341,7 +8946,7 @@ msgid ""
 "{related.invoice_number} required changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:192
+#: hypha/apply/todo/options.py:199
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8349,7 +8954,7 @@ msgid ""
 "{related.invoice_number} is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:200
+#: hypha/apply/todo/options.py:207
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8357,7 +8962,7 @@ msgid ""
 "{related.invoice_number} is waiting to be paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:208
+#: hypha/apply/todo/options.py:215
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.project.fund_name} "
@@ -8366,19 +8971,29 @@ msgid ""
 "\">\"{related.project.title}\"</span> is due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:216
+#: hypha/apply/todo/options.py:223
 msgid "Your generated submission export file is ready for download"
 msgstr ""
 
-#: hypha/apply/todo/options.py:219 hypha/apply/todo/options.py:227
+#: hypha/apply/todo/options.py:226 hypha/apply/todo/options.py:234
+#: hypha/apply/todo/options.py:241 hypha/apply/todo/options.py:249
 msgid "export"
 msgstr ""
 
-#: hypha/apply/todo/options.py:223
+#: hypha/apply/todo/options.py:230
 msgid ""
 "There was an issue generating your submission export file, please try again."
 msgstr ""
 
+#: hypha/apply/todo/options.py:238
+msgid "Your generated invoice export file is ready for download"
+msgstr ""
+
+#: hypha/apply/todo/options.py:245
+msgid ""
+"There was an issue generating your invoice export file, please try again."
+msgstr ""
+
 #: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
 msgid "You don't have any pending task."
 msgstr ""
@@ -8438,139 +9053,172 @@ msgstr ""
 msgid "View users in this group"
 msgstr ""
 
-#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:63
+#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:67
 msgid "Remember me"
 msgstr ""
 
-#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:65
+#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:69
 msgid "On trusted devices only, keeps you logged in for a longer period."
 msgstr ""
 
-#: hypha/apply/users/forms.py:55
+#: hypha/apply/users/forms.py:57
 msgid "Email address"
 msgstr ""
 
-#: hypha/apply/users/forms.py:86
+#: hypha/apply/users/forms.py:90
 msgid "A user with that email already exists."
 msgstr ""
 
-#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/forms.py:91
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: hypha/apply/users/forms.py:200
+#: hypha/apply/users/forms.py:208
 msgid ""
 "You are registered using OAuth, please contact an admin if you need to "
 "change your email address."
 msgstr ""
 
-#: hypha/apply/users/forms.py:208
+#: hypha/apply/users/forms.py:216
 msgid "Slack names must not include spaces"
 msgstr ""
 
-#: hypha/apply/users/forms.py:251
+#: hypha/apply/users/forms.py:259
 msgid "Only includes active, non-superusers"
 msgstr ""
 
-#: hypha/apply/users/forms.py:261
-#: hypha/apply/users/templates/users/account.html:64
+#: hypha/apply/users/forms.py:269
+#: hypha/apply/users/templates/users/account.html:67
 #: hypha/apply/users/templates/users/activation/email.txt:13
 #: hypha/elevate/forms.py:20
 msgid "Password"
 msgstr ""
 
-#: hypha/apply/users/forms.py:262
+#: hypha/apply/users/forms.py:270
 msgid "Email change requires you to put password."
 msgstr ""
 
-#: hypha/apply/users/forms.py:275
+#: hypha/apply/users/forms.py:283
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: hypha/apply/users/forms.py:291
+#: hypha/apply/users/forms.py:299
 msgid "To proceed, type \"disable\" below and then click on \"confirm\":"
 msgstr ""
 
-#: hypha/apply/users/forms.py:301
+#: hypha/apply/users/forms.py:309
 msgid "Incorrect input."
 msgstr ""
 
-#: hypha/apply/users/middleware.py:52
+#: hypha/apply/users/middleware.py:56
 msgid "Two factor authentication required"
 msgstr ""
 
-#: hypha/apply/users/models.py:195
+#: hypha/apply/users/models.py:230
 msgid "email address"
 msgstr ""
 
-#: hypha/apply/users/models.py:197
+#: hypha/apply/users/models.py:232
 msgid "full name"
 msgstr ""
 
-#: hypha/apply/users/models.py:200
+#: hypha/apply/users/models.py:235
 msgid "slack name"
 msgstr ""
 
-#: hypha/apply/users/models.py:202
+#: hypha/apply/users/models.py:237
 msgid "This is the name we should \"@mention\" when sending notifications"
 msgstr ""
 
-#: hypha/apply/users/models.py:321
+#: hypha/apply/users/models.py:391
 msgid "user"
 msgstr ""
 
-#: hypha/apply/users/models.py:322
+#: hypha/apply/users/models.py:392
 msgid "users"
 msgstr ""
 
-#: hypha/apply/users/models.py:333
+#: hypha/apply/users/models.py:403
 msgid "Auth Settings"
 msgstr ""
 
-#: hypha/apply/users/models.py:335
+#: hypha/apply/users/models.py:405
 msgid "show consent checkbox?"
 msgstr ""
 
-#: hypha/apply/users/models.py:336
+#: hypha/apply/users/models.py:406
 msgid "consent text"
 msgstr ""
 
-#: hypha/apply/users/models.py:337
+#: hypha/apply/users/models.py:407
 msgid "consent help"
 msgstr ""
 
-#: hypha/apply/users/models.py:339
+#: hypha/apply/users/models.py:409
 msgid "login extra text"
 msgstr ""
 
-#: hypha/apply/users/models.py:341
+#: hypha/apply/users/models.py:411
 msgid "Displayed along side login form"
 msgstr ""
 
-#: hypha/apply/users/models.py:351
+#: hypha/apply/users/models.py:421
 msgid "User consent on login & register forms"
 msgstr ""
 
-#: hypha/apply/users/models.py:357
+#: hypha/apply/users/models.py:427
 msgid "Login form customizations"
 msgstr ""
 
-#: hypha/apply/users/models.py:382
+#: hypha/apply/users/models.py:452
 msgid "Pending signup"
 msgstr ""
 
-#: hypha/apply/users/models.py:383
+#: hypha/apply/users/models.py:453
 msgid "Pending signups"
 msgstr ""
 
-#: hypha/apply/users/models.py:401
+#: hypha/apply/users/models.py:471
 msgid "Confirm Access Token"
 msgstr ""
 
-#: hypha/apply/users/models.py:402
+#: hypha/apply/users/models.py:472
 msgid "Confirm Access Tokens"
 msgstr ""
 
+#: hypha/apply/users/passkey_views.py:160
+#, python-brace-format
+msgid "Maximum of {max} passkeys allowed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:197
+#: hypha/apply/users/passkey_views.py:278
+msgid "Invalid JSON"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:202
+#: hypha/apply/users/passkey_views.py:283
+msgid "No active WebAuthn challenge"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:230
+#: hypha/apply/users/passkey_views.py:351
+#: hypha/apply/users/passkey_views.py:358
+msgid "Verification failed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:248
+msgid "Could not save passkey"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:292
+msgid "Invalid credential"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:336
+msgid "Unknown credential"
+msgstr ""
+
 #: hypha/apply/users/roles.py:4
 msgid "Administrator"
 msgstr ""
@@ -8636,16 +9284,31 @@ msgid ""
 "contracting."
 msgstr ""
 
-#: hypha/apply/users/services.py:110
+#: hypha/apply/users/services.py:36
+#, python-format
+msgid "A passkey was added to your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:41
+#, python-format
+msgid "A passkey was removed from your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:152
 #, python-brace-format
 msgid "Log in to {user} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/services.py:134
+#: hypha/apply/users/services.py:176
 #, python-brace-format
 msgid "Welcome to {ORG_LONG_NAME}"
 msgstr ""
 
+#: hypha/apply/users/signals.py:31
+#, python-format
+msgid "Successful login to %(org)s"
+msgstr ""
+
 #: hypha/apply/users/templates/elevate/elevate.html:4
 #: hypha/apply/users/templates/elevate/elevate.html:10
 msgid "Confirm access"
@@ -8682,13 +9345,17 @@ msgid ""
 "inactivity."
 msgstr ""
 
+#: hypha/apply/users/templates/includes/delete_user_submissions_form.html:20
+msgid "Yes, delete"
+msgstr ""
+
 #: hypha/apply/users/templates/two_factor/_base.html:8
 #: hypha/apply/users/templates/users/change_password.html:9
 msgid "Back to account"
 msgstr ""
 
 #: hypha/apply/users/templates/two_factor/_base.html:9
-#: hypha/apply/users/templates/users/account.html:85
+#: hypha/apply/users/templates/users/account.html:88
 msgid "Two-Factor Authentication (2FA)"
 msgstr ""
 
@@ -8728,10 +9395,6 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
-msgid "Copied!"
-msgstr ""
-
 #: hypha/apply/users/templates/two_factor/core/backup_tokens.html:41
 msgid "Copy to Clipboard"
 msgstr ""
@@ -8942,32 +9605,42 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:60
+#: hypha/apply/users/templates/users/account.html:63
 msgid "Account Security"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:69
+#: hypha/apply/users/templates/users/account.html:72
 #: hypha/apply/users/templates/users/change_password.html:3
 msgid "Update password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:77
+#: hypha/apply/users/templates/users/account.html:80
 msgid "Set Password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:89
+#: hypha/apply/users/templates/users/account.html:92
 msgid "Backup codes"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:90
+#: hypha/apply/users/templates/users/account.html:93
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:9
 msgid "Disable 2FA"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:92
+#: hypha/apply/users/templates/users/account.html:95
 msgid "Enable 2FA"
 msgstr ""
 
+#: hypha/apply/users/templates/users/account.html:100
+msgid "Passkeys"
+msgstr ""
+
+#: hypha/apply/users/templates/users/account.html:102
+msgid ""
+"With passkeys you can use your fingerprint, face, or screen lock to login "
+"securely without a password."
+msgstr ""
+
 #: hypha/apply/users/templates/users/activation/confirm.html:4
 msgid "Confirm account creation"
 msgstr ""
@@ -9069,7 +9742,7 @@ msgid "Select User:"
 msgstr ""
 
 #: hypha/apply/users/templates/users/become.html:26
-#: hypha/templates/includes/user_menu.html:69
+#: hypha/apply/users/templates/users/includes/user_menu.html:69
 msgid "Switch User"
 msgstr ""
 
@@ -9097,7 +9770,7 @@ msgid "Email Change - Verify Email"
 msgstr ""
 
 #: hypha/apply/users/templates/users/email_change/done.html:4
-#: hypha/apply/users/views.py:230
+#: hypha/apply/users/views.py:235
 msgid "Verify Email"
 msgstr ""
 
@@ -9160,12 +9833,75 @@ msgid "If you did not request this email, please ignore it."
 msgstr ""
 
 #: hypha/apply/users/templates/users/emails/confirm_access.md:11
+#: hypha/apply/users/templates/users/emails/login_notification.md:11
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:12
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:12
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
 #, python-format
 msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
 msgstr ""
 
+#: hypha/apply/users/templates/users/emails/login_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that your account was successfully logged in to "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:6
+#, python-format
+msgid "Login time: %(login_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:8
+msgid ""
+"If you did not log in, please contact us immediately and consider changing "
+"your password."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a new passkey was added to your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:6
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:6
+#, python-format
+msgid "Passkey: %(passkey_name)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:7
+#, python-format
+msgid "Added: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:9
+msgid ""
+"If you did not add this passkey, please contact us immediately and consider "
+"removing it from your account."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a passkey was removed from your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:7
+#, python-format
+msgid "Removed: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:9
+msgid ""
+"If you did not remove this passkey, please contact us immediately and "
+"consider changing your password if you have one."
+msgstr ""
+
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
 #, python-format
 msgid ""
@@ -9211,6 +9947,75 @@ msgstr ""
 msgid "Set password for %(username)s at %(ORG_LONG_NAME)s"
 msgstr ""
 
+#: hypha/apply/users/templates/users/includes/okta_login_button.html:7
+msgid "Log in with Okta"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/org_login_button.html:7
+#, python-format
+msgid "Log in with your %(ORG_SHORT_NAME)s email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:14
+msgid "Log in with passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:18
+msgid "Failed to begin authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:19
+msgid "Authentication failed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/password_login_button.html:7
+msgid "Log in with password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passwordless_login_button.html:7
+msgid "Log in without password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:27
+msgid "Goto your account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:31
+msgid "My account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:36
+msgid "Check latest notifications"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:40
+msgid "Activity feed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:44
+msgid "Goto your flagged submissions"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:48
+msgid "My flagged"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:53
+msgid "Goto wagtail admin"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:84
+msgid "Release User"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:92
+msgid "Log out"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
+msgid " or Sign up"
+msgstr ""
+
 #: hypha/apply/users/templates/users/login.html:23
 #: hypha/apply/users/templates/users/login.html:31
 msgid "Two factor verification"
@@ -9248,27 +10053,27 @@ msgstr ""
 msgid "OR"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:109
+#: hypha/apply/users/templates/users/login.html:115
 msgid "Or, alternatively, use one of your backup phones:"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:125
+#: hypha/apply/users/templates/users/login.html:131
 msgid "As a last resort, you can use a backup codes: "
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:130
+#: hypha/apply/users/templates/users/login.html:136
 msgid "Click here to use a backup code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:133
+#: hypha/apply/users/templates/users/login.html:139
 msgid "Use a Backup Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:149
+#: hypha/apply/users/templates/users/login.html:163
 msgid "Verification Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:153
+#: hypha/apply/users/templates/users/login.html:167
 msgid "Backup Code"
 msgstr ""
 
@@ -9306,6 +10111,62 @@ msgstr ""
 msgid "Use your password"
 msgstr ""
 
+#: hypha/apply/users/templates/users/partials/passkey-list.html:22
+#: hypha/apply/users/templates/users/partials/passkey-list.html:70
+msgid "Passkey name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:23
+msgid "Click to edit name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:26
+msgid "Save name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:32
+#, python-format
+msgid "Used %(when)s ago"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:34
+msgid "Never used"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:41
+msgid "Delete this passkey?"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:44
+msgid "Delete passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:52
+msgid "No passkeys registered."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:59
+msgid "Server error"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:60
+msgid "Registration failed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:61
+msgid ""
+"This authenticator already has a passkey registered. Try a different "
+"authenticator or device."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:69
+msgid "e.g. MacBook Touch ID"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:75
+msgid "Add passkey"
+msgstr ""
+
 #: hypha/apply/users/templates/users/password_reset/complete.html:3
 #: hypha/apply/users/templates/users/password_reset/confirm.html:10
 #: hypha/apply/users/templates/users/password_reset/form.html:4
@@ -9438,6 +10299,42 @@ msgid ""
 "email."
 msgstr ""
 
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:6
+msgid "Are you sure you want to delete these users?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:20
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:22
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:5
+msgid "Are you sure you want to delete this user?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:12
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:14
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted!"
+msgstr ""
+
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:12
 msgid "This account does not have 2FA enabled."
 msgstr ""
@@ -9446,50 +10343,50 @@ msgstr ""
 msgid "2FA is disabled"
 msgstr ""
 
-#: hypha/apply/users/utils.py:40
+#: hypha/apply/users/utils.py:43
 msgid "Email is already in use."
 msgstr ""
 
-#: hypha/apply/users/utils.py:130
+#: hypha/apply/users/utils.py:137
 #, python-brace-format
 msgid "Confirmation email for {unverified_email} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/views.py:117
+#: hypha/apply/users/views.py:120
 msgid "Profile updated."
 msgstr ""
 
-#: hypha/apply/users/views.py:161 hypha/apply/users/views.py:236
+#: hypha/apply/users/views.py:164 hypha/apply/users/views.py:241
 msgid "Hijack feature is not enabled."
 msgstr ""
 
-#: hypha/apply/users/views.py:190
+#: hypha/apply/users/views.py:193
 msgid "Password Page timed out. Try changing the email again."
 msgstr ""
 
-#: hypha/apply/users/views.py:211
+#: hypha/apply/users/views.py:216
 msgid "Alert! An attempt to update your email."
 msgstr ""
 
-#: hypha/apply/users/views.py:270
+#: hypha/apply/users/views.py:285
 #, python-brace-format
 msgid "Your email has been successfully updated to {email}!"
 msgstr ""
 
-#: hypha/apply/users/views.py:372
+#: hypha/apply/users/views.py:387
 msgid "Your password was successfully updated!"
 msgstr ""
 
-#: hypha/apply/users/views.py:377
+#: hypha/apply/users/views.py:392
 msgid "Please correct the errors below."
 msgstr ""
 
-#: hypha/apply/users/views.py:809
+#: hypha/apply/users/views.py:824
 #, python-brace-format
 msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgstr ""
 
-#: hypha/apply/users/views.py:870
+#: hypha/apply/users/views.py:885
 msgid "✓ Check your email for password set link."
 msgstr ""
 
@@ -9713,49 +10610,49 @@ msgstr ""
 msgid "Mobile site logo (if not set default will be used)"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:60
+#: hypha/core/models/system_settings.py:61
 #, python-brace-format
 msgid ""
 "Link for the site logo, e.g. \"{example_url}\". If not set, defaults to page "
 "with slug set to \"home\"."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:64
+#: hypha/core/models/system_settings.py:66
 msgid "Front page navigation content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:66
+#: hypha/core/models/system_settings.py:68
 msgid ""
 "This will overwrite the default front page navigation bar, html tags is "
 "allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:72
+#: hypha/core/models/system_settings.py:74
 msgid "Footer content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:74
+#: hypha/core/models/system_settings.py:76
 msgid "This will be added to the footer, html tags is allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:84
-#: hypha/core/models/system_settings.py:94
+#: hypha/core/models/system_settings.py:86
+#: hypha/core/models/system_settings.py:96
 msgid "Text"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:105
+#: hypha/core/models/system_settings.py:107
 msgid "Homepage"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:113
+#: hypha/core/models/system_settings.py:115
 msgid "Site logo"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:122
+#: hypha/core/models/system_settings.py:124
 msgid "404 page"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:129
+#: hypha/core/models/system_settings.py:131
 msgid "403 page"
 msgstr ""
 
@@ -9817,13 +10714,13 @@ msgstr ""
 msgid "renditions"
 msgstr ""
 
-#: hypha/settings/django.py:164 hypha/settings/local.py:105
+#: hypha/settings/django.py:163 hypha/settings/local.py:105
 msgid ""
 "This password has previously appeared in a data breach and should not be "
 "used. Please choose a different password."
 msgstr ""
 
-#: hypha/settings/django.py:167 hypha/settings/local.py:108
+#: hypha/settings/django.py:166 hypha/settings/local.py:108
 msgid "Your password must not have been detected in a major security breach."
 msgstr ""
 
@@ -9872,23 +10769,19 @@ msgstr ""
 msgid "current theme"
 msgstr ""
 
-#: hypha/templates/base-apply.html:32
-msgid "Toggle Light / Dark / Auto color theme"
-msgstr ""
-
-#: hypha/templates/base-apply.html:54
+#: hypha/templates/base-apply.html:50
 msgid "Menu"
 msgstr ""
 
-#: hypha/templates/base-apply.html:76
+#: hypha/templates/base-apply.html:72
 msgid "Copyright"
 msgstr ""
 
-#: hypha/templates/base-apply.html:79
+#: hypha/templates/base-apply.html:75
 msgid "Built with"
 msgstr ""
 
-#: hypha/templates/base-apply.html:85
+#: hypha/templates/base-apply.html:81
 msgid "Manage cookies"
 msgstr ""
 
@@ -9901,20 +10794,48 @@ msgstr ""
 msgid "Page:"
 msgstr ""
 
+#: hypha/templates/cotton/card_attachment.html:13
+#, python-format
+msgid "View file - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:21
+msgid "uploaded"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:33
+#, python-format
+msgid "File not found - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:40
+msgid "Missing file"
+msgstr ""
+
 #: hypha/templates/cotton/dropdown_menu.html:69
 #: hypha/templates/cotton/dropdown_menu.html:77
 #, python-format
 msgid "Filter %(title)s"
 msgstr ""
 
-#. Translators: "delete" should match msgid "delete" (with context "confirm-delete")
-#: hypha/templates/cotton/modal/confirm.html:25
-msgid "Type <em>delete</em> below to confirm"
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "delete"
 msgstr ""
 
-#: hypha/templates/cotton/modal/confirm.html:41
-msgctxt "confirm-delete"
-msgid "delete"
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "anonymize"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:24
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">delete</pre> below to "
+"confirm"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:25
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">anonymize</pre> below to "
+"confirm"
 msgstr ""
 
 #: hypha/templates/cotton/modal/header.html:11
@@ -9941,21 +10862,21 @@ msgstr ""
 msgid "* This must be a number"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Hide password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Show password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently visible"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently hidden"
 msgstr ""
 
@@ -10009,59 +10930,6 @@ msgstr ""
 msgid "Your Tasks"
 msgstr ""
 
-#: hypha/templates/includes/org_login_button.html:7
-#, python-format
-msgid "Log in with your %(ORG_SHORT_NAME)s email"
-msgstr ""
-
-#: hypha/templates/includes/password_login_button.html:7
-msgid "Log in with password"
-msgstr ""
-
-#: hypha/templates/includes/passwordless_login_button.html:7
-msgid "Log in without password"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:27
-msgid "Goto your account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:31
-msgid "My account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:36
-msgid "Check latest notifications"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:40
-msgid "Activity feed"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:44
-msgid "Goto your flagged submissions"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:48
-msgid "My flagged"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:53
-msgid "Goto wagtail admin"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:84
-msgid "Release User"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:91
-msgid "Log out"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:101
-msgid " or Sign up"
-msgstr ""
-
 #: hypha/templates/password_required.html:4
 #: hypha/templates/password_required.html:9
 msgid "Password required"
diff --git a/hypha/locale/en/LC_MESSAGES/django.po b/hypha/locale/en/LC_MESSAGES/django.po
index 3b4ba94764..d4a12cab0e 100644
--- a/hypha/locale/en/LC_MESSAGES/django.po
+++ b/hypha/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-22 16:12+0000\n"
+"POT-Creation-Date: 2026-09-17 11:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,300 +27,351 @@ msgstr ""
 msgid "Please provide data for: {fields}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:28
+#: hypha/apply/activity/adapters/activity_feed.py:27
 #, python-brace-format
 msgid "Submitted {source.title_text_display} for {source.page.title}"
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:29
 #: hypha/apply/activity/adapters/activity_feed.py:30
-#: hypha/apply/activity/adapters/activity_feed.py:31
 msgid "edited the submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:32
+#: hypha/apply/activity/adapters/activity_feed.py:31
 #, python-brace-format
 msgid "updated Lead from {old_lead} to {source.lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:33
+#: hypha/apply/activity/adapters/activity_feed.py:32
 #, python-brace-format
 msgid "batch updated Lead to {new_lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:35
+#: hypha/apply/activity/adapters/activity_feed.py:34
 #, python-brace-format
 msgid "sent a determination. Outcome: {determination.clean_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:38
+#: hypha/apply/activity/adapters/activity_feed.py:37
 msgid "Invited to submit a proposal"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:41
+#: hypha/apply/activity/adapters/activity_feed.py:40
 msgid "Submitted a review"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:42
+#: hypha/apply/activity/adapters/activity_feed.py:41
 msgid "Opened the submission while still sealed"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:45
+#: hypha/apply/activity/adapters/activity_feed.py:44
 #, python-brace-format
 msgid ""
 "{opinion.opinion_display}s with {opinion.review.author}s review of {source}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:48
+#: hypha/apply/activity/adapters/activity_feed.py:47
 #, python-brace-format
 msgid "deleted the opinion for review: {review_opinion.review}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:51
+#: hypha/apply/activity/adapters/activity_feed.py:50
 #, python-brace-format
 msgid "Created project with initial status of \"{status}\""
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:52
+#, python-brace-format
+msgid "Created SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:53
+#, python-brace-format
+msgid "Edited SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:54
+#, python-brace-format
+msgid "Created project form for project \"{related.project}\""
+msgstr ""
+
 #: hypha/apply/activity/adapters/activity_feed.py:55
 #, python-brace-format
+msgid "Edited project form for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:58
+#, python-brace-format
 msgid "updated the project title from {old_title} to {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:57
+#: hypha/apply/activity/adapters/activity_feed.py:61
+#, python-brace-format
+msgid "updated contract number to {source.contract_number}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:63
 #, python-brace-format
 msgid "update Lead from {old_lead} to {source.lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:58
+#: hypha/apply/activity/adapters/activity_feed.py:64
 msgid "Requested approval"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:60
+#: hypha/apply/activity/adapters/activity_feed.py:66
 #: hypha/apply/determinations/models.py:209
 #: hypha/apply/determinations/models.py:213
 #: hypha/apply/determinations/models.py:217
 #: hypha/apply/determinations/options.py:12
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
-#: hypha/apply/projects/utils.py:87
+#: hypha/apply/projects/utils.py:90
 msgid "Approved"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:61
+#: hypha/apply/activity/adapters/activity_feed.py:67
 msgid "requested changes for acceptance"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:62
+#: hypha/apply/activity/adapters/activity_feed.py:68
 msgid "Submitted Contract Documents"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:69
 #, python-brace-format
 msgid "Uploaded a {contract.state} contract"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:64
+#: hypha/apply/activity/adapters/activity_feed.py:70
 msgid "Approved contract"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:66
-#: hypha/apply/projects/views/payment.py:275
+#: hypha/apply/activity/adapters/activity_feed.py:72
+#: hypha/apply/projects/views/invoice.py:280
 msgid "Invoice added"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:67
+#: hypha/apply/activity/adapters/activity_feed.py:73
 msgid "Submitted a report"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:70
-#: hypha/apply/activity/options.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:74
+msgid "deleted a report"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:77
+#: hypha/apply/activity/options.py:73
 msgid "disabled reporting"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:74
+#: hypha/apply/activity/adapters/activity_feed.py:81
 msgid "archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:75
+#: hypha/apply/activity/adapters/activity_feed.py:82
 msgid "un-archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:76
+#: hypha/apply/activity/adapters/activity_feed.py:83
 msgid "deleted an invoice"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:131
-#: hypha/apply/funds/views/submission_edit.py:630
+#: hypha/apply/activity/adapters/activity_feed.py:85
+#, python-brace-format
+msgid "updated author from {old_author} to {source.user}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:145
+#: hypha/apply/funds/views/submission_edit.py:631
 msgid "Reviewers updated."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:133
-#: hypha/apply/activity/adapters/slack.py:237
+#: hypha/apply/activity/adapters/activity_feed.py:147
+#: hypha/apply/activity/adapters/slack.py:257
 msgid "Added:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:137
-#: hypha/apply/activity/adapters/slack.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:151
+#: hypha/apply/activity/adapters/slack.py:261
 msgid "Removed:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:143
+#: hypha/apply/activity/adapters/activity_feed.py:157
 msgid "Batch reviewers updated:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:146
+#: hypha/apply/activity/adapters/activity_feed.py:160
 #, python-brace-format
 msgid "{user} as {name}."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:165
+#: hypha/apply/activity/adapters/activity_feed.py:179
 #, python-brace-format
 msgid "Successfully deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:174
+#: hypha/apply/activity/adapters/activity_feed.py:188
 #, python-brace-format
 msgid "Successfully archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:187
+#: hypha/apply/activity/adapters/activity_feed.py:201
 #, python-brace-format
 msgid ""
 "Successfully updated status to {invoice_status} for invoices: "
 "{invoice_numbers}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:204
+#: hypha/apply/activity/adapters/activity_feed.py:218
 #, python-brace-format
 msgid "assigned Project form to {}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:210
+#: hypha/apply/activity/adapters/activity_feed.py:224
 #, python-brace-format
 msgid "removed the task {task.code} for {source} from the task list"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:215
+#: hypha/apply/activity/adapters/activity_feed.py:229
 #, python-brace-format
 msgid ""
 "removed the task {task.code} for {source} from whole team's{user_groups} "
 "task list."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:228
-#: hypha/apply/activity/adapters/activity_feed.py:260
+#: hypha/apply/activity/adapters/activity_feed.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:273
 #, python-brace-format
 msgid "Progressed from {old_display} to {new_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:291
+#: hypha/apply/activity/adapters/activity_feed.py:304
 #, python-brace-format
 msgid ""
 "Updated reporting frequency. New schedule is: {new_schedule} starting on "
 "{schedule_start}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:296
+#: hypha/apply/activity/adapters/activity_feed.py:309
 msgid "Skipped a Report"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:298
+#: hypha/apply/activity/adapters/activity_feed.py:311
 msgid "Marked a Report as required"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:301
+#: hypha/apply/activity/adapters/activity_feed.py:314
 #, python-brace-format
 msgid "Updated Invoice status to: {invoice_status}."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:350
+#: hypha/apply/activity/adapters/activity_feed.py:363
 #, python-brace-format
 msgid "Updated screening decision from \"{old_status}\" to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:353
+#: hypha/apply/activity/adapters/activity_feed.py:366
 #, python-brace-format
 msgid "Added screening decision to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:357
+#: hypha/apply/activity/adapters/activity_feed.py:370
 #, python-brace-format
 msgid "Removed \"{old_status}\" screening decision."
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:196
+#: hypha/apply/activity/adapters/base.py:203
 #, python-brace-format
 msgid "{adapter} [to: {recipient}]: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:200
+#: hypha/apply/activity/adapters/base.py:207
 #, python-brace-format
 msgid "{adapter}: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:90
+#: hypha/apply/activity/adapters/emails.py:92
 #, python-brace-format
 msgid "Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:96
+#: hypha/apply/activity/adapters/emails.py:98
 msgid "Multiple applications are now ready for your review"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:99
+#: hypha/apply/activity/adapters/emails.py:101
 #, python-brace-format
 msgid "Reminder: Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:102
+#: hypha/apply/activity/adapters/emails.py:104
 msgid "You are invited as a co-applicant"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:107
+#: hypha/apply/activity/adapters/emails.py:109
 #, python-brace-format
 msgid "Project is waiting for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:111
+#: hypha/apply/activity/adapters/emails.py:113
 #, python-brace-format
 msgid "Contract uploaded for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:116
+#: hypha/apply/activity/adapters/emails.py:118
 #, python-brace-format
 msgid "Contract Documents required approval for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:126
+#: hypha/apply/activity/adapters/emails.py:128
 #, python-brace-format
 msgid "Project is waiting for the contract: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:130
+#: hypha/apply/activity/adapters/emails.py:132
 #, python-brace-format
 msgid "Project is ready for invoicing: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:134
+#: hypha/apply/activity/adapters/emails.py:136
 #, python-brace-format
 msgid "Project status has changed to {project_status}: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:140
+#: hypha/apply/activity/adapters/emails.py:142
 msgid "Project has been rejected, please update and resubmit"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:143
+#: hypha/apply/activity/adapters/emails.py:145
 #, python-brace-format
 msgid "Project documents are ready to be assigned for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:150
+#: hypha/apply/activity/adapters/emails.py:151
+#, python-brace-format
+msgid "New comment on application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:158
+#, python-brace-format
+msgid ""
+"Your application to {ORG_LONG_NAME} has been reviewed: "
+"{source.title_text_display}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:162
+#, python-brace-format
+msgid "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:167
 #, python-brace-format
 msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:153
+#: hypha/apply/activity/adapters/emails.py:170
 #, python-brace-format
-msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+msgid "Your {ORG_LONG_NAME} project: {source.title}"
 msgstr ""
 
 #: hypha/apply/activity/adapters/slack.py:31
@@ -398,183 +449,219 @@ msgstr ""
 
 #: hypha/apply/activity/adapters/slack.py:73
 #, python-brace-format
+msgid "{user} has anonymized {source.title_text_display}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:76
+#, python-brace-format
 msgid ""
 "{user} has deleted {review.author} review for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:76
+#: hypha/apply/activity/adapters/slack.py:79
 #, python-brace-format
 msgid ""
 "{user} has deleted {review_opinion.author} review opinion for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:79
+#: hypha/apply/activity/adapters/slack.py:82
 #, python-brace-format
 msgid "{user} has created a Project: <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:82
+#: hypha/apply/activity/adapters/slack.py:85
 #, python-brace-format
 msgid ""
 "The lead of project <{link}|{source.title}> has been updated from {old_lead} "
 "to {source.lead} by {user}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:85
+#: hypha/apply/activity/adapters/slack.py:88
 #, python-brace-format
 msgid ""
 "The project title has been updated from <{link}|{old_title}> to <{link}|"
 "{source.title}> by {user}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:88
+#: hypha/apply/activity/adapters/slack.py:91
+#, python-brace-format
+msgid ""
+"The contract number of project <{link}|{source.title}> has been updated to "
+"{source.contract_number} by {user}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:94
 #, python-brace-format
 msgid ""
 "{user} has edited {review.author} review for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:91
+#: hypha/apply/activity/adapters/slack.py:97
 #, python-brace-format
 msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:94
+#: hypha/apply/activity/adapters/slack.py:100
 #, python-brace-format
 msgid "{user} has approved project <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:97
+#: hypha/apply/activity/adapters/slack.py:103
 #, python-brace-format
 msgid ""
 "{user} has requested changes for project acceptance on <{link}|{source.title}"
 ">"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:100
+#: hypha/apply/activity/adapters/slack.py:106
 #, python-brace-format
 msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:103
+#: hypha/apply/activity/adapters/slack.py:109
 #, python-brace-format
 msgid ""
 "{user} has submitted the contracting document for project <{link}|"
 "{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:106
+#: hypha/apply/activity/adapters/slack.py:112
 #, python-brace-format
 msgid "{user} has approved contract for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:109
+#: hypha/apply/activity/adapters/slack.py:115
 #, python-brace-format
 msgid "{user} has created invoice for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:112
+#: hypha/apply/activity/adapters/slack.py:118
 #, python-brace-format
 msgid ""
 "{user} has changed the status of <{link_related}|invoice> on <{link}|"
 "{source.title}> to {invoice.status_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:115
+#: hypha/apply/activity/adapters/slack.py:121
 #, python-brace-format
 msgid "{user} has deleted invoice from <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:118
+#: hypha/apply/activity/adapters/slack.py:124
 #, python-brace-format
 msgid "{user} has updated invoice for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:121
+#: hypha/apply/activity/adapters/slack.py:127
 #, python-brace-format
 msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:125
+#: hypha/apply/activity/adapters/slack.py:130
+#, python-brace-format
+msgid "{user} has deleted a report for <{link}|{source.title}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:135
 #, python-brace-format
 msgid "{user} has created a new account for <{link}|{source}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:128
+#: hypha/apply/activity/adapters/slack.py:138
 #, python-brace-format
 msgid ""
 "{user} has edited account for <{link}|{source}> that now has following "
 "roles: {roles}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:132
+#: hypha/apply/activity/adapters/slack.py:142
 #, python-brace-format
 msgid "{user} has archived the submission: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:135
+#: hypha/apply/activity/adapters/slack.py:145
 #, python-brace-format
 msgid "{user} has unarchived the submission: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:231
+#: hypha/apply/activity/adapters/slack.py:148
+#, python-brace-format
+msgid ""
+"{user} has updated author from {old_author} to {source.user} for submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:151
+#, python-brace-format
+msgid ""
+"A new comment has been assigned to {assignee} by {user} on submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:251
 #, python-brace-format
 msgid "{user} has updated the reviewers on <{link}|{title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:250
+#: hypha/apply/activity/adapters/slack.py:270
 #, python-brace-format
 msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:262
+#: hypha/apply/activity/adapters/slack.py:282
 #, python-brace-format
 msgid "{user} as {name},"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:268
+#: hypha/apply/activity/adapters/slack.py:288
 #, python-brace-format
 msgid ""
 "{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:288
+#: hypha/apply/activity/adapters/slack.py:308
 #, python-brace-format
 msgid "{user} has transitioned the following submissions: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:298
+#: hypha/apply/activity/adapters/slack.py:318
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was sent by email. Outcome: "
 "{determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:305
+#: hypha/apply/activity/adapters/slack.py:325
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was saved without sending an "
 "email. Outcome: {determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:321
+#: hypha/apply/activity/adapters/slack.py:341
 #, python-brace-format
 msgid "Determinations of {outcome} was sent for: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:332
+#: hypha/apply/activity/adapters/slack.py:352
 #, python-brace-format
 msgid "{user} has deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:339
+#: hypha/apply/activity/adapters/slack.py:361
+#, python-brace-format
+msgid "{user} has anonymized submissions: {title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:368
 #, python-brace-format
 msgid "{user} has archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:353
+#: hypha/apply/activity/adapters/slack.py:382
 #, python-brace-format
 msgid ""
 "<{link}|{title}> is ready for review. The following are assigned as "
@@ -606,32 +693,36 @@ msgstr ""
 msgid "Last 3 months"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:16
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:70
+#: hypha/apply/activity/forms.py:17
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:47
 msgid "Attachments"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:20 hypha/apply/funds/forms.py:102
-#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:371
+#: hypha/apply/activity/forms.py:21 hypha/apply/funds/forms.py:102
+#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:389
 msgid "Select..."
 msgstr ""
 
-#: hypha/apply/activity/forms.py:21
+#: hypha/apply/activity/forms.py:22
 msgid "Assign to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:33
+#: hypha/apply/activity/forms.py:39
 msgid "Visible to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:34
+#: hypha/apply/activity/forms.py:40
 msgid "Message"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:38
+#: hypha/apply/activity/forms.py:44
 msgid "Select a relevant user role. Staff can view every comment."
 msgstr ""
 
+#: hypha/apply/activity/forms.py:73
+msgid "Write a comment..."
+msgstr ""
+
 #: hypha/apply/activity/management/commands/send_staff_email_digest.py:146
 msgid "Summary of all activities"
 msgstr ""
@@ -641,7 +732,8 @@ msgid "Activities Summary - "
 msgstr ""
 
 #: hypha/apply/activity/models.py:25
-#: hypha/apply/funds/models/co_applicants.py:9 hypha/apply/todo/options.py:69
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:12
+#: hypha/apply/funds/models/co_applicants.py:10 hypha/apply/todo/options.py:76
 msgid "Comment"
 msgstr ""
 
@@ -649,7 +741,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: hypha/apply/activity/models.py:36
+#: hypha/apply/activity/models.py:36 hypha/apply/funds/forms.py:336
 msgid "Applicants"
 msgstr ""
 
@@ -657,9 +749,9 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:231
-#: hypha/apply/funds/tables.py:469
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:81
+#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:245
+#: hypha/apply/funds/tables.py:533
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:86
 #: hypha/apply/funds/templates/submissions/all.html:437
 #: hypha/apply/funds/templates/submissions/all.html:478
 msgid "Reviewers"
@@ -677,7 +769,7 @@ msgstr ""
 msgid "activity attachments"
 msgstr ""
 
-#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:379
+#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:384
 msgid "message"
 msgstr ""
 
@@ -693,19 +785,19 @@ msgstr ""
 msgid "activities"
 msgstr ""
 
-#: hypha/apply/activity/models.py:329
+#: hypha/apply/activity/models.py:334
 msgid "verb"
 msgstr ""
 
-#: hypha/apply/activity/models.py:340
+#: hypha/apply/activity/models.py:345
 msgid "event"
 msgstr ""
 
-#: hypha/apply/activity/models.py:341
+#: hypha/apply/activity/models.py:346
 msgid "events"
 msgstr ""
 
-#: hypha/apply/activity/models.py:380
+#: hypha/apply/activity/models.py:385
 msgid "messages"
 msgstr ""
 
@@ -798,149 +890,189 @@ msgid "deleted submission"
 msgstr ""
 
 #: hypha/apply/activity/options.py:35
-msgid "deleted review"
+msgid "anonymized submission"
 msgstr ""
 
 #: hypha/apply/activity/options.py:36
-msgid "deleted review opinion"
+msgid "deleted review"
 msgstr ""
 
 #: hypha/apply/activity/options.py:37
-msgid "created project"
+msgid "deleted review opinion"
 msgstr ""
 
 #: hypha/apply/activity/options.py:38
-msgid "updated project lead"
+msgid "created project"
 msgstr ""
 
 #: hypha/apply/activity/options.py:39
-msgid "updated project title"
+msgid "created a project SOW"
 msgstr ""
 
 #: hypha/apply/activity/options.py:40
-msgid "edited review"
+msgid "edited a project SOW"
 msgstr ""
 
 #: hypha/apply/activity/options.py:41
-msgid "sent for approval"
+msgid "created a project form"
 msgstr ""
 
 #: hypha/apply/activity/options.py:42
-msgid "approved project"
+msgid "edited a project form"
 msgstr ""
 
 #: hypha/apply/activity/options.py:43
-msgid "assign project form approver"
+msgid "updated project lead"
 msgstr ""
 
 #: hypha/apply/activity/options.py:44
+msgid "updated project title"
+msgstr ""
+
+#: hypha/apply/activity/options.py:47
+msgid "updated project contract number"
+msgstr ""
+
+#: hypha/apply/activity/options.py:49
+msgid "edited review"
+msgstr ""
+
+#: hypha/apply/activity/options.py:50
+msgid "sent for approval"
+msgstr ""
+
+#: hypha/apply/activity/options.py:51
+msgid "approved project"
+msgstr ""
+
+#: hypha/apply/activity/options.py:52
+msgid "assign project form approver"
+msgstr ""
+
+#: hypha/apply/activity/options.py:53
 msgid "approved project form"
 msgstr ""
 
-#: hypha/apply/activity/options.py:45
+#: hypha/apply/activity/options.py:54
 msgid "transitioned project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:46
+#: hypha/apply/activity/options.py:55
 msgid "requested project change"
 msgstr ""
 
-#: hypha/apply/activity/options.py:49
+#: hypha/apply/activity/options.py:58
 msgid "submitted contract documents"
 msgstr ""
 
-#: hypha/apply/activity/options.py:51
+#: hypha/apply/activity/options.py:60
 msgid "uploaded document to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:52
+#: hypha/apply/activity/options.py:61
 msgid "uploaded contract to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:53
+#: hypha/apply/activity/options.py:62
 msgid "approved contract"
 msgstr ""
 
-#: hypha/apply/activity/options.py:54
+#: hypha/apply/activity/options.py:63
 msgid "created invoice for project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:55
+#: hypha/apply/activity/options.py:64
 msgid "updated invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:56
+#: hypha/apply/activity/options.py:65
 msgid "approve invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:57
+#: hypha/apply/activity/options.py:66
 msgid "deleted invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:58
+#: hypha/apply/activity/options.py:67
 msgid "sent project to compliance"
 msgstr ""
 
-#: hypha/apply/activity/options.py:59
+#: hypha/apply/activity/options.py:68
 msgid "updated invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:60
+#: hypha/apply/activity/options.py:69
 msgid "submitted report"
 msgstr ""
 
-#: hypha/apply/activity/options.py:61
+#: hypha/apply/activity/options.py:70
+msgid "deleted report"
+msgstr ""
+
+#: hypha/apply/activity/options.py:71
 msgid "skipped report"
 msgstr ""
 
-#: hypha/apply/activity/options.py:62
+#: hypha/apply/activity/options.py:72
 msgid "changed report frequency"
 msgstr ""
 
-#: hypha/apply/activity/options.py:64
+#: hypha/apply/activity/options.py:74
 msgid "notified report"
 msgstr ""
 
-#: hypha/apply/activity/options.py:65
+#: hypha/apply/activity/options.py:75
 msgid "reminder to review"
 msgstr ""
 
-#: hypha/apply/activity/options.py:66
+#: hypha/apply/activity/options.py:76
 msgid "batch deleted submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:69
+#: hypha/apply/activity/options.py:79
+msgid "batch anonymized submissions"
+msgstr ""
+
+#: hypha/apply/activity/options.py:83
 msgid "batch archive submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:73
+#: hypha/apply/activity/options.py:87
 msgid "batch update invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:75
+#: hypha/apply/activity/options.py:89
 msgid "created new account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:76
+#: hypha/apply/activity/options.py:90
 msgid "edited account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:77
+#: hypha/apply/activity/options.py:91
 msgid "archived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:78
+#: hypha/apply/activity/options.py:92
 msgid "unarchived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:79
+#: hypha/apply/activity/options.py:93
 msgid "remove task"
 msgstr ""
 
-#: hypha/apply/activity/options.py:80
+#: hypha/apply/activity/options.py:94
 msgid "invite co-applicant"
 msgstr ""
 
+#: hypha/apply/activity/options.py:95
+msgid "updated author"
+msgstr ""
+
+#: hypha/apply/activity/options.py:96
+msgid "comment assigned"
+msgstr ""
+
 #: hypha/apply/activity/templates/activity/include/action_list.html:6
 msgid "There are no actions."
 msgstr ""
@@ -972,13 +1104,13 @@ msgid "Filter"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/notifications.html:79
-#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:44
+#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:61
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:46
-#: hypha/apply/funds/models/co_applicants.py:8
+#: hypha/apply/funds/models/co_applicants.py:9
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:62
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:76
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:83
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:99
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:133
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:120
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:159
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:72
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:19
@@ -1002,90 +1134,120 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:28
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:23
+msgid "Additional options"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:35
+#: hypha/apply/funds/templates/funds/comments.html:68
+#: hypha/apply/funds/templates/funds/comments.html:82
+msgid "Add Comment"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:36
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:150
 #, python-format
 msgid "This user is a %(role)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:37
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:48
+msgid "message from determination"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:50
+#, python-format
+msgid "commented on %(related_name)s"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:53
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:159
 msgid "commented"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:52
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:69
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:173
 msgid "Assigned to you"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:54
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:71
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:175
 #, python-format
 msgid "Assigned to %(assigned_to)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:61
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:78
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:182
 #, python-format
 msgid "This is visible to %(visibility_text)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:72
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:193
 msgid "Edit comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:76
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:93
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:197
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:40
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:36
-#: hypha/apply/funds/models/co_applicants.py:10
+#: hypha/apply/funds/models/co_applicants.py:11
 #: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:10
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:118
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:55
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:90
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:98
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:122
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:106
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:97
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:76
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:130
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:170
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:29
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:148
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:50
 #: hypha/apply/review/templates/review/review_detail.html:82
 msgid "Edit"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:84
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:101
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:205
 msgid ""
 "Are you sure you want to delete this comment? This action cannot be undone."
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:85
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:102
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:206
 msgid "Delete comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:106
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:210
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:59
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:120
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:182
 #: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:21
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:26
 #: hypha/apply/funds/templates/funds/modals/edit_co_applicant_form.html:75
-#: hypha/apply/funds/templates/submissions/all.html:502
-#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:59
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
-#: hypha/apply/projects/views/payment.py:356
+#: hypha/apply/funds/templates/submissions/all.html:504
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:71
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:41
+#: hypha/apply/projects/views/invoice.py:361
 #: hypha/apply/review/templates/review/review_detail.html:92
-#: hypha/templates/cotton/modal/confirm.html:43
 #: hypha/templates/includes/dialog_form_base.html:28
 msgid "Delete"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:97
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:114
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:218
 msgid "updated"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:109
-msgid "View "
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:125
+#, python-format
+msgid "View %(related_name)s"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:27
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:78
-#: hypha/apply/funds/views/submission_edit.py:131
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:130
+#: hypha/apply/funds/views/submission_edit.py:318
 #: hypha/apply/funds/workflows/definitions/double_stage.py:20
 #: hypha/apply/funds/workflows/definitions/double_stage.py:48
 #: hypha/apply/funds/workflows/definitions/double_stage.py:98
@@ -1100,6 +1262,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:50
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:120
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:164
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:19
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:46
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:105
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:20
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:47
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:93
@@ -1109,18 +1275,18 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
 #: hypha/apply/projects/reports/templates/reports/report_form.html:60
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:30
-#: hypha/apply/projects/views/project.py:309
-#: hypha/apply/projects/views/project.py:345
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
-#: hypha/apply/projects/views/project.py:903
-#: hypha/apply/projects/views/project.py:942
-#: hypha/apply/projects/views/project.py:976
-#: hypha/apply/projects/views/project.py:1009
-#: hypha/apply/projects/views/project.py:1363
-#: hypha/apply/projects/views/project.py:1436
-#: hypha/apply/projects/views/project.py:1467
-#: hypha/apply/projects/views/project.py:1622
+#: hypha/apply/projects/views/project.py:313
+#: hypha/apply/projects/views/project.py:349
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
+#: hypha/apply/projects/views/project.py:954
+#: hypha/apply/projects/views/project.py:993
+#: hypha/apply/projects/views/project.py:1027
+#: hypha/apply/projects/views/project.py:1060
+#: hypha/apply/projects/views/project.py:1414
+#: hypha/apply/projects/views/project.py:1487
+#: hypha/apply/projects/views/project.py:1518
+#: hypha/apply/projects/views/project.py:1673
 #: hypha/apply/review/templates/review/review_edit_form.html:67
 #: hypha/apply/review/templates/review/review_form.html:84
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1135,6 +1301,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:58
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:59
 #: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:40
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:37
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:17
 #: hypha/apply/projects/templates/application_projects/project_form.html:33
 #: hypha/apply/users/templates/users/become.html:33
 #: hypha/templates/cotton/modal/confirm.html:48
@@ -1164,12 +1332,13 @@ msgid "Submissions"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:17
-#: hypha/apply/funds/tables.py:76
+#: hypha/apply/funds/tables.py:77
 #: hypha/apply/funds/templates/cotton/submission_list.html:38
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:41
-#: hypha/apply/funds/templates/funds/comments.html:37
-#: hypha/apply/projects/templates/application_projects/project_detail.html:31
-#: hypha/apply/review/views.py:432
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:29
+#: hypha/apply/funds/templates/funds/comments.html:25
+#: hypha/apply/projects/templates/application_projects/project_detail.html:26
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:24
+#: hypha/apply/review/views.py:441
 msgid "Comments"
 msgstr ""
 
@@ -1178,7 +1347,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
 #: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:62
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:68
 #: hypha/apply/review/templates/review/review_list.html:4
 #: hypha/apply/review/templates/review/review_list.html:9
 #: hypha/core/navigation.py:80
@@ -1212,6 +1381,7 @@ msgid "View your submission here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:16
+#: hypha/apply/activity/templates/messages/email/author_updated.html:11
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:29
 #: hypha/apply/activity/templates/messages/email/invited_to_proposal.html:11
 #: hypha/apply/activity/templates/messages/email/submission_confirmation.html:10
@@ -1219,6 +1389,7 @@ msgid "If you have any questions, please submit them here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:18
+#: hypha/apply/activity/templates/messages/email/author_updated.html:13
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:31
 msgid "See our guide for more information"
 msgstr ""
@@ -1245,8 +1416,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/revisions_compare.html:42
 #: hypha/apply/funds/templates/funds/revisions_compare.html:43
 #: hypha/core/models/system_settings.py:21
-#: hypha/core/models/system_settings.py:79
-#: hypha/core/models/system_settings.py:89
+#: hypha/core/models/system_settings.py:81
+#: hypha/core/models/system_settings.py:91
 msgid "Title"
 msgstr ""
 
@@ -1269,11 +1440,30 @@ msgstr ""
 msgid "Please contact %(lead)s - %(email)s if you have any questions."
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/author_updated.html:6
+#, python-format
+msgid "You have been assigned as an Applicant to submission \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:10
+msgid "Link to your submission"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:15
+#, python-format
+msgid ""
+"If you have any issues accessing the submission or other general inquiries, "
+"please email us at %(ORG_EMAIL)s"
+msgstr ""
+
 #: hypha/apply/activity/templates/messages/email/base.html:5
 #: hypha/apply/users/templates/users/activation/email.txt:2
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:2
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:2
 #: hypha/apply/users/templates/users/emails/confirm_access.md:2
+#: hypha/apply/users/templates/users/emails/login_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:2
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:2
 #: hypha/apply/users/templates/users/emails/set_password.txt:2
 #: hypha/apply/users/templates/users/password_reset/email.txt:2
@@ -1286,6 +1476,9 @@ msgstr ""
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:7
 #: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/login_notification.md:14
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:15
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:15
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
 #: hypha/apply/users/templates/users/emails/set_password.txt:10
@@ -1318,6 +1511,19 @@ msgstr ""
 msgid "Read the full comment here"
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:5
+msgid "Hey there,"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:8
+#, python-format
+msgid "You have been assigned to a comment on \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:12
+msgid "View it here"
+msgstr ""
+
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:13
 msgid "A new contract has been added to your Project"
 msgstr ""
@@ -1541,8 +1747,8 @@ msgid "no longer required"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/report_skipped.html:6
-#: hypha/apply/projects/models/project.py:818
-#: hypha/apply/projects/models/project.py:855
+#: hypha/apply/projects/models/project.py:847
+#: hypha/apply/projects/models/project.py:884
 msgid "required"
 msgstr ""
 
@@ -1640,7 +1846,7 @@ msgid "Please submit any questions related to your application here"
 msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:50
-#: hypha/apply/funds/tables.py:498
+#: hypha/apply/funds/tables.py:562
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:12
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:28
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:44
@@ -1651,7 +1857,7 @@ msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:61
 #: hypha/apply/funds/templates/cotton/submission_list.html:24
-#: hypha/apply/funds/templatetags/workflow_tags.py:72
+#: hypha/apply/funds/templatetags/workflow_tags.py:126
 #: hypha/apply/users/roles.py:5
 msgid "Applicant"
 msgstr ""
@@ -1666,22 +1872,26 @@ msgstr ""
 msgid "You can begin submitting invoices and reports for your project."
 msgstr ""
 
-#: hypha/apply/activity/views.py:61
+#: hypha/apply/activity/views.py:99
 msgid "You can only edit your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:64
+#: hypha/apply/activity/views.py:102
 msgid "You can not edit a deleted comment"
 msgstr ""
 
-#: hypha/apply/activity/views.py:92
+#: hypha/apply/activity/views.py:130
 msgid "You can only delete your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:95
+#: hypha/apply/activity/views.py:133
 msgid "You can not delete a deleted comment"
 msgstr ""
 
+#: hypha/apply/activity/views.py:183
+msgid "Comment added!"
+msgstr ""
+
 #: hypha/apply/categories/admin.py:13
 msgid "Category Questions"
 msgstr ""
@@ -1701,27 +1911,27 @@ msgstr ""
 msgid "{title} {child_verbose_name} {verbose_name} for {parent}"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:31
+#: hypha/apply/categories/blocks.py:37
 msgid "Multi select"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:35 hypha/apply/funds/blocks.py:96
-#: hypha/apply/funds/blocks.py:153 hypha/apply/funds/blocks.py:199
+#: hypha/apply/categories/blocks.py:41 hypha/apply/funds/blocks.py:113
+#: hypha/apply/funds/blocks.py:170 hypha/apply/funds/blocks.py:216
 #: hypha/apply/stream_forms/blocks.py:36
 msgid "Label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:37
+#: hypha/apply/categories/blocks.py:43
 msgid "Leave blank to use the default Category label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:40 hypha/apply/funds/blocks.py:100
-#: hypha/apply/funds/blocks.py:157 hypha/apply/funds/blocks.py:202
+#: hypha/apply/categories/blocks.py:46 hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:174 hypha/apply/funds/blocks.py:219
 #: hypha/apply/stream_forms/blocks.py:37
 msgid "Help text"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:42
+#: hypha/apply/categories/blocks.py:48
 msgid "Leave blank to use the default Category help text"
 msgstr ""
 
@@ -1742,7 +1952,8 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:234
+#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:248
+#: hypha/apply/funds/tables.py:333
 #: hypha/apply/funds/templates/submissions/all.html:419
 #: hypha/apply/projects/templates/application_projects/modals/contracting_documents_upload.html:7
 #: hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html:7
@@ -1786,11 +1997,15 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:373
-#: hypha/apply/funds/tables.py:236
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:121
+#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:390
+#: hypha/apply/funds/tables.py:250
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:126
 #: hypha/apply/funds/templates/submissions/all.html:425
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:5
+#: hypha/apply/projects/forms/invoice.py:238 hypha/apply/projects/tables.py:115
+#: hypha/apply/projects/tables.py:152
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:58
+#: hypha/apply/projects/templates/application_projects/partials/invoice_tags.html:4
 msgid "Tags"
 msgstr ""
 
@@ -1864,12 +2079,12 @@ msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html:91
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:24
-#: hypha/apply/funds/tables.py:68
+#: hypha/apply/funds/tables.py:69
 #: hypha/apply/funds/templates/submissions/all.html:328
-#: hypha/apply/projects/models/payment.py:26
-#: hypha/apply/projects/models/project.py:218
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:56
-#: hypha/apply/projects/tables.py:42
+#: hypha/apply/projects/models/invoice.py:37
+#: hypha/apply/projects/models/project.py:219
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:63
+#: hypha/apply/projects/tables.py:40
 msgid "Submitted"
 msgstr ""
 
@@ -1911,7 +2126,7 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:13
 #: hypha/apply/dashboard/templates/dashboard/staff_dashboard.html:16
 #: hypha/apply/users/templates/users/account.html:35
-#: hypha/templates/includes/user_menu.html:57
+#: hypha/apply/users/templates/users/includes/user_menu.html:57
 msgid "Administration"
 msgstr ""
 
@@ -1926,7 +2141,7 @@ msgid "You don't have any PAFs for review right now"
 msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:27
-#: hypha/apply/funds/models/co_applicants.py:16
+#: hypha/apply/funds/models/co_applicants.py:17
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:6
 #: hypha/core/navigation.py:109
@@ -2010,11 +2225,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:27
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
 #: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:79
-#: hypha/apply/todo/options.py:87 hypha/apply/todo/options.py:95
+#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:86
+#: hypha/apply/todo/options.py:94 hypha/apply/todo/options.py:102
 #: hypha/apply/todo/templates/todo/todolist_item.html:16
 msgid "Draft"
 msgstr ""
@@ -2026,11 +2242,9 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:30
 #: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:11
 #: hypha/apply/determinations/templates/determinations/includes/determination_block.html:18
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:104
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:84
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:79
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:28
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:40
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "by"
 msgstr ""
@@ -2126,30 +2340,38 @@ msgstr ""
 #: hypha/apply/determinations/blocks.py:77
 #: hypha/apply/determinations/blocks.py:78
 #: hypha/apply/determinations/blocks.py:79
-#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:276
-#: hypha/apply/review/blocks.py:172 hypha/apply/review/blocks.py:173
-#: hypha/apply/review/blocks.py:174 hypha/apply/review/blocks.py:175
-#: hypha/apply/review/blocks.py:176 hypha/apply/review/blocks.py:177
-#: hypha/apply/review/blocks.py:178 hypha/apply/stream_forms/blocks.py:475
-#: hypha/apply/stream_forms/blocks.py:476
-#: hypha/apply/stream_forms/blocks.py:477
-#: hypha/apply/stream_forms/blocks.py:478
-#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482
-#: hypha/apply/stream_forms/blocks.py:483
-#: hypha/apply/stream_forms/blocks.py:484
-#: hypha/apply/stream_forms/blocks.py:485
-#: hypha/apply/stream_forms/blocks.py:486
-#: hypha/apply/stream_forms/blocks.py:487
-#: hypha/apply/stream_forms/blocks.py:488 hypha/apply/utils/blocks.py:74
+#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:303
+#: hypha/apply/funds/blocks.py:304 hypha/apply/funds/blocks.py:305
+#: hypha/apply/funds/blocks.py:306 hypha/apply/funds/blocks.py:307
+#: hypha/apply/funds/blocks.py:308 hypha/apply/funds/blocks.py:309
+#: hypha/apply/funds/blocks.py:310 hypha/apply/funds/blocks.py:311
+#: hypha/apply/funds/blocks.py:312 hypha/apply/funds/blocks.py:313
+#: hypha/apply/funds/blocks.py:314 hypha/apply/funds/blocks.py:315
+#: hypha/apply/funds/blocks.py:316 hypha/apply/funds/blocks.py:317
+#: hypha/apply/funds/blocks.py:318 hypha/apply/review/blocks.py:172
+#: hypha/apply/review/blocks.py:173 hypha/apply/review/blocks.py:174
+#: hypha/apply/review/blocks.py:175 hypha/apply/review/blocks.py:176
+#: hypha/apply/review/blocks.py:177 hypha/apply/review/blocks.py:178
+#: hypha/apply/stream_forms/blocks.py:513
+#: hypha/apply/stream_forms/blocks.py:514
+#: hypha/apply/stream_forms/blocks.py:515
+#: hypha/apply/stream_forms/blocks.py:516
+#: hypha/apply/stream_forms/blocks.py:517
+#: hypha/apply/stream_forms/blocks.py:518
+#: hypha/apply/stream_forms/blocks.py:519
+#: hypha/apply/stream_forms/blocks.py:520
+#: hypha/apply/stream_forms/blocks.py:521
+#: hypha/apply/stream_forms/blocks.py:522
+#: hypha/apply/stream_forms/blocks.py:523
+#: hypha/apply/stream_forms/blocks.py:524
+#: hypha/apply/stream_forms/blocks.py:525
+#: hypha/apply/stream_forms/blocks.py:526 hypha/apply/utils/blocks.py:74
 #: hypha/apply/utils/blocks.py:75
 msgid "Fields"
 msgstr ""
 
 #: hypha/apply/determinations/blocks.py:78 hypha/apply/review/blocks.py:174
-#: hypha/apply/stream_forms/blocks.py:473
+#: hypha/apply/stream_forms/blocks.py:511
 msgid "Paragraph"
 msgstr ""
 
@@ -2169,7 +2391,7 @@ msgid "Do you recommend requesting a proposal based on this concept note?"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:305
-#: hypha/apply/determinations/views.py:99
+#: hypha/apply/determinations/views.py:100
 msgid "-- No determination selected -- "
 msgstr ""
 
@@ -2250,22 +2472,22 @@ msgid "Rationale and appropriateness questions and comments"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:592
-#: hypha/apply/determinations/views.py:389
+#: hypha/apply/determinations/views.py:394
 msgid "-- No proposal form selected -- "
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:595
-#: hypha/apply/determinations/views.py:392
+#: hypha/apply/determinations/views.py:397
 msgid "Select the proposal form only for determination approval"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:599
-#: hypha/apply/determinations/views.py:396
+#: hypha/apply/determinations/views.py:401
 msgid "Select the proposal form to use for proposal stage."
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:602
-#: hypha/apply/determinations/views.py:399
+#: hypha/apply/determinations/views.py:404
 msgid "Proposal Form"
 msgstr ""
 
@@ -2319,11 +2541,12 @@ msgstr ""
 #: hypha/apply/determinations/models.py:214
 #: hypha/apply/determinations/models.py:218
 #: hypha/apply/determinations/options.py:10
-#: hypha/apply/funds/workflows/constants.py:93
+#: hypha/apply/funds/workflows/constants.py:97
 #: hypha/apply/funds/workflows/definitions/double_stage.py:147
 #: hypha/apply/funds/workflows/definitions/double_stage.py:326
 #: hypha/apply/funds/workflows/definitions/single_stage.py:149
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:214
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:198
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:138
 msgid "Dismissed"
@@ -2336,7 +2559,7 @@ msgid "Needs more info"
 msgstr ""
 
 #: hypha/apply/determinations/models.py:255
-#: hypha/apply/funds/workflows/registry.py:66
+#: hypha/apply/funds/workflows/registry.py:67
 msgid "Request"
 msgstr ""
 
@@ -2399,9 +2622,9 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:85
 #: hypha/apply/funds/templates/funds/application_base.html:125
 #: hypha/apply/funds/templates/funds/applicationsubmission_form.html:49
-#: hypha/apply/funds/views/submission_edit.py:129
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:320
+#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:319
 #: hypha/apply/projects/reports/templates/reports/report_form.html:69
 #: hypha/apply/projects/templates/application_projects/project_approval_form.html:52
 #: hypha/apply/projects/templates/application_projects/project_sow_form.html:48
@@ -2411,7 +2634,7 @@ msgid "Save draft"
 msgstr ""
 
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:108
-#: hypha/apply/funds/templates/funds/comments.html:108
+#: hypha/apply/funds/templates/funds/comments.html:96
 #: hypha/apply/review/templates/review/review_form.html:107
 #: hypha/templates/cotton/dropdown_menu.html:99
 msgid "Loading…"
@@ -2461,8 +2684,8 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:34
 #: hypha/apply/funds/templates/funds/application_preview.html:66
 #: hypha/apply/funds/templates/funds/submission-success.html:65
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:88
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:96
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:95
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:74
 msgid "Continue editing"
 msgstr ""
 
@@ -2489,44 +2712,44 @@ msgstr ""
 msgid "Add determination"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:120
+#: hypha/apply/determinations/views.py:121
 msgid "Improperly configured request, please try again."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:213
+#: hypha/apply/determinations/views.py:214
 #, python-brace-format
 msgid "Successfully determined as {outcome}: "
 msgstr ""
 
-#: hypha/apply/determinations/views.py:234
+#: hypha/apply/determinations/views.py:235
 #, python-brace-format
 msgid "Unable to determine submission \"{title}\" as already determined"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:286
+#: hypha/apply/determinations/views.py:291
 msgid "You do not have permission to create that determination."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:291
+#: hypha/apply/determinations/views.py:296
 msgid "A final determination has already been submitted."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:304
+#: hypha/apply/determinations/views.py:309
 msgid "There is a draft determination you do not have permission to edit."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:460
+#: hypha/apply/determinations/views.py:469
 msgid "A project was automatically created."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:504
+#: hypha/apply/determinations/views.py:513
 #, python-brace-format
 msgid ""
 "A determination of \"{current}\" exists but you tried to progress as "
 "\"{target}\""
 msgstr ""
 
-#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:554
+#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:626
 #: hypha/apply/users/roles.py:6
 msgid "Staff"
 msgstr ""
@@ -2581,10 +2804,11 @@ msgstr ""
 msgid "Sealed Rounds"
 msgstr ""
 
-#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:40
-#: hypha/apply/funds/tables.py:223 hypha/apply/funds/tables.py:314
-#: hypha/apply/funds/tables.py:437 hypha/apply/funds/tables.py:474
-#: hypha/apply/projects/filters.py:35 hypha/apply/projects/filters.py:51
+#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:41
+#: hypha/apply/funds/tables.py:237 hypha/apply/funds/tables.py:325
+#: hypha/apply/funds/tables.py:372 hypha/apply/funds/tables.py:501
+#: hypha/apply/funds/tables.py:538 hypha/apply/projects/filters.py:39
+#: hypha/apply/projects/filters.py:55
 msgid "Funds"
 msgstr ""
 
@@ -2593,7 +2817,7 @@ msgid "Request For Partners"
 msgstr ""
 
 #: hypha/apply/funds/admin.py:118 hypha/apply/funds/admin_helpers.py:73
-#: hypha/apply/funds/models/__init__.py:74
+#: hypha/apply/funds/models/__init__.py:75
 msgid "Labs"
 msgstr ""
 
@@ -2644,8 +2868,8 @@ msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:47
 #: hypha/apply/funds/templates/funds/application_base.html:135
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:321
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:320
 msgid "Preview"
 msgstr ""
 
@@ -2670,7 +2894,7 @@ msgstr ""
 msgid "state"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:413
+#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:477
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:22
 #: hypha/apply/funds/templates/funds/includes/round-block.html:12
 #: hypha/apply/funds/templates/funds/includes/round-block.html:20
@@ -2679,7 +2903,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:414
+#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:478
 #: hypha/apply/funds/templates/funds/includes/round-block.html:30
 #: hypha/apply/funds/templates/funds/includes/round-block.html:37
 #: hypha/apply/funds/templates/funds/includes/round-block.html:39
@@ -2688,12 +2912,12 @@ msgid "Closed"
 msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:92
-#: hypha/apply/projects/models/project.py:220
-#: hypha/apply/projects/models/project.py:226
+#: hypha/apply/projects/models/project.py:221
+#: hypha/apply/projects/models/project.py:227
 msgid "Not started"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:416
+#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:480
 msgid "Unpublished"
 msgstr ""
 
@@ -2706,138 +2930,144 @@ msgstr ""
 msgid "Copy {form_name}"
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:79
+#: hypha/apply/funds/admin_views.py:68
+msgid ""
+"Please select the date in the copied page. Newly copied pages have NONE "
+"value for the start and end date"
+msgstr ""
+
+#: hypha/apply/funds/admin_views.py:77
 #, python-brace-format
 msgid "Page '{0}' and {1} subpages copied."
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:85
+#: hypha/apply/funds/admin_views.py:83
 #, python-brace-format
 msgid "Page '{0}' copied."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:94
+#: hypha/apply/funds/blocks.py:111
 msgid "The title of the project"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:96
+#: hypha/apply/funds/blocks.py:113
 msgid "What is the title of your application?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:101
+#: hypha/apply/funds/blocks.py:118
 msgid "This project name can be changed if a full proposal is requested."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:103
+#: hypha/apply/funds/blocks.py:120
 msgid "Max length"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:106
+#: hypha/apply/funds/blocks.py:123
 msgid "Application title"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:134
 msgid "The value of the project"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:126
+#: hypha/apply/funds/blocks.py:143
 msgid "Requested amount"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:142
+#: hypha/apply/funds/blocks.py:159
 msgid "The name of the organization"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:146
+#: hypha/apply/funds/blocks.py:163
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:73
 #: hypha/apply/projects/reports/tables.py:24
 msgid "Organization name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:151
+#: hypha/apply/funds/blocks.py:168
 msgid "The applicant email address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:153
+#: hypha/apply/funds/blocks.py:170
 msgid "What email address should we use to contact you?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:159
+#: hypha/apply/funds/blocks.py:176
 msgid ""
 "We will use this email address to communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:172
+#: hypha/apply/funds/blocks.py:189
 msgid "The postal address of the user"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:177
+#: hypha/apply/funds/blocks.py:194
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:66
 #: hypha/apply/funds/templates/funds/revisions_compare.html:57
 #: hypha/apply/funds/templates/funds/revisions_compare.html:58
 msgid "Address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:198 hypha/apply/funds/blocks.py:215
+#: hypha/apply/funds/blocks.py:215 hypha/apply/funds/blocks.py:232
 msgid "Full name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:199
+#: hypha/apply/funds/blocks.py:216
 msgid "What is your name?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:204
+#: hypha/apply/funds/blocks.py:221
 msgid "We will use this name when we communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:221
+#: hypha/apply/funds/blocks.py:238
 msgid "Duration"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:227
+#: hypha/apply/funds/blocks.py:244
 msgid "Days"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:228 hypha/apply/projects/reports/models.py:244
+#: hypha/apply/funds/blocks.py:245 hypha/apply/projects/reports/models.py:249
 msgid "Weeks"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:229 hypha/apply/projects/reports/models.py:245
+#: hypha/apply/funds/blocks.py:246 hypha/apply/projects/reports/models.py:250
 msgid "Months"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:232
+#: hypha/apply/funds/blocks.py:249
 #, python-brace-format
 msgid "{} day"
 msgid_plural "{} days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:235
+#: hypha/apply/funds/blocks.py:252
 #, python-brace-format
 msgid "{} week"
 msgid_plural "{} weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:238
+#: hypha/apply/funds/blocks.py:255
 #, python-brace-format
 msgid "{} month"
 msgid_plural "{} months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:244
+#: hypha/apply/funds/blocks.py:261
 msgid ""
 "Duration type is used to display duration choices in Days, Weeks or Months "
 "in application forms. Be careful, changing the duration type in the active "
 "round can result in data inconsistency."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:275 hypha/apply/stream_forms/blocks.py:473
-#: hypha/apply/stream_forms/blocks.py:474
-#: hypha/apply/stream_forms/blocks.py:489
-#: hypha/apply/stream_forms/blocks.py:490 hypha/apply/utils/blocks.py:85
+#: hypha/apply/funds/blocks.py:319 hypha/apply/stream_forms/blocks.py:511
+#: hypha/apply/stream_forms/blocks.py:512
+#: hypha/apply/stream_forms/blocks.py:527
+#: hypha/apply/stream_forms/blocks.py:528 hypha/apply/utils/blocks.py:85
 msgid "Custom"
 msgstr ""
 
@@ -2845,7 +3075,7 @@ msgstr ""
 msgid "Take action"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:448
+#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:458
 #, python-brace-format
 msgid "Update lead from {lead} to"
 msgstr ""
@@ -2877,65 +3107,66 @@ msgstr ""
 msgid "{role_name} Reviewer"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:376
+#: hypha/apply/funds/forms.py:393
 msgid "Tags are hierarchical in nature."
 msgstr ""
 
-#: hypha/apply/funds/forms.py:425 hypha/apply/stream_forms/blocks.py:118
+#: hypha/apply/funds/forms.py:442 hypha/apply/stream_forms/blocks.py:156
 msgid "Email"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:427 hypha/apply/funds/forms.py:460
+#: hypha/apply/funds/forms.py:444 hypha/apply/funds/forms.py:477
 msgid "Role"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:433 hypha/apply/funds/forms.py:466
+#: hypha/apply/funds/forms.py:450 hypha/apply/funds/forms.py:483
 msgid "Project permissions"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:435 hypha/apply/funds/forms.py:468
+#: hypha/apply/funds/forms.py:452 hypha/apply/funds/forms.py:485
 msgid ""
 "Enable same access level to these sections. Example: View role + Contracting "
 "= read-only contracting access."
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:39 hypha/apply/funds/tables.py:75
+#: hypha/apply/funds/models/__init__.py:40 hypha/apply/funds/tables.py:76
 #: hypha/apply/funds/templates/submissions/all.html:410
-#: hypha/apply/projects/tables.py:185 hypha/apply/projects/tables.py:262
+#: hypha/apply/projects/tables.py:203 hypha/apply/projects/tables.py:284
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
 msgid "Fund"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:47
+#: hypha/apply/funds/models/__init__.py:48
 msgid "RFP"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:48
+#: hypha/apply/funds/models/__init__.py:49
 msgid "RFPs"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:55
+#: hypha/apply/funds/models/__init__.py:56
 #: hypha/apply/funds/templates/cotton/submission_list.html:31
 #: hypha/apply/funds/templates/submissions/all.html:414
 msgid "Round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:56 hypha/apply/funds/tables.py:225
-#: hypha/apply/funds/tables.py:312 hypha/apply/funds/tables.py:479
+#: hypha/apply/funds/models/__init__.py:57 hypha/apply/funds/tables.py:239
+#: hypha/apply/funds/tables.py:327 hypha/apply/funds/tables.py:370
+#: hypha/apply/funds/tables.py:543
 #: hypha/apply/funds/templates/funds/rounds.html:5
 #: hypha/apply/funds/templates/funds/rounds.html:10
 msgid "Rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:63
+#: hypha/apply/funds/models/__init__.py:64
 msgid "Sealed round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:64
+#: hypha/apply/funds/models/__init__.py:65
 msgid "Sealed rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:73
+#: hypha/apply/funds/models/__init__.py:74
 msgid "Lab"
 msgstr ""
 
@@ -3139,76 +3370,77 @@ msgstr ""
 msgid "assigned reviewers"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:14
+#: hypha/apply/funds/models/co_applicants.py:15
 msgid "Project Document"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:15
+#: hypha/apply/funds/models/co_applicants.py:16
 msgid "Contracting Document"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:17
+#: hypha/apply/funds/models/co_applicants.py:18
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:10
 #: hypha/apply/projects/reports/templates/reports/report_list.html:6
 #: hypha/core/navigation.py:114
 msgid "Reports"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:21
+#: hypha/apply/funds/models/co_applicants.py:22
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:22
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:53
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
 msgid "Pending"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:22
-#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/workflows/constants.py:93
 #: hypha/apply/funds/workflows/definitions/double_stage.py:311
 #: hypha/apply/funds/workflows/definitions/single_stage.py:134
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:197
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:182
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:123
 msgid "Accepted"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/models/co_applicants.py:24
 msgid "Rejected"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:24
+#: hypha/apply/funds/models/co_applicants.py:25
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:14
 msgid "Expired"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:33
+#: hypha/apply/funds/models/co_applicants.py:34
 msgid "invited user email"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:42
-#: hypha/apply/funds/models/submissions.py:487
-#: hypha/apply/projects/models/payment.py:137
-#: hypha/apply/projects/models/project.py:262
+#: hypha/apply/funds/models/co_applicants.py:43
+#: hypha/apply/funds/models/submissions.py:495
+#: hypha/apply/projects/models/invoice.py:160
+#: hypha/apply/projects/models/project.py:267
 msgid "status"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:48
-#: hypha/apply/funds/models/co_applicants.py:77
+#: hypha/apply/funds/models/co_applicants.py:49
+#: hypha/apply/funds/models/co_applicants.py:83
 msgid "role"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:57
+#: hypha/apply/funds/models/co_applicants.py:58
 msgid "co-applicant invite"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:58
+#: hypha/apply/funds/models/co_applicants.py:59
 msgid "co-applicant invites"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:84
+#: hypha/apply/funds/models/co_applicants.py:90
 msgid "co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:85
+#: hypha/apply/funds/models/co_applicants.py:91
 msgid "co-applicants"
 msgstr ""
 
@@ -3483,19 +3715,20 @@ msgstr ""
 msgid "screening decisions"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:439
+#: hypha/apply/funds/models/submissions.py:447
 msgid "summary"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:502
+#: hypha/apply/funds/models/submissions.py:510
+#: hypha/apply/funds/models/submissions.py:1119
 msgid "submit time"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:531
+#: hypha/apply/funds/models/submissions.py:539
 msgid "application submission"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:532
+#: hypha/apply/funds/models/submissions.py:540
 msgid "application submissions"
 msgstr ""
 
@@ -3541,14 +3774,17 @@ msgid "Confirmation email"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:211
+#: hypha/apply/projects/models/invoice.py:21
 msgid "Failed"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:212
+#: hypha/apply/projects/models/invoice.py:22
 msgid "Success"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:213
+#: hypha/apply/projects/models/invoice.py:23
 msgid "In Progress"
 msgstr ""
 
@@ -3560,8 +3796,8 @@ msgstr ""
 msgid "submission export managers"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:24 hypha/apply/funds/permissions.py:34
-#: hypha/apply/funds/permissions.py:208 hypha/apply/projects/permissions.py:44
+#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
+#: hypha/apply/funds/permissions.py:212 hypha/apply/projects/permissions.py:44
 #: hypha/apply/projects/permissions.py:57
 #: hypha/apply/projects/permissions.py:124
 #: hypha/apply/projects/permissions.py:179
@@ -3569,38 +3805,40 @@ msgstr ""
 #: hypha/apply/projects/permissions.py:261
 #: hypha/apply/projects/permissions.py:327
 #: hypha/apply/projects/permissions.py:346
+#: hypha/apply/projects/permissions.py:423
+#: hypha/apply/projects/permissions.py:441
 msgid "Login Required"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
-#: hypha/apply/funds/permissions.py:211
+#: hypha/apply/funds/permissions.py:30 hypha/apply/funds/permissions.py:40
+#: hypha/apply/funds/permissions.py:215
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:25
 #: hypha/apply/funds/templates/funds/includes/submission-table-row.html:26
 msgid "Archived Submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:43
+#: hypha/apply/funds/permissions.py:46
 msgid "Co-applicant with edit role can edit submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:44
+#: hypha/apply/funds/permissions.py:47
 msgid "Co-applicant does not have edit role"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:45
+#: hypha/apply/funds/permissions.py:48
 msgid "User can edit in current phase"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:155
+#: hypha/apply/funds/permissions.py:159
 msgid "Staff is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:157
+#: hypha/apply/funds/permissions.py:161
 msgid "Staff Admin is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:158 hypha/apply/funds/permissions.py:255
-#: hypha/apply/funds/permissions.py:263 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:162 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:289 hypha/apply/funds/permissions.py:305
 #: hypha/apply/projects/permissions.py:49
 #: hypha/apply/projects/permissions.py:77
 #: hypha/apply/projects/permissions.py:85
@@ -3621,172 +3859,178 @@ msgstr ""
 msgid "Forbidden Error"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:231
+#: hypha/apply/funds/permissions.py:259
 msgid "No access to view submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:233
+#: hypha/apply/funds/permissions.py:261
 msgid "Applicant cannot view submission screening"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:239
+#: hypha/apply/funds/permissions.py:267
 msgid "Co-applicant can't be added to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:245
+#: hypha/apply/funds/permissions.py:271
 msgid "Co-applicants can't be invited to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:250
+#: hypha/apply/funds/permissions.py:276
 msgid "Limit reached for this submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:252
+#: hypha/apply/funds/permissions.py:278
 msgid "Applicants can invite co-applicants to their application"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:254
+#: hypha/apply/funds/permissions.py:280
 msgid "Staff can invite co-applicant on behalf of applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:260
+#: hypha/apply/funds/permissions.py:286
 msgid "Submission user can access their submission's co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:262
+#: hypha/apply/funds/permissions.py:288
 msgid "Staff can access each submissions' co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:268
+#: hypha/apply/funds/permissions.py:294
 msgid "Co-applicant can't be updated to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:274
+#: hypha/apply/funds/permissions.py:298
 msgid "Co-applicants can't be updated to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:276
+#: hypha/apply/funds/permissions.py:300
 msgid "Same user who invited can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:278
+#: hypha/apply/funds/permissions.py:302
 msgid "Submission owner can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:280
+#: hypha/apply/funds/permissions.py:304
 msgid "Staff can delete any co-applicant of any submission"
 msgstr ""
 
-#: hypha/apply/funds/services.py:45
+#: hypha/apply/funds/services.py:47
 #, python-brace-format
 msgid "{count} submissions archived."
 msgstr ""
 
-#: hypha/apply/funds/services.py:78
+#: hypha/apply/funds/services.py:80
 #, python-brace-format
 msgid "{count} submissions deleted."
 msgstr ""
 
-#: hypha/apply/funds/services.py:108
+#: hypha/apply/funds/services.py:150
+#, python-brace-format
+msgid "{sub_number} submission anonymized"
+msgid_plural "{sub_number} submissions anonymized"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/funds/services.py:175
 #, python-brace-format
 msgid "Lead set to {lead} on "
 msgstr ""
 
-#: hypha/apply/funds/services.py:158
+#: hypha/apply/funds/services.py:225
 #, python-brace-format
 msgid "{user} as {name}"
 msgstr ""
 
-#: hypha/apply/funds/services.py:166
+#: hypha/apply/funds/services.py:233
 #, python-brace-format
 msgid "Batch reviewers updated: {reviewers_text} on "
 msgstr ""
 
-#: hypha/apply/funds/tables.py:70
+#: hypha/apply/funds/tables.py:71
 #: hypha/apply/funds/templates/cotton/submission_list.html:22
 #: hypha/apply/funds/templates/submissions/all.html:344
 #: hypha/apply/funds/templates/submissions/all.html:470
-#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
-#: hypha/apply/projects/forms/payment.py:208
+#: hypha/apply/projects/filters.py:43 hypha/apply/projects/filters.py:64
+#: hypha/apply/projects/forms/invoice.py:210
 #: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:183
-#: hypha/apply/projects/tables.py:260
+#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:200
+#: hypha/apply/projects/tables.py:282
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:58
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:6
 #: hypha/apply/users/admin_views.py:55 hypha/apply/users/admin_views.py:128
 msgid "Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:74
+#: hypha/apply/funds/tables.py:75
 msgid "Type"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:78
+#: hypha/apply/funds/tables.py:79
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "Last updated"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:100
+#: hypha/apply/funds/tables.py:101
 msgid "No submissions available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:210
+#: hypha/apply/funds/tables.py:224
 msgid "Statuses"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:226 hypha/apply/funds/tables.py:438
+#: hypha/apply/funds/tables.py:240 hypha/apply/funds/tables.py:502
 msgid "Leads"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 #: hypha/apply/funds/templates/submissions/all.html:382
 msgid "Screening"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 msgid "No Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:345
+#: hypha/apply/funds/tables.py:403
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:46
 msgid "Determined"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:346
+#: hypha/apply/funds/tables.py:404
 msgid "Start"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:347
+#: hypha/apply/funds/tables.py:405
 msgid "End"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/funds/tables.py:439
+#: hypha/apply/funds/tables.py:456 hypha/apply/funds/tables.py:503
 #: hypha/apply/users/admin_views.py:125
 msgid "Active"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/users/admin_views.py:125
+#: hypha/apply/funds/tables.py:456 hypha/apply/users/admin_views.py:125
 msgid "Inactive"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:415
+#: hypha/apply/funds/tables.py:479
 msgid "Not Started"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:440
+#: hypha/apply/funds/tables.py:504
 msgid "State"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:516 hypha/apply/funds/tables.py:547
+#: hypha/apply/funds/tables.py:580 hypha/apply/funds/tables.py:619
 msgid "No reviews available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:525
+#: hypha/apply/funds/tables.py:597
 msgid "Submission"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:564
+#: hypha/apply/funds/tables.py:636
 msgid "No staff available"
 msgstr ""
 
@@ -3795,13 +4039,13 @@ msgid "Organization"
 msgstr ""
 
 #: hypha/apply/funds/templates/cotton/submission_list.html:35
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:87
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
 #: hypha/apply/funds/templates/funds/submission_sealed.html:14
 #: hypha/apply/funds/templates/submissions/all.html:431
 #: hypha/apply/funds/templates/submissions/all.html:474
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:10
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:14
-#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
+#: hypha/apply/projects/filters.py:45 hypha/apply/projects/filters.py:58
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:46
 #: hypha/apply/projects/templates/application_projects/project_sow_detail.html:10
 msgid "Lead"
@@ -3872,7 +4116,7 @@ msgid "(selected)"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/application_base.html:105
-#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:127
 msgid "Preview and submit"
 msgstr ""
 
@@ -3930,7 +4174,6 @@ msgid "Reviews & assignees"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html:50
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:66
 msgid "View all"
 msgstr ""
 
@@ -3942,6 +4185,17 @@ msgstr ""
 msgid "Create new reminder"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:3
+msgid "Anonymize application"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:5
+msgid ""
+"Are you sure you want to anonymize this application? Personal data will be "
+"removed and the application will only be accessible via statistics in the "
+"Results view. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:3
 msgid "Delete application"
 msgstr ""
@@ -3953,78 +4207,69 @@ msgid ""
 "action cannot be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:22
-#: hypha/apply/funds/templates/funds/comments.html:18
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:18
+#: hypha/apply/funds/templates/funds/comments.html:14
 #: hypha/apply/projects/templates/application_projects/paf_export.html:76
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:107
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:109
 #: hypha/apply/projects/templates/application_projects/project_detail.html:17
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:15
 msgid "Application"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:32
-#: hypha/apply/funds/templates/funds/comments.html:28
-#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
-#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
-#: hypha/apply/projects/templates/application_projects/project_detail.html:24
-msgid "Project"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:50
-#: hypha/apply/funds/templates/funds/comments.html:46
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:38
+#: hypha/apply/funds/templates/funds/comments.html:34
 msgid "View message log"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:61
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:49
 msgid "Congratulations!"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:63
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:51
 #, python-format
 msgid "Your %(stage)s application has been accepted."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:68
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:56
 #, python-format
 msgid "Start your %(stage)s application."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:77
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:65
 msgid "This application has been archived. This is visible to accounts with "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:85
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:73
 msgid "This application is sealed."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Drafted "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:22
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Submitted "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:100
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:88
 #: hypha/apply/funds/templates/submissions/all.html:336
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:34
 msgid "Updated"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:129
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:117
 msgid "Delete Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:195
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:183
 msgid "Related submissions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:203
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:214
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:191
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:202
 msgid "View linked"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:223
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:211
 msgid "Other Submissions"
 msgstr ""
 
@@ -4083,6 +4328,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:154
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:204
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:94
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:140
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:171
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:189
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:127
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:160
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:177
@@ -4106,95 +4355,104 @@ msgstr ""
 msgid "Comments: %(title)s"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/comments.html:57
+#: hypha/apply/funds/templates/funds/comments.html:45
 msgid "Add communication"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/comments.html:80
-#: hypha/apply/funds/templates/funds/comments.html:94
-msgid "Add Comment"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:4
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:5
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:6
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:88
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:66
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:4
 #: hypha/apply/projects/templates/application_projects/project_admin_detail.html:10
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:128
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:35
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:131
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:41
 msgid "Actions to take"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:15
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:16
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:12
 msgid "Unarchive Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:26
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:28
+msgid "Add another project"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:30
 #: hypha/apply/funds/templates/funds/modals/create_project_form.html:2
 msgid "Create project"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:32
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
 msgid "Complete draft determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:42
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:9
 msgid "Complete draft review"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:45
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:50
 msgid "Assign reviewers"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:60
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:19
 msgid "View determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:68
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
 #: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:34
-#: hypha/apply/projects/views/payment.py:138
+#: hypha/apply/projects/views/invoice.py:147
 msgid "Update status"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:78
 msgid "Assign"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:97
 msgid "More actions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:101
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:106
 #: hypha/apply/funds/templates/funds/revisions_compare.html:88
 msgid "Revisions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:111
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:116
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:69
 msgid "Translate"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:130
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:135
 #: hypha/apply/funds/views/reminders.py:69
 msgid "Create Reminder"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:138
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:178
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:53
-msgid "Download as PDF"
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:140
+msgid "Change Author"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:181
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:59
+msgid "Download as PDF"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:158
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:30
-#: hypha/apply/funds/templates/submissions/all.html:490
+#: hypha/apply/funds/templates/submissions/all.html:491
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:32
 msgid "Archive"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:172
+#: hypha/apply/funds/templates/submissions/all.html:515
+msgid "Anonymize"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:8
 msgid "Co-applicants"
 msgstr ""
@@ -4210,8 +4468,8 @@ msgid "Not allowed"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:25
-#: hypha/apply/funds/views/co_applicants.py:58
-#: hypha/apply/funds/views/co_applicants.py:102
+#: hypha/apply/funds/views/co_applicants.py:57
+#: hypha/apply/funds/views/co_applicants.py:101
 msgid "Invite"
 msgstr ""
 
@@ -4237,7 +4495,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:16
 msgid ""
 "Are you sure you want to archive submission? Archived submissions will be "
-"hidden from the main list of submissions and can not be edited."
+"hidden from the main list of submissions and can not be edited. Submissions "
+"can be unarchived at any time."
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:16
@@ -4255,6 +4514,21 @@ msgstr ""
 msgid "You have no %(type)s rounds or labs assigned to you."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:18
+#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
+#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
+msgid "Project"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:30
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:18
+#, python-format
+msgctxt "project tab"
+msgid "Project"
+msgid_plural "Projects (%(counter)s)"
+msgstr[0] ""
+msgstr[1] ""
+
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:34
 msgid "No reminders yet."
 msgstr ""
@@ -4291,6 +4565,10 @@ msgstr ""
 msgid "Legal Name"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:54
+msgid "Edit user account"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:61
 #: hypha/apply/funds/templates/funds/revisions_compare.html:52
 #: hypha/apply/funds/templates/funds/revisions_compare.html:53
@@ -4321,7 +4599,7 @@ msgid ""
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:69
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:49
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:55
 msgid "Export"
 msgstr ""
 
@@ -4397,7 +4675,7 @@ msgid "selected"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:43
-#: hypha/templates/base.html:159
+#: hypha/templates/base.html:160
 msgid "Search..."
 msgstr ""
 
@@ -4405,17 +4683,17 @@ msgstr ""
 msgid "Search input"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:60
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:73
 #: hypha/apply/funds/templates/submissions/all.html:202
 msgid "Clear current filters & sorts"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:108
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:121
 #: hypha/templates/cotton/pagination.html:12
 msgid "Previous"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:109
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:122
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:6
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:10
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:47
@@ -4428,9 +4706,8 @@ msgid "Translate application"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:38
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:10
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:26
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 #: hypha/apply/projects/templates/application_projects/filters/widgets/date_range_input_widget.html:5
 msgid "to"
@@ -4451,22 +4728,25 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:20
 #: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:51
-#: hypha/apply/funds/views/submission_edit.py:535
-#: hypha/apply/funds/views/submission_edit.py:566
-#: hypha/apply/funds/views/submission_edit.py:595
-#: hypha/apply/funds/views/submission_edit.py:639
-#: hypha/apply/funds/views/submission_edit.py:669
-#: hypha/apply/funds/views/submission_edit.py:695
-#: hypha/apply/funds/views/translate.py:60
-#: hypha/apply/funds/views/translate.py:95
+#: hypha/apply/funds/views/submission_edit.py:536
+#: hypha/apply/funds/views/submission_edit.py:567
+#: hypha/apply/funds/views/submission_edit.py:596
+#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:670
+#: hypha/apply/funds/views/submission_edit.py:696
+#: hypha/apply/funds/views/submission_edit.py:726
+#: hypha/apply/funds/views/submission_edit.py:752
+#: hypha/apply/funds/views/translate.py:58
+#: hypha/apply/funds/views/translate.py:93
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:28
-#: hypha/apply/projects/views/payment.py:354
-#: hypha/apply/projects/views/project.py:423
-#: hypha/apply/projects/views/project.py:462
-#: hypha/apply/projects/views/project.py:506
-#: hypha/apply/projects/views/project.py:542
-#: hypha/apply/projects/views/project.py:1289
-#: hypha/apply/projects/views/project.py:1328
+#: hypha/apply/projects/views/invoice.py:359
+#: hypha/apply/projects/views/project.py:427
+#: hypha/apply/projects/views/project.py:466
+#: hypha/apply/projects/views/project.py:510
+#: hypha/apply/projects/views/project.py:546
+#: hypha/apply/projects/views/project.py:588
+#: hypha/apply/projects/views/project.py:1340
+#: hypha/apply/projects/views/project.py:1379
 msgid "Update"
 msgstr ""
 
@@ -4540,10 +4820,10 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:15
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:20
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:25
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:46
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:137
-#: hypha/apply/projects/views/project.py:1043
-#: hypha/apply/projects/views/project.py:1260
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:47
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
+#: hypha/apply/projects/views/project.py:1094
+#: hypha/apply/projects/views/project.py:1311
 msgid "Update Status"
 msgstr ""
 
@@ -4553,6 +4833,14 @@ msgstr ""
 msgid "Current status"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:2
+msgid "Update Author"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:6
+msgid "Current Author"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/modals/update_lead_form.html:2
 #: hypha/apply/projects/templates/application_projects/modals/lead_update.html:2
 msgid "Update Lead"
@@ -4566,6 +4854,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html:2
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:12
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:13
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:2
 msgid "Update tags"
 msgstr ""
 
@@ -4615,7 +4904,7 @@ msgid "Reviews by %(object)s"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:3
-#: hypha/apply/review/views.py:473
+#: hypha/apply/review/views.py:482
 msgid "Compare"
 msgstr ""
 
@@ -4704,11 +4993,11 @@ msgstr ""
 
 #: hypha/apply/funds/templates/funds/submission-success.html:77
 #: hypha/apply/users/templates/users/activation/confirm.html:43
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
 #: hypha/apply/users/templates/users/login.html:4
 #: hypha/apply/users/templates/users/login.html:86
 #: hypha/apply/users/templates/users/password_reset/complete.html:14
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:5
-#: hypha/templates/includes/user_menu.html:101
 msgid "Log in"
 msgstr ""
 
@@ -4767,6 +5056,13 @@ msgid ""
 "amount fields or data and are not included."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/submissions_result.html:53
+#, python-format
+msgid ""
+"%(count)s anonymized submission(s) are excluded because the active filter "
+"does not apply to anonymized data."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/tables/table.html:24
 #: hypha/apply/projects/templates/application_projects/tables/table.html:18
 msgid "Show"
@@ -4940,30 +5236,56 @@ msgstr ""
 msgid "Assign Reviewer(s)"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:486
-msgid "Are you sure you want to archive the selected submissions?"
+#: hypha/apply/funds/templates/submissions/all.html:538
+msgid "No results matched your search"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "Try"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "clearing"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "the current query and try again"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:4
+msgid "Anonymize applications"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:498
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:9
+#, python-format
 msgid ""
-"Are you sure you want to delete the selected submissions? This action cannot "
+"Are you sure you want to anonymize %(count)s submission(s)? Personal data "
+"will be removed and applications will only be accessible via statistics in "
+"the Results view. All draft submissions will be deleted. This action cannot "
 "be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:524
-msgid "No results matched your search"
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:11
+msgid "Archive submissions"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "Try"
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:14
+#, python-format
+msgid ""
+"Are you sure you want to archive %(count)s submission(s)? Archived "
+"submissions will be hidden from the main list and cannot be edited. "
+"Submissions can be unarchived at any time."
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "clearing"
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:4
+msgid "Delete applications"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "the current query and try again"
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:8
+#, python-format
+msgid ""
+"Are you sure you want to permanently delete %(count)s submission(s)? All "
+"data will be permanently removed. This action cannot be undone."
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:9
@@ -4971,6 +5293,7 @@ msgid "Submissions: Export as CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:11
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:11
 msgid "Export as CSV"
 msgstr ""
 
@@ -4987,6 +5310,8 @@ msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:23
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:24
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:23
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:24
 msgid "Generating downloadable CSV..."
 msgstr ""
 
@@ -4995,6 +5320,7 @@ msgid "Submissions: Download generated CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:42
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:42
 msgid "Download generated CSV"
 msgstr ""
 
@@ -5003,10 +5329,12 @@ msgid "Submissions: Generate downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:64
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:64
 msgid "Generation failed, click to retry generating downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:66
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:66
 msgid "Generate downloadable CSV"
 msgstr ""
 
@@ -5015,6 +5343,7 @@ msgid "Add tags"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:38
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 msgid "Add"
@@ -5168,12 +5497,12 @@ msgstr ""
 msgid "Filter by {label}"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:123
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
 msgid "Application #"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
-#: hypha/apply/stream_forms/blocks.py:119
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:125
+#: hypha/apply/stream_forms/blocks.py:157
 msgid "URL"
 msgstr ""
 
@@ -5186,84 +5515,86 @@ msgstr ""
 msgid "No screening"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:251
+#: hypha/apply/funds/views/all.py:244
 msgid "Newest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:252
+#: hypha/apply/funds/views/all.py:245
 msgid "Oldest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:253
+#: hypha/apply/funds/views/all.py:246
 msgid "Most Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:254
+#: hypha/apply/funds/views/all.py:247
 msgid "Least Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:255
+#: hypha/apply/funds/views/all.py:248
 msgid "Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:256
+#: hypha/apply/funds/views/all.py:249
 msgid "Least Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:257
+#: hypha/apply/funds/views/all.py:250
 msgid "Best Match"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:304
+#: hypha/apply/funds/views/all.py:297 hypha/apply/projects/views/invoice.py:671
 msgid "Started CSV generation."
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:405
+#: hypha/apply/funds/views/all.py:469
 #, python-brace-format
 msgid ""
 "A determination already exists for the following submissions and they have "
 "been excluded: {submissions}"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:418
+#: hypha/apply/funds/views/all.py:482
 msgid "Submissions expect different forms - please contact admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:431
+#: hypha/apply/funds/views/all.py:495
 msgid "Inconsistent states provided - please talk to an admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:458
+#: hypha/apply/funds/views/all.py:522
 msgid "Failed to update: "
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:463
+#: hypha/apply/funds/views/all.py:527
 #, python-brace-format
 msgid "Successfully updated status to {status}: "
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:94
+#: hypha/apply/funds/views/co_applicants.py:93
 msgid "Co-applicant invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:234
+#: hypha/apply/funds/views/co_applicants.py:229
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:18
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:74
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:14
 #: hypha/apply/projects/templates/application_projects/project_form.html:29
-#: hypha/apply/projects/views/payment.py:285
-#: hypha/apply/projects/views/project.py:2040
+#: hypha/apply/projects/views/invoice.py:290
+#: hypha/apply/projects/views/project.py:2131
 #: hypha/apply/users/templates/users/account.html:54
 msgid "Save"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:254
+#: hypha/apply/funds/views/co_applicants.py:249
 msgid "Co-applicant updated"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:282
+#: hypha/apply/funds/views/co_applicants.py:277
 msgid "Co-applicant re-invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:304
+#: hypha/apply/funds/views/co_applicants.py:299
 msgid "Co-applicant deleted"
 msgstr ""
 
@@ -5279,38 +5610,47 @@ msgstr ""
 msgid "Reminder deleted"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_detail.py:311
+#: hypha/apply/funds/views/submission_delete.py:47
+msgid "Submission anonymized."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_detail.py:301
 msgid "Submission details"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:97
-#: hypha/apply/funds/views/submission_edit.py:276
+#: hypha/apply/funds/views/submission_edit.py:96
+#: hypha/apply/funds/views/submission_edit.py:275
 msgid "Draft saved"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:366
-#: hypha/apply/funds/views/submission_edit.py:392
+#: hypha/apply/funds/views/submission_edit.py:365
+#: hypha/apply/funds/views/submission_edit.py:391
 #: hypha/apply/funds/workflows/definitions/double_stage.py:133
 msgid "Progress"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:419
-#: hypha/apply/funds/views/submission_edit.py:461
-#: hypha/apply/projects/views/project.py:605
-#: hypha/apply/projects/views/project.py:664
+#: hypha/apply/funds/views/submission_edit.py:410
+msgid "This submission already has a project."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_edit.py:421
+#: hypha/apply/funds/views/submission_edit.py:463
+#: hypha/apply/projects/views/project.py:651
+#: hypha/apply/projects/views/project.py:710
 #: hypha/apply/review/templates/review/review_confirm_delete.html:23
 #: hypha/apply/users/templates/elevate/elevate.html:39
 #: hypha/apply/users/templates/two_factor/admin/disable.html:24
 #: hypha/apply/users/templates/two_factor/profile/disable.html:39
 #: hypha/apply/users/templates/users/partials/confirmation_code_sent.html:43
+#: hypha/templates/cotton/modal/confirm.html:43
 msgid "Confirm"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:558
+#: hypha/apply/funds/views/submission_edit.py:559
 msgid "Submission Lead updated."
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:687
+#: hypha/apply/funds/views/submission_edit.py:744
 msgid "Tags updated successfully."
 msgstr ""
 
@@ -5318,56 +5658,86 @@ msgstr ""
 msgid "User attempted to translate submission but is not org faculty"
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:154
+#: hypha/apply/funds/views/translate.py:152
 #, python-brace-format
 msgid "Submission translated from {fl} to {tl}."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:167
+#: hypha/apply/funds/views/translate.py:165
 msgid "Submission translation failed. Contact your Administrator."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:174
+#: hypha/apply/funds/views/translate.py:172
 msgid "Translation cleared."
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:59
+#: hypha/apply/funds/workflows/constants.py:63
 msgid "Received"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:63
+#: hypha/apply/funds/workflows/constants.py:67
 #: hypha/apply/funds/workflows/definitions/double_stage.py:74
 #: hypha/apply/funds/workflows/definitions/double_stage.py:211
 #: hypha/apply/funds/workflows/definitions/single_stage.py:74
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:83
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:129
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:69
 msgid "Internal Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:67
+#: hypha/apply/funds/workflows/constants.py:71
+#: hypha/apply/funds/workflows/definitions/double_stage.py:91
+#: hypha/apply/funds/workflows/definitions/double_stage.py:228
+#: hypha/apply/funds/workflows/definitions/double_stage.py:273
+#: hypha/apply/funds/workflows/definitions/single_stage.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:98
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
 msgid "Ready for Discussion"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:73
+#: hypha/apply/funds/workflows/constants.py:77
 msgid "More Information Requested"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:77
+#: hypha/apply/funds/workflows/constants.py:81
 #: hypha/apply/funds/workflows/definitions/double_stage.py:165
 msgid "Invited for Proposal"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:81
+#: hypha/apply/funds/workflows/constants.py:85
 #: hypha/apply/funds/workflows/definitions/double_stage.py:258
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:115
 msgid "External Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:85
+#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/workflows/definitions/single_stage.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage.py:58
+#: hypha/apply/funds/workflows/definitions/single_stage.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage.py:109
 #: hypha/apply/funds/workflows/definitions/single_stage.py:127
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:190
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:66
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:138
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:163
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:116
 msgid "Ready for Determination"
 msgstr ""
@@ -5382,6 +5752,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:35
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:107
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:150
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:33
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:90
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:137
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:34
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:80
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:123
@@ -5402,7 +5775,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:36
 #: hypha/apply/funds/workflows/definitions/double_stage.py:60
 #: hypha/apply/funds/workflows/definitions/double_stage.py:86
-msgid "Ready For Preliminary Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:122
+msgid "Ready for Preliminary Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:37
@@ -5436,6 +5810,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:155
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:188
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:67
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:96
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:173
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:190
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:37
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:84
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:128
@@ -5449,6 +5829,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:42
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:38
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:39
 msgid "Need screening"
@@ -5468,6 +5849,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:61
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:131
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:57
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:116
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:162
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:58
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:104
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:148
@@ -5483,6 +5867,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:79
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:92
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:139
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:78
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:66
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:112
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:66
@@ -5493,6 +5879,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage.py:72
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:80
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:68
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:67
 msgid "Need screening (revert)"
@@ -5515,18 +5902,6 @@ msgstr ""
 msgid "Open Review (revert)"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:91
-#: hypha/apply/funds/workflows/definitions/double_stage.py:228
-#: hypha/apply/funds/workflows/definitions/double_stage.py:273
-#: hypha/apply/funds/workflows/definitions/single_stage.py:92
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
-msgid "Ready For Discussion"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:118
 #: hypha/apply/funds/workflows/definitions/double_stage.py:256
 #: hypha/apply/funds/workflows/definitions/double_stage.py:299
@@ -5536,16 +5911,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:140
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:184
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:206
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:126
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:113
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:157
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:179
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:131
-msgid "Ready For Discussion (revert)"
-msgstr ""
-
-#: hypha/apply/funds/workflows/definitions/double_stage.py:122
-msgid "Ready for Preliminary Determination"
+msgid "Ready for Discussion (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:129
@@ -5562,6 +5935,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:223
 #: hypha/apply/funds/workflows/definitions/double_stage.py:245
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:108
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:65
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:81
 msgid "Open External Review"
 msgstr ""
@@ -5571,7 +5945,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:197
 #: hypha/apply/funds/workflows/definitions/double_stage.py:224
 #: hypha/apply/funds/workflows/definitions/double_stage.py:267
-msgid "Ready For Final Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:304
+msgid "Ready for Final Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:179
@@ -5585,12 +5960,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:225
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:110
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:139
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:83
 msgid "Open Internal Review (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:268
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:152
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:125
 msgid "Open External Review (revert)"
 msgstr ""
@@ -5610,10 +5987,6 @@ msgstr ""
 msgid "Accept but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:304
-msgid "Ready for Final Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:312
 msgid "Final Determination"
 msgstr ""
@@ -5626,23 +5999,9 @@ msgstr ""
 msgid "Accepted but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/single_stage.py:35
-#: hypha/apply/funds/workflows/definitions/single_stage.py:58
-#: hypha/apply/funds/workflows/definitions/single_stage.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
-msgid "Ready For Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/single_stage.py:41
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:43
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:40
 msgid "Application Received"
@@ -5650,6 +6009,7 @@ msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:135
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:198
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:183
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:171
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:124
 msgid "Application Outcome"
@@ -5664,24 +6024,63 @@ msgstr ""
 msgid "Community Review"
 msgstr ""
 
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:34
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:70
+msgid "Ready for Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:79
+msgid "Ready for Review (revert)"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:82
+msgid "Application Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:91
+msgid "Open Internal Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:95
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:141
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:172
+msgid "Waitlist"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:191
+msgid "Ready for Determination (revert)"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:193
+msgid "Waitlisted"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:199
+msgid "Not Accepted"
+msgstr ""
+
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:69
 #: hypha/apply/review/templates/review/review_detail.html:10
 msgid "Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:69
+#: hypha/apply/funds/workflows/registry.py:70
 msgid "Request with same time review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:75
+#: hypha/apply/funds/workflows/registry.py:76
 msgid "Request with external review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:81
+#: hypha/apply/funds/workflows/registry.py:82
 msgid "Request with community review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:87
+#: hypha/apply/funds/workflows/registry.py:88
+msgid "Request external then internal review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/registry.py:94
 msgid "Concept & Proposal"
 msgstr ""
 
@@ -5691,20 +6090,25 @@ msgid ""
 "usages and try again!"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:45
+#: hypha/apply/projects/admin.py:46
 msgid "Project Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:62
+#: hypha/apply/projects/admin.py:63
 msgid "SOW Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:79
+#: hypha/apply/projects/admin.py:80
 msgid "Report Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:99
+#: hypha/apply/projects/admin.py:101
+msgid "Invoice Tags"
+msgstr ""
+
+#: hypha/apply/projects/admin.py:107
 #: hypha/apply/projects/templates/application_projects/project_list.html:6
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:4
 #: hypha/core/navigation.py:98 hypha/core/navigation.py:133
 msgid "Projects"
 msgstr ""
@@ -5722,17 +6126,17 @@ msgid "Vendor pending"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:22
-#: hypha/apply/projects/models/payment.py:34 hypha/apply/projects/utils.py:91
+#: hypha/apply/projects/models/invoice.py:45 hypha/apply/projects/utils.py:94
 msgid "Declined"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:23
-#: hypha/apply/projects/models/payment.py:32 hypha/apply/projects/utils.py:93
+#: hypha/apply/projects/models/invoice.py:43 hypha/apply/projects/utils.py:96
 msgid "Paid"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:24
-#: hypha/apply/projects/models/payment.py:33 hypha/apply/projects/utils.py:95
+#: hypha/apply/projects/models/invoice.py:44 hypha/apply/projects/utils.py:98
 msgid "Payment failed"
 msgstr ""
 
@@ -5745,7 +6149,7 @@ msgstr ""
 msgid "Request for change"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:224
 msgid "Up to date"
 msgstr ""
 
@@ -5753,37 +6157,42 @@ msgstr ""
 msgid "Behind schedule"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:66
+#: hypha/apply/projects/filters.py:61 hypha/apply/projects/tables.py:202
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
+msgid "Contractor"
+msgstr ""
+
+#: hypha/apply/projects/filters.py:73
 #: hypha/apply/projects/reports/templates/reports/reporting.html:6
 #: hypha/apply/projects/reports/templates/reports/reporting.html:11
-#: hypha/apply/projects/tables.py:186
+#: hypha/apply/projects/tables.py:205
 msgid "Reporting"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:108
+#: hypha/apply/projects/forms/invoice.py:110
 msgid "Invoice file"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:110
+#: hypha/apply/projects/forms/invoice.py:112
 msgid "The invoice must be a PDF."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:115
+#: hypha/apply/projects/forms/invoice.py:117
 msgid ""
 "Files that are related to the invoice. They could be xls, microsoft office "
 "documents, open office documents, pdfs, txt files."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:142
+#: hypha/apply/projects/forms/invoice.py:144
 msgid "Invoice File"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:408
+#: hypha/apply/projects/forms/invoice.py:179
+#: hypha/apply/projects/forms/project.py:418
 msgid "Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:200
+#: hypha/apply/projects/forms/invoice.py:202
 msgid "File not found on submission"
 msgstr ""
 
@@ -5800,127 +6209,164 @@ msgid "You can only approve a signed contract"
 msgstr ""
 
 #: hypha/apply/projects/forms/project.py:93
+#: hypha/apply/projects/templates/application_projects/paf_export.html:6
+#: hypha/apply/projects/templates/application_projects/sow_export.html:6
+msgid "Project title"
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:95
+msgid ""
+"A submission can have several projects. Give this one a name so it can be "
+"told apart from the others."
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:101
 msgid "Select project lead"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:98
+#: hypha/apply/projects/forms/project.py:106
 msgid "Initial project status"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:104
+#: hypha/apply/projects/forms/project.py:112
 msgid "Project end date"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:123
+#: hypha/apply/projects/forms/project.py:132
 msgid "Project lead is a required field"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:222
+#: hypha/apply/projects/forms/project.py:232
 msgid "Project form status"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:307
+#: hypha/apply/projects/forms/project.py:317
 msgid "A Project can only be sent for Approval when Drafted."
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:385
-#: hypha/apply/projects/forms/project.py:400
+#: hypha/apply/projects/forms/project.py:395
+#: hypha/apply/projects/forms/project.py:410
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:78
 msgid "Contract"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:397
 msgid "Signed and approved"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:424
+#: hypha/apply/projects/forms/project.py:434
 msgid "Contract Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:482
+#: hypha/apply/projects/forms/project.py:492
 msgid "The end date must be after the start date."
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:27
+#: hypha/apply/projects/models/invoice.py:38
 msgid "Resubmitted"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:28
+#: hypha/apply/projects/models/invoice.py:39
 msgid "Changes requested by staff"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:29
+#: hypha/apply/projects/models/invoice.py:40
 msgid "Changes requested by finance"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:30
+#: hypha/apply/projects/models/invoice.py:41
 msgid "Approved by staff"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:31
+#: hypha/apply/projects/models/invoice.py:42
 msgid "Approved by finance"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:109
+#: hypha/apply/projects/models/invoice.py:82
+msgid "invoice tag"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:83
+msgid "invoice tags"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:132
 msgid "paid value"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:116
-#: hypha/apply/projects/models/payment.py:289
-#: hypha/apply/projects/models/project.py:763
-#: hypha/apply/projects/models/project.py:795
+#: hypha/apply/projects/models/invoice.py:139
+#: hypha/apply/projects/models/invoice.py:319
+#: hypha/apply/projects/models/project.py:792
+#: hypha/apply/projects/models/project.py:824
 msgid "document"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:120
-#: hypha/apply/projects/models/payment.py:123
+#: hypha/apply/projects/models/invoice.py:143
+#: hypha/apply/projects/models/invoice.py:146
 msgid "comment"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:121
+#: hypha/apply/projects/models/invoice.py:144
 msgid "This will be displayed as a comment in the comments tab"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:125
+#: hypha/apply/projects/models/invoice.py:148
 msgid "invoice number"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:132
+#: hypha/apply/projects/models/invoice.py:155
 msgid "invoice amount"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:134
+#: hypha/apply/projects/models/invoice.py:157
 msgid "invoice date"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:135
+#: hypha/apply/projects/models/invoice.py:158
 msgid "paid date"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:146
+#: hypha/apply/projects/models/invoice.py:168
+msgid "tags"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:175
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 msgid "invoice"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:147
+#: hypha/apply/projects/models/invoice.py:176
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:20
 msgid "invoices"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:150
+#: hypha/apply/projects/models/invoice.py:180
+#, python-brace-format
+msgid "Invoice for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:181
 #, python-brace-format
-msgid "Invoice requested for {project}"
+msgid "Invoice {number} for {project}"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:298
+#: hypha/apply/projects/models/invoice.py:328
 msgid "supporting document"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:299
+#: hypha/apply/projects/models/invoice.py:329
 msgid "supporting documents"
 msgstr ""
 
+#: hypha/apply/projects/models/invoice.py:359
+msgid "invoice export manager"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:360
+msgid "invoice export managers"
+msgstr ""
+
 #: hypha/apply/projects/models/project.py:75
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:41
 msgid "Approve"
@@ -5959,299 +6405,323 @@ msgstr ""
 msgid "{} approval"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:215
+#: hypha/apply/projects/models/project.py:216
 msgid "In progress"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:248
-#: hypha/apply/projects/models/project.py:761
-#: hypha/apply/projects/models/project.py:793
+#: hypha/apply/projects/models/project.py:251
+#: hypha/apply/projects/models/project.py:790
+#: hypha/apply/projects/models/project.py:822
 msgid "title"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:250
+#: hypha/apply/projects/models/project.py:253
 msgid "value"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:257
+#: hypha/apply/projects/models/project.py:260
 msgid "proposed start date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:259
+#: hypha/apply/projects/models/project.py:262
 msgid "proposed end date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:269
+#: hypha/apply/projects/models/project.py:264
+msgid "contract number"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:274
 msgid "locked"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:272
+#: hypha/apply/projects/models/project.py:277
 msgid "submit contracting documents"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:285
+#: hypha/apply/projects/models/project.py:290
 msgid "ID of this project at integrated payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:289
+#: hypha/apply/projects/models/project.py:294
 msgid "More details of the project integrated at payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:294
+#: hypha/apply/projects/models/project.py:299
 msgid "Reviewers role and their actions/comments"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:302 hypha/apply/todo/options.py:105
-#: hypha/apply/todo/options.py:113 hypha/apply/todo/options.py:121
-#: hypha/apply/todo/options.py:129 hypha/apply/todo/options.py:138
-#: hypha/apply/todo/options.py:146 hypha/apply/todo/options.py:155
-#: hypha/apply/todo/options.py:163 hypha/apply/todo/options.py:171
-#: hypha/apply/todo/options.py:180 hypha/apply/todo/options.py:188
-#: hypha/apply/todo/options.py:196 hypha/apply/todo/options.py:204
-#: hypha/apply/todo/options.py:212
+#: hypha/apply/projects/models/project.py:307 hypha/apply/todo/options.py:112
+#: hypha/apply/todo/options.py:120 hypha/apply/todo/options.py:128
+#: hypha/apply/todo/options.py:136 hypha/apply/todo/options.py:145
+#: hypha/apply/todo/options.py:153 hypha/apply/todo/options.py:162
+#: hypha/apply/todo/options.py:170 hypha/apply/todo/options.py:178
+#: hypha/apply/todo/options.py:187 hypha/apply/todo/options.py:195
+#: hypha/apply/todo/options.py:203 hypha/apply/todo/options.py:211
+#: hypha/apply/todo/options.py:219
 msgid "project"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:303
+#: hypha/apply/projects/models/project.py:308
 msgid "projects"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:411
+#: hypha/apply/projects/models/project.py:418
 msgid "Proposed End Date must be after Proposed Start Date"
 msgstr ""
 
 #. Translators: SOW = Statement of Work
-#: hypha/apply/projects/models/project.py:518
+#: hypha/apply/projects/models/project.py:525
 msgctxt "singular"
 msgid "project SOW"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:519
+#: hypha/apply/projects/models/project.py:526
 msgctxt "plural"
 msgid "project SOW"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:541
+#: hypha/apply/projects/models/project.py:532
+#, python-brace-format
+msgid "Scope of Work for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:543
+msgctxt "singular"
+msgid "project form"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:544
+msgctxt "plural"
+msgid "project forms"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:550
+#, python-brace-format
+msgid "Project form for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:572
 msgid "project form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:542
+#: hypha/apply/projects/models/project.py:573
 msgid "project forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:579
 msgid "project SOW form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:549
+#: hypha/apply/projects/models/project.py:580
 msgid "project SOW forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:561
+#: hypha/apply/projects/models/project.py:592
 msgid "project report form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:562
+#: hypha/apply/projects/models/project.py:593
 msgid "project report forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:569
+#: hypha/apply/projects/models/project.py:600
 msgid "user groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:602
 msgid ""
 "Only selected group's users will be listed for this ProjectFormReviewerRole"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:583
+#: hypha/apply/projects/models/project.py:614
 msgid "PAF reviewers role"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:584
+#: hypha/apply/projects/models/project.py:615
 msgid "PAF reviewers roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:595
+#: hypha/apply/projects/models/project.py:626
 msgid "Before"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:596
+#: hypha/apply/projects/models/project.py:627
 msgid "After"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:605
+#: hypha/apply/projects/models/project.py:636
 msgid "Number of days"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:637
 msgid "Relation to report due date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:610
+#: hypha/apply/projects/models/project.py:641
 msgid "project reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:642
 msgid "project reminder frequencies"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:617
+#: hypha/apply/projects/models/project.py:648
 msgid "contracting group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:650
 msgid "finance group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:620
+#: hypha/apply/projects/models/project.py:651
 msgid "staff group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:622
+#: hypha/apply/projects/models/project.py:653
 msgid "Uncheck it to approve project parallelly"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:632
+#: hypha/apply/projects/models/project.py:663
 msgid "Approve Project Sequentially"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:635
+#: hypha/apply/projects/models/project.py:666
 msgid "Project Form Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:638
+#: hypha/apply/projects/models/project.py:669
 msgid "Project Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:640
+#: hypha/apply/projects/models/project.py:671
 msgid ""
 "Reviewer Roles are needed to move projects to 'Internal Approval' stage. "
 "Delete all roles to skip internal approval process and to move all internal "
 "approval projects back to the 'Draft' stage with all approvals removed."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:647
-#: hypha/apply/projects/models/project.py:648
+#: hypha/apply/projects/models/project.py:678
+#: hypha/apply/projects/models/project.py:679
 msgid "Report reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:650
+#: hypha/apply/projects/models/project.py:681
 msgid ""
 "Set up a cron job to run `notify_report_due.py`. The script will use these "
 "reminder settings."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:656
+#: hypha/apply/projects/models/project.py:687
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:35
 msgid "project settings"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:681
+#: hypha/apply/projects/models/project.py:712
 msgid "PAF approval"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:682
+#: hypha/apply/projects/models/project.py:713
 msgid "PAF approvals"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:685
+#: hypha/apply/projects/models/project.py:716
 #, python-brace-format
 msgid "Approval of {project} by {user}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:713
+#: hypha/apply/projects/models/project.py:744
 msgid "file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:716
+#: hypha/apply/projects/models/project.py:747
 msgid "signed and approved"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:718
+#: hypha/apply/projects/models/project.py:749
 msgid "counter signed?"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:728
+#: hypha/apply/projects/models/project.py:759
 msgid "contract"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:729
+#: hypha/apply/projects/models/project.py:760
 msgid "contracts"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Counter Signed"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Unsigned"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:740
+#: hypha/apply/projects/models/project.py:771
 #, python-brace-format
 msgid "Contract for {project} ({state})"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:768
+#: hypha/apply/projects/models/project.py:797
 #, python-brace-format
 msgid "Project file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:772
-#: hypha/apply/projects/models/project.py:773
+#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:802
 msgid "packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:800
+#: hypha/apply/projects/models/project.py:829
 msgid "contract packet file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:830
 msgid "contract packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:804
+#: hypha/apply/projects/models/project.py:833
 #, python-brace-format
 msgid "Contract file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:814
 #: hypha/apply/projects/models/project.py:843
+#: hypha/apply/projects/models/project.py:872
 msgid "name"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:816
 #: hypha/apply/projects/models/project.py:845
+#: hypha/apply/projects/models/project.py:874
 msgid "recommended minimum"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:820
-#: hypha/apply/projects/models/project.py:857
+#: hypha/apply/projects/models/project.py:849
+#: hypha/apply/projects/models/project.py:886
 msgid "template"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:832
+#: hypha/apply/projects/models/project.py:861
 msgid "Document Category"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:833
+#: hypha/apply/projects/models/project.py:862
 msgid "Project Document Categories"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:850
+#: hypha/apply/projects/models/project.py:879
 msgid "allow document access for groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:851
+#: hypha/apply/projects/models/project.py:880
 msgid "Only selected group's users can access the document"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:869
+#: hypha/apply/projects/models/project.py:898
 msgid "Contrat Document Category"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:870
+#: hypha/apply/projects/models/project.py:899
 msgid "Contract Document Categories"
 msgstr ""
 
@@ -6436,15 +6906,31 @@ msgstr ""
 msgid "Access allowed"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:424
-msgid "Project form is editable for active projects if no reviewer roles"
+#: hypha/apply/projects/permissions.py:426
+msgid "Project is not in Draft state"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:427
-msgid "Project form is editable in Draft by this user"
+#: hypha/apply/projects/permissions.py:429
+msgid "Only Staff can skip the PAF approval process"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:428
+#: hypha/apply/projects/permissions.py:433
+msgid "Staff can skip PAF approval when no reviewer roles are configured"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:436
+msgid "PAF reviewer roles are configured, cannot skip approval process"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:445
+msgid "Project form is editable for active projects if no reviewer roles"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:448
+msgid "Project form is editable in Draft by this user"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:449
 msgid "You are not allowed to edit the project at this time"
 msgstr ""
 
@@ -6452,7 +6938,17 @@ msgstr ""
 msgid "Reporting Period"
 msgstr ""
 
-#: hypha/apply/projects/reports/forms.py:100
+#: hypha/apply/projects/reports/forms.py:101
+#: hypha/apply/projects/reports/forms.py:120
+msgid "Report due date"
+msgstr ""
+
+#: hypha/apply/projects/reports/forms.py:112
+#: hypha/apply/projects/reports/forms.py:131
+msgid "A report for this date already exists."
+msgstr ""
+
+#: hypha/apply/projects/reports/forms.py:136
 msgid "Report on:"
 msgstr ""
 
@@ -6466,91 +6962,96 @@ msgctxt "project report (noun)"
 msgid "reports"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:204
+#: hypha/apply/projects/reports/models.py:131
+#, python-brace-format
+msgid "Report due {due_date} for {project}"
+msgstr ""
+
+#: hypha/apply/projects/reports/models.py:209
 msgid "report version"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:205
+#: hypha/apply/projects/reports/models.py:210
 msgid "report versions"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:220
+#: hypha/apply/projects/reports/models.py:225
 msgid "report private file"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:221
+#: hypha/apply/projects/reports/models.py:226
 msgid "report private files"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:240
+#: hypha/apply/projects/reports/models.py:245
 msgid "week"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:241
+#: hypha/apply/projects/reports/models.py:246
 msgid "month"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:242
+#: hypha/apply/projects/reports/models.py:247
 msgid "year"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:246
+#: hypha/apply/projects/reports/models.py:251
 msgid "Years"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:262
+#: hypha/apply/projects/reports/models.py:267
 msgid "report config"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:263
+#: hypha/apply/projects/reports/models.py:268
 msgid "report configs"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:267
+#: hypha/apply/projects/reports/models.py:272
 msgid "Disabled"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:272
+#: hypha/apply/projects/reports/models.py:277
 #, python-brace-format
 msgid "One time, that already has reported on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:277
+#: hypha/apply/projects/reports/models.py:282
 #, python-brace-format
 msgid "One time on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:285
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:316
 msgid "last day"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:291
+#: hypha/apply/projects/reports/models.py:307
 #, python-brace-format
 msgid "Once a year on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:294
+#: hypha/apply/projects/reports/models.py:310
 #, python-brace-format
 msgid "Every {occurrence} years on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:304
+#: hypha/apply/projects/reports/models.py:320
 #, python-brace-format
 msgid "Once a month on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:305
+#: hypha/apply/projects/reports/models.py:321
 #, python-brace-format
 msgid "Every {occurrence} months on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:312
+#: hypha/apply/projects/reports/models.py:328
 #, python-brace-format
 msgid "Once a week on {weekday}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:313
+#: hypha/apply/projects/reports/models.py:329
 #, python-brace-format
 msgid "Every {occurrence} weeks on {weekday}"
 msgstr ""
@@ -6567,70 +7068,88 @@ msgstr ""
 msgid "Last Notified"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "The"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "current"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "next"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:11
+msgid "Edit this report date"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "reporting period is"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:12
+msgid "edit"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:8
-msgid "A report is due for the period"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:16
+msgid "Past due"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
 msgid "Continue Editing"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
-msgid "Add Report"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+msgid "Create report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:33
 #, python-format
 msgid ""
 " You're skipping the report for %(start_date)s - %(end_date)s. This will "
 "result in a gap in reporting for the project. You can undo this at any time. "
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:29
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:32
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:34
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:38
 msgid "Skip"
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:36
+msgid "Skip this report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:48
+msgid "Delete report requirement"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:26
 msgid "Enable"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:55
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:62
 msgid "Period End"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:101
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:108
 msgid "Unskip"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show less"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show more"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:130
 msgid "No reports submitted yet."
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:2
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:18
+msgid "Add report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:2
+msgid "Delete report"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:4
+msgid ""
+"Are you sure you want to delete this report? This action cannot be undone."
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:2
+msgid "Edit report due date"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:2
 msgid "Change reporting frequency"
 msgstr ""
@@ -6693,24 +7212,24 @@ msgstr ""
 msgid "View project"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 msgid "This report is for the period"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:56
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:32
 msgid "Report Skipped"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:58
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:37
 msgid "Public Report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:107
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:85
 msgid "View previous report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:115
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:93
 msgid "View next report"
 msgstr ""
 
@@ -6774,69 +7293,90 @@ msgstr ""
 msgid "No Projects Currently Reporting."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:78
-#: hypha/apply/projects/reports/views.py:100
+#: hypha/apply/projects/reports/views.py:83
+#: hypha/apply/projects/reports/views.py:105
 msgid "You do not have permission to access this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:125
+#: hypha/apply/projects/reports/views.py:130
 msgid "You do not have permission to update this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:372
+#: hypha/apply/projects/reports/views.py:377
 msgid "You do not have permission to update reporting configurations."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:491
+#: hypha/apply/projects/reports/views.py:496
 msgid "Reporting disabled"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:31
+#: hypha/apply/projects/reports/views.py:532
+msgid "You do not have permission to add reports."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:572
+msgid "You do not have permission to edit report due dates."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:583
+msgid "A submitted report's due date cannot be edited."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:607
+msgid "You do not have permission to delete reports."
+msgstr ""
+
+#: hypha/apply/projects/tables.py:29
 msgid "Invoice #"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:43
+#: hypha/apply/projects/tables.py:41
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
 msgid "Invoice date"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:45
+#: hypha/apply/projects/tables.py:43
 msgid "Project Title"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:103
+#: hypha/apply/projects/tables.py:114
 msgid "Vendor Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:137
+#: hypha/apply/projects/tables.py:151
 msgid "Project Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:188
+#: hypha/apply/projects/tables.py:204
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:66
+msgid "Contract #"
+msgstr ""
+
+#: hypha/apply/projects/tables.py:207
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:48
 msgid "End date"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:213
+#: hypha/apply/projects/tables.py:232
 #, python-brace-format
 msgid "{count} outstanding"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:251
+#: hypha/apply/projects/tables.py:270
 msgid "Date requested"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:266
+#: hypha/apply/projects/tables.py:288
 msgid "Assignee"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:286
+#: hypha/apply/projects/tables.py:308
 msgid "Waiting for approval"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:288
+#: hypha/apply/projects/tables.py:310
 msgid "Waiting for assignee"
 msgstr ""
 
@@ -6879,8 +7419,8 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:170
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:60
 #: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:56
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
 #: hypha/apply/templates/forms/includes/field.html:55
 msgid "Upload"
 msgstr ""
@@ -6953,12 +7493,12 @@ msgid "Update approvers"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:55
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:156
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:159
 msgid "Change approver"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:67
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:168
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:171
 msgid "Assign approver"
 msgstr ""
 
@@ -6969,7 +7509,7 @@ msgstr ""
 msgid "Project form"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:124
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:132
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:172
 msgid "Fill in"
 msgstr ""
@@ -6990,7 +7530,7 @@ msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:69
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:70
 msgid "Invoice"
 msgstr ""
 
@@ -7006,13 +7546,13 @@ msgstr ""
 msgid "Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:74
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:76
 msgid "Download invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:90
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:94
 #: hypha/apply/projects/templates/application_projects/paf_export.html:63
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:101
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:106
 msgid "Supporting Documents"
 msgstr ""
 
@@ -7085,6 +7625,10 @@ msgstr ""
 msgid "Project documents status"
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/modals/project_contract_number_update.html:2
+msgid "Update contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
 msgid "Update project dates"
 msgstr ""
@@ -7205,38 +7749,33 @@ msgid ""
 "invoicing & reporting stage."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/paf_export.html:6
-#: hypha/apply/projects/templates/application_projects/sow_export.html:6
-msgid "Project title"
-msgstr ""
-
 #: hypha/apply/projects/templates/application_projects/paf_export.html:7
 #: hypha/apply/projects/templates/application_projects/sow_export.html:7
 msgid "Project ID"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:18
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:49
 msgid "Approvals"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:32
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:66
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
 msgid "Submission lead"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:34
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:72
 msgid "Staff reviewers"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:41
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:75
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:78
 msgid "as"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:51
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:89
 msgid "Advisory council"
 msgstr ""
 
@@ -7258,6 +7797,29 @@ msgstr ""
 msgid "Submit contract documents"
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:9
+msgid "Invoices: Export as CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:12
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:72
+msgid ""
+"Are you sure you want to export the invoices as a CSV file? This file may "
+"contain sensitive information, so please handle it carefully."
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:22
+msgid "Invoices: Generating downloadable CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:40
+msgid "Invoices: Download generated CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:62
+msgid "Invoices: Generate downloadable CSV"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:35
 msgid "Only editable when submitted or you have been requested to make changes"
 msgstr ""
@@ -7266,18 +7828,13 @@ msgstr ""
 msgid "Edit Invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:29
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:52
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
-msgid "View comment"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:21
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:43
+msgid "Status & Activity"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:69
-msgid "show less"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
-msgid "Contractor"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:48
+msgid "When you leave a comment or change the statuses, it'll show up here!"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:22
@@ -7293,6 +7850,23 @@ msgstr ""
 msgid "Awaiting contract finalization..."
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:75
+msgid "edit contract number"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
+msgid "Copied!"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+msgid "Copy contract number"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:91
+msgid "copy contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:10
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:14
 msgid "Project lead"
@@ -7330,22 +7904,22 @@ msgstr ""
 msgid "Update project status"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:23
-#: hypha/apply/projects/templates/application_projects/project_detail.html:54
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:49
 msgid "Project Information"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:83
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:94
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:97
 msgid "No reviews"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:174
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:177
 msgid "Download"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:182
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:57
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:185
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:63
 msgid "Download as DOCX"
 msgstr ""
 
@@ -7358,28 +7932,32 @@ msgstr ""
 msgid "Proposal attachments"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:45
+#: hypha/apply/projects/templates/application_projects/project_detail.html:40
 #, python-format
 msgid "This project is in %(status)s state."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:119
+#: hypha/apply/projects/templates/application_projects/project_detail.html:114
 msgid "Project form approvals"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#: hypha/apply/projects/templates/application_projects/project_detail.html:127
 msgid "Request changes or more information by "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:149
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+msgid "View comment"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_detail.html:144
 msgid "Pending approval from "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:153
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
 msgid "nobody assigned yet"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:161
+#: hypha/apply/projects/templates/application_projects/project_detail.html:156
 msgid "approved"
 msgstr ""
 
@@ -7396,7 +7974,7 @@ msgstr ""
 msgid "No Projects Available."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:25
 #: hypha/apply/projects/templates/application_projects/sow_export.html:5
 msgid "Scope of Work"
 msgstr ""
@@ -7422,57 +8000,57 @@ msgstr ""
 msgid "{status} by {user_role}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:104
-#: hypha/apply/projects/templatetags/project_tags.py:109
-#: hypha/apply/projects/templatetags/project_tags.py:115
-#: hypha/apply/projects/templatetags/project_tags.py:119
-#: hypha/apply/projects/templatetags/project_tags.py:237
-#: hypha/apply/projects/templatetags/project_tags.py:249
-#: hypha/apply/projects/templatetags/project_tags.py:259
-#: hypha/apply/projects/templatetags/project_tags.py:278
-#: hypha/apply/projects/templatetags/project_tags.py:283
+#: hypha/apply/projects/templatetags/project_tags.py:117
+#: hypha/apply/projects/templatetags/project_tags.py:122
+#: hypha/apply/projects/templatetags/project_tags.py:128
+#: hypha/apply/projects/templatetags/project_tags.py:132
+#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:262
+#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:291
+#: hypha/apply/projects/templatetags/project_tags.py:296
 msgid "To do"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:105
+#: hypha/apply/projects/templatetags/project_tags.py:118
 msgid "Fill in the Project Form"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:110
+#: hypha/apply/projects/templatetags/project_tags.py:123
 msgid "Move project to next stage"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:116
+#: hypha/apply/projects/templatetags/project_tags.py:129
 msgid "Resubmit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:120
+#: hypha/apply/projects/templatetags/project_tags.py:133
 msgid "Submit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:124
-#: hypha/apply/projects/templatetags/project_tags.py:132
-#: hypha/apply/projects/templatetags/project_tags.py:136
-#: hypha/apply/projects/templatetags/project_tags.py:142
-#: hypha/apply/projects/templatetags/project_tags.py:158
-#: hypha/apply/projects/templatetags/project_tags.py:164
-#: hypha/apply/projects/templatetags/project_tags.py:179
-#: hypha/apply/projects/templatetags/project_tags.py:188
-#: hypha/apply/projects/templatetags/project_tags.py:194
-#: hypha/apply/projects/templatetags/project_tags.py:202
-#: hypha/apply/projects/templatetags/project_tags.py:211
-#: hypha/apply/projects/templatetags/project_tags.py:218
-#: hypha/apply/projects/templatetags/project_tags.py:225
-#: hypha/apply/projects/templatetags/project_tags.py:229
-#: hypha/apply/projects/templatetags/project_tags.py:243
-#: hypha/apply/projects/templatetags/project_tags.py:253
+#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:145
+#: hypha/apply/projects/templatetags/project_tags.py:149
+#: hypha/apply/projects/templatetags/project_tags.py:155
+#: hypha/apply/projects/templatetags/project_tags.py:171
+#: hypha/apply/projects/templatetags/project_tags.py:177
+#: hypha/apply/projects/templatetags/project_tags.py:192
+#: hypha/apply/projects/templatetags/project_tags.py:201
+#: hypha/apply/projects/templatetags/project_tags.py:207
+#: hypha/apply/projects/templatetags/project_tags.py:215
+#: hypha/apply/projects/templatetags/project_tags.py:224
+#: hypha/apply/projects/templatetags/project_tags.py:231
+#: hypha/apply/projects/templatetags/project_tags.py:238
+#: hypha/apply/projects/templatetags/project_tags.py:242
+#: hypha/apply/projects/templatetags/project_tags.py:256
 #: hypha/apply/projects/templatetags/project_tags.py:266
-#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:285
 msgid "Waiting for"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:126
-#: hypha/apply/projects/templatetags/project_tags.py:144
+#: hypha/apply/projects/templatetags/project_tags.py:139
+#: hypha/apply/projects/templatetags/project_tags.py:157
 #, python-brace-format
 msgid ""
 "Awaiting project documents to be created and approved by {ORG_SHORT_NAME} "
@@ -7480,210 +8058,222 @@ msgid ""
 "stage."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:133
+#: hypha/apply/projects/templatetags/project_tags.py:146
 msgid "Changes requested. Awaiting documents to be resubmitted."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:150
 msgid "Awaiting project form to be created."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:160
-#: hypha/apply/projects/templatetags/project_tags.py:196
+#: hypha/apply/projects/templatetags/project_tags.py:173
+#: hypha/apply/projects/templatetags/project_tags.py:209
 #, python-brace-format
 msgid "Awaiting approval. Assigned to {approver}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:166
-#: hypha/apply/projects/templatetags/project_tags.py:204
+#: hypha/apply/projects/templatetags/project_tags.py:179
+#: hypha/apply/projects/templatetags/project_tags.py:217
 #, python-brace-format
 msgid "Awaiting {reviewer_role} to assign an approver"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:180
+#: hypha/apply/projects/templatetags/project_tags.py:193
 msgid "Awaiting project form to be approved"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:189
+#: hypha/apply/projects/templatetags/project_tags.py:202
 msgid "Awaiting approval from other approvers teams"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:212
+#: hypha/apply/projects/templatetags/project_tags.py:225
 msgid "Awaiting project from assigned approvers"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:219
+#: hypha/apply/projects/templatetags/project_tags.py:232
 #, python-brace-format
 msgid "Awaiting signed contract from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:226
+#: hypha/apply/projects/templatetags/project_tags.py:239
 msgid "Awaiting signed contract from Staff/Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:230
+#: hypha/apply/projects/templatetags/project_tags.py:243
 msgid "Awaiting signed contract from Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:239
+#: hypha/apply/projects/templatetags/project_tags.py:252
 msgid "Awaiting contract documents to be submitted by you."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:244
+#: hypha/apply/projects/templatetags/project_tags.py:257
 msgid "Awaiting countersigned contract from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:263
 msgid "Awaiting contract documents submission by you"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:254
+#: hypha/apply/projects/templatetags/project_tags.py:267
 msgid "Awaiting contract documents submission from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:261
+#: hypha/apply/projects/templatetags/project_tags.py:274
 msgid "Review the contract for all relevant details and approve."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:268
+#: hypha/apply/projects/templatetags/project_tags.py:281
 #, python-brace-format
 msgid "Awaiting contract approval from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:273
+#: hypha/apply/projects/templatetags/project_tags.py:286
 msgid "Awaiting contract approval from Staff"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:292
 msgid "Add invoices"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:284
+#: hypha/apply/projects/templatetags/project_tags.py:297
 msgid "Review invoice and take action"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:303
+#: hypha/apply/projects/templatetags/project_tags.py:316
 #, python-brace-format
 msgid "Please download the signed contract uploaded by {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:305
+#: hypha/apply/projects/templatetags/project_tags.py:318
 msgid "Countersign"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:306
+#: hypha/apply/projects/templatetags/project_tags.py:319
 msgid "Upload it back"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:308
+#: hypha/apply/projects/templatetags/project_tags.py:321
 msgid "Please also make sure to upload other required contracting documents"
 msgstr ""
 
-#: hypha/apply/projects/utils.py:85
+#: hypha/apply/projects/utils.py:88
 msgid "Pending approval"
 msgstr ""
 
-#: hypha/apply/projects/utils.py:89
+#: hypha/apply/projects/utils.py:92
 msgid "Request for change or more information"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:166
-#: hypha/apply/projects/views/payment.py:396
+#: hypha/apply/projects/views/invoice.py:175
+#: hypha/apply/projects/views/invoice.py:397
 #, python-brace-format
 msgid "<p>Invoice status updated to: {status}.</p>"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:209
+#: hypha/apply/projects/views/invoice.py:218
 msgid "Invoice updated."
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:299
+#: hypha/apply/projects/views/invoice.py:304
 msgid "<p>Invoice added.</p>"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:575
+#: hypha/apply/projects/views/invoice.py:574
 msgid "Sorry something went wrong"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:265
+#: hypha/apply/projects/views/invoice.py:712
+msgid "Invoice tags updated."
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:269
 msgid "PAF has been submitted for approval"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:337
+#: hypha/apply/projects/views/project.py:341
 msgid "Document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:365
+#: hypha/apply/projects/views/project.py:369
 msgid "Document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:396
+#: hypha/apply/projects/views/project.py:400
 msgid "Contracting document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:443
+#: hypha/apply/projects/views/project.py:447
 msgid "Unassigned"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:452
+#: hypha/apply/projects/views/project.py:456
 msgid "Lead has been updated."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:498
+#: hypha/apply/projects/views/project.py:502
 msgid "Title has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:534
+#: hypha/apply/projects/views/project.py:538
 msgid "Dates has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:655
+#: hypha/apply/projects/views/project.py:580
+msgid "Contract number has been updated"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:701
 msgid ""
 "Contractor documents have been approved.  You can receive invoices from "
 "vendor now."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:721
+#: hypha/apply/projects/views/project.py:766
 msgid "Countersigned contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:724
+#: hypha/apply/projects/views/project.py:769
 msgid "Signed contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:935
+#: hypha/apply/projects/views/project.py:986
 msgid "Contract documents submitted"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:999
+#: hypha/apply/projects/views/project.py:1050
 msgid "Contracting document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1077
+#: hypha/apply/projects/views/project.py:1128
 msgid "User don't have project form approver roles"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1083
+#: hypha/apply/projects/views/project.py:1134
 #, python-brace-format
 msgid "Updated project form status to: {paf_status}"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1173
+#: hypha/apply/projects/views/project.py:1224
 msgid "Project form status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1226
+#: hypha/apply/projects/views/project.py:1277
 msgid "Project form has been approved"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1321
+#: hypha/apply/projects/views/project.py:1372
 msgid "Project status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1614
+#: hypha/apply/projects/views/project.py:1665
 msgid "Project form approvers have been updated"
 msgstr ""
 
+#: hypha/apply/projects/views/project.py:1799
+msgid "No projects for this submission"
+msgstr ""
+
 #: hypha/apply/review/admin_helpers.py:11
 msgid "Clone"
 msgstr ""
@@ -7712,7 +8302,7 @@ msgstr ""
 
 #: hypha/apply/review/blocks.py:149
 #: hypha/apply/review/templates/review/review_detail.html:48
-#: hypha/apply/review/views.py:431
+#: hypha/apply/review/views.py:440
 msgid "Visibility"
 msgstr ""
 
@@ -7777,7 +8367,7 @@ msgstr ""
 msgid "5. Excellent"
 msgstr ""
 
-#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:245
+#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:283
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:11
 msgid "No"
 msgstr ""
@@ -7786,7 +8376,7 @@ msgstr ""
 msgid "Maybe"
 msgstr ""
 
-#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:244
+#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:282
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:8
 msgid "Yes"
 msgstr ""
@@ -7845,13 +8435,13 @@ msgid "View Changes"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:40
-#: hypha/apply/review/views.py:429
+#: hypha/apply/review/views.py:438
 msgid "Recommendation"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:66
 #: hypha/apply/review/templates/review/review_list.html:30
-#: hypha/apply/review/views.py:427
+#: hypha/apply/review/views.py:436
 msgid "Opinions"
 msgstr ""
 
@@ -7903,155 +8493,167 @@ msgstr ""
 msgid "Avg. score: {average}"
 msgstr ""
 
-#: hypha/apply/review/views.py:74
+#: hypha/apply/review/views.py:76
 msgid "Edit Review"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Update Review draft"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Create Review"
 msgstr ""
 
-#: hypha/apply/review/views.py:428
+#: hypha/apply/review/views.py:437
 msgid "Overall Score"
 msgstr ""
 
-#: hypha/apply/review/views.py:430
+#: hypha/apply/review/views.py:439
 msgid "Revision"
 msgstr ""
 
-#: hypha/apply/review/views.py:470
+#: hypha/apply/review/views.py:479
 msgid "Current"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:114
-#: hypha/apply/stream_forms/blocks.py:217
+#: hypha/apply/stream_forms/blocks.py:123
+#: hypha/apply/stream_forms/blocks.py:255
 msgid "Required"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:124
+#: hypha/apply/stream_forms/blocks.py:142
+msgid "Personal information"
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:146
+msgid ""
+"Tick this if the answer will contain personally identifiable information, "
+"such as a name, address, phone number or date of birth. Only the applicant, "
+"their co-applicants and staff will be able to see the answer. Reviewers and "
+"other users will see that the question was asked, but not the answer."
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:162
 msgid "Format"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:125
-#: hypha/apply/stream_forms/blocks.py:156
-#: hypha/apply/stream_forms/blocks.py:171
+#: hypha/apply/stream_forms/blocks.py:163
+#: hypha/apply/stream_forms/blocks.py:194
+#: hypha/apply/stream_forms/blocks.py:209
 msgid "Default value"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:128
+#: hypha/apply/stream_forms/blocks.py:166
 msgid "Text field (single line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:147
+#: hypha/apply/stream_forms/blocks.py:185
 msgid "Max number of inputs"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:148
+#: hypha/apply/stream_forms/blocks.py:186
 msgid "Add new item"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:151
+#: hypha/apply/stream_forms/blocks.py:189
 msgid "Text field (single line) (multiple inputs)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:157
+#: hypha/apply/stream_forms/blocks.py:195
 msgid "Word limit"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:162
+#: hypha/apply/stream_forms/blocks.py:200
 msgid "Text field (multi line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:176
+#: hypha/apply/stream_forms/blocks.py:214
 msgid "Number field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:189
+#: hypha/apply/stream_forms/blocks.py:227
 msgid "Checkbox field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:201
-#: hypha/apply/stream_forms/blocks.py:219
+#: hypha/apply/stream_forms/blocks.py:239
+#: hypha/apply/stream_forms/blocks.py:257
 msgid "Choice"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:207
+#: hypha/apply/stream_forms/blocks.py:245
 msgid "Radio buttons"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:221
+#: hypha/apply/stream_forms/blocks.py:259
 msgid ""
 "Please create only two choices for toggle. First choice will revel the group "
 "and the second hide it. Additional choices will be ignored."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:231
+#: hypha/apply/stream_forms/blocks.py:269
 msgid "Group fields"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:233
+#: hypha/apply/stream_forms/blocks.py:271
 msgid "Remember to end group using Group fields end block."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:253
+#: hypha/apply/stream_forms/blocks.py:291
 msgid "Group fields end"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:255
+#: hypha/apply/stream_forms/blocks.py:293
 msgid "End of Group fields Block"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:262
+#: hypha/apply/stream_forms/blocks.py:300
 msgid "Dropdown field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:272
+#: hypha/apply/stream_forms/blocks.py:310
 msgid "Checkbox"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:278
+#: hypha/apply/stream_forms/blocks.py:316
 msgid "Multiple checkboxes field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:319
+#: hypha/apply/stream_forms/blocks.py:357
 msgid "Date field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:341
+#: hypha/apply/stream_forms/blocks.py:379
 msgid "Time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:373
+#: hypha/apply/stream_forms/blocks.py:411
 msgid "Date+time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:405
+#: hypha/apply/stream_forms/blocks.py:443
 msgid "Image field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:418
+#: hypha/apply/stream_forms/blocks.py:456
 msgid "Single File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:424
-#: hypha/apply/stream_forms/blocks.py:443
+#: hypha/apply/stream_forms/blocks.py:462
+#: hypha/apply/stream_forms/blocks.py:481
 #, python-brace-format
 msgid "{help_text} Accepted file types are {file_types}"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:437
+#: hypha/apply/stream_forms/blocks.py:475
 msgid "Multiple File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:474
+#: hypha/apply/stream_forms/blocks.py:512
 msgid "Section header"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:493
+#: hypha/apply/stream_forms/blocks.py:531
 msgid "Form fields"
 msgstr ""
 
@@ -8089,25 +8691,20 @@ msgid ""
 "update your user account with the name you provide here."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:8
-#, python-format
-msgid "View file - %(filename)s"
-msgstr ""
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:14
-msgid "uploaded"
+#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
+msgid "No selection"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:25
-msgid "File not found"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "Contains personal information."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:32
-msgid "Missing file"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "(PII)"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
-msgid "No selection"
+#: hypha/apply/stream_forms/templates/stream_forms/render_redacted_field.html:12
+msgid "Hidden — contains personal information."
 msgstr ""
 
 #: hypha/apply/templates/forms/includes/field.html:11
@@ -8144,91 +8741,99 @@ msgstr ""
 msgid "tasks"
 msgstr ""
 
-#: hypha/apply/todo/options.py:30
+#: hypha/apply/todo/options.py:32
 msgid "Comment Task"
 msgstr ""
 
-#: hypha/apply/todo/options.py:31
+#: hypha/apply/todo/options.py:33
 msgid "Submission Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:32
+#: hypha/apply/todo/options.py:34
 msgid "Determination draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:33
+#: hypha/apply/todo/options.py:35
 msgid "Review Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:34
+#: hypha/apply/todo/options.py:36
 msgid "Project waiting project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:35
+#: hypha/apply/todo/options.py:37
 msgid "Project waiting scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:36
+#: hypha/apply/todo/options.py:38
 msgid "Project submit project form(s)"
 msgstr ""
 
-#: hypha/apply/todo/options.py:37
+#: hypha/apply/todo/options.py:39
 msgid "Project submit scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:38
+#: hypha/apply/todo/options.py:40
 msgid "Project form required changes"
 msgstr ""
 
-#: hypha/apply/todo/options.py:39
+#: hypha/apply/todo/options.py:41
 msgid "Project form waiting assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:40
+#: hypha/apply/todo/options.py:42
 msgid "Project form waiting approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:41
+#: hypha/apply/todo/options.py:43
 msgid "Project waiting contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:44
+#: hypha/apply/todo/options.py:46
 msgid "Project waiting contract document"
 msgstr ""
 
-#: hypha/apply/todo/options.py:46
+#: hypha/apply/todo/options.py:48
 msgid "Project waiting contract review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:47
+#: hypha/apply/todo/options.py:49
 msgid "Project waiting invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:48
+#: hypha/apply/todo/options.py:50
 msgid "Invoice required changes"
 msgstr ""
 
-#: hypha/apply/todo/options.py:49
+#: hypha/apply/todo/options.py:51
 msgid "Invoice waiting approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:50
+#: hypha/apply/todo/options.py:52
 msgid "Invoice waiting paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:51
+#: hypha/apply/todo/options.py:53
 msgid "Report due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:52
+#: hypha/apply/todo/options.py:54
 msgid "Download exported submissions"
 msgstr ""
 
-#: hypha/apply/todo/options.py:55
+#: hypha/apply/todo/options.py:57
 msgid "Failed to generate submissions export file"
 msgstr ""
 
-#: hypha/apply/todo/options.py:65
+#: hypha/apply/todo/options.py:59
+msgid "Download exported invoices"
+msgstr ""
+
+#: hypha/apply/todo/options.py:62
+msgid "Failed to generate invoices export file"
+msgstr ""
+
+#: hypha/apply/todo/options.py:72
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.source.fund_name} "
@@ -8236,7 +8841,7 @@ msgid ""
 "comment: <q class=\"text-fg-muted italic align-bottom\">{msg}</q>"
 msgstr ""
 
-#: hypha/apply/todo/options.py:75
+#: hypha/apply/todo/options.py:82
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8244,7 +8849,7 @@ msgid ""
 "align-bottom \">\"{related.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:83
+#: hypha/apply/todo/options.py:90
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8253,7 +8858,7 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:91
+#: hypha/apply/todo/options.py:98
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8262,70 +8867,70 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:101
+#: hypha/apply/todo/options.py:108
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:109
+#: hypha/apply/todo/options.py:116
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:117
+#: hypha/apply/todo/options.py:124
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form(s) submission"
 msgstr ""
 
-#: hypha/apply/todo/options.py:125
+#: hypha/apply/todo/options.py:132
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form requires changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:134
+#: hypha/apply/todo/options.py:141
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form is waiting for assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:142
+#: hypha/apply/todo/options.py:149
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br> Project form is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:151
+#: hypha/apply/todo/options.py:158
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:159
+#: hypha/apply/todo/options.py:166
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contracting documents"
 msgstr ""
 
-#: hypha/apply/todo/options.py:167
+#: hypha/apply/todo/options.py:174
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Contract for project is waiting for review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:176
+#: hypha/apply/todo/options.py:183
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8333,7 +8938,7 @@ msgid ""
 "bottom\">\"{related.title}\"</span> is waiting for invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:184
+#: hypha/apply/todo/options.py:191
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8341,7 +8946,7 @@ msgid ""
 "{related.invoice_number} required changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:192
+#: hypha/apply/todo/options.py:199
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8349,7 +8954,7 @@ msgid ""
 "{related.invoice_number} is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:200
+#: hypha/apply/todo/options.py:207
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8357,7 +8962,7 @@ msgid ""
 "{related.invoice_number} is waiting to be paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:208
+#: hypha/apply/todo/options.py:215
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.project.fund_name} "
@@ -8366,19 +8971,29 @@ msgid ""
 "\">\"{related.project.title}\"</span> is due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:216
+#: hypha/apply/todo/options.py:223
 msgid "Your generated submission export file is ready for download"
 msgstr ""
 
-#: hypha/apply/todo/options.py:219 hypha/apply/todo/options.py:227
+#: hypha/apply/todo/options.py:226 hypha/apply/todo/options.py:234
+#: hypha/apply/todo/options.py:241 hypha/apply/todo/options.py:249
 msgid "export"
 msgstr ""
 
-#: hypha/apply/todo/options.py:223
+#: hypha/apply/todo/options.py:230
 msgid ""
 "There was an issue generating your submission export file, please try again."
 msgstr ""
 
+#: hypha/apply/todo/options.py:238
+msgid "Your generated invoice export file is ready for download"
+msgstr ""
+
+#: hypha/apply/todo/options.py:245
+msgid ""
+"There was an issue generating your invoice export file, please try again."
+msgstr ""
+
 #: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
 msgid "You don't have any pending task."
 msgstr ""
@@ -8438,139 +9053,172 @@ msgstr ""
 msgid "View users in this group"
 msgstr ""
 
-#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:63
+#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:67
 msgid "Remember me"
 msgstr ""
 
-#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:65
+#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:69
 msgid "On trusted devices only, keeps you logged in for a longer period."
 msgstr ""
 
-#: hypha/apply/users/forms.py:55
+#: hypha/apply/users/forms.py:57
 msgid "Email address"
 msgstr ""
 
-#: hypha/apply/users/forms.py:86
+#: hypha/apply/users/forms.py:90
 msgid "A user with that email already exists."
 msgstr ""
 
-#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/forms.py:91
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: hypha/apply/users/forms.py:200
+#: hypha/apply/users/forms.py:208
 msgid ""
 "You are registered using OAuth, please contact an admin if you need to "
 "change your email address."
 msgstr ""
 
-#: hypha/apply/users/forms.py:208
+#: hypha/apply/users/forms.py:216
 msgid "Slack names must not include spaces"
 msgstr ""
 
-#: hypha/apply/users/forms.py:251
+#: hypha/apply/users/forms.py:259
 msgid "Only includes active, non-superusers"
 msgstr ""
 
-#: hypha/apply/users/forms.py:261
-#: hypha/apply/users/templates/users/account.html:64
+#: hypha/apply/users/forms.py:269
+#: hypha/apply/users/templates/users/account.html:67
 #: hypha/apply/users/templates/users/activation/email.txt:13
 #: hypha/elevate/forms.py:20
 msgid "Password"
 msgstr ""
 
-#: hypha/apply/users/forms.py:262
+#: hypha/apply/users/forms.py:270
 msgid "Email change requires you to put password."
 msgstr ""
 
-#: hypha/apply/users/forms.py:275
+#: hypha/apply/users/forms.py:283
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: hypha/apply/users/forms.py:291
+#: hypha/apply/users/forms.py:299
 msgid "To proceed, type \"disable\" below and then click on \"confirm\":"
 msgstr ""
 
-#: hypha/apply/users/forms.py:301
+#: hypha/apply/users/forms.py:309
 msgid "Incorrect input."
 msgstr ""
 
-#: hypha/apply/users/middleware.py:52
+#: hypha/apply/users/middleware.py:56
 msgid "Two factor authentication required"
 msgstr ""
 
-#: hypha/apply/users/models.py:195
+#: hypha/apply/users/models.py:230
 msgid "email address"
 msgstr ""
 
-#: hypha/apply/users/models.py:197
+#: hypha/apply/users/models.py:232
 msgid "full name"
 msgstr ""
 
-#: hypha/apply/users/models.py:200
+#: hypha/apply/users/models.py:235
 msgid "slack name"
 msgstr ""
 
-#: hypha/apply/users/models.py:202
+#: hypha/apply/users/models.py:237
 msgid "This is the name we should \"@mention\" when sending notifications"
 msgstr ""
 
-#: hypha/apply/users/models.py:321
+#: hypha/apply/users/models.py:391
 msgid "user"
 msgstr ""
 
-#: hypha/apply/users/models.py:322
+#: hypha/apply/users/models.py:392
 msgid "users"
 msgstr ""
 
-#: hypha/apply/users/models.py:333
+#: hypha/apply/users/models.py:403
 msgid "Auth Settings"
 msgstr ""
 
-#: hypha/apply/users/models.py:335
+#: hypha/apply/users/models.py:405
 msgid "show consent checkbox?"
 msgstr ""
 
-#: hypha/apply/users/models.py:336
+#: hypha/apply/users/models.py:406
 msgid "consent text"
 msgstr ""
 
-#: hypha/apply/users/models.py:337
+#: hypha/apply/users/models.py:407
 msgid "consent help"
 msgstr ""
 
-#: hypha/apply/users/models.py:339
+#: hypha/apply/users/models.py:409
 msgid "login extra text"
 msgstr ""
 
-#: hypha/apply/users/models.py:341
+#: hypha/apply/users/models.py:411
 msgid "Displayed along side login form"
 msgstr ""
 
-#: hypha/apply/users/models.py:351
+#: hypha/apply/users/models.py:421
 msgid "User consent on login & register forms"
 msgstr ""
 
-#: hypha/apply/users/models.py:357
+#: hypha/apply/users/models.py:427
 msgid "Login form customizations"
 msgstr ""
 
-#: hypha/apply/users/models.py:382
+#: hypha/apply/users/models.py:452
 msgid "Pending signup"
 msgstr ""
 
-#: hypha/apply/users/models.py:383
+#: hypha/apply/users/models.py:453
 msgid "Pending signups"
 msgstr ""
 
-#: hypha/apply/users/models.py:401
+#: hypha/apply/users/models.py:471
 msgid "Confirm Access Token"
 msgstr ""
 
-#: hypha/apply/users/models.py:402
+#: hypha/apply/users/models.py:472
 msgid "Confirm Access Tokens"
 msgstr ""
 
+#: hypha/apply/users/passkey_views.py:160
+#, python-brace-format
+msgid "Maximum of {max} passkeys allowed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:197
+#: hypha/apply/users/passkey_views.py:278
+msgid "Invalid JSON"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:202
+#: hypha/apply/users/passkey_views.py:283
+msgid "No active WebAuthn challenge"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:230
+#: hypha/apply/users/passkey_views.py:351
+#: hypha/apply/users/passkey_views.py:358
+msgid "Verification failed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:248
+msgid "Could not save passkey"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:292
+msgid "Invalid credential"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:336
+msgid "Unknown credential"
+msgstr ""
+
 #: hypha/apply/users/roles.py:4
 msgid "Administrator"
 msgstr ""
@@ -8636,16 +9284,31 @@ msgid ""
 "contracting."
 msgstr ""
 
-#: hypha/apply/users/services.py:110
+#: hypha/apply/users/services.py:36
+#, python-format
+msgid "A passkey was added to your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:41
+#, python-format
+msgid "A passkey was removed from your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:152
 #, python-brace-format
 msgid "Log in to {user} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/services.py:134
+#: hypha/apply/users/services.py:176
 #, python-brace-format
 msgid "Welcome to {ORG_LONG_NAME}"
 msgstr ""
 
+#: hypha/apply/users/signals.py:31
+#, python-format
+msgid "Successful login to %(org)s"
+msgstr ""
+
 #: hypha/apply/users/templates/elevate/elevate.html:4
 #: hypha/apply/users/templates/elevate/elevate.html:10
 msgid "Confirm access"
@@ -8682,13 +9345,17 @@ msgid ""
 "inactivity."
 msgstr ""
 
+#: hypha/apply/users/templates/includes/delete_user_submissions_form.html:20
+msgid "Yes, delete"
+msgstr ""
+
 #: hypha/apply/users/templates/two_factor/_base.html:8
 #: hypha/apply/users/templates/users/change_password.html:9
 msgid "Back to account"
 msgstr ""
 
 #: hypha/apply/users/templates/two_factor/_base.html:9
-#: hypha/apply/users/templates/users/account.html:85
+#: hypha/apply/users/templates/users/account.html:88
 msgid "Two-Factor Authentication (2FA)"
 msgstr ""
 
@@ -8728,10 +9395,6 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
-msgid "Copied!"
-msgstr ""
-
 #: hypha/apply/users/templates/two_factor/core/backup_tokens.html:41
 msgid "Copy to Clipboard"
 msgstr ""
@@ -8942,32 +9605,42 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:60
+#: hypha/apply/users/templates/users/account.html:63
 msgid "Account Security"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:69
+#: hypha/apply/users/templates/users/account.html:72
 #: hypha/apply/users/templates/users/change_password.html:3
 msgid "Update password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:77
+#: hypha/apply/users/templates/users/account.html:80
 msgid "Set Password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:89
+#: hypha/apply/users/templates/users/account.html:92
 msgid "Backup codes"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:90
+#: hypha/apply/users/templates/users/account.html:93
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:9
 msgid "Disable 2FA"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:92
+#: hypha/apply/users/templates/users/account.html:95
 msgid "Enable 2FA"
 msgstr ""
 
+#: hypha/apply/users/templates/users/account.html:100
+msgid "Passkeys"
+msgstr ""
+
+#: hypha/apply/users/templates/users/account.html:102
+msgid ""
+"With passkeys you can use your fingerprint, face, or screen lock to login "
+"securely without a password."
+msgstr ""
+
 #: hypha/apply/users/templates/users/activation/confirm.html:4
 msgid "Confirm account creation"
 msgstr ""
@@ -9069,7 +9742,7 @@ msgid "Select User:"
 msgstr ""
 
 #: hypha/apply/users/templates/users/become.html:26
-#: hypha/templates/includes/user_menu.html:69
+#: hypha/apply/users/templates/users/includes/user_menu.html:69
 msgid "Switch User"
 msgstr ""
 
@@ -9097,7 +9770,7 @@ msgid "Email Change - Verify Email"
 msgstr ""
 
 #: hypha/apply/users/templates/users/email_change/done.html:4
-#: hypha/apply/users/views.py:230
+#: hypha/apply/users/views.py:235
 msgid "Verify Email"
 msgstr ""
 
@@ -9160,12 +9833,75 @@ msgid "If you did not request this email, please ignore it."
 msgstr ""
 
 #: hypha/apply/users/templates/users/emails/confirm_access.md:11
+#: hypha/apply/users/templates/users/emails/login_notification.md:11
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:12
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:12
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
 #, python-format
 msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
 msgstr ""
 
+#: hypha/apply/users/templates/users/emails/login_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that your account was successfully logged in to "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:6
+#, python-format
+msgid "Login time: %(login_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:8
+msgid ""
+"If you did not log in, please contact us immediately and consider changing "
+"your password."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a new passkey was added to your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:6
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:6
+#, python-format
+msgid "Passkey: %(passkey_name)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:7
+#, python-format
+msgid "Added: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:9
+msgid ""
+"If you did not add this passkey, please contact us immediately and consider "
+"removing it from your account."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a passkey was removed from your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:7
+#, python-format
+msgid "Removed: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:9
+msgid ""
+"If you did not remove this passkey, please contact us immediately and "
+"consider changing your password if you have one."
+msgstr ""
+
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
 #, python-format
 msgid ""
@@ -9211,6 +9947,75 @@ msgstr ""
 msgid "Set password for %(username)s at %(ORG_LONG_NAME)s"
 msgstr ""
 
+#: hypha/apply/users/templates/users/includes/okta_login_button.html:7
+msgid "Log in with Okta"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/org_login_button.html:7
+#, python-format
+msgid "Log in with your %(ORG_SHORT_NAME)s email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:14
+msgid "Log in with passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:18
+msgid "Failed to begin authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:19
+msgid "Authentication failed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/password_login_button.html:7
+msgid "Log in with password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passwordless_login_button.html:7
+msgid "Log in without password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:27
+msgid "Goto your account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:31
+msgid "My account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:36
+msgid "Check latest notifications"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:40
+msgid "Activity feed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:44
+msgid "Goto your flagged submissions"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:48
+msgid "My flagged"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:53
+msgid "Goto wagtail admin"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:84
+msgid "Release User"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:92
+msgid "Log out"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
+msgid " or Sign up"
+msgstr ""
+
 #: hypha/apply/users/templates/users/login.html:23
 #: hypha/apply/users/templates/users/login.html:31
 msgid "Two factor verification"
@@ -9248,27 +10053,27 @@ msgstr ""
 msgid "OR"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:109
+#: hypha/apply/users/templates/users/login.html:115
 msgid "Or, alternatively, use one of your backup phones:"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:125
+#: hypha/apply/users/templates/users/login.html:131
 msgid "As a last resort, you can use a backup codes: "
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:130
+#: hypha/apply/users/templates/users/login.html:136
 msgid "Click here to use a backup code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:133
+#: hypha/apply/users/templates/users/login.html:139
 msgid "Use a Backup Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:149
+#: hypha/apply/users/templates/users/login.html:163
 msgid "Verification Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:153
+#: hypha/apply/users/templates/users/login.html:167
 msgid "Backup Code"
 msgstr ""
 
@@ -9306,6 +10111,62 @@ msgstr ""
 msgid "Use your password"
 msgstr ""
 
+#: hypha/apply/users/templates/users/partials/passkey-list.html:22
+#: hypha/apply/users/templates/users/partials/passkey-list.html:70
+msgid "Passkey name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:23
+msgid "Click to edit name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:26
+msgid "Save name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:32
+#, python-format
+msgid "Used %(when)s ago"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:34
+msgid "Never used"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:41
+msgid "Delete this passkey?"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:44
+msgid "Delete passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:52
+msgid "No passkeys registered."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:59
+msgid "Server error"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:60
+msgid "Registration failed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:61
+msgid ""
+"This authenticator already has a passkey registered. Try a different "
+"authenticator or device."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:69
+msgid "e.g. MacBook Touch ID"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:75
+msgid "Add passkey"
+msgstr ""
+
 #: hypha/apply/users/templates/users/password_reset/complete.html:3
 #: hypha/apply/users/templates/users/password_reset/confirm.html:10
 #: hypha/apply/users/templates/users/password_reset/form.html:4
@@ -9438,6 +10299,42 @@ msgid ""
 "email."
 msgstr ""
 
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:6
+msgid "Are you sure you want to delete these users?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:20
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:22
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:5
+msgid "Are you sure you want to delete this user?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:12
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:14
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted!"
+msgstr ""
+
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:12
 msgid "This account does not have 2FA enabled."
 msgstr ""
@@ -9446,50 +10343,50 @@ msgstr ""
 msgid "2FA is disabled"
 msgstr ""
 
-#: hypha/apply/users/utils.py:40
+#: hypha/apply/users/utils.py:43
 msgid "Email is already in use."
 msgstr ""
 
-#: hypha/apply/users/utils.py:130
+#: hypha/apply/users/utils.py:137
 #, python-brace-format
 msgid "Confirmation email for {unverified_email} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/views.py:117
+#: hypha/apply/users/views.py:120
 msgid "Profile updated."
 msgstr ""
 
-#: hypha/apply/users/views.py:161 hypha/apply/users/views.py:236
+#: hypha/apply/users/views.py:164 hypha/apply/users/views.py:241
 msgid "Hijack feature is not enabled."
 msgstr ""
 
-#: hypha/apply/users/views.py:190
+#: hypha/apply/users/views.py:193
 msgid "Password Page timed out. Try changing the email again."
 msgstr ""
 
-#: hypha/apply/users/views.py:211
+#: hypha/apply/users/views.py:216
 msgid "Alert! An attempt to update your email."
 msgstr ""
 
-#: hypha/apply/users/views.py:270
+#: hypha/apply/users/views.py:285
 #, python-brace-format
 msgid "Your email has been successfully updated to {email}!"
 msgstr ""
 
-#: hypha/apply/users/views.py:372
+#: hypha/apply/users/views.py:387
 msgid "Your password was successfully updated!"
 msgstr ""
 
-#: hypha/apply/users/views.py:377
+#: hypha/apply/users/views.py:392
 msgid "Please correct the errors below."
 msgstr ""
 
-#: hypha/apply/users/views.py:809
+#: hypha/apply/users/views.py:824
 #, python-brace-format
 msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgstr ""
 
-#: hypha/apply/users/views.py:870
+#: hypha/apply/users/views.py:885
 msgid "✓ Check your email for password set link."
 msgstr ""
 
@@ -9713,49 +10610,49 @@ msgstr ""
 msgid "Mobile site logo (if not set default will be used)"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:60
+#: hypha/core/models/system_settings.py:61
 #, python-brace-format
 msgid ""
 "Link for the site logo, e.g. \"{example_url}\". If not set, defaults to page "
 "with slug set to \"home\"."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:64
+#: hypha/core/models/system_settings.py:66
 msgid "Front page navigation content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:66
+#: hypha/core/models/system_settings.py:68
 msgid ""
 "This will overwrite the default front page navigation bar, html tags is "
 "allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:72
+#: hypha/core/models/system_settings.py:74
 msgid "Footer content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:74
+#: hypha/core/models/system_settings.py:76
 msgid "This will be added to the footer, html tags is allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:84
-#: hypha/core/models/system_settings.py:94
+#: hypha/core/models/system_settings.py:86
+#: hypha/core/models/system_settings.py:96
 msgid "Text"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:105
+#: hypha/core/models/system_settings.py:107
 msgid "Homepage"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:113
+#: hypha/core/models/system_settings.py:115
 msgid "Site logo"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:122
+#: hypha/core/models/system_settings.py:124
 msgid "404 page"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:129
+#: hypha/core/models/system_settings.py:131
 msgid "403 page"
 msgstr ""
 
@@ -9817,13 +10714,13 @@ msgstr ""
 msgid "renditions"
 msgstr ""
 
-#: hypha/settings/django.py:164 hypha/settings/local.py:105
+#: hypha/settings/django.py:163 hypha/settings/local.py:105
 msgid ""
 "This password has previously appeared in a data breach and should not be "
 "used. Please choose a different password."
 msgstr ""
 
-#: hypha/settings/django.py:167 hypha/settings/local.py:108
+#: hypha/settings/django.py:166 hypha/settings/local.py:108
 msgid "Your password must not have been detected in a major security breach."
 msgstr ""
 
@@ -9872,23 +10769,19 @@ msgstr ""
 msgid "current theme"
 msgstr ""
 
-#: hypha/templates/base-apply.html:32
-msgid "Toggle Light / Dark / Auto color theme"
-msgstr ""
-
-#: hypha/templates/base-apply.html:54
+#: hypha/templates/base-apply.html:50
 msgid "Menu"
 msgstr ""
 
-#: hypha/templates/base-apply.html:76
+#: hypha/templates/base-apply.html:72
 msgid "Copyright"
 msgstr ""
 
-#: hypha/templates/base-apply.html:79
+#: hypha/templates/base-apply.html:75
 msgid "Built with"
 msgstr ""
 
-#: hypha/templates/base-apply.html:85
+#: hypha/templates/base-apply.html:81
 msgid "Manage cookies"
 msgstr ""
 
@@ -9901,20 +10794,48 @@ msgstr ""
 msgid "Page:"
 msgstr ""
 
+#: hypha/templates/cotton/card_attachment.html:13
+#, python-format
+msgid "View file - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:21
+msgid "uploaded"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:33
+#, python-format
+msgid "File not found - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:40
+msgid "Missing file"
+msgstr ""
+
 #: hypha/templates/cotton/dropdown_menu.html:69
 #: hypha/templates/cotton/dropdown_menu.html:77
 #, python-format
 msgid "Filter %(title)s"
 msgstr ""
 
-#. Translators: "delete" should match msgid "delete" (with context "confirm-delete")
-#: hypha/templates/cotton/modal/confirm.html:25
-msgid "Type <em>delete</em> below to confirm"
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "delete"
 msgstr ""
 
-#: hypha/templates/cotton/modal/confirm.html:41
-msgctxt "confirm-delete"
-msgid "delete"
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "anonymize"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:24
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">delete</pre> below to "
+"confirm"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:25
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">anonymize</pre> below to "
+"confirm"
 msgstr ""
 
 #: hypha/templates/cotton/modal/header.html:11
@@ -9941,21 +10862,21 @@ msgstr ""
 msgid "* This must be a number"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Hide password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Show password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently visible"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently hidden"
 msgstr ""
 
@@ -10009,59 +10930,6 @@ msgstr ""
 msgid "Your Tasks"
 msgstr ""
 
-#: hypha/templates/includes/org_login_button.html:7
-#, python-format
-msgid "Log in with your %(ORG_SHORT_NAME)s email"
-msgstr ""
-
-#: hypha/templates/includes/password_login_button.html:7
-msgid "Log in with password"
-msgstr ""
-
-#: hypha/templates/includes/passwordless_login_button.html:7
-msgid "Log in without password"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:27
-msgid "Goto your account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:31
-msgid "My account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:36
-msgid "Check latest notifications"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:40
-msgid "Activity feed"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:44
-msgid "Goto your flagged submissions"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:48
-msgid "My flagged"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:53
-msgid "Goto wagtail admin"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:84
-msgid "Release User"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:91
-msgid "Log out"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:101
-msgid " or Sign up"
-msgstr ""
-
 #: hypha/templates/password_required.html:4
 #: hypha/templates/password_required.html:9
 msgid "Password required"
diff --git a/hypha/locale/es/LC_MESSAGES/django.po b/hypha/locale/es/LC_MESSAGES/django.po
index 13de62b233..af5f53bf0c 100644
--- a/hypha/locale/es/LC_MESSAGES/django.po
+++ b/hypha/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-22 16:12+0000\n"
+"POT-Creation-Date: 2026-09-17 11:49+0000\n"
 "PO-Revision-Date: 2024-02-22 07:43+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/hypha/hypha-core/"
@@ -28,48 +28,48 @@ msgstr ""
 msgid "Please provide data for: {fields}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:28
+#: hypha/apply/activity/adapters/activity_feed.py:27
 #, fuzzy, python-brace-format
 #| msgid "Submitted {source.title} for {source.page.title}"
 msgid "Submitted {source.title_text_display} for {source.page.title}"
 msgstr "Enviado {source.title} para {source.page.title}"
 
+#: hypha/apply/activity/adapters/activity_feed.py:29
 #: hypha/apply/activity/adapters/activity_feed.py:30
-#: hypha/apply/activity/adapters/activity_feed.py:31
 msgid "edited the submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:32
+#: hypha/apply/activity/adapters/activity_feed.py:31
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "updated Lead from {old_lead} to {source.lead}"
 msgstr "Lead cambiado de {old_lead} a {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:33
+#: hypha/apply/activity/adapters/activity_feed.py:32
 #, fuzzy, python-brace-format
 #| msgid "Batch Lead changed to {new_lead}"
 msgid "batch updated Lead to {new_lead}"
 msgstr "Batch Lead cambiado a {new_lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:35
+#: hypha/apply/activity/adapters/activity_feed.py:34
 #, fuzzy, python-brace-format
 #| msgid "Sent a determination. Outcome: {determination.clean_outcome}"
 msgid "sent a determination. Outcome: {determination.clean_outcome}"
 msgstr "Envió una determinación. Resultado: {determination.clean_outcome}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:38
+#: hypha/apply/activity/adapters/activity_feed.py:37
 msgid "Invited to submit a proposal"
 msgstr "Invitados a presentar una propuesta"
 
-#: hypha/apply/activity/adapters/activity_feed.py:41
+#: hypha/apply/activity/adapters/activity_feed.py:40
 msgid "Submitted a review"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/activity/adapters/activity_feed.py:42
+#: hypha/apply/activity/adapters/activity_feed.py:41
 msgid "Opened the submission while still sealed"
 msgstr "Abierto el envío cuando aún estaba precintado"
 
-#: hypha/apply/activity/adapters/activity_feed.py:45
+#: hypha/apply/activity/adapters/activity_feed.py:44
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} {opinion.opinion_display}s with {opinion.review.author}s review of "
@@ -80,267 +80,321 @@ msgstr ""
 "{user} {opinion.opinion_display}s con {opinion.review.author}s revisión de "
 "{source}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:48
+#: hypha/apply/activity/adapters/activity_feed.py:47
 #, python-brace-format
 msgid "deleted the opinion for review: {review_opinion.review}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:51
+#: hypha/apply/activity/adapters/activity_feed.py:50
 #, python-brace-format
 msgid "Created project with initial status of \"{status}\""
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:52
+#, python-brace-format
+msgid "Created SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:53
+#, python-brace-format
+msgid "Edited SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:54
+#, python-brace-format
+msgid "Created project form for project \"{related.project}\""
+msgstr ""
+
 #: hypha/apply/activity/adapters/activity_feed.py:55
+#, python-brace-format
+msgid "Edited project form for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:58
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "updated the project title from {old_title} to {source.title}"
 msgstr "Lead cambiado de {old_lead} a {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:57
+#: hypha/apply/activity/adapters/activity_feed.py:61
+#, python-brace-format
+msgid "updated contract number to {source.contract_number}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:63
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "update Lead from {old_lead} to {source.lead}"
 msgstr "Lead cambiado de {old_lead} a {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:58
+#: hypha/apply/activity/adapters/activity_feed.py:64
 msgid "Requested approval"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/activity/adapters/activity_feed.py:60
+#: hypha/apply/activity/adapters/activity_feed.py:66
 #: hypha/apply/determinations/models.py:209
 #: hypha/apply/determinations/models.py:213
 #: hypha/apply/determinations/models.py:217
 #: hypha/apply/determinations/options.py:12
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
-#: hypha/apply/projects/utils.py:87
+#: hypha/apply/projects/utils.py:90
 msgid "Approved"
 msgstr "Aprobado"
 
-#: hypha/apply/activity/adapters/activity_feed.py:61
+#: hypha/apply/activity/adapters/activity_feed.py:67
 #, fuzzy
 #| msgid "Requested changes for acceptance: \"{comment}\""
 msgid "requested changes for acceptance"
 msgstr "Cambios solicitados para su aceptación: \"{comment}\""
 
-#: hypha/apply/activity/adapters/activity_feed.py:62
+#: hypha/apply/activity/adapters/activity_feed.py:68
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Submitted Contract Documents"
 msgstr "Presentado un informe"
 
-#: hypha/apply/activity/adapters/activity_feed.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:69
 #, python-brace-format
 msgid "Uploaded a {contract.state} contract"
 msgstr "Subido un contrato {contract.state}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:64
+#: hypha/apply/activity/adapters/activity_feed.py:70
 msgid "Approved contract"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/activity/adapters/activity_feed.py:66
-#: hypha/apply/projects/views/payment.py:275
+#: hypha/apply/activity/adapters/activity_feed.py:72
+#: hypha/apply/projects/views/invoice.py:280
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice added"
 msgstr "Factura emitida"
 
-#: hypha/apply/activity/adapters/activity_feed.py:67
+#: hypha/apply/activity/adapters/activity_feed.py:73
 msgid "Submitted a report"
 msgstr "Presentado un informe"
 
-#: hypha/apply/activity/adapters/activity_feed.py:70
-#: hypha/apply/activity/options.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:74
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "deleted a report"
+msgstr "Presentado un informe"
+
+#: hypha/apply/activity/adapters/activity_feed.py:77
+#: hypha/apply/activity/options.py:73
 msgid "disabled reporting"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:74
+#: hypha/apply/activity/adapters/activity_feed.py:81
 msgid "archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:75
+#: hypha/apply/activity/adapters/activity_feed.py:82
 msgid "un-archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:76
+#: hypha/apply/activity/adapters/activity_feed.py:83
 msgid "deleted an invoice"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:131
-#: hypha/apply/funds/views/submission_edit.py:630
+#: hypha/apply/activity/adapters/activity_feed.py:85
+#, fuzzy, python-brace-format
+#| msgid "Lead changed from {old_lead} to {source.lead}"
+msgid "updated author from {old_author} to {source.user}"
+msgstr "Lead cambiado de {old_lead} a {source.lead}"
+
+#: hypha/apply/activity/adapters/activity_feed.py:145
+#: hypha/apply/funds/views/submission_edit.py:631
 msgid "Reviewers updated."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:133
-#: hypha/apply/activity/adapters/slack.py:237
+#: hypha/apply/activity/adapters/activity_feed.py:147
+#: hypha/apply/activity/adapters/slack.py:257
 msgid "Added:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:137
-#: hypha/apply/activity/adapters/slack.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:151
+#: hypha/apply/activity/adapters/slack.py:261
 msgid "Removed:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:143
+#: hypha/apply/activity/adapters/activity_feed.py:157
 msgid "Batch reviewers updated:"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:146
+#: hypha/apply/activity/adapters/activity_feed.py:160
 #, python-brace-format
 msgid "{user} as {name}."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:165
+#: hypha/apply/activity/adapters/activity_feed.py:179
 #, python-brace-format
 msgid "Successfully deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:174
+#: hypha/apply/activity/adapters/activity_feed.py:188
 #, python-brace-format
 msgid "Successfully archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:187
+#: hypha/apply/activity/adapters/activity_feed.py:201
 #, python-brace-format
 msgid ""
 "Successfully updated status to {invoice_status} for invoices: "
 "{invoice_numbers}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:204
+#: hypha/apply/activity/adapters/activity_feed.py:218
 #, python-brace-format
 msgid "assigned Project form to {}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:210
+#: hypha/apply/activity/adapters/activity_feed.py:224
 #, python-brace-format
 msgid "removed the task {task.code} for {source} from the task list"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:215
+#: hypha/apply/activity/adapters/activity_feed.py:229
 #, python-brace-format
 msgid ""
 "removed the task {task.code} for {source} from whole team's{user_groups} "
 "task list."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:228
-#: hypha/apply/activity/adapters/activity_feed.py:260
+#: hypha/apply/activity/adapters/activity_feed.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:273
 #, python-brace-format
 msgid "Progressed from {old_display} to {new_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:291
+#: hypha/apply/activity/adapters/activity_feed.py:304
 #, python-brace-format
 msgid ""
 "Updated reporting frequency. New schedule is: {new_schedule} starting on "
 "{schedule_start}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:296
+#: hypha/apply/activity/adapters/activity_feed.py:309
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Skipped a Report"
 msgstr "Presentado un informe"
 
-#: hypha/apply/activity/adapters/activity_feed.py:298
+#: hypha/apply/activity/adapters/activity_feed.py:311
 msgid "Marked a Report as required"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:301
+#: hypha/apply/activity/adapters/activity_feed.py:314
 #, python-brace-format
 msgid "Updated Invoice status to: {invoice_status}."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:350
+#: hypha/apply/activity/adapters/activity_feed.py:363
 #, python-brace-format
 msgid "Updated screening decision from \"{old_status}\" to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:353
+#: hypha/apply/activity/adapters/activity_feed.py:366
 #, python-brace-format
 msgid "Added screening decision to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:357
+#: hypha/apply/activity/adapters/activity_feed.py:370
 #, python-brace-format
 msgid "Removed \"{old_status}\" screening decision."
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:196
+#: hypha/apply/activity/adapters/base.py:203
 #, python-brace-format
 msgid "{adapter} [to: {recipient}]: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:200
+#: hypha/apply/activity/adapters/base.py:207
 #, python-brace-format
 msgid "{adapter}: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:90
+#: hypha/apply/activity/adapters/emails.py:92
 #, python-brace-format
 msgid "Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:96
+#: hypha/apply/activity/adapters/emails.py:98
 msgid "Multiple applications are now ready for your review"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:99
+#: hypha/apply/activity/adapters/emails.py:101
 #, python-brace-format
 msgid "Reminder: Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:102
+#: hypha/apply/activity/adapters/emails.py:104
 msgid "You are invited as a co-applicant"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:107
+#: hypha/apply/activity/adapters/emails.py:109
 #, python-brace-format
 msgid "Project is waiting for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:111
+#: hypha/apply/activity/adapters/emails.py:113
 #, python-brace-format
 msgid "Contract uploaded for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:116
+#: hypha/apply/activity/adapters/emails.py:118
 #, python-brace-format
 msgid "Contract Documents required approval for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:126
+#: hypha/apply/activity/adapters/emails.py:128
 #, python-brace-format
 msgid "Project is waiting for the contract: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:130
+#: hypha/apply/activity/adapters/emails.py:132
 #, python-brace-format
 msgid "Project is ready for invoicing: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:134
+#: hypha/apply/activity/adapters/emails.py:136
 #, python-brace-format
 msgid "Project status has changed to {project_status}: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:140
+#: hypha/apply/activity/adapters/emails.py:142
 msgid "Project has been rejected, please update and resubmit"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:143
+#: hypha/apply/activity/adapters/emails.py:145
 #, python-brace-format
 msgid "Project documents are ready to be assigned for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:150
+#: hypha/apply/activity/adapters/emails.py:151
+#, python-brace-format
+msgid "New comment on application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:158
+#, python-brace-format
+msgid ""
+"Your application to {ORG_LONG_NAME} has been reviewed: "
+"{source.title_text_display}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:162
+#, python-brace-format
+msgid "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:167
 #, python-brace-format
 msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:153
+#: hypha/apply/activity/adapters/emails.py:170
 #, python-brace-format
-msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+msgid "Your {ORG_LONG_NAME} project: {source.title}"
 msgstr ""
 
 #: hypha/apply/activity/adapters/slack.py:31
@@ -422,56 +476,69 @@ msgid "{user} has deleted {source.title_text_display}"
 msgstr ""
 
 #: hypha/apply/activity/adapters/slack.py:73
+#, fuzzy, python-brace-format
+#| msgid "Submitted {source.title} for {source.page.title}"
+msgid "{user} has anonymized {source.title_text_display}"
+msgstr "Enviado {source.title} para {source.page.title}"
+
+#: hypha/apply/activity/adapters/slack.py:76
 #, python-brace-format
 msgid ""
 "{user} has deleted {review.author} review for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:76
+#: hypha/apply/activity/adapters/slack.py:79
 #, python-brace-format
 msgid ""
 "{user} has deleted {review_opinion.author} review opinion for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:79
+#: hypha/apply/activity/adapters/slack.py:82
 #, python-brace-format
 msgid "{user} has created a Project: <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:82
+#: hypha/apply/activity/adapters/slack.py:85
 #, python-brace-format
 msgid ""
 "The lead of project <{link}|{source.title}> has been updated from {old_lead} "
 "to {source.lead} by {user}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:85
+#: hypha/apply/activity/adapters/slack.py:88
 #, python-brace-format
 msgid ""
 "The project title has been updated from <{link}|{old_title}> to <{link}|"
 "{source.title}> by {user}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:88
+#: hypha/apply/activity/adapters/slack.py:91
+#, python-brace-format
+msgid ""
+"The contract number of project <{link}|{source.title}> has been updated to "
+"{source.contract_number} by {user}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:94
 #, python-brace-format
 msgid ""
 "{user} has edited {review.author} review for <{link}|"
 "{source.title_text_display}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:91
+#: hypha/apply/activity/adapters/slack.py:97
 #, python-brace-format
 msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:94
+#: hypha/apply/activity/adapters/slack.py:100
 #, python-brace-format
 msgid "{user} has approved project <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:97
+#: hypha/apply/activity/adapters/slack.py:103
 #, fuzzy, python-brace-format
 #| msgid "Requested changes for acceptance: \"{comment}\""
 msgid ""
@@ -479,128 +546,153 @@ msgid ""
 ">"
 msgstr "Cambios solicitados para su aceptación: \"{comment}\""
 
-#: hypha/apply/activity/adapters/slack.py:100
+#: hypha/apply/activity/adapters/slack.py:106
 #, python-brace-format
 msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:103
+#: hypha/apply/activity/adapters/slack.py:109
 #, python-brace-format
 msgid ""
 "{user} has submitted the contracting document for project <{link}|"
 "{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:106
+#: hypha/apply/activity/adapters/slack.py:112
 #, python-brace-format
 msgid "{user} has approved contract for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:109
+#: hypha/apply/activity/adapters/slack.py:115
 #, python-brace-format
 msgid "{user} has created invoice for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:112
+#: hypha/apply/activity/adapters/slack.py:118
 #, python-brace-format
 msgid ""
 "{user} has changed the status of <{link_related}|invoice> on <{link}|"
 "{source.title}> to {invoice.status_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:115
+#: hypha/apply/activity/adapters/slack.py:121
 #, python-brace-format
 msgid "{user} has deleted invoice from <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:118
+#: hypha/apply/activity/adapters/slack.py:124
 #, python-brace-format
 msgid "{user} has updated invoice for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:121
+#: hypha/apply/activity/adapters/slack.py:127
 #, python-brace-format
 msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:125
+#: hypha/apply/activity/adapters/slack.py:130
+#, fuzzy, python-brace-format
+#| msgid "Requested changes for acceptance: \"{comment}\""
+msgid "{user} has deleted a report for <{link}|{source.title}>"
+msgstr "Cambios solicitados para su aceptación: \"{comment}\""
+
+#: hypha/apply/activity/adapters/slack.py:135
 #, python-brace-format
 msgid "{user} has created a new account for <{link}|{source}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:128
+#: hypha/apply/activity/adapters/slack.py:138
 #, python-brace-format
 msgid ""
 "{user} has edited account for <{link}|{source}> that now has following "
 "roles: {roles}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:132
+#: hypha/apply/activity/adapters/slack.py:142
 #, python-brace-format
 msgid "{user} has archived the submission: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:135
+#: hypha/apply/activity/adapters/slack.py:145
 #, python-brace-format
 msgid "{user} has unarchived the submission: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:231
+#: hypha/apply/activity/adapters/slack.py:148
+#, python-brace-format
+msgid ""
+"{user} has updated author from {old_author} to {source.user} for submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:151
+#, python-brace-format
+msgid ""
+"A new comment has been assigned to {assignee} by {user} on submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:251
 #, python-brace-format
 msgid "{user} has updated the reviewers on <{link}|{title}>"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:250
+#: hypha/apply/activity/adapters/slack.py:270
 #, python-brace-format
 msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:262
+#: hypha/apply/activity/adapters/slack.py:282
 #, python-brace-format
 msgid "{user} as {name},"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:268
+#: hypha/apply/activity/adapters/slack.py:288
 #, python-brace-format
 msgid ""
 "{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:288
+#: hypha/apply/activity/adapters/slack.py:308
 #, python-brace-format
 msgid "{user} has transitioned the following submissions: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:298
+#: hypha/apply/activity/adapters/slack.py:318
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was sent by email. Outcome: "
 "{determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:305
+#: hypha/apply/activity/adapters/slack.py:325
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was saved without sending an "
 "email. Outcome: {determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:321
+#: hypha/apply/activity/adapters/slack.py:341
 #, python-brace-format
 msgid "Determinations of {outcome} was sent for: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:332
+#: hypha/apply/activity/adapters/slack.py:352
 #, python-brace-format
 msgid "{user} has deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:339
+#: hypha/apply/activity/adapters/slack.py:361
+#, python-brace-format
+msgid "{user} has anonymized submissions: {title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:368
 #, python-brace-format
 msgid "{user} has archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:353
+#: hypha/apply/activity/adapters/slack.py:382
 #, python-brace-format
 msgid ""
 "<{link}|{title}> is ready for review. The following are assigned as "
@@ -632,32 +724,36 @@ msgstr ""
 msgid "Last 3 months"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:16
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:70
+#: hypha/apply/activity/forms.py:17
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:47
 msgid "Attachments"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:20 hypha/apply/funds/forms.py:102
-#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:371
+#: hypha/apply/activity/forms.py:21 hypha/apply/funds/forms.py:102
+#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:389
 msgid "Select..."
 msgstr ""
 
-#: hypha/apply/activity/forms.py:21
+#: hypha/apply/activity/forms.py:22
 msgid "Assign to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:33
+#: hypha/apply/activity/forms.py:39
 msgid "Visible to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:34
+#: hypha/apply/activity/forms.py:40
 msgid "Message"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:38
+#: hypha/apply/activity/forms.py:44
 msgid "Select a relevant user role. Staff can view every comment."
 msgstr ""
 
+#: hypha/apply/activity/forms.py:73
+msgid "Write a comment..."
+msgstr ""
+
 #: hypha/apply/activity/management/commands/send_staff_email_digest.py:146
 msgid "Summary of all activities"
 msgstr ""
@@ -667,7 +763,8 @@ msgid "Activities Summary - "
 msgstr ""
 
 #: hypha/apply/activity/models.py:25
-#: hypha/apply/funds/models/co_applicants.py:9 hypha/apply/todo/options.py:69
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:12
+#: hypha/apply/funds/models/co_applicants.py:10 hypha/apply/todo/options.py:76
 msgid "Comment"
 msgstr ""
 
@@ -675,7 +772,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: hypha/apply/activity/models.py:36
+#: hypha/apply/activity/models.py:36 hypha/apply/funds/forms.py:336
 msgid "Applicants"
 msgstr ""
 
@@ -683,9 +780,9 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:231
-#: hypha/apply/funds/tables.py:469
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:81
+#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:245
+#: hypha/apply/funds/tables.py:533
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:86
 #: hypha/apply/funds/templates/submissions/all.html:437
 #: hypha/apply/funds/templates/submissions/all.html:478
 msgid "Reviewers"
@@ -703,7 +800,7 @@ msgstr ""
 msgid "activity attachments"
 msgstr ""
 
-#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:379
+#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:384
 msgid "message"
 msgstr ""
 
@@ -721,19 +818,19 @@ msgstr ""
 msgid "activities"
 msgstr "Factura emitida"
 
-#: hypha/apply/activity/models.py:329
+#: hypha/apply/activity/models.py:334
 msgid "verb"
 msgstr ""
 
-#: hypha/apply/activity/models.py:340
+#: hypha/apply/activity/models.py:345
 msgid "event"
 msgstr ""
 
-#: hypha/apply/activity/models.py:341
+#: hypha/apply/activity/models.py:346
 msgid "events"
 msgstr ""
 
-#: hypha/apply/activity/models.py:380
+#: hypha/apply/activity/models.py:385
 msgid "messages"
 msgstr ""
 
@@ -835,170 +932,228 @@ msgstr ""
 
 #: hypha/apply/activity/options.py:35
 #, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "anonymized submission"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/activity/options.py:36
+#, fuzzy
 #| msgid "Submitted a review"
 msgid "deleted review"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/activity/options.py:36
+#: hypha/apply/activity/options.py:37
 msgid "deleted review opinion"
 msgstr ""
 
-#: hypha/apply/activity/options.py:37
+#: hypha/apply/activity/options.py:38
 msgid "created project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:38
+#: hypha/apply/activity/options.py:39
+#, fuzzy
+#| msgid "Approved contract"
+msgid "created a project SOW"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/activity/options.py:40
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "edited a project SOW"
+msgstr "Presentado un informe"
+
+#: hypha/apply/activity/options.py:41
+#, fuzzy
+#| msgid "Approved contract"
+msgid "created a project form"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/activity/options.py:42
+#, fuzzy
+#| msgid "Approved contract"
+msgid "edited a project form"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/activity/options.py:43
 msgid "updated project lead"
 msgstr ""
 
-#: hypha/apply/activity/options.py:39
+#: hypha/apply/activity/options.py:44
 msgid "updated project title"
 msgstr ""
 
-#: hypha/apply/activity/options.py:40
+#: hypha/apply/activity/options.py:47
+#, fuzzy
+#| msgid "Approved contract"
+msgid "updated project contract number"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/activity/options.py:49
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "edited review"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/activity/options.py:41
+#: hypha/apply/activity/options.py:50
 #, fuzzy
 #| msgid "Requested approval"
 msgid "sent for approval"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/activity/options.py:42
+#: hypha/apply/activity/options.py:51
 #, fuzzy
 #| msgid "Approved contract"
 msgid "approved project"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/activity/options.py:43
+#: hypha/apply/activity/options.py:52
 msgid "assign project form approver"
 msgstr ""
 
-#: hypha/apply/activity/options.py:44
+#: hypha/apply/activity/options.py:53
 msgid "approved project form"
 msgstr ""
 
-#: hypha/apply/activity/options.py:45
+#: hypha/apply/activity/options.py:54
 msgid "transitioned project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:46
+#: hypha/apply/activity/options.py:55
 #, fuzzy
 #| msgid "Requested approval"
 msgid "requested project change"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/activity/options.py:49
+#: hypha/apply/activity/options.py:58
 msgid "submitted contract documents"
 msgstr ""
 
-#: hypha/apply/activity/options.py:51
+#: hypha/apply/activity/options.py:60
 msgid "uploaded document to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:52
+#: hypha/apply/activity/options.py:61
 #, fuzzy
 #| msgid "Uploaded a {contract.state} contract"
 msgid "uploaded contract to project"
 msgstr "Subido un contrato {contract.state}"
 
-#: hypha/apply/activity/options.py:53
+#: hypha/apply/activity/options.py:62
 #, fuzzy
 #| msgid "Approved contract"
 msgid "approved contract"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/activity/options.py:54
+#: hypha/apply/activity/options.py:63
 msgid "created invoice for project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:55
+#: hypha/apply/activity/options.py:64
 msgid "updated invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:56
+#: hypha/apply/activity/options.py:65
 msgid "approve invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:57
+#: hypha/apply/activity/options.py:66
 msgid "deleted invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:58
+#: hypha/apply/activity/options.py:67
 msgid "sent project to compliance"
 msgstr ""
 
-#: hypha/apply/activity/options.py:59
+#: hypha/apply/activity/options.py:68
 msgid "updated invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:60
+#: hypha/apply/activity/options.py:69
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "submitted report"
 msgstr "Presentado un informe"
 
-#: hypha/apply/activity/options.py:61
+#: hypha/apply/activity/options.py:70
+#, fuzzy
+#| msgid "Submitted a review"
+msgid "deleted report"
+msgstr "Enviar una revisión"
+
+#: hypha/apply/activity/options.py:71
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "skipped report"
 msgstr "Presentado un informe"
 
-#: hypha/apply/activity/options.py:62
+#: hypha/apply/activity/options.py:72
 msgid "changed report frequency"
 msgstr ""
 
-#: hypha/apply/activity/options.py:64
+#: hypha/apply/activity/options.py:74
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "notified report"
 msgstr "Presentado un informe"
 
-#: hypha/apply/activity/options.py:65
+#: hypha/apply/activity/options.py:75
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "reminder to review"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/activity/options.py:66
+#: hypha/apply/activity/options.py:76
 msgid "batch deleted submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:69
+#: hypha/apply/activity/options.py:79
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "batch anonymized submissions"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/activity/options.py:83
 msgid "batch archive submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:73
+#: hypha/apply/activity/options.py:87
 msgid "batch update invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:75
+#: hypha/apply/activity/options.py:89
 msgid "created new account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:76
+#: hypha/apply/activity/options.py:90
 msgid "edited account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:77
+#: hypha/apply/activity/options.py:91
 msgid "archived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:78
+#: hypha/apply/activity/options.py:92
 msgid "unarchived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:79
+#: hypha/apply/activity/options.py:93
 msgid "remove task"
 msgstr ""
 
-#: hypha/apply/activity/options.py:80
+#: hypha/apply/activity/options.py:94
 msgid "invite co-applicant"
 msgstr ""
 
+#: hypha/apply/activity/options.py:95
+#, fuzzy
+#| msgid "Submitted a review"
+msgid "updated author"
+msgstr "Enviar una revisión"
+
+#: hypha/apply/activity/options.py:96
+msgid "comment assigned"
+msgstr ""
+
 #: hypha/apply/activity/templates/activity/include/action_list.html:6
 msgid "There are no actions."
 msgstr ""
@@ -1030,13 +1185,13 @@ msgid "Filter"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/notifications.html:79
-#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:44
+#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:61
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:46
-#: hypha/apply/funds/models/co_applicants.py:8
+#: hypha/apply/funds/models/co_applicants.py:9
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:62
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:76
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:83
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:99
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:133
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:120
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:159
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:72
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:19
@@ -1064,90 +1219,124 @@ msgstr "Enviar una revisión"
 msgid "deleted"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:28
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:23
+#, fuzzy
+#| msgid "Sent a determination. Outcome: {determination.clean_outcome}"
+msgid "Additional options"
+msgstr "Envió una determinación. Resultado: {determination.clean_outcome}"
+
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:35
+#: hypha/apply/funds/templates/funds/comments.html:68
+#: hypha/apply/funds/templates/funds/comments.html:82
+msgid "Add Comment"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:36
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:150
 #, python-format
 msgid "This user is a %(role)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:37
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:48
+#, fuzzy
+#| msgid "Sent a determination. Outcome: {determination.clean_outcome}"
+msgid "message from determination"
+msgstr "Envió una determinación. Resultado: {determination.clean_outcome}"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:50
+#, python-format
+msgid "commented on %(related_name)s"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:53
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:159
 msgid "commented"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:52
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:69
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:173
 msgid "Assigned to you"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:54
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:71
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:175
 #, python-format
 msgid "Assigned to %(assigned_to)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:61
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:78
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:182
 #, python-format
 msgid "This is visible to %(visibility_text)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:72
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:193
 msgid "Edit comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:76
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:93
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:197
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:40
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:36
-#: hypha/apply/funds/models/co_applicants.py:10
+#: hypha/apply/funds/models/co_applicants.py:11
 #: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:10
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:118
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:55
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:90
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:98
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:122
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:106
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:97
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:76
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:130
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:170
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:29
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:148
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:50
 #: hypha/apply/review/templates/review/review_detail.html:82
 msgid "Edit"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:84
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:101
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:205
 msgid ""
 "Are you sure you want to delete this comment? This action cannot be undone."
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:85
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:102
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:206
 msgid "Delete comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:106
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:210
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:59
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:120
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:182
 #: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:21
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:26
 #: hypha/apply/funds/templates/funds/modals/edit_co_applicant_form.html:75
-#: hypha/apply/funds/templates/submissions/all.html:502
-#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:59
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
-#: hypha/apply/projects/views/payment.py:356
+#: hypha/apply/funds/templates/submissions/all.html:504
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:71
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:41
+#: hypha/apply/projects/views/invoice.py:361
 #: hypha/apply/review/templates/review/review_detail.html:92
-#: hypha/templates/cotton/modal/confirm.html:43
 #: hypha/templates/includes/dialog_form_base.html:28
 msgid "Delete"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:97
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:114
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:218
 msgid "updated"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:109
-msgid "View "
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:125
+#, python-format
+msgid "View %(related_name)s"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:27
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:78
-#: hypha/apply/funds/views/submission_edit.py:131
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:130
+#: hypha/apply/funds/views/submission_edit.py:318
 #: hypha/apply/funds/workflows/definitions/double_stage.py:20
 #: hypha/apply/funds/workflows/definitions/double_stage.py:48
 #: hypha/apply/funds/workflows/definitions/double_stage.py:98
@@ -1162,6 +1351,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:50
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:120
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:164
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:19
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:46
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:105
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:20
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:47
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:93
@@ -1171,18 +1364,18 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
 #: hypha/apply/projects/reports/templates/reports/report_form.html:60
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:30
-#: hypha/apply/projects/views/project.py:309
-#: hypha/apply/projects/views/project.py:345
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
-#: hypha/apply/projects/views/project.py:903
-#: hypha/apply/projects/views/project.py:942
-#: hypha/apply/projects/views/project.py:976
-#: hypha/apply/projects/views/project.py:1009
-#: hypha/apply/projects/views/project.py:1363
-#: hypha/apply/projects/views/project.py:1436
-#: hypha/apply/projects/views/project.py:1467
-#: hypha/apply/projects/views/project.py:1622
+#: hypha/apply/projects/views/project.py:313
+#: hypha/apply/projects/views/project.py:349
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
+#: hypha/apply/projects/views/project.py:954
+#: hypha/apply/projects/views/project.py:993
+#: hypha/apply/projects/views/project.py:1027
+#: hypha/apply/projects/views/project.py:1060
+#: hypha/apply/projects/views/project.py:1414
+#: hypha/apply/projects/views/project.py:1487
+#: hypha/apply/projects/views/project.py:1518
+#: hypha/apply/projects/views/project.py:1673
 #: hypha/apply/review/templates/review/review_edit_form.html:67
 #: hypha/apply/review/templates/review/review_form.html:84
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1197,6 +1390,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:58
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:59
 #: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:40
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:37
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:17
 #: hypha/apply/projects/templates/application_projects/project_form.html:33
 #: hypha/apply/users/templates/users/become.html:33
 #: hypha/templates/cotton/modal/confirm.html:48
@@ -1205,8 +1400,10 @@ msgid "Cancel"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:4
+#, fuzzy
+#| msgid "Invoice created"
 msgid "Activities Summary"
-msgstr ""
+msgstr "Factura emitida"
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:7
 #, python-format
@@ -1226,12 +1423,13 @@ msgid "Submissions"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:17
-#: hypha/apply/funds/tables.py:76
+#: hypha/apply/funds/tables.py:77
 #: hypha/apply/funds/templates/cotton/submission_list.html:38
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:41
-#: hypha/apply/funds/templates/funds/comments.html:37
-#: hypha/apply/projects/templates/application_projects/project_detail.html:31
-#: hypha/apply/review/views.py:432
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:29
+#: hypha/apply/funds/templates/funds/comments.html:25
+#: hypha/apply/projects/templates/application_projects/project_detail.html:26
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:24
+#: hypha/apply/review/views.py:441
 msgid "Comments"
 msgstr ""
 
@@ -1240,7 +1438,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
 #: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:62
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:68
 #: hypha/apply/review/templates/review/review_list.html:4
 #: hypha/apply/review/templates/review/review_list.html:9
 #: hypha/core/navigation.py:80
@@ -1248,8 +1446,10 @@ msgid "Reviews"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:25
+#, fuzzy
+#| msgid "Invoice created"
 msgid "Other activities"
-msgstr ""
+msgstr "Factura emitida"
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:7
 msgid ""
@@ -1274,6 +1474,7 @@ msgid "View your submission here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:16
+#: hypha/apply/activity/templates/messages/email/author_updated.html:11
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:29
 #: hypha/apply/activity/templates/messages/email/invited_to_proposal.html:11
 #: hypha/apply/activity/templates/messages/email/submission_confirmation.html:10
@@ -1281,6 +1482,7 @@ msgid "If you have any questions, please submit them here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:18
+#: hypha/apply/activity/templates/messages/email/author_updated.html:13
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:31
 msgid "See our guide for more information"
 msgstr ""
@@ -1307,8 +1509,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/revisions_compare.html:42
 #: hypha/apply/funds/templates/funds/revisions_compare.html:43
 #: hypha/core/models/system_settings.py:21
-#: hypha/core/models/system_settings.py:79
-#: hypha/core/models/system_settings.py:89
+#: hypha/core/models/system_settings.py:81
+#: hypha/core/models/system_settings.py:91
 msgid "Title"
 msgstr ""
 
@@ -1331,11 +1533,32 @@ msgstr ""
 msgid "Please contact %(lead)s - %(email)s if you have any questions."
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/author_updated.html:6
+#, python-format
+msgid "You have been assigned as an Applicant to submission \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:10
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "Link to your submission"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:15
+#, python-format
+msgid ""
+"If you have any issues accessing the submission or other general inquiries, "
+"please email us at %(ORG_EMAIL)s"
+msgstr ""
+
 #: hypha/apply/activity/templates/messages/email/base.html:5
 #: hypha/apply/users/templates/users/activation/email.txt:2
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:2
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:2
 #: hypha/apply/users/templates/users/emails/confirm_access.md:2
+#: hypha/apply/users/templates/users/emails/login_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:2
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:2
 #: hypha/apply/users/templates/users/emails/set_password.txt:2
 #: hypha/apply/users/templates/users/password_reset/email.txt:2
@@ -1348,6 +1571,9 @@ msgstr ""
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:7
 #: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/login_notification.md:14
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:15
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:15
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
 #: hypha/apply/users/templates/users/emails/set_password.txt:10
@@ -1380,6 +1606,21 @@ msgstr ""
 msgid "Read the full comment here"
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:5
+msgid "Hey there,"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:8
+#, python-format
+msgid "You have been assigned to a comment on \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:12
+#, fuzzy
+#| msgid "Approved contract"
+msgid "View it here"
+msgstr "Contrato aprobado"
+
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:13
 msgid "A new contract has been added to your Project"
 msgstr ""
@@ -1607,8 +1848,8 @@ msgid "no longer required"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/report_skipped.html:6
-#: hypha/apply/projects/models/project.py:818
-#: hypha/apply/projects/models/project.py:855
+#: hypha/apply/projects/models/project.py:847
+#: hypha/apply/projects/models/project.py:884
 msgid "required"
 msgstr ""
 
@@ -1706,7 +1947,7 @@ msgid "Please submit any questions related to your application here"
 msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:50
-#: hypha/apply/funds/tables.py:498
+#: hypha/apply/funds/tables.py:562
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:12
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:28
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:44
@@ -1717,7 +1958,7 @@ msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:61
 #: hypha/apply/funds/templates/cotton/submission_list.html:24
-#: hypha/apply/funds/templatetags/workflow_tags.py:72
+#: hypha/apply/funds/templatetags/workflow_tags.py:126
 #: hypha/apply/users/roles.py:5
 msgid "Applicant"
 msgstr ""
@@ -1732,22 +1973,26 @@ msgstr ""
 msgid "You can begin submitting invoices and reports for your project."
 msgstr ""
 
-#: hypha/apply/activity/views.py:61
+#: hypha/apply/activity/views.py:99
 msgid "You can only edit your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:64
+#: hypha/apply/activity/views.py:102
 msgid "You can not edit a deleted comment"
 msgstr ""
 
-#: hypha/apply/activity/views.py:92
+#: hypha/apply/activity/views.py:130
 msgid "You can only delete your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:95
+#: hypha/apply/activity/views.py:133
 msgid "You can not delete a deleted comment"
 msgstr ""
 
+#: hypha/apply/activity/views.py:183
+msgid "Comment added!"
+msgstr ""
+
 #: hypha/apply/categories/admin.py:13
 msgid "Category Questions"
 msgstr ""
@@ -1767,27 +2012,27 @@ msgstr ""
 msgid "{title} {child_verbose_name} {verbose_name} for {parent}"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:31
+#: hypha/apply/categories/blocks.py:37
 msgid "Multi select"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:35 hypha/apply/funds/blocks.py:96
-#: hypha/apply/funds/blocks.py:153 hypha/apply/funds/blocks.py:199
+#: hypha/apply/categories/blocks.py:41 hypha/apply/funds/blocks.py:113
+#: hypha/apply/funds/blocks.py:170 hypha/apply/funds/blocks.py:216
 #: hypha/apply/stream_forms/blocks.py:36
 msgid "Label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:37
+#: hypha/apply/categories/blocks.py:43
 msgid "Leave blank to use the default Category label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:40 hypha/apply/funds/blocks.py:100
-#: hypha/apply/funds/blocks.py:157 hypha/apply/funds/blocks.py:202
+#: hypha/apply/categories/blocks.py:46 hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:174 hypha/apply/funds/blocks.py:219
 #: hypha/apply/stream_forms/blocks.py:37
 msgid "Help text"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:42
+#: hypha/apply/categories/blocks.py:48
 msgid "Leave blank to use the default Category help text"
 msgstr ""
 
@@ -1808,7 +2053,8 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:234
+#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:248
+#: hypha/apply/funds/tables.py:333
 #: hypha/apply/funds/templates/submissions/all.html:419
 #: hypha/apply/projects/templates/application_projects/modals/contracting_documents_upload.html:7
 #: hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html:7
@@ -1852,11 +2098,15 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:373
-#: hypha/apply/funds/tables.py:236
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:121
+#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:390
+#: hypha/apply/funds/tables.py:250
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:126
 #: hypha/apply/funds/templates/submissions/all.html:425
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:5
+#: hypha/apply/projects/forms/invoice.py:238 hypha/apply/projects/tables.py:115
+#: hypha/apply/projects/tables.py:152
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:58
+#: hypha/apply/projects/templates/application_projects/partials/invoice_tags.html:4
 msgid "Tags"
 msgstr ""
 
@@ -1930,12 +2180,12 @@ msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html:91
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:24
-#: hypha/apply/funds/tables.py:68
+#: hypha/apply/funds/tables.py:69
 #: hypha/apply/funds/templates/submissions/all.html:328
-#: hypha/apply/projects/models/payment.py:26
-#: hypha/apply/projects/models/project.py:218
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:56
-#: hypha/apply/projects/tables.py:42
+#: hypha/apply/projects/models/invoice.py:37
+#: hypha/apply/projects/models/project.py:219
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:63
+#: hypha/apply/projects/tables.py:40
 msgid "Submitted"
 msgstr ""
 
@@ -1977,7 +2227,7 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:13
 #: hypha/apply/dashboard/templates/dashboard/staff_dashboard.html:16
 #: hypha/apply/users/templates/users/account.html:35
-#: hypha/templates/includes/user_menu.html:57
+#: hypha/apply/users/templates/users/includes/user_menu.html:57
 msgid "Administration"
 msgstr ""
 
@@ -1992,7 +2242,7 @@ msgid "You don't have any PAFs for review right now"
 msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:27
-#: hypha/apply/funds/models/co_applicants.py:16
+#: hypha/apply/funds/models/co_applicants.py:17
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:6
 #: hypha/core/navigation.py:109
@@ -2088,11 +2338,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:27
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
 #: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:79
-#: hypha/apply/todo/options.py:87 hypha/apply/todo/options.py:95
+#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:86
+#: hypha/apply/todo/options.py:94 hypha/apply/todo/options.py:102
 #: hypha/apply/todo/templates/todo/todolist_item.html:16
 msgid "Draft"
 msgstr ""
@@ -2104,11 +2355,9 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:30
 #: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:11
 #: hypha/apply/determinations/templates/determinations/includes/determination_block.html:18
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:104
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:84
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:79
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:28
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:40
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "by"
 msgstr ""
@@ -2206,30 +2455,38 @@ msgstr ""
 #: hypha/apply/determinations/blocks.py:77
 #: hypha/apply/determinations/blocks.py:78
 #: hypha/apply/determinations/blocks.py:79
-#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:276
-#: hypha/apply/review/blocks.py:172 hypha/apply/review/blocks.py:173
-#: hypha/apply/review/blocks.py:174 hypha/apply/review/blocks.py:175
-#: hypha/apply/review/blocks.py:176 hypha/apply/review/blocks.py:177
-#: hypha/apply/review/blocks.py:178 hypha/apply/stream_forms/blocks.py:475
-#: hypha/apply/stream_forms/blocks.py:476
-#: hypha/apply/stream_forms/blocks.py:477
-#: hypha/apply/stream_forms/blocks.py:478
-#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482
-#: hypha/apply/stream_forms/blocks.py:483
-#: hypha/apply/stream_forms/blocks.py:484
-#: hypha/apply/stream_forms/blocks.py:485
-#: hypha/apply/stream_forms/blocks.py:486
-#: hypha/apply/stream_forms/blocks.py:487
-#: hypha/apply/stream_forms/blocks.py:488 hypha/apply/utils/blocks.py:74
+#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:303
+#: hypha/apply/funds/blocks.py:304 hypha/apply/funds/blocks.py:305
+#: hypha/apply/funds/blocks.py:306 hypha/apply/funds/blocks.py:307
+#: hypha/apply/funds/blocks.py:308 hypha/apply/funds/blocks.py:309
+#: hypha/apply/funds/blocks.py:310 hypha/apply/funds/blocks.py:311
+#: hypha/apply/funds/blocks.py:312 hypha/apply/funds/blocks.py:313
+#: hypha/apply/funds/blocks.py:314 hypha/apply/funds/blocks.py:315
+#: hypha/apply/funds/blocks.py:316 hypha/apply/funds/blocks.py:317
+#: hypha/apply/funds/blocks.py:318 hypha/apply/review/blocks.py:172
+#: hypha/apply/review/blocks.py:173 hypha/apply/review/blocks.py:174
+#: hypha/apply/review/blocks.py:175 hypha/apply/review/blocks.py:176
+#: hypha/apply/review/blocks.py:177 hypha/apply/review/blocks.py:178
+#: hypha/apply/stream_forms/blocks.py:513
+#: hypha/apply/stream_forms/blocks.py:514
+#: hypha/apply/stream_forms/blocks.py:515
+#: hypha/apply/stream_forms/blocks.py:516
+#: hypha/apply/stream_forms/blocks.py:517
+#: hypha/apply/stream_forms/blocks.py:518
+#: hypha/apply/stream_forms/blocks.py:519
+#: hypha/apply/stream_forms/blocks.py:520
+#: hypha/apply/stream_forms/blocks.py:521
+#: hypha/apply/stream_forms/blocks.py:522
+#: hypha/apply/stream_forms/blocks.py:523
+#: hypha/apply/stream_forms/blocks.py:524
+#: hypha/apply/stream_forms/blocks.py:525
+#: hypha/apply/stream_forms/blocks.py:526 hypha/apply/utils/blocks.py:74
 #: hypha/apply/utils/blocks.py:75
 msgid "Fields"
 msgstr ""
 
 #: hypha/apply/determinations/blocks.py:78 hypha/apply/review/blocks.py:174
-#: hypha/apply/stream_forms/blocks.py:473
+#: hypha/apply/stream_forms/blocks.py:511
 msgid "Paragraph"
 msgstr ""
 
@@ -2249,7 +2506,7 @@ msgid "Do you recommend requesting a proposal based on this concept note?"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:305
-#: hypha/apply/determinations/views.py:99
+#: hypha/apply/determinations/views.py:100
 msgid "-- No determination selected -- "
 msgstr ""
 
@@ -2330,22 +2587,22 @@ msgid "Rationale and appropriateness questions and comments"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:592
-#: hypha/apply/determinations/views.py:389
+#: hypha/apply/determinations/views.py:394
 msgid "-- No proposal form selected -- "
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:595
-#: hypha/apply/determinations/views.py:392
+#: hypha/apply/determinations/views.py:397
 msgid "Select the proposal form only for determination approval"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:599
-#: hypha/apply/determinations/views.py:396
+#: hypha/apply/determinations/views.py:401
 msgid "Select the proposal form to use for proposal stage."
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:602
-#: hypha/apply/determinations/views.py:399
+#: hypha/apply/determinations/views.py:404
 msgid "Proposal Form"
 msgstr ""
 
@@ -2411,11 +2668,12 @@ msgstr ""
 #: hypha/apply/determinations/models.py:214
 #: hypha/apply/determinations/models.py:218
 #: hypha/apply/determinations/options.py:10
-#: hypha/apply/funds/workflows/constants.py:93
+#: hypha/apply/funds/workflows/constants.py:97
 #: hypha/apply/funds/workflows/definitions/double_stage.py:147
 #: hypha/apply/funds/workflows/definitions/double_stage.py:326
 #: hypha/apply/funds/workflows/definitions/single_stage.py:149
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:214
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:198
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:138
 msgid "Dismissed"
@@ -2428,7 +2686,7 @@ msgid "Needs more info"
 msgstr ""
 
 #: hypha/apply/determinations/models.py:255
-#: hypha/apply/funds/workflows/registry.py:66
+#: hypha/apply/funds/workflows/registry.py:67
 msgid "Request"
 msgstr ""
 
@@ -2491,9 +2749,9 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:85
 #: hypha/apply/funds/templates/funds/application_base.html:125
 #: hypha/apply/funds/templates/funds/applicationsubmission_form.html:49
-#: hypha/apply/funds/views/submission_edit.py:129
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:320
+#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:319
 #: hypha/apply/projects/reports/templates/reports/report_form.html:69
 #: hypha/apply/projects/templates/application_projects/project_approval_form.html:52
 #: hypha/apply/projects/templates/application_projects/project_sow_form.html:48
@@ -2503,7 +2761,7 @@ msgid "Save draft"
 msgstr ""
 
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:108
-#: hypha/apply/funds/templates/funds/comments.html:108
+#: hypha/apply/funds/templates/funds/comments.html:96
 #: hypha/apply/review/templates/review/review_form.html:107
 #: hypha/templates/cotton/dropdown_menu.html:99
 msgid "Loading…"
@@ -2555,8 +2813,8 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:34
 #: hypha/apply/funds/templates/funds/application_preview.html:66
 #: hypha/apply/funds/templates/funds/submission-success.html:65
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:88
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:96
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:95
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:74
 msgid "Continue editing"
 msgstr ""
 
@@ -2583,44 +2841,44 @@ msgstr ""
 msgid "Add determination"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:120
+#: hypha/apply/determinations/views.py:121
 msgid "Improperly configured request, please try again."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:213
+#: hypha/apply/determinations/views.py:214
 #, python-brace-format
 msgid "Successfully determined as {outcome}: "
 msgstr ""
 
-#: hypha/apply/determinations/views.py:234
+#: hypha/apply/determinations/views.py:235
 #, python-brace-format
 msgid "Unable to determine submission \"{title}\" as already determined"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:286
+#: hypha/apply/determinations/views.py:291
 msgid "You do not have permission to create that determination."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:291
+#: hypha/apply/determinations/views.py:296
 msgid "A final determination has already been submitted."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:304
+#: hypha/apply/determinations/views.py:309
 msgid "There is a draft determination you do not have permission to edit."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:460
+#: hypha/apply/determinations/views.py:469
 msgid "A project was automatically created."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:504
+#: hypha/apply/determinations/views.py:513
 #, python-brace-format
 msgid ""
 "A determination of \"{current}\" exists but you tried to progress as "
 "\"{target}\""
 msgstr ""
 
-#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:554
+#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:626
 #: hypha/apply/users/roles.py:6
 msgid "Staff"
 msgstr ""
@@ -2677,10 +2935,11 @@ msgstr ""
 msgid "Sealed Rounds"
 msgstr ""
 
-#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:40
-#: hypha/apply/funds/tables.py:223 hypha/apply/funds/tables.py:314
-#: hypha/apply/funds/tables.py:437 hypha/apply/funds/tables.py:474
-#: hypha/apply/projects/filters.py:35 hypha/apply/projects/filters.py:51
+#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:41
+#: hypha/apply/funds/tables.py:237 hypha/apply/funds/tables.py:325
+#: hypha/apply/funds/tables.py:372 hypha/apply/funds/tables.py:501
+#: hypha/apply/funds/tables.py:538 hypha/apply/projects/filters.py:39
+#: hypha/apply/projects/filters.py:55
 msgid "Funds"
 msgstr ""
 
@@ -2689,7 +2948,7 @@ msgid "Request For Partners"
 msgstr ""
 
 #: hypha/apply/funds/admin.py:118 hypha/apply/funds/admin_helpers.py:73
-#: hypha/apply/funds/models/__init__.py:74
+#: hypha/apply/funds/models/__init__.py:75
 msgid "Labs"
 msgstr ""
 
@@ -2742,8 +3001,8 @@ msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:47
 #: hypha/apply/funds/templates/funds/application_base.html:135
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:321
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:320
 msgid "Preview"
 msgstr ""
 
@@ -2768,7 +3027,7 @@ msgstr ""
 msgid "state"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:413
+#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:477
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:22
 #: hypha/apply/funds/templates/funds/includes/round-block.html:12
 #: hypha/apply/funds/templates/funds/includes/round-block.html:20
@@ -2777,7 +3036,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:414
+#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:478
 #: hypha/apply/funds/templates/funds/includes/round-block.html:30
 #: hypha/apply/funds/templates/funds/includes/round-block.html:37
 #: hypha/apply/funds/templates/funds/includes/round-block.html:39
@@ -2786,14 +3045,14 @@ msgid "Closed"
 msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:92
-#: hypha/apply/projects/models/project.py:220
-#: hypha/apply/projects/models/project.py:226
+#: hypha/apply/projects/models/project.py:221
+#: hypha/apply/projects/models/project.py:227
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Not started"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:416
+#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:480
 msgid "Unpublished"
 msgstr ""
 
@@ -2806,142 +3065,148 @@ msgstr ""
 msgid "Copy {form_name}"
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:79
+#: hypha/apply/funds/admin_views.py:68
+msgid ""
+"Please select the date in the copied page. Newly copied pages have NONE "
+"value for the start and end date"
+msgstr ""
+
+#: hypha/apply/funds/admin_views.py:77
 #, python-brace-format
 msgid "Page '{0}' and {1} subpages copied."
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:85
+#: hypha/apply/funds/admin_views.py:83
 #, python-brace-format
 msgid "Page '{0}' copied."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:94
+#: hypha/apply/funds/blocks.py:111
 #, fuzzy
 #| msgid "Approved contract"
 msgid "The title of the project"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/funds/blocks.py:96
+#: hypha/apply/funds/blocks.py:113
 msgid "What is the title of your application?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:101
+#: hypha/apply/funds/blocks.py:118
 msgid "This project name can be changed if a full proposal is requested."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:103
+#: hypha/apply/funds/blocks.py:120
 msgid "Max length"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:106
+#: hypha/apply/funds/blocks.py:123
 msgid "Application title"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:134
 #, fuzzy
 #| msgid "Approved contract"
 msgid "The value of the project"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/funds/blocks.py:126
+#: hypha/apply/funds/blocks.py:143
 msgid "Requested amount"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:142
+#: hypha/apply/funds/blocks.py:159
 msgid "The name of the organization"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:146
+#: hypha/apply/funds/blocks.py:163
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:73
 #: hypha/apply/projects/reports/tables.py:24
 msgid "Organization name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:151
+#: hypha/apply/funds/blocks.py:168
 msgid "The applicant email address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:153
+#: hypha/apply/funds/blocks.py:170
 msgid "What email address should we use to contact you?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:159
+#: hypha/apply/funds/blocks.py:176
 msgid ""
 "We will use this email address to communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:172
+#: hypha/apply/funds/blocks.py:189
 msgid "The postal address of the user"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:177
+#: hypha/apply/funds/blocks.py:194
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:66
 #: hypha/apply/funds/templates/funds/revisions_compare.html:57
 #: hypha/apply/funds/templates/funds/revisions_compare.html:58
 msgid "Address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:198 hypha/apply/funds/blocks.py:215
+#: hypha/apply/funds/blocks.py:215 hypha/apply/funds/blocks.py:232
 msgid "Full name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:199
+#: hypha/apply/funds/blocks.py:216
 msgid "What is your name?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:204
+#: hypha/apply/funds/blocks.py:221
 msgid "We will use this name when we communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:221
+#: hypha/apply/funds/blocks.py:238
 msgid "Duration"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:227
+#: hypha/apply/funds/blocks.py:244
 msgid "Days"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:228 hypha/apply/projects/reports/models.py:244
+#: hypha/apply/funds/blocks.py:245 hypha/apply/projects/reports/models.py:249
 msgid "Weeks"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:229 hypha/apply/projects/reports/models.py:245
+#: hypha/apply/funds/blocks.py:246 hypha/apply/projects/reports/models.py:250
 msgid "Months"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:232
+#: hypha/apply/funds/blocks.py:249
 #, python-brace-format
 msgid "{} day"
 msgid_plural "{} days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:235
+#: hypha/apply/funds/blocks.py:252
 #, python-brace-format
 msgid "{} week"
 msgid_plural "{} weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:238
+#: hypha/apply/funds/blocks.py:255
 #, python-brace-format
 msgid "{} month"
 msgid_plural "{} months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:244
+#: hypha/apply/funds/blocks.py:261
 msgid ""
 "Duration type is used to display duration choices in Days, Weeks or Months "
 "in application forms. Be careful, changing the duration type in the active "
 "round can result in data inconsistency."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:275 hypha/apply/stream_forms/blocks.py:473
-#: hypha/apply/stream_forms/blocks.py:474
-#: hypha/apply/stream_forms/blocks.py:489
-#: hypha/apply/stream_forms/blocks.py:490 hypha/apply/utils/blocks.py:85
+#: hypha/apply/funds/blocks.py:319 hypha/apply/stream_forms/blocks.py:511
+#: hypha/apply/stream_forms/blocks.py:512
+#: hypha/apply/stream_forms/blocks.py:527
+#: hypha/apply/stream_forms/blocks.py:528 hypha/apply/utils/blocks.py:85
 msgid "Custom"
 msgstr ""
 
@@ -2949,7 +3214,7 @@ msgstr ""
 msgid "Take action"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:448
+#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:458
 #, python-brace-format
 msgid "Update lead from {lead} to"
 msgstr ""
@@ -2981,67 +3246,68 @@ msgstr ""
 msgid "{role_name} Reviewer"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:376
+#: hypha/apply/funds/forms.py:393
 msgid "Tags are hierarchical in nature."
 msgstr ""
 
-#: hypha/apply/funds/forms.py:425 hypha/apply/stream_forms/blocks.py:118
+#: hypha/apply/funds/forms.py:442 hypha/apply/stream_forms/blocks.py:156
 msgid "Email"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:427 hypha/apply/funds/forms.py:460
+#: hypha/apply/funds/forms.py:444 hypha/apply/funds/forms.py:477
 msgid "Role"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:433 hypha/apply/funds/forms.py:466
+#: hypha/apply/funds/forms.py:450 hypha/apply/funds/forms.py:483
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project permissions"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/funds/forms.py:435 hypha/apply/funds/forms.py:468
+#: hypha/apply/funds/forms.py:452 hypha/apply/funds/forms.py:485
 msgid ""
 "Enable same access level to these sections. Example: View role + Contracting "
 "= read-only contracting access."
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:39 hypha/apply/funds/tables.py:75
+#: hypha/apply/funds/models/__init__.py:40 hypha/apply/funds/tables.py:76
 #: hypha/apply/funds/templates/submissions/all.html:410
-#: hypha/apply/projects/tables.py:185 hypha/apply/projects/tables.py:262
+#: hypha/apply/projects/tables.py:203 hypha/apply/projects/tables.py:284
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
 msgid "Fund"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:47
+#: hypha/apply/funds/models/__init__.py:48
 msgid "RFP"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:48
+#: hypha/apply/funds/models/__init__.py:49
 msgid "RFPs"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:55
+#: hypha/apply/funds/models/__init__.py:56
 #: hypha/apply/funds/templates/cotton/submission_list.html:31
 #: hypha/apply/funds/templates/submissions/all.html:414
 msgid "Round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:56 hypha/apply/funds/tables.py:225
-#: hypha/apply/funds/tables.py:312 hypha/apply/funds/tables.py:479
+#: hypha/apply/funds/models/__init__.py:57 hypha/apply/funds/tables.py:239
+#: hypha/apply/funds/tables.py:327 hypha/apply/funds/tables.py:370
+#: hypha/apply/funds/tables.py:543
 #: hypha/apply/funds/templates/funds/rounds.html:5
 #: hypha/apply/funds/templates/funds/rounds.html:10
 msgid "Rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:63
+#: hypha/apply/funds/models/__init__.py:64
 msgid "Sealed round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:64
+#: hypha/apply/funds/models/__init__.py:65
 msgid "Sealed rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:73
+#: hypha/apply/funds/models/__init__.py:74
 msgid "Lab"
 msgstr ""
 
@@ -3261,86 +3527,87 @@ msgstr "Enviar una revisión"
 msgid "assigned reviewers"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/funds/models/co_applicants.py:14
+#: hypha/apply/funds/models/co_applicants.py:15
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Document"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/funds/models/co_applicants.py:15
+#: hypha/apply/funds/models/co_applicants.py:16
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Contracting Document"
 msgstr "Presentado un informe"
 
-#: hypha/apply/funds/models/co_applicants.py:17
+#: hypha/apply/funds/models/co_applicants.py:18
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:10
 #: hypha/apply/projects/reports/templates/reports/report_list.html:6
 #: hypha/core/navigation.py:114
 msgid "Reports"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:21
+#: hypha/apply/funds/models/co_applicants.py:22
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:22
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:53
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
 msgid "Pending"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:22
-#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/workflows/constants.py:93
 #: hypha/apply/funds/workflows/definitions/double_stage.py:311
 #: hypha/apply/funds/workflows/definitions/single_stage.py:134
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:197
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:182
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:123
 msgid "Accepted"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/models/co_applicants.py:24
 msgid "Rejected"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:24
+#: hypha/apply/funds/models/co_applicants.py:25
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:14
 msgid "Expired"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:33
+#: hypha/apply/funds/models/co_applicants.py:34
 msgid "invited user email"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:42
-#: hypha/apply/funds/models/submissions.py:487
-#: hypha/apply/projects/models/payment.py:137
-#: hypha/apply/projects/models/project.py:262
+#: hypha/apply/funds/models/co_applicants.py:43
+#: hypha/apply/funds/models/submissions.py:495
+#: hypha/apply/projects/models/invoice.py:160
+#: hypha/apply/projects/models/project.py:267
 msgid "status"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:48
-#: hypha/apply/funds/models/co_applicants.py:77
+#: hypha/apply/funds/models/co_applicants.py:49
+#: hypha/apply/funds/models/co_applicants.py:83
 msgid "role"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:57
+#: hypha/apply/funds/models/co_applicants.py:58
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicant invite"
 msgstr "Factura emitida"
 
-#: hypha/apply/funds/models/co_applicants.py:58
+#: hypha/apply/funds/models/co_applicants.py:59
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicant invites"
 msgstr "Factura emitida"
 
-#: hypha/apply/funds/models/co_applicants.py:84
+#: hypha/apply/funds/models/co_applicants.py:90
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicant"
 msgstr "Factura emitida"
 
-#: hypha/apply/funds/models/co_applicants.py:85
+#: hypha/apply/funds/models/co_applicants.py:91
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicants"
@@ -3645,21 +3912,22 @@ msgstr ""
 msgid "screening decisions"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:439
+#: hypha/apply/funds/models/submissions.py:447
 msgid "summary"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:502
+#: hypha/apply/funds/models/submissions.py:510
+#: hypha/apply/funds/models/submissions.py:1119
 msgid "submit time"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:531
+#: hypha/apply/funds/models/submissions.py:539
 #, fuzzy
 #| msgid "Opened the submission while still sealed"
 msgid "application submission"
 msgstr "Abierto el envío cuando aún estaba precintado"
 
-#: hypha/apply/funds/models/submissions.py:532
+#: hypha/apply/funds/models/submissions.py:540
 #, fuzzy
 #| msgid "Opened the submission while still sealed"
 msgid "application submissions"
@@ -3707,14 +3975,17 @@ msgid "Confirmation email"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:211
+#: hypha/apply/projects/models/invoice.py:21
 msgid "Failed"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:212
+#: hypha/apply/projects/models/invoice.py:22
 msgid "Success"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:213
+#: hypha/apply/projects/models/invoice.py:23
 msgid "In Progress"
 msgstr ""
 
@@ -3726,8 +3997,8 @@ msgstr ""
 msgid "submission export managers"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:24 hypha/apply/funds/permissions.py:34
-#: hypha/apply/funds/permissions.py:208 hypha/apply/projects/permissions.py:44
+#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
+#: hypha/apply/funds/permissions.py:212 hypha/apply/projects/permissions.py:44
 #: hypha/apply/projects/permissions.py:57
 #: hypha/apply/projects/permissions.py:124
 #: hypha/apply/projects/permissions.py:179
@@ -3735,40 +4006,42 @@ msgstr ""
 #: hypha/apply/projects/permissions.py:261
 #: hypha/apply/projects/permissions.py:327
 #: hypha/apply/projects/permissions.py:346
+#: hypha/apply/projects/permissions.py:423
+#: hypha/apply/projects/permissions.py:441
 msgid "Login Required"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
-#: hypha/apply/funds/permissions.py:211
+#: hypha/apply/funds/permissions.py:30 hypha/apply/funds/permissions.py:40
+#: hypha/apply/funds/permissions.py:215
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:25
 #: hypha/apply/funds/templates/funds/includes/submission-table-row.html:26
 msgid "Archived Submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:43
+#: hypha/apply/funds/permissions.py:46
 msgid "Co-applicant with edit role can edit submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:44
+#: hypha/apply/funds/permissions.py:47
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Co-applicant does not have edit role"
 msgstr "Factura emitida"
 
-#: hypha/apply/funds/permissions.py:45
+#: hypha/apply/funds/permissions.py:48
 msgid "User can edit in current phase"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:155
+#: hypha/apply/funds/permissions.py:159
 msgid "Staff is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:157
+#: hypha/apply/funds/permissions.py:161
 msgid "Staff Admin is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:158 hypha/apply/funds/permissions.py:255
-#: hypha/apply/funds/permissions.py:263 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:162 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:289 hypha/apply/funds/permissions.py:305
 #: hypha/apply/projects/permissions.py:49
 #: hypha/apply/projects/permissions.py:77
 #: hypha/apply/projects/permissions.py:85
@@ -3789,174 +4062,180 @@ msgstr ""
 msgid "Forbidden Error"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:231
+#: hypha/apply/funds/permissions.py:259
 msgid "No access to view submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:233
+#: hypha/apply/funds/permissions.py:261
 msgid "Applicant cannot view submission screening"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:239
+#: hypha/apply/funds/permissions.py:267
 msgid "Co-applicant can't be added to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:245
+#: hypha/apply/funds/permissions.py:271
 msgid "Co-applicants can't be invited to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:250
+#: hypha/apply/funds/permissions.py:276
 msgid "Limit reached for this submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:252
+#: hypha/apply/funds/permissions.py:278
 msgid "Applicants can invite co-applicants to their application"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:254
+#: hypha/apply/funds/permissions.py:280
 msgid "Staff can invite co-applicant on behalf of applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:260
+#: hypha/apply/funds/permissions.py:286
 msgid "Submission user can access their submission's co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:262
+#: hypha/apply/funds/permissions.py:288
 msgid "Staff can access each submissions' co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:268
+#: hypha/apply/funds/permissions.py:294
 msgid "Co-applicant can't be updated to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:274
+#: hypha/apply/funds/permissions.py:298
 msgid "Co-applicants can't be updated to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:276
+#: hypha/apply/funds/permissions.py:300
 msgid "Same user who invited can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:278
+#: hypha/apply/funds/permissions.py:302
 msgid "Submission owner can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:280
+#: hypha/apply/funds/permissions.py:304
 msgid "Staff can delete any co-applicant of any submission"
 msgstr ""
 
-#: hypha/apply/funds/services.py:45
+#: hypha/apply/funds/services.py:47
 #, python-brace-format
 msgid "{count} submissions archived."
 msgstr ""
 
-#: hypha/apply/funds/services.py:78
+#: hypha/apply/funds/services.py:80
 #, python-brace-format
 msgid "{count} submissions deleted."
 msgstr ""
 
-#: hypha/apply/funds/services.py:108
+#: hypha/apply/funds/services.py:150
+#, python-brace-format
+msgid "{sub_number} submission anonymized"
+msgid_plural "{sub_number} submissions anonymized"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/funds/services.py:175
 #, python-brace-format
 msgid "Lead set to {lead} on "
 msgstr ""
 
-#: hypha/apply/funds/services.py:158
+#: hypha/apply/funds/services.py:225
 #, python-brace-format
 msgid "{user} as {name}"
 msgstr ""
 
-#: hypha/apply/funds/services.py:166
+#: hypha/apply/funds/services.py:233
 #, python-brace-format
 msgid "Batch reviewers updated: {reviewers_text} on "
 msgstr ""
 
-#: hypha/apply/funds/tables.py:70
+#: hypha/apply/funds/tables.py:71
 #: hypha/apply/funds/templates/cotton/submission_list.html:22
 #: hypha/apply/funds/templates/submissions/all.html:344
 #: hypha/apply/funds/templates/submissions/all.html:470
-#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
-#: hypha/apply/projects/forms/payment.py:208
+#: hypha/apply/projects/filters.py:43 hypha/apply/projects/filters.py:64
+#: hypha/apply/projects/forms/invoice.py:210
 #: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:183
-#: hypha/apply/projects/tables.py:260
+#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:200
+#: hypha/apply/projects/tables.py:282
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:58
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:6
 #: hypha/apply/users/admin_views.py:55 hypha/apply/users/admin_views.py:128
 msgid "Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:74
+#: hypha/apply/funds/tables.py:75
 msgid "Type"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:78
+#: hypha/apply/funds/tables.py:79
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "Last updated"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:100
+#: hypha/apply/funds/tables.py:101
 msgid "No submissions available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:210
+#: hypha/apply/funds/tables.py:224
 msgid "Statuses"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:226 hypha/apply/funds/tables.py:438
+#: hypha/apply/funds/tables.py:240 hypha/apply/funds/tables.py:502
 msgid "Leads"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 #: hypha/apply/funds/templates/submissions/all.html:382
 msgid "Screening"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 msgid "No Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:345
+#: hypha/apply/funds/tables.py:403
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:46
 msgid "Determined"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:346
+#: hypha/apply/funds/tables.py:404
 msgid "Start"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:347
+#: hypha/apply/funds/tables.py:405
 msgid "End"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/funds/tables.py:439
+#: hypha/apply/funds/tables.py:456 hypha/apply/funds/tables.py:503
 #: hypha/apply/users/admin_views.py:125
 msgid "Active"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/users/admin_views.py:125
+#: hypha/apply/funds/tables.py:456 hypha/apply/users/admin_views.py:125
 msgid "Inactive"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:415
+#: hypha/apply/funds/tables.py:479
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Not Started"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/funds/tables.py:440
+#: hypha/apply/funds/tables.py:504
 msgid "State"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:516 hypha/apply/funds/tables.py:547
+#: hypha/apply/funds/tables.py:580 hypha/apply/funds/tables.py:619
 msgid "No reviews available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:525
+#: hypha/apply/funds/tables.py:597
 msgid "Submission"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:564
+#: hypha/apply/funds/tables.py:636
 msgid "No staff available"
 msgstr ""
 
@@ -3965,13 +4244,13 @@ msgid "Organization"
 msgstr ""
 
 #: hypha/apply/funds/templates/cotton/submission_list.html:35
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:87
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
 #: hypha/apply/funds/templates/funds/submission_sealed.html:14
 #: hypha/apply/funds/templates/submissions/all.html:431
 #: hypha/apply/funds/templates/submissions/all.html:474
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:10
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:14
-#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
+#: hypha/apply/projects/filters.py:45 hypha/apply/projects/filters.py:58
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:46
 #: hypha/apply/projects/templates/application_projects/project_sow_detail.html:10
 msgid "Lead"
@@ -4044,7 +4323,7 @@ msgid "(selected)"
 msgstr "Factura emitida"
 
 #: hypha/apply/funds/templates/funds/application_base.html:105
-#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:127
 msgid "Preview and submit"
 msgstr ""
 
@@ -4105,7 +4384,6 @@ msgid "Reviews & assignees"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html:50
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:66
 msgid "View all"
 msgstr ""
 
@@ -4119,6 +4397,17 @@ msgstr ""
 msgid "Create new reminder"
 msgstr "Creado"
 
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:3
+msgid "Anonymize application"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:5
+msgid ""
+"Are you sure you want to anonymize this application? Personal data will be "
+"removed and the application will only be accessible via statistics in the "
+"Results view. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:3
 msgid "Delete application"
 msgstr ""
@@ -4130,82 +4419,73 @@ msgid ""
 "action cannot be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:22
-#: hypha/apply/funds/templates/funds/comments.html:18
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:18
+#: hypha/apply/funds/templates/funds/comments.html:14
 #: hypha/apply/projects/templates/application_projects/paf_export.html:76
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:107
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:109
 #: hypha/apply/projects/templates/application_projects/project_detail.html:17
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:15
 msgid "Application"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:32
-#: hypha/apply/funds/templates/funds/comments.html:28
-#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
-#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
-#: hypha/apply/projects/templates/application_projects/project_detail.html:24
-msgid "Project"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:50
-#: hypha/apply/funds/templates/funds/comments.html:46
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:38
+#: hypha/apply/funds/templates/funds/comments.html:34
 msgid "View message log"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:61
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:49
 msgid "Congratulations!"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:63
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:51
 #, python-format
 msgid "Your %(stage)s application has been accepted."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:68
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:56
 #, python-format
 msgid "Start your %(stage)s application."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:77
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:65
 msgid "This application has been archived. This is visible to accounts with "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:85
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:73
 #, fuzzy
 #| msgid "Opened the submission while still sealed"
 msgid "This application is sealed."
 msgstr "Abierto el envío cuando aún estaba precintado"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Drafted "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:22
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "Submitted "
 msgstr "Enviar una revisión"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:100
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:88
 #: hypha/apply/funds/templates/submissions/all.html:336
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:34
 msgid "Updated"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:129
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:117
 msgid "Delete Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:195
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:183
 msgid "Related submissions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:203
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:214
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:191
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:202
 msgid "View linked"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:223
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:211
 msgid "Other Submissions"
 msgstr ""
 
@@ -4264,6 +4544,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:154
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:204
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:94
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:140
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:171
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:189
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:127
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:160
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:177
@@ -4288,101 +4572,114 @@ msgstr ""
 msgid "Comments: %(title)s"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/funds/templates/funds/comments.html:57
+#: hypha/apply/funds/templates/funds/comments.html:45
 msgid "Add communication"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/comments.html:80
-#: hypha/apply/funds/templates/funds/comments.html:94
-msgid "Add Comment"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:4
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:5
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:6
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:88
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:66
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:4
 #: hypha/apply/projects/templates/application_projects/project_admin_detail.html:10
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:128
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:35
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:131
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:41
 msgid "Actions to take"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:15
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:16
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:12
 msgid "Unarchive Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:26
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:28
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Add another project"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:30
 #: hypha/apply/funds/templates/funds/modals/create_project_form.html:2
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Create project"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:32
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
 msgid "Complete draft determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:42
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:9
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "Complete draft review"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:45
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:50
 msgid "Assign reviewers"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:60
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:19
 msgid "View determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:68
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
 #: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:34
-#: hypha/apply/projects/views/payment.py:138
+#: hypha/apply/projects/views/invoice.py:147
 msgid "Update status"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:78
 msgid "Assign"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:97
 msgid "More actions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:101
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:106
 #: hypha/apply/funds/templates/funds/revisions_compare.html:88
 msgid "Revisions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:111
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:116
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:69
 msgid "Translate"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:130
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:135
 #: hypha/apply/funds/views/reminders.py:69
 #, fuzzy
 #| msgid "Created"
 msgid "Create Reminder"
 msgstr "Creado"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:138
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:178
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:53
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:140
+#, fuzzy
+#| msgid "Approved"
+msgid "Change Author"
+msgstr "Aprobado"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:181
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:59
 msgid "Download as PDF"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:158
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:30
-#: hypha/apply/funds/templates/submissions/all.html:490
+#: hypha/apply/funds/templates/submissions/all.html:491
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:32
 msgid "Archive"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:172
+#: hypha/apply/funds/templates/submissions/all.html:515
+msgid "Anonymize"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:8
 msgid "Co-applicants"
 msgstr ""
@@ -4398,8 +4695,8 @@ msgid "Not allowed"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:25
-#: hypha/apply/funds/views/co_applicants.py:58
-#: hypha/apply/funds/views/co_applicants.py:102
+#: hypha/apply/funds/views/co_applicants.py:57
+#: hypha/apply/funds/views/co_applicants.py:101
 msgid "Invite"
 msgstr ""
 
@@ -4425,7 +4722,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:16
 msgid ""
 "Are you sure you want to archive submission? Archived submissions will be "
-"hidden from the main list of submissions and can not be edited."
+"hidden from the main list of submissions and can not be edited. Submissions "
+"can be unarchived at any time."
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:16
@@ -4443,6 +4741,22 @@ msgstr ""
 msgid "You have no %(type)s rounds or labs assigned to you."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:18
+#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
+#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
+msgid "Project"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:30
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:18
+#, fuzzy, python-format
+#| msgid "Submitted a report"
+msgctxt "project tab"
+msgid "Project"
+msgid_plural "Projects (%(counter)s)"
+msgstr[0] "Presentado un informe"
+msgstr[1] "Presentado un informe"
+
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:34
 msgid "No reminders yet."
 msgstr ""
@@ -4479,6 +4793,10 @@ msgstr ""
 msgid "Legal Name"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:54
+msgid "Edit user account"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:61
 #: hypha/apply/funds/templates/funds/revisions_compare.html:52
 #: hypha/apply/funds/templates/funds/revisions_compare.html:53
@@ -4509,7 +4827,7 @@ msgid ""
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:69
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:49
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:55
 msgid "Export"
 msgstr ""
 
@@ -4589,7 +4907,7 @@ msgid "selected"
 msgstr "Factura emitida"
 
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:43
-#: hypha/templates/base.html:159
+#: hypha/templates/base.html:160
 msgid "Search..."
 msgstr ""
 
@@ -4597,17 +4915,17 @@ msgstr ""
 msgid "Search input"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:60
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:73
 #: hypha/apply/funds/templates/submissions/all.html:202
 msgid "Clear current filters & sorts"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:108
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:121
 #: hypha/templates/cotton/pagination.html:12
 msgid "Previous"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:109
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:122
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:6
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:10
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:47
@@ -4620,9 +4938,8 @@ msgid "Translate application"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:38
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:10
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:26
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 #: hypha/apply/projects/templates/application_projects/filters/widgets/date_range_input_widget.html:5
 msgid "to"
@@ -4643,22 +4960,25 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:20
 #: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:51
-#: hypha/apply/funds/views/submission_edit.py:535
-#: hypha/apply/funds/views/submission_edit.py:566
-#: hypha/apply/funds/views/submission_edit.py:595
-#: hypha/apply/funds/views/submission_edit.py:639
-#: hypha/apply/funds/views/submission_edit.py:669
-#: hypha/apply/funds/views/submission_edit.py:695
-#: hypha/apply/funds/views/translate.py:60
-#: hypha/apply/funds/views/translate.py:95
+#: hypha/apply/funds/views/submission_edit.py:536
+#: hypha/apply/funds/views/submission_edit.py:567
+#: hypha/apply/funds/views/submission_edit.py:596
+#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:670
+#: hypha/apply/funds/views/submission_edit.py:696
+#: hypha/apply/funds/views/submission_edit.py:726
+#: hypha/apply/funds/views/submission_edit.py:752
+#: hypha/apply/funds/views/translate.py:58
+#: hypha/apply/funds/views/translate.py:93
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:28
-#: hypha/apply/projects/views/payment.py:354
-#: hypha/apply/projects/views/project.py:423
-#: hypha/apply/projects/views/project.py:462
-#: hypha/apply/projects/views/project.py:506
-#: hypha/apply/projects/views/project.py:542
-#: hypha/apply/projects/views/project.py:1289
-#: hypha/apply/projects/views/project.py:1328
+#: hypha/apply/projects/views/invoice.py:359
+#: hypha/apply/projects/views/project.py:427
+#: hypha/apply/projects/views/project.py:466
+#: hypha/apply/projects/views/project.py:510
+#: hypha/apply/projects/views/project.py:546
+#: hypha/apply/projects/views/project.py:588
+#: hypha/apply/projects/views/project.py:1340
+#: hypha/apply/projects/views/project.py:1379
 msgid "Update"
 msgstr ""
 
@@ -4734,10 +5054,10 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:15
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:20
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:25
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:46
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:137
-#: hypha/apply/projects/views/project.py:1043
-#: hypha/apply/projects/views/project.py:1260
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:47
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
+#: hypha/apply/projects/views/project.py:1094
+#: hypha/apply/projects/views/project.py:1311
 msgid "Update Status"
 msgstr ""
 
@@ -4747,6 +5067,16 @@ msgstr ""
 msgid "Current status"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:2
+#, fuzzy
+#| msgid "Submitted a review"
+msgid "Update Author"
+msgstr "Enviar una revisión"
+
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:6
+msgid "Current Author"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/modals/update_lead_form.html:2
 #: hypha/apply/projects/templates/application_projects/modals/lead_update.html:2
 msgid "Update Lead"
@@ -4760,6 +5090,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html:2
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:12
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:13
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:2
 msgid "Update tags"
 msgstr ""
 
@@ -4813,7 +5144,7 @@ msgid "Reviews by %(object)s"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:3
-#: hypha/apply/review/views.py:473
+#: hypha/apply/review/views.py:482
 msgid "Compare"
 msgstr ""
 
@@ -4902,11 +5233,11 @@ msgstr ""
 
 #: hypha/apply/funds/templates/funds/submission-success.html:77
 #: hypha/apply/users/templates/users/activation/confirm.html:43
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
 #: hypha/apply/users/templates/users/login.html:4
 #: hypha/apply/users/templates/users/login.html:86
 #: hypha/apply/users/templates/users/password_reset/complete.html:14
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:5
-#: hypha/templates/includes/user_menu.html:101
 msgid "Log in"
 msgstr ""
 
@@ -4967,6 +5298,13 @@ msgid ""
 "amount fields or data and are not included."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/submissions_result.html:53
+#, python-format
+msgid ""
+"%(count)s anonymized submission(s) are excluded because the active filter "
+"does not apply to anonymized data."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/tables/table.html:24
 #: hypha/apply/projects/templates/application_projects/tables/table.html:18
 msgid "Show"
@@ -5148,37 +5486,70 @@ msgstr "Aprobado"
 msgid "Assign Reviewer(s)"
 msgstr "Aprobado"
 
-#: hypha/apply/funds/templates/submissions/all.html:486
-msgid "Are you sure you want to archive the selected submissions?"
-msgstr ""
-
-#: hypha/apply/funds/templates/submissions/all.html:498
-msgid ""
-"Are you sure you want to delete the selected submissions? This action cannot "
-"be undone."
-msgstr ""
-
-#: hypha/apply/funds/templates/submissions/all.html:524
+#: hypha/apply/funds/templates/submissions/all.html:538
 msgid "No results matched your search"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "Try"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "clearing"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "the current query and try again"
 msgstr ""
 
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:4
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "Anonymize applications"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:9
+#, python-format
+msgid ""
+"Are you sure you want to anonymize %(count)s submission(s)? Personal data "
+"will be removed and applications will only be accessible via statistics in "
+"the Results view. All draft submissions will be deleted. This action cannot "
+"be undone."
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:11
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "Archive submissions"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:14
+#, python-format
+msgid ""
+"Are you sure you want to archive %(count)s submission(s)? Archived "
+"submissions will be hidden from the main list and cannot be edited. "
+"Submissions can be unarchived at any time."
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:4
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "Delete applications"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:8
+#, python-format
+msgid ""
+"Are you sure you want to permanently delete %(count)s submission(s)? All "
+"data will be permanently removed. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:9
 msgid "Submissions: Export as CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:11
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:11
 msgid "Export as CSV"
 msgstr ""
 
@@ -5195,6 +5566,8 @@ msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:23
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:24
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:23
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:24
 msgid "Generating downloadable CSV..."
 msgstr ""
 
@@ -5203,6 +5576,7 @@ msgid "Submissions: Download generated CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:42
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:42
 msgid "Download generated CSV"
 msgstr ""
 
@@ -5211,10 +5585,12 @@ msgid "Submissions: Generate downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:64
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:64
 msgid "Generation failed, click to retry generating downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:66
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:66
 msgid "Generate downloadable CSV"
 msgstr ""
 
@@ -5223,6 +5599,7 @@ msgid "Add tags"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:38
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 msgid "Add"
@@ -5378,12 +5755,12 @@ msgstr ""
 msgid "Filter by {label}"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:123
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
 msgid "Application #"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
-#: hypha/apply/stream_forms/blocks.py:119
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:125
+#: hypha/apply/stream_forms/blocks.py:157
 msgid "URL"
 msgstr ""
 
@@ -5396,86 +5773,88 @@ msgstr ""
 msgid "No screening"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:251
+#: hypha/apply/funds/views/all.py:244
 msgid "Newest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:252
+#: hypha/apply/funds/views/all.py:245
 msgid "Oldest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:253
+#: hypha/apply/funds/views/all.py:246
 msgid "Most Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:254
+#: hypha/apply/funds/views/all.py:247
 msgid "Least Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:255
+#: hypha/apply/funds/views/all.py:248
 msgid "Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:256
+#: hypha/apply/funds/views/all.py:249
 msgid "Least Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:257
+#: hypha/apply/funds/views/all.py:250
 msgid "Best Match"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:304
+#: hypha/apply/funds/views/all.py:297 hypha/apply/projects/views/invoice.py:671
 msgid "Started CSV generation."
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:405
+#: hypha/apply/funds/views/all.py:469
 #, python-brace-format
 msgid ""
 "A determination already exists for the following submissions and they have "
 "been excluded: {submissions}"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:418
+#: hypha/apply/funds/views/all.py:482
 msgid "Submissions expect different forms - please contact admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:431
+#: hypha/apply/funds/views/all.py:495
 msgid "Inconsistent states provided - please talk to an admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:458
+#: hypha/apply/funds/views/all.py:522
 msgid "Failed to update: "
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:463
+#: hypha/apply/funds/views/all.py:527
 #, python-brace-format
 msgid "Successfully updated status to {status}: "
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:94
+#: hypha/apply/funds/views/co_applicants.py:93
 msgid "Co-applicant invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:234
+#: hypha/apply/funds/views/co_applicants.py:229
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:18
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:74
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:14
 #: hypha/apply/projects/templates/application_projects/project_form.html:29
-#: hypha/apply/projects/views/payment.py:285
-#: hypha/apply/projects/views/project.py:2040
+#: hypha/apply/projects/views/invoice.py:290
+#: hypha/apply/projects/views/project.py:2131
 #: hypha/apply/users/templates/users/account.html:54
 msgid "Save"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:254
+#: hypha/apply/funds/views/co_applicants.py:249
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Co-applicant updated"
 msgstr "Factura emitida"
 
-#: hypha/apply/funds/views/co_applicants.py:282
+#: hypha/apply/funds/views/co_applicants.py:277
 msgid "Co-applicant re-invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:304
+#: hypha/apply/funds/views/co_applicants.py:299
 msgid "Co-applicant deleted"
 msgstr ""
 
@@ -5493,38 +5872,49 @@ msgstr "Creado"
 msgid "Reminder deleted"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_detail.py:311
+#: hypha/apply/funds/views/submission_delete.py:47
+#, fuzzy
+#| msgid "Submitted a review"
+msgid "Submission anonymized."
+msgstr "Enviar una revisión"
+
+#: hypha/apply/funds/views/submission_detail.py:301
 msgid "Submission details"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:97
-#: hypha/apply/funds/views/submission_edit.py:276
+#: hypha/apply/funds/views/submission_edit.py:96
+#: hypha/apply/funds/views/submission_edit.py:275
 msgid "Draft saved"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:366
-#: hypha/apply/funds/views/submission_edit.py:392
+#: hypha/apply/funds/views/submission_edit.py:365
+#: hypha/apply/funds/views/submission_edit.py:391
 #: hypha/apply/funds/workflows/definitions/double_stage.py:133
 msgid "Progress"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:419
-#: hypha/apply/funds/views/submission_edit.py:461
-#: hypha/apply/projects/views/project.py:605
-#: hypha/apply/projects/views/project.py:664
+#: hypha/apply/funds/views/submission_edit.py:410
+msgid "This submission already has a project."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_edit.py:421
+#: hypha/apply/funds/views/submission_edit.py:463
+#: hypha/apply/projects/views/project.py:651
+#: hypha/apply/projects/views/project.py:710
 #: hypha/apply/review/templates/review/review_confirm_delete.html:23
 #: hypha/apply/users/templates/elevate/elevate.html:39
 #: hypha/apply/users/templates/two_factor/admin/disable.html:24
 #: hypha/apply/users/templates/two_factor/profile/disable.html:39
 #: hypha/apply/users/templates/users/partials/confirmation_code_sent.html:43
+#: hypha/templates/cotton/modal/confirm.html:43
 msgid "Confirm"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:558
+#: hypha/apply/funds/views/submission_edit.py:559
 msgid "Submission Lead updated."
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:687
+#: hypha/apply/funds/views/submission_edit.py:744
 msgid "Tags updated successfully."
 msgstr ""
 
@@ -5532,56 +5922,86 @@ msgstr ""
 msgid "User attempted to translate submission but is not org faculty"
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:154
+#: hypha/apply/funds/views/translate.py:152
 #, python-brace-format
 msgid "Submission translated from {fl} to {tl}."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:167
+#: hypha/apply/funds/views/translate.py:165
 msgid "Submission translation failed. Contact your Administrator."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:174
+#: hypha/apply/funds/views/translate.py:172
 msgid "Translation cleared."
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:59
+#: hypha/apply/funds/workflows/constants.py:63
 msgid "Received"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:63
+#: hypha/apply/funds/workflows/constants.py:67
 #: hypha/apply/funds/workflows/definitions/double_stage.py:74
 #: hypha/apply/funds/workflows/definitions/double_stage.py:211
 #: hypha/apply/funds/workflows/definitions/single_stage.py:74
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:83
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:129
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:69
 msgid "Internal Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:67
+#: hypha/apply/funds/workflows/constants.py:71
+#: hypha/apply/funds/workflows/definitions/double_stage.py:91
+#: hypha/apply/funds/workflows/definitions/double_stage.py:228
+#: hypha/apply/funds/workflows/definitions/double_stage.py:273
+#: hypha/apply/funds/workflows/definitions/single_stage.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:98
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
 msgid "Ready for Discussion"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:73
+#: hypha/apply/funds/workflows/constants.py:77
 msgid "More Information Requested"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:77
+#: hypha/apply/funds/workflows/constants.py:81
 #: hypha/apply/funds/workflows/definitions/double_stage.py:165
 msgid "Invited for Proposal"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:81
+#: hypha/apply/funds/workflows/constants.py:85
 #: hypha/apply/funds/workflows/definitions/double_stage.py:258
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:115
 msgid "External Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:85
+#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/workflows/definitions/single_stage.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage.py:58
+#: hypha/apply/funds/workflows/definitions/single_stage.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage.py:109
 #: hypha/apply/funds/workflows/definitions/single_stage.py:127
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:190
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:66
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:138
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:163
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:116
 msgid "Ready for Determination"
 msgstr ""
@@ -5596,6 +6016,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:35
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:107
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:150
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:33
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:90
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:137
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:34
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:80
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:123
@@ -5616,7 +6039,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:36
 #: hypha/apply/funds/workflows/definitions/double_stage.py:60
 #: hypha/apply/funds/workflows/definitions/double_stage.py:86
-msgid "Ready For Preliminary Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:122
+msgid "Ready for Preliminary Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:37
@@ -5650,6 +6074,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:155
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:188
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:67
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:96
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:173
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:190
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:37
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:84
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:128
@@ -5663,6 +6093,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:42
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:38
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:39
 msgid "Need screening"
@@ -5682,6 +6113,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:61
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:131
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:57
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:116
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:162
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:58
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:104
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:148
@@ -5697,6 +6131,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:79
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:92
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:139
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:78
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:66
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:112
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:66
@@ -5707,6 +6143,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage.py:72
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:80
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:68
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:67
 msgid "Need screening (revert)"
@@ -5729,18 +6166,6 @@ msgstr ""
 msgid "Open Review (revert)"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:91
-#: hypha/apply/funds/workflows/definitions/double_stage.py:228
-#: hypha/apply/funds/workflows/definitions/double_stage.py:273
-#: hypha/apply/funds/workflows/definitions/single_stage.py:92
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
-msgid "Ready For Discussion"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:118
 #: hypha/apply/funds/workflows/definitions/double_stage.py:256
 #: hypha/apply/funds/workflows/definitions/double_stage.py:299
@@ -5750,16 +6175,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:140
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:184
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:206
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:126
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:113
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:157
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:179
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:131
-msgid "Ready For Discussion (revert)"
-msgstr ""
-
-#: hypha/apply/funds/workflows/definitions/double_stage.py:122
-msgid "Ready for Preliminary Determination"
+msgid "Ready for Discussion (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:129
@@ -5776,6 +6199,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:223
 #: hypha/apply/funds/workflows/definitions/double_stage.py:245
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:108
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:65
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:81
 msgid "Open External Review"
 msgstr ""
@@ -5785,7 +6209,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:197
 #: hypha/apply/funds/workflows/definitions/double_stage.py:224
 #: hypha/apply/funds/workflows/definitions/double_stage.py:267
-msgid "Ready For Final Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:304
+msgid "Ready for Final Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:179
@@ -5799,12 +6224,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:225
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:110
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:139
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:83
 msgid "Open Internal Review (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:268
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:152
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:125
 msgid "Open External Review (revert)"
 msgstr ""
@@ -5824,10 +6251,6 @@ msgstr ""
 msgid "Accept but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:304
-msgid "Ready for Final Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:312
 msgid "Final Determination"
 msgstr ""
@@ -5840,23 +6263,9 @@ msgstr ""
 msgid "Accepted but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/single_stage.py:35
-#: hypha/apply/funds/workflows/definitions/single_stage.py:58
-#: hypha/apply/funds/workflows/definitions/single_stage.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
-msgid "Ready For Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/single_stage.py:41
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:43
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:40
 msgid "Application Received"
@@ -5864,6 +6273,7 @@ msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:135
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:198
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:183
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:171
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:124
 msgid "Application Outcome"
@@ -5878,24 +6288,73 @@ msgstr ""
 msgid "Community Review"
 msgstr ""
 
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:34
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:70
+#, fuzzy
+#| msgid "Created"
+msgid "Ready for Review"
+msgstr "Creado"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:79
+msgid "Ready for Review (revert)"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:82
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "Application Review"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:91
+#, fuzzy
+#| msgid "Created"
+msgid "Open Internal Review"
+msgstr "Creado"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:95
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:141
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:172
+msgid "Waitlist"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:191
+#, fuzzy
+#| msgid "Sent a determination. Outcome: {determination.clean_outcome}"
+msgid "Ready for Determination (revert)"
+msgstr "Envió una determinación. Resultado: {determination.clean_outcome}"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:193
+msgid "Waitlisted"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:199
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Not Accepted"
+msgstr "Contrato aprobado"
+
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:69
 #: hypha/apply/review/templates/review/review_detail.html:10
 msgid "Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:69
+#: hypha/apply/funds/workflows/registry.py:70
 msgid "Request with same time review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:75
+#: hypha/apply/funds/workflows/registry.py:76
 msgid "Request with external review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:81
+#: hypha/apply/funds/workflows/registry.py:82
 msgid "Request with community review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:87
+#: hypha/apply/funds/workflows/registry.py:88
+msgid "Request external then internal review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/registry.py:94
 msgid "Concept & Proposal"
 msgstr ""
 
@@ -5905,22 +6364,29 @@ msgid ""
 "usages and try again!"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:45
+#: hypha/apply/projects/admin.py:46
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Forms"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/admin.py:62
+#: hypha/apply/projects/admin.py:63
 msgid "SOW Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:79
+#: hypha/apply/projects/admin.py:80
 msgid "Report Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:99
+#: hypha/apply/projects/admin.py:101
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Invoice Tags"
+msgstr "Factura emitida"
+
+#: hypha/apply/projects/admin.py:107
 #: hypha/apply/projects/templates/application_projects/project_list.html:6
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:4
 #: hypha/core/navigation.py:98 hypha/core/navigation.py:133
 msgid "Projects"
 msgstr ""
@@ -5938,17 +6404,17 @@ msgid "Vendor pending"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:22
-#: hypha/apply/projects/models/payment.py:34 hypha/apply/projects/utils.py:91
+#: hypha/apply/projects/models/invoice.py:45 hypha/apply/projects/utils.py:94
 msgid "Declined"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:23
-#: hypha/apply/projects/models/payment.py:32 hypha/apply/projects/utils.py:93
+#: hypha/apply/projects/models/invoice.py:43 hypha/apply/projects/utils.py:96
 msgid "Paid"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:24
-#: hypha/apply/projects/models/payment.py:33 hypha/apply/projects/utils.py:95
+#: hypha/apply/projects/models/invoice.py:44 hypha/apply/projects/utils.py:98
 msgid "Payment failed"
 msgstr ""
 
@@ -5961,7 +6427,7 @@ msgstr ""
 msgid "Request for change"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:224
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Up to date"
@@ -5971,41 +6437,46 @@ msgstr "Contrato aprobado"
 msgid "Behind schedule"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:66
+#: hypha/apply/projects/filters.py:61 hypha/apply/projects/tables.py:202
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
+msgid "Contractor"
+msgstr ""
+
+#: hypha/apply/projects/filters.py:73
 #: hypha/apply/projects/reports/templates/reports/reporting.html:6
 #: hypha/apply/projects/reports/templates/reports/reporting.html:11
-#: hypha/apply/projects/tables.py:186
+#: hypha/apply/projects/tables.py:205
 msgid "Reporting"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:108
+#: hypha/apply/projects/forms/invoice.py:110
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice file"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/forms/payment.py:110
+#: hypha/apply/projects/forms/invoice.py:112
 msgid "The invoice must be a PDF."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:115
+#: hypha/apply/projects/forms/invoice.py:117
 msgid ""
 "Files that are related to the invoice. They could be xls, microsoft office "
 "documents, open office documents, pdfs, txt files."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:142
+#: hypha/apply/projects/forms/invoice.py:144
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice File"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:408
+#: hypha/apply/projects/forms/invoice.py:179
+#: hypha/apply/projects/forms/project.py:418
 msgid "Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:200
+#: hypha/apply/projects/forms/invoice.py:202
 msgid "File not found on submission"
 msgstr ""
 
@@ -6022,124 +6493,152 @@ msgid "You can only approve a signed contract"
 msgstr ""
 
 #: hypha/apply/projects/forms/project.py:93
+#: hypha/apply/projects/templates/application_projects/paf_export.html:6
+#: hypha/apply/projects/templates/application_projects/sow_export.html:6
+msgid "Project title"
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:95
+msgid ""
+"A submission can have several projects. Give this one a name so it can be "
+"told apart from the others."
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:101
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Select project lead"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/forms/project.py:98
+#: hypha/apply/projects/forms/project.py:106
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Initial project status"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/forms/project.py:104
+#: hypha/apply/projects/forms/project.py:112
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project end date"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/forms/project.py:123
+#: hypha/apply/projects/forms/project.py:132
 msgid "Project lead is a required field"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:222
+#: hypha/apply/projects/forms/project.py:232
 msgid "Project form status"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:307
+#: hypha/apply/projects/forms/project.py:317
 msgid "A Project can only be sent for Approval when Drafted."
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:385
-#: hypha/apply/projects/forms/project.py:400
+#: hypha/apply/projects/forms/project.py:395
+#: hypha/apply/projects/forms/project.py:410
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:78
 msgid "Contract"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:397
 msgid "Signed and approved"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:424
+#: hypha/apply/projects/forms/project.py:434
 msgid "Contract Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:482
+#: hypha/apply/projects/forms/project.py:492
 msgid "The end date must be after the start date."
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:27
+#: hypha/apply/projects/models/invoice.py:38
 msgid "Resubmitted"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:28
+#: hypha/apply/projects/models/invoice.py:39
 msgid "Changes requested by staff"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:29
+#: hypha/apply/projects/models/invoice.py:40
 msgid "Changes requested by finance"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:30
+#: hypha/apply/projects/models/invoice.py:41
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approved by staff"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/payment.py:31
+#: hypha/apply/projects/models/invoice.py:42
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approved by finance"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/payment.py:109
+#: hypha/apply/projects/models/invoice.py:82
+#, fuzzy
+#| msgid "Invoice created"
+msgid "invoice tag"
+msgstr "Factura emitida"
+
+#: hypha/apply/projects/models/invoice.py:83
+#, fuzzy
+#| msgid "Invoice created"
+msgid "invoice tags"
+msgstr "Factura emitida"
+
+#: hypha/apply/projects/models/invoice.py:132
 msgid "paid value"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:116
-#: hypha/apply/projects/models/payment.py:289
-#: hypha/apply/projects/models/project.py:763
-#: hypha/apply/projects/models/project.py:795
+#: hypha/apply/projects/models/invoice.py:139
+#: hypha/apply/projects/models/invoice.py:319
+#: hypha/apply/projects/models/project.py:792
+#: hypha/apply/projects/models/project.py:824
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "document"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/projects/models/payment.py:120
-#: hypha/apply/projects/models/payment.py:123
+#: hypha/apply/projects/models/invoice.py:143
+#: hypha/apply/projects/models/invoice.py:146
 msgid "comment"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:121
+#: hypha/apply/projects/models/invoice.py:144
 msgid "This will be displayed as a comment in the comments tab"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:125
+#: hypha/apply/projects/models/invoice.py:148
 #, fuzzy
 #| msgid "Invoice created"
 msgid "invoice number"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/models/payment.py:132
+#: hypha/apply/projects/models/invoice.py:155
 #, fuzzy
 #| msgid "Invoice created"
 msgid "invoice amount"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/models/payment.py:134
+#: hypha/apply/projects/models/invoice.py:157
 #, fuzzy
 #| msgid "Invoice created"
 msgid "invoice date"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/models/payment.py:135
+#: hypha/apply/projects/models/invoice.py:158
 #, fuzzy
 #| msgid "Invoice created"
 msgid "paid date"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/models/payment.py:146
+#: hypha/apply/projects/models/invoice.py:168
+msgid "tags"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:175
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 #, fuzzy
@@ -6147,28 +6646,47 @@ msgstr "Factura emitida"
 msgid "invoice"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/models/payment.py:147
+#: hypha/apply/projects/models/invoice.py:176
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:20
 msgid "invoices"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:150
-#, python-brace-format
-msgid "Invoice requested for {project}"
-msgstr ""
+#: hypha/apply/projects/models/invoice.py:180
+#, fuzzy, python-brace-format
+#| msgid "Requested approval"
+msgid "Invoice for {project}"
+msgstr "Solicitud de aprobación"
+
+#: hypha/apply/projects/models/invoice.py:181
+#, fuzzy, python-brace-format
+#| msgid "Invoice created"
+msgid "Invoice {number} for {project}"
+msgstr "Factura emitida"
 
-#: hypha/apply/projects/models/payment.py:298
+#: hypha/apply/projects/models/invoice.py:328
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "supporting document"
 msgstr "Presentado un informe"
 
-#: hypha/apply/projects/models/payment.py:299
+#: hypha/apply/projects/models/invoice.py:329
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "supporting documents"
 msgstr "Presentado un informe"
 
+#: hypha/apply/projects/models/invoice.py:359
+#, fuzzy
+#| msgid "Invoice created"
+msgid "invoice export manager"
+msgstr "Factura emitida"
+
+#: hypha/apply/projects/models/invoice.py:360
+#, fuzzy
+#| msgid "Invoice created"
+msgid "invoice export managers"
+msgstr "Factura emitida"
+
 #: hypha/apply/projects/models/project.py:75
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:41
 #, fuzzy
@@ -6214,339 +6732,370 @@ msgstr ""
 msgid "{} approval"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/projects/models/project.py:215
+#: hypha/apply/projects/models/project.py:216
 msgid "In progress"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:248
-#: hypha/apply/projects/models/project.py:761
-#: hypha/apply/projects/models/project.py:793
+#: hypha/apply/projects/models/project.py:251
+#: hypha/apply/projects/models/project.py:790
+#: hypha/apply/projects/models/project.py:822
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "title"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/projects/models/project.py:250
+#: hypha/apply/projects/models/project.py:253
 msgid "value"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:257
+#: hypha/apply/projects/models/project.py:260
 msgid "proposed start date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:259
+#: hypha/apply/projects/models/project.py:262
 #, fuzzy
 #| msgid "Approved contract"
 msgid "proposed end date"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:269
+#: hypha/apply/projects/models/project.py:264
+#, fuzzy
+#| msgid "Approved contract"
+msgid "contract number"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/projects/models/project.py:274
 msgid "locked"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:272
+#: hypha/apply/projects/models/project.py:277
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "submit contracting documents"
 msgstr "Presentado un informe"
 
-#: hypha/apply/projects/models/project.py:285
+#: hypha/apply/projects/models/project.py:290
 msgid "ID of this project at integrated payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:289
+#: hypha/apply/projects/models/project.py:294
 msgid "More details of the project integrated at payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:294
+#: hypha/apply/projects/models/project.py:299
 msgid "Reviewers role and their actions/comments"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:302 hypha/apply/todo/options.py:105
-#: hypha/apply/todo/options.py:113 hypha/apply/todo/options.py:121
-#: hypha/apply/todo/options.py:129 hypha/apply/todo/options.py:138
-#: hypha/apply/todo/options.py:146 hypha/apply/todo/options.py:155
-#: hypha/apply/todo/options.py:163 hypha/apply/todo/options.py:171
-#: hypha/apply/todo/options.py:180 hypha/apply/todo/options.py:188
-#: hypha/apply/todo/options.py:196 hypha/apply/todo/options.py:204
-#: hypha/apply/todo/options.py:212
+#: hypha/apply/projects/models/project.py:307 hypha/apply/todo/options.py:112
+#: hypha/apply/todo/options.py:120 hypha/apply/todo/options.py:128
+#: hypha/apply/todo/options.py:136 hypha/apply/todo/options.py:145
+#: hypha/apply/todo/options.py:153 hypha/apply/todo/options.py:162
+#: hypha/apply/todo/options.py:170 hypha/apply/todo/options.py:178
+#: hypha/apply/todo/options.py:187 hypha/apply/todo/options.py:195
+#: hypha/apply/todo/options.py:203 hypha/apply/todo/options.py:211
+#: hypha/apply/todo/options.py:219
 msgid "project"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:303
+#: hypha/apply/projects/models/project.py:308
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "projects"
 msgstr "Presentado un informe"
 
-#: hypha/apply/projects/models/project.py:411
+#: hypha/apply/projects/models/project.py:418
 msgid "Proposed End Date must be after Proposed Start Date"
 msgstr ""
 
-#. Translators: SOW = Statement of Work
-#: hypha/apply/projects/models/project.py:518
+#. Translators: SOW = Statement of Work
+#: hypha/apply/projects/models/project.py:525
+#, fuzzy
+#| msgid "Submitted a report"
+msgctxt "singular"
+msgid "project SOW"
+msgstr "Presentado un informe"
+
+#: hypha/apply/projects/models/project.py:526
+#, fuzzy
+#| msgid "Submitted a report"
+msgctxt "plural"
+msgid "project SOW"
+msgstr "Presentado un informe"
+
+#: hypha/apply/projects/models/project.py:532
+#, python-brace-format
+msgid "Scope of Work for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:543
 #, fuzzy
-#| msgid "Submitted a report"
+#| msgid "Approved contract"
 msgctxt "singular"
-msgid "project SOW"
-msgstr "Presentado un informe"
+msgid "project form"
+msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:519
+#: hypha/apply/projects/models/project.py:544
 #, fuzzy
-#| msgid "Submitted a report"
+#| msgid "Approved contract"
 msgctxt "plural"
-msgid "project SOW"
-msgstr "Presentado un informe"
+msgid "project forms"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/projects/models/project.py:550
+#, fuzzy, python-brace-format
+#| msgid "Requested approval"
+msgid "Project form for {project}"
+msgstr "Solicitud de aprobación"
 
-#: hypha/apply/projects/models/project.py:541
+#: hypha/apply/projects/models/project.py:572
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project form"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:542
+#: hypha/apply/projects/models/project.py:573
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project forms"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:579
 msgid "project SOW form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:549
+#: hypha/apply/projects/models/project.py:580
 msgid "project SOW forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:561
+#: hypha/apply/projects/models/project.py:592
 msgid "project report form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:562
+#: hypha/apply/projects/models/project.py:593
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project report forms"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:569
+#: hypha/apply/projects/models/project.py:600
 msgid "user groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:602
 msgid ""
 "Only selected group's users will be listed for this ProjectFormReviewerRole"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:583
+#: hypha/apply/projects/models/project.py:614
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "PAF reviewers role"
 msgstr "Enviar una revisión"
 
-#: hypha/apply/projects/models/project.py:584
+#: hypha/apply/projects/models/project.py:615
 msgid "PAF reviewers roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:595
+#: hypha/apply/projects/models/project.py:626
 msgid "Before"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:596
+#: hypha/apply/projects/models/project.py:627
 msgid "After"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:605
+#: hypha/apply/projects/models/project.py:636
 msgid "Number of days"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:637
 msgid "Relation to report due date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:610
+#: hypha/apply/projects/models/project.py:641
 msgid "project reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:642
 msgid "project reminder frequencies"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:617
+#: hypha/apply/projects/models/project.py:648
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "contracting group email"
 msgstr "Presentado un informe"
 
-#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:650
 msgid "finance group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:620
+#: hypha/apply/projects/models/project.py:651
 msgid "staff group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:622
+#: hypha/apply/projects/models/project.py:653
 msgid "Uncheck it to approve project parallelly"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:632
+#: hypha/apply/projects/models/project.py:663
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approve Project Sequentially"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:635
+#: hypha/apply/projects/models/project.py:666
 msgid "Project Form Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:638
+#: hypha/apply/projects/models/project.py:669
 msgid "Project Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:640
+#: hypha/apply/projects/models/project.py:671
 msgid ""
 "Reviewer Roles are needed to move projects to 'Internal Approval' stage. "
 "Delete all roles to skip internal approval process and to move all internal "
 "approval projects back to the 'Draft' stage with all approvals removed."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:647
-#: hypha/apply/projects/models/project.py:648
+#: hypha/apply/projects/models/project.py:678
+#: hypha/apply/projects/models/project.py:679
 msgid "Report reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:650
+#: hypha/apply/projects/models/project.py:681
 msgid ""
 "Set up a cron job to run `notify_report_due.py`. The script will use these "
 "reminder settings."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:656
+#: hypha/apply/projects/models/project.py:687
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:35
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project settings"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:681
+#: hypha/apply/projects/models/project.py:712
 #, fuzzy
 #| msgid "Requested approval"
 msgid "PAF approval"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/projects/models/project.py:682
+#: hypha/apply/projects/models/project.py:713
 #, fuzzy
 #| msgid "Approved"
 msgid "PAF approvals"
 msgstr "Aprobado"
 
-#: hypha/apply/projects/models/project.py:685
+#: hypha/apply/projects/models/project.py:716
 #, python-brace-format
 msgid "Approval of {project} by {user}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:713
+#: hypha/apply/projects/models/project.py:744
 msgid "file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:716
+#: hypha/apply/projects/models/project.py:747
 #, fuzzy
 #| msgid "Approved"
 msgid "signed and approved"
 msgstr "Aprobado"
 
-#: hypha/apply/projects/models/project.py:718
+#: hypha/apply/projects/models/project.py:749
 msgid "counter signed?"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:728
+#: hypha/apply/projects/models/project.py:759
 #, fuzzy
 #| msgid "Approved contract"
 msgid "contract"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:729
+#: hypha/apply/projects/models/project.py:760
 #, fuzzy
 #| msgid "Approved contract"
 msgid "contracts"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Counter Signed"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Unsigned"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:740
+#: hypha/apply/projects/models/project.py:771
 #, python-brace-format
 msgid "Contract for {project} ({state})"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:768
+#: hypha/apply/projects/models/project.py:797
 #, python-brace-format
 msgid "Project file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:772
-#: hypha/apply/projects/models/project.py:773
+#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:802
 msgid "packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:800
+#: hypha/apply/projects/models/project.py:829
 msgid "contract packet file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:830
 msgid "contract packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:804
+#: hypha/apply/projects/models/project.py:833
 #, python-brace-format
 msgid "Contract file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:814
 #: hypha/apply/projects/models/project.py:843
+#: hypha/apply/projects/models/project.py:872
 msgid "name"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:816
 #: hypha/apply/projects/models/project.py:845
+#: hypha/apply/projects/models/project.py:874
 msgid "recommended minimum"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:820
-#: hypha/apply/projects/models/project.py:857
+#: hypha/apply/projects/models/project.py:849
+#: hypha/apply/projects/models/project.py:886
 msgid "template"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:832
+#: hypha/apply/projects/models/project.py:861
 msgid "Document Category"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:833
+#: hypha/apply/projects/models/project.py:862
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Document Categories"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/models/project.py:850
+#: hypha/apply/projects/models/project.py:879
 msgid "allow document access for groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:851
+#: hypha/apply/projects/models/project.py:880
 msgid "Only selected group's users can access the document"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:869
+#: hypha/apply/projects/models/project.py:898
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Contrat Document Category"
 msgstr "Presentado un informe"
 
-#: hypha/apply/projects/models/project.py:870
+#: hypha/apply/projects/models/project.py:899
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Contract Document Categories"
@@ -6743,15 +7292,35 @@ msgstr ""
 msgid "Access allowed"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:424
+#: hypha/apply/projects/permissions.py:426
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Project is not in Draft state"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/projects/permissions.py:429
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Only Staff can skip the PAF approval process"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/projects/permissions.py:433
+msgid "Staff can skip PAF approval when no reviewer roles are configured"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:436
+msgid "PAF reviewer roles are configured, cannot skip approval process"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:445
 msgid "Project form is editable for active projects if no reviewer roles"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:427
+#: hypha/apply/projects/permissions.py:448
 msgid "Project form is editable in Draft by this user"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:428
+#: hypha/apply/projects/permissions.py:449
 msgid "You are not allowed to edit the project at this time"
 msgstr ""
 
@@ -6759,7 +7328,19 @@ msgstr ""
 msgid "Reporting Period"
 msgstr ""
 
-#: hypha/apply/projects/reports/forms.py:100
+#: hypha/apply/projects/reports/forms.py:101
+#: hypha/apply/projects/reports/forms.py:120
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Report due date"
+msgstr "Factura emitida"
+
+#: hypha/apply/projects/reports/forms.py:112
+#: hypha/apply/projects/reports/forms.py:131
+msgid "A report for this date already exists."
+msgstr ""
+
+#: hypha/apply/projects/reports/forms.py:136
 msgid "Report on:"
 msgstr ""
 
@@ -6775,95 +7356,100 @@ msgctxt "project report (noun)"
 msgid "reports"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:204
+#: hypha/apply/projects/reports/models.py:131
+#, python-brace-format
+msgid "Report due {due_date} for {project}"
+msgstr ""
+
+#: hypha/apply/projects/reports/models.py:209
 #, fuzzy
 #| msgid "Approved contract"
 msgid "report version"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/reports/models.py:205
+#: hypha/apply/projects/reports/models.py:210
 #, fuzzy
 #| msgid "Approved contract"
 msgid "report versions"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/reports/models.py:220
+#: hypha/apply/projects/reports/models.py:225
 msgid "report private file"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:221
+#: hypha/apply/projects/reports/models.py:226
 msgid "report private files"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:240
+#: hypha/apply/projects/reports/models.py:245
 msgid "week"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:241
+#: hypha/apply/projects/reports/models.py:246
 msgid "month"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:242
+#: hypha/apply/projects/reports/models.py:247
 msgid "year"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:246
+#: hypha/apply/projects/reports/models.py:251
 msgid "Years"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:262
+#: hypha/apply/projects/reports/models.py:267
 msgid "report config"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:263
+#: hypha/apply/projects/reports/models.py:268
 msgid "report configs"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:267
+#: hypha/apply/projects/reports/models.py:272
 msgid "Disabled"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:272
+#: hypha/apply/projects/reports/models.py:277
 #, python-brace-format
 msgid "One time, that already has reported on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:277
+#: hypha/apply/projects/reports/models.py:282
 #, python-brace-format
 msgid "One time on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:285
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:316
 msgid "last day"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:291
+#: hypha/apply/projects/reports/models.py:307
 #, python-brace-format
 msgid "Once a year on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:294
+#: hypha/apply/projects/reports/models.py:310
 #, python-brace-format
 msgid "Every {occurrence} years on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:304
+#: hypha/apply/projects/reports/models.py:320
 #, python-brace-format
 msgid "Once a month on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:305
+#: hypha/apply/projects/reports/models.py:321
 #, python-brace-format
 msgid "Every {occurrence} months on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:312
+#: hypha/apply/projects/reports/models.py:328
 #, python-brace-format
 msgid "Once a week on {weekday}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:313
+#: hypha/apply/projects/reports/models.py:329
 #, python-brace-format
 msgid "Every {occurrence} weeks on {weekday}"
 msgstr ""
@@ -6882,70 +7468,94 @@ msgstr ""
 msgid "Last Notified"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "The"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:11
+msgid "Edit this report date"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "current"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "next"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "reporting period is"
-msgstr ""
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:12
+#, fuzzy
+#| msgid "Submitted a review"
+msgid "edit"
+msgstr "Enviar una revisión"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:8
-msgid "A report is due for the period"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:16
+msgid "Past due"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
 msgid "Continue Editing"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
-msgid "Add Report"
-msgstr ""
-
 #: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Create report"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:33
 #, python-format
 msgid ""
 " You're skipping the report for %(start_date)s - %(end_date)s. This will "
 "result in a gap in reporting for the project. You can undo this at any time. "
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:29
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:32
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:34
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:38
 msgid "Skip"
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:36
+msgid "Skip this report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:48
+msgid "Delete report requirement"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:26
 msgid "Enable"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:55
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:62
 msgid "Period End"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:101
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:108
 msgid "Unskip"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show less"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show more"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:130
 msgid "No reports submitted yet."
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:2
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:18
+msgid "Add report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:2
+#, fuzzy
+#| msgid "Created"
+msgid "Delete report"
+msgstr "Creado"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:4
+msgid ""
+"Are you sure you want to delete this report? This action cannot be undone."
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:2
+msgid "Edit report due date"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:2
 msgid "Change reporting frequency"
 msgstr ""
@@ -7010,24 +7620,24 @@ msgstr ""
 msgid "View project"
 msgstr "Presentado un informe"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 msgid "This report is for the period"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:56
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:32
 msgid "Report Skipped"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:58
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:37
 msgid "Public Report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:107
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:85
 msgid "View previous report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:115
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:93
 msgid "View next report"
 msgstr ""
 
@@ -7099,30 +7709,46 @@ msgstr "Presentado un informe"
 msgid "No Projects Currently Reporting."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:78
-#: hypha/apply/projects/reports/views.py:100
+#: hypha/apply/projects/reports/views.py:83
+#: hypha/apply/projects/reports/views.py:105
 msgid "You do not have permission to access this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:125
+#: hypha/apply/projects/reports/views.py:130
 msgid "You do not have permission to update this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:372
+#: hypha/apply/projects/reports/views.py:377
 msgid "You do not have permission to update reporting configurations."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:491
+#: hypha/apply/projects/reports/views.py:496
 msgid "Reporting disabled"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:31
+#: hypha/apply/projects/reports/views.py:532
+msgid "You do not have permission to add reports."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:572
+msgid "You do not have permission to edit report due dates."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:583
+msgid "A submitted report's due date cannot be edited."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:607
+msgid "You do not have permission to delete reports."
+msgstr ""
+
+#: hypha/apply/projects/tables.py:29
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice #"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/tables.py:43
+#: hypha/apply/projects/tables.py:41
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
@@ -7131,45 +7757,52 @@ msgstr "Factura emitida"
 msgid "Invoice date"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/tables.py:45
+#: hypha/apply/projects/tables.py:43
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Title"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/tables.py:103
+#: hypha/apply/projects/tables.py:114
 msgid "Vendor Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:137
+#: hypha/apply/projects/tables.py:151
 msgid "Project Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:188
+#: hypha/apply/projects/tables.py:204
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:66
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Contract #"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/projects/tables.py:207
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:48
 #, fuzzy
 #| msgid "Invoice created"
 msgid "End date"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/tables.py:213
+#: hypha/apply/projects/tables.py:232
 #, python-brace-format
 msgid "{count} outstanding"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:251
+#: hypha/apply/projects/tables.py:270
 msgid "Date requested"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:266
+#: hypha/apply/projects/tables.py:288
 msgid "Assignee"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:286
+#: hypha/apply/projects/tables.py:308
 msgid "Waiting for approval"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:288
+#: hypha/apply/projects/tables.py:310
 msgid "Waiting for assignee"
 msgstr ""
 
@@ -7218,8 +7851,8 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:170
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:60
 #: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:56
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
 #: hypha/apply/templates/forms/includes/field.html:55
 msgid "Upload"
 msgstr ""
@@ -7300,12 +7933,12 @@ msgid "Update approvers"
 msgstr "Contrato aprobado"
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:55
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:156
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:159
 msgid "Change approver"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:67
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:168
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:171
 #, fuzzy
 #| msgid "Approved"
 msgid "Assign approver"
@@ -7318,7 +7951,7 @@ msgstr "Aprobado"
 msgid "Project form"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:124
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:132
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:172
 msgid "Fill in"
 msgstr ""
@@ -7339,7 +7972,7 @@ msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:69
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:70
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice"
@@ -7359,13 +7992,13 @@ msgstr ""
 msgid "Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:74
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:76
 msgid "Download invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:90
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:94
 #: hypha/apply/projects/templates/application_projects/paf_export.html:63
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:101
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:106
 msgid "Supporting Documents"
 msgstr ""
 
@@ -7448,6 +8081,10 @@ msgstr ""
 msgid "Project documents status"
 msgstr "Contrato aprobado"
 
+#: hypha/apply/projects/templates/application_projects/modals/project_contract_number_update.html:2
+msgid "Update contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
 #, fuzzy
 #| msgid "Approved contract"
@@ -7578,42 +8215,37 @@ msgid ""
 "invoicing & reporting stage."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/paf_export.html:6
-#: hypha/apply/projects/templates/application_projects/sow_export.html:6
-msgid "Project title"
-msgstr ""
-
 #: hypha/apply/projects/templates/application_projects/paf_export.html:7
 #: hypha/apply/projects/templates/application_projects/sow_export.html:7
 msgid "Project ID"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:18
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:49
 #, fuzzy
 #| msgid "Approved"
 msgid "Approvals"
 msgstr "Aprobado"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:32
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:66
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
 msgid "Submission lead"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:34
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:72
 #, fuzzy
 #| msgid "Submitted a review"
 msgid "Staff reviewers"
 msgstr "Enviar una revisión"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:41
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:75
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:78
 msgid "as"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:51
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:89
 msgid "Advisory council"
 msgstr ""
 
@@ -7635,6 +8267,29 @@ msgstr ""
 msgid "Submit contract documents"
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:9
+msgid "Invoices: Export as CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:12
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:72
+msgid ""
+"Are you sure you want to export the invoices as a CSV file? This file may "
+"contain sensitive information, so please handle it carefully."
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:22
+msgid "Invoices: Generating downloadable CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:40
+msgid "Invoices: Download generated CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:62
+msgid "Invoices: Generate downloadable CSV"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:35
 msgid "Only editable when submitted or you have been requested to make changes"
 msgstr ""
@@ -7643,18 +8298,13 @@ msgstr ""
 msgid "Edit Invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:29
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:52
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
-msgid "View comment"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:69
-msgid "show less"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:21
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:43
+msgid "Status & Activity"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
-msgid "Contractor"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:48
+msgid "When you leave a comment or change the statuses, it'll show up here!"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:22
@@ -7672,6 +8322,27 @@ msgstr "Enviar una revisión"
 msgid "Awaiting contract finalization..."
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:75
+#, fuzzy
+#| msgid "Approved contract"
+msgid "edit contract number"
+msgstr "Contrato aprobado"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
+msgid "Copied!"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "Copy contract number"
+msgstr "Presentado un informe"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:91
+msgid "copy contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:10
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:14
 #, fuzzy
@@ -7719,22 +8390,22 @@ msgstr ""
 msgid "Update project status"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:23
-#: hypha/apply/projects/templates/application_projects/project_detail.html:54
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:49
 msgid "Project Information"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:83
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:94
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:97
 msgid "No reviews"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:174
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:177
 msgid "Download"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:182
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:57
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:185
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:63
 msgid "Download as DOCX"
 msgstr ""
 
@@ -7747,28 +8418,32 @@ msgstr ""
 msgid "Proposal attachments"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:45
+#: hypha/apply/projects/templates/application_projects/project_detail.html:40
 #, python-format
 msgid "This project is in %(status)s state."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:119
+#: hypha/apply/projects/templates/application_projects/project_detail.html:114
 msgid "Project form approvals"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#: hypha/apply/projects/templates/application_projects/project_detail.html:127
 msgid "Request changes or more information by "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:149
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+msgid "View comment"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_detail.html:144
 msgid "Pending approval from "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:153
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
 msgid "nobody assigned yet"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:161
+#: hypha/apply/projects/templates/application_projects/project_detail.html:156
 #, fuzzy
 #| msgid "Approved"
 msgid "approved"
@@ -7787,7 +8462,7 @@ msgstr ""
 msgid "No Projects Available."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:25
 #: hypha/apply/projects/templates/application_projects/sow_export.html:5
 msgid "Scope of Work"
 msgstr ""
@@ -7813,57 +8488,57 @@ msgstr ""
 msgid "{status} by {user_role}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:104
-#: hypha/apply/projects/templatetags/project_tags.py:109
-#: hypha/apply/projects/templatetags/project_tags.py:115
-#: hypha/apply/projects/templatetags/project_tags.py:119
-#: hypha/apply/projects/templatetags/project_tags.py:237
-#: hypha/apply/projects/templatetags/project_tags.py:249
-#: hypha/apply/projects/templatetags/project_tags.py:259
-#: hypha/apply/projects/templatetags/project_tags.py:278
-#: hypha/apply/projects/templatetags/project_tags.py:283
+#: hypha/apply/projects/templatetags/project_tags.py:117
+#: hypha/apply/projects/templatetags/project_tags.py:122
+#: hypha/apply/projects/templatetags/project_tags.py:128
+#: hypha/apply/projects/templatetags/project_tags.py:132
+#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:262
+#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:291
+#: hypha/apply/projects/templatetags/project_tags.py:296
 msgid "To do"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:105
+#: hypha/apply/projects/templatetags/project_tags.py:118
 msgid "Fill in the Project Form"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:110
+#: hypha/apply/projects/templatetags/project_tags.py:123
 msgid "Move project to next stage"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:116
+#: hypha/apply/projects/templatetags/project_tags.py:129
 msgid "Resubmit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:120
+#: hypha/apply/projects/templatetags/project_tags.py:133
 msgid "Submit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:124
-#: hypha/apply/projects/templatetags/project_tags.py:132
-#: hypha/apply/projects/templatetags/project_tags.py:136
-#: hypha/apply/projects/templatetags/project_tags.py:142
-#: hypha/apply/projects/templatetags/project_tags.py:158
-#: hypha/apply/projects/templatetags/project_tags.py:164
-#: hypha/apply/projects/templatetags/project_tags.py:179
-#: hypha/apply/projects/templatetags/project_tags.py:188
-#: hypha/apply/projects/templatetags/project_tags.py:194
-#: hypha/apply/projects/templatetags/project_tags.py:202
-#: hypha/apply/projects/templatetags/project_tags.py:211
-#: hypha/apply/projects/templatetags/project_tags.py:218
-#: hypha/apply/projects/templatetags/project_tags.py:225
-#: hypha/apply/projects/templatetags/project_tags.py:229
-#: hypha/apply/projects/templatetags/project_tags.py:243
-#: hypha/apply/projects/templatetags/project_tags.py:253
+#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:145
+#: hypha/apply/projects/templatetags/project_tags.py:149
+#: hypha/apply/projects/templatetags/project_tags.py:155
+#: hypha/apply/projects/templatetags/project_tags.py:171
+#: hypha/apply/projects/templatetags/project_tags.py:177
+#: hypha/apply/projects/templatetags/project_tags.py:192
+#: hypha/apply/projects/templatetags/project_tags.py:201
+#: hypha/apply/projects/templatetags/project_tags.py:207
+#: hypha/apply/projects/templatetags/project_tags.py:215
+#: hypha/apply/projects/templatetags/project_tags.py:224
+#: hypha/apply/projects/templatetags/project_tags.py:231
+#: hypha/apply/projects/templatetags/project_tags.py:238
+#: hypha/apply/projects/templatetags/project_tags.py:242
+#: hypha/apply/projects/templatetags/project_tags.py:256
 #: hypha/apply/projects/templatetags/project_tags.py:266
-#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:285
 msgid "Waiting for"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:126
-#: hypha/apply/projects/templatetags/project_tags.py:144
+#: hypha/apply/projects/templatetags/project_tags.py:139
+#: hypha/apply/projects/templatetags/project_tags.py:157
 #, python-brace-format
 msgid ""
 "Awaiting project documents to be created and approved by {ORG_SHORT_NAME} "
@@ -7871,216 +8546,232 @@ msgid ""
 "stage."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:133
+#: hypha/apply/projects/templatetags/project_tags.py:146
 msgid "Changes requested. Awaiting documents to be resubmitted."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:150
 msgid "Awaiting project form to be created."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:160
-#: hypha/apply/projects/templatetags/project_tags.py:196
+#: hypha/apply/projects/templatetags/project_tags.py:173
+#: hypha/apply/projects/templatetags/project_tags.py:209
 #, python-brace-format
 msgid "Awaiting approval. Assigned to {approver}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:166
-#: hypha/apply/projects/templatetags/project_tags.py:204
+#: hypha/apply/projects/templatetags/project_tags.py:179
+#: hypha/apply/projects/templatetags/project_tags.py:217
 #, python-brace-format
 msgid "Awaiting {reviewer_role} to assign an approver"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:180
+#: hypha/apply/projects/templatetags/project_tags.py:193
 msgid "Awaiting project form to be approved"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:189
+#: hypha/apply/projects/templatetags/project_tags.py:202
 msgid "Awaiting approval from other approvers teams"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:212
+#: hypha/apply/projects/templatetags/project_tags.py:225
 msgid "Awaiting project from assigned approvers"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:219
+#: hypha/apply/projects/templatetags/project_tags.py:232
 #, python-brace-format
 msgid "Awaiting signed contract from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:226
+#: hypha/apply/projects/templatetags/project_tags.py:239
 msgid "Awaiting signed contract from Staff/Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:230
+#: hypha/apply/projects/templatetags/project_tags.py:243
 msgid "Awaiting signed contract from Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:239
+#: hypha/apply/projects/templatetags/project_tags.py:252
 msgid "Awaiting contract documents to be submitted by you."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:244
+#: hypha/apply/projects/templatetags/project_tags.py:257
 msgid "Awaiting countersigned contract from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:263
 msgid "Awaiting contract documents submission by you"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:254
+#: hypha/apply/projects/templatetags/project_tags.py:267
 msgid "Awaiting contract documents submission from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:261
+#: hypha/apply/projects/templatetags/project_tags.py:274
 msgid "Review the contract for all relevant details and approve."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:268
+#: hypha/apply/projects/templatetags/project_tags.py:281
 #, python-brace-format
 msgid "Awaiting contract approval from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:273
+#: hypha/apply/projects/templatetags/project_tags.py:286
 msgid "Awaiting contract approval from Staff"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:292
 msgid "Add invoices"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:284
+#: hypha/apply/projects/templatetags/project_tags.py:297
 msgid "Review invoice and take action"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:303
+#: hypha/apply/projects/templatetags/project_tags.py:316
 #, python-brace-format
 msgid "Please download the signed contract uploaded by {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:305
+#: hypha/apply/projects/templatetags/project_tags.py:318
 msgid "Countersign"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:306
+#: hypha/apply/projects/templatetags/project_tags.py:319
 msgid "Upload it back"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:308
+#: hypha/apply/projects/templatetags/project_tags.py:321
 msgid "Please also make sure to upload other required contracting documents"
 msgstr ""
 
-#: hypha/apply/projects/utils.py:85
+#: hypha/apply/projects/utils.py:88
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Pending approval"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/projects/utils.py:89
+#: hypha/apply/projects/utils.py:92
 msgid "Request for change or more information"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:166
-#: hypha/apply/projects/views/payment.py:396
+#: hypha/apply/projects/views/invoice.py:175
+#: hypha/apply/projects/views/invoice.py:397
 #, python-brace-format
 msgid "<p>Invoice status updated to: {status}.</p>"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:209
+#: hypha/apply/projects/views/invoice.py:218
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice updated."
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/views/payment.py:299
+#: hypha/apply/projects/views/invoice.py:304
 #, fuzzy
 #| msgid "Invoice created"
 msgid "<p>Invoice added.</p>"
 msgstr "Factura emitida"
 
-#: hypha/apply/projects/views/payment.py:575
+#: hypha/apply/projects/views/invoice.py:574
 msgid "Sorry something went wrong"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:265
+#: hypha/apply/projects/views/invoice.py:712
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Invoice tags updated."
+msgstr "Factura emitida"
+
+#: hypha/apply/projects/views/project.py:269
 msgid "PAF has been submitted for approval"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:337
+#: hypha/apply/projects/views/project.py:341
 msgid "Document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:365
+#: hypha/apply/projects/views/project.py:369
 msgid "Document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:396
+#: hypha/apply/projects/views/project.py:400
 msgid "Contracting document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:443
+#: hypha/apply/projects/views/project.py:447
 msgid "Unassigned"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:452
+#: hypha/apply/projects/views/project.py:456
 msgid "Lead has been updated."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:498
+#: hypha/apply/projects/views/project.py:502
 msgid "Title has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:534
+#: hypha/apply/projects/views/project.py:538
 msgid "Dates has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:655
+#: hypha/apply/projects/views/project.py:580
+msgid "Contract number has been updated"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:701
 msgid ""
 "Contractor documents have been approved.  You can receive invoices from "
 "vendor now."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:721
+#: hypha/apply/projects/views/project.py:766
 msgid "Countersigned contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:724
+#: hypha/apply/projects/views/project.py:769
 msgid "Signed contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:935
+#: hypha/apply/projects/views/project.py:986
 msgid "Contract documents submitted"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:999
+#: hypha/apply/projects/views/project.py:1050
 msgid "Contracting document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1077
+#: hypha/apply/projects/views/project.py:1128
 msgid "User don't have project form approver roles"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1083
+#: hypha/apply/projects/views/project.py:1134
 #, python-brace-format
 msgid "Updated project form status to: {paf_status}"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1173
+#: hypha/apply/projects/views/project.py:1224
 msgid "Project form status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1226
+#: hypha/apply/projects/views/project.py:1277
 msgid "Project form has been approved"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1321
+#: hypha/apply/projects/views/project.py:1372
 msgid "Project status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1614
+#: hypha/apply/projects/views/project.py:1665
 msgid "Project form approvers have been updated"
 msgstr ""
 
+#: hypha/apply/projects/views/project.py:1799
+#, fuzzy
+#| msgid "Requested approval"
+msgid "No projects for this submission"
+msgstr "Solicitud de aprobación"
+
 #: hypha/apply/review/admin_helpers.py:11
 msgid "Clone"
 msgstr ""
@@ -8109,7 +8800,7 @@ msgstr ""
 
 #: hypha/apply/review/blocks.py:149
 #: hypha/apply/review/templates/review/review_detail.html:48
-#: hypha/apply/review/views.py:431
+#: hypha/apply/review/views.py:440
 msgid "Visibility"
 msgstr ""
 
@@ -8182,7 +8873,7 @@ msgstr ""
 msgid "5. Excellent"
 msgstr ""
 
-#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:245
+#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:283
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:11
 msgid "No"
 msgstr ""
@@ -8191,7 +8882,7 @@ msgstr ""
 msgid "Maybe"
 msgstr ""
 
-#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:244
+#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:282
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:8
 msgid "Yes"
 msgstr ""
@@ -8252,13 +8943,13 @@ msgid "View Changes"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:40
-#: hypha/apply/review/views.py:429
+#: hypha/apply/review/views.py:438
 msgid "Recommendation"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:66
 #: hypha/apply/review/templates/review/review_list.html:30
-#: hypha/apply/review/views.py:427
+#: hypha/apply/review/views.py:436
 msgid "Opinions"
 msgstr ""
 
@@ -8312,157 +9003,169 @@ msgstr ""
 msgid "Avg. score: {average}"
 msgstr ""
 
-#: hypha/apply/review/views.py:74
+#: hypha/apply/review/views.py:76
 msgid "Edit Review"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Update Review draft"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 #, fuzzy
 #| msgid "Created"
 msgid "Create Review"
 msgstr "Creado"
 
-#: hypha/apply/review/views.py:428
+#: hypha/apply/review/views.py:437
 msgid "Overall Score"
 msgstr ""
 
-#: hypha/apply/review/views.py:430
+#: hypha/apply/review/views.py:439
 msgid "Revision"
 msgstr ""
 
-#: hypha/apply/review/views.py:470
+#: hypha/apply/review/views.py:479
 msgid "Current"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:114
-#: hypha/apply/stream_forms/blocks.py:217
+#: hypha/apply/stream_forms/blocks.py:123
+#: hypha/apply/stream_forms/blocks.py:255
 msgid "Required"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:124
+#: hypha/apply/stream_forms/blocks.py:142
+msgid "Personal information"
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:146
+msgid ""
+"Tick this if the answer will contain personally identifiable information, "
+"such as a name, address, phone number or date of birth. Only the applicant, "
+"their co-applicants and staff will be able to see the answer. Reviewers and "
+"other users will see that the question was asked, but not the answer."
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:162
 msgid "Format"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:125
-#: hypha/apply/stream_forms/blocks.py:156
-#: hypha/apply/stream_forms/blocks.py:171
+#: hypha/apply/stream_forms/blocks.py:163
+#: hypha/apply/stream_forms/blocks.py:194
+#: hypha/apply/stream_forms/blocks.py:209
 msgid "Default value"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:128
+#: hypha/apply/stream_forms/blocks.py:166
 msgid "Text field (single line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:147
+#: hypha/apply/stream_forms/blocks.py:185
 msgid "Max number of inputs"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:148
+#: hypha/apply/stream_forms/blocks.py:186
 msgid "Add new item"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:151
+#: hypha/apply/stream_forms/blocks.py:189
 msgid "Text field (single line) (multiple inputs)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:157
+#: hypha/apply/stream_forms/blocks.py:195
 msgid "Word limit"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:162
+#: hypha/apply/stream_forms/blocks.py:200
 msgid "Text field (multi line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:176
+#: hypha/apply/stream_forms/blocks.py:214
 msgid "Number field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:189
+#: hypha/apply/stream_forms/blocks.py:227
 msgid "Checkbox field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:201
-#: hypha/apply/stream_forms/blocks.py:219
+#: hypha/apply/stream_forms/blocks.py:239
+#: hypha/apply/stream_forms/blocks.py:257
 msgid "Choice"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:207
+#: hypha/apply/stream_forms/blocks.py:245
 msgid "Radio buttons"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:221
+#: hypha/apply/stream_forms/blocks.py:259
 msgid ""
 "Please create only two choices for toggle. First choice will revel the group "
 "and the second hide it. Additional choices will be ignored."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:231
+#: hypha/apply/stream_forms/blocks.py:269
 msgid "Group fields"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:233
+#: hypha/apply/stream_forms/blocks.py:271
 msgid "Remember to end group using Group fields end block."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:253
+#: hypha/apply/stream_forms/blocks.py:291
 msgid "Group fields end"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:255
+#: hypha/apply/stream_forms/blocks.py:293
 msgid "End of Group fields Block"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:262
+#: hypha/apply/stream_forms/blocks.py:300
 msgid "Dropdown field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:272
+#: hypha/apply/stream_forms/blocks.py:310
 msgid "Checkbox"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:278
+#: hypha/apply/stream_forms/blocks.py:316
 msgid "Multiple checkboxes field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:319
+#: hypha/apply/stream_forms/blocks.py:357
 msgid "Date field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:341
+#: hypha/apply/stream_forms/blocks.py:379
 msgid "Time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:373
+#: hypha/apply/stream_forms/blocks.py:411
 msgid "Date+time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:405
+#: hypha/apply/stream_forms/blocks.py:443
 msgid "Image field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:418
+#: hypha/apply/stream_forms/blocks.py:456
 msgid "Single File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:424
-#: hypha/apply/stream_forms/blocks.py:443
+#: hypha/apply/stream_forms/blocks.py:462
+#: hypha/apply/stream_forms/blocks.py:481
 #, python-brace-format
 msgid "{help_text} Accepted file types are {file_types}"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:437
+#: hypha/apply/stream_forms/blocks.py:475
 msgid "Multiple File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:474
+#: hypha/apply/stream_forms/blocks.py:512
 msgid "Section header"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:493
+#: hypha/apply/stream_forms/blocks.py:531
 msgid "Form fields"
 msgstr ""
 
@@ -8500,25 +9203,20 @@ msgid ""
 "update your user account with the name you provide here."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:8
-#, python-format
-msgid "View file - %(filename)s"
-msgstr ""
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:14
-msgid "uploaded"
+#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
+msgid "No selection"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:25
-msgid "File not found"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "Contains personal information."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:32
-msgid "Missing file"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "(PII)"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
-msgid "No selection"
+#: hypha/apply/stream_forms/templates/stream_forms/render_redacted_field.html:12
+msgid "Hidden — contains personal information."
 msgstr ""
 
 #: hypha/apply/templates/forms/includes/field.html:11
@@ -8555,109 +9253,119 @@ msgstr ""
 msgid "tasks"
 msgstr ""
 
-#: hypha/apply/todo/options.py:30
+#: hypha/apply/todo/options.py:32
 msgid "Comment Task"
 msgstr ""
 
-#: hypha/apply/todo/options.py:31
+#: hypha/apply/todo/options.py:33
 msgid "Submission Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:32
+#: hypha/apply/todo/options.py:34
 msgid "Determination draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:33
+#: hypha/apply/todo/options.py:35
 msgid "Review Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:34
+#: hypha/apply/todo/options.py:36
 msgid "Project waiting project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:35
+#: hypha/apply/todo/options.py:37
 msgid "Project waiting scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:36
+#: hypha/apply/todo/options.py:38
 msgid "Project submit project form(s)"
 msgstr ""
 
-#: hypha/apply/todo/options.py:37
+#: hypha/apply/todo/options.py:39
 msgid "Project submit scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:38
+#: hypha/apply/todo/options.py:40
 msgid "Project form required changes"
 msgstr ""
 
-#: hypha/apply/todo/options.py:39
+#: hypha/apply/todo/options.py:41
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project form waiting assignee"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/todo/options.py:40
+#: hypha/apply/todo/options.py:42
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Project form waiting approval"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/todo/options.py:41
+#: hypha/apply/todo/options.py:43
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting contract"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/todo/options.py:44
+#: hypha/apply/todo/options.py:46
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting contract document"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/todo/options.py:46
+#: hypha/apply/todo/options.py:48
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting contract review"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/todo/options.py:47
+#: hypha/apply/todo/options.py:49
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting invoice"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/todo/options.py:48
+#: hypha/apply/todo/options.py:50
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice required changes"
 msgstr "Factura emitida"
 
-#: hypha/apply/todo/options.py:49
+#: hypha/apply/todo/options.py:51
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Invoice waiting approval"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/todo/options.py:50
+#: hypha/apply/todo/options.py:52
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice waiting paid"
 msgstr "Factura emitida"
 
-#: hypha/apply/todo/options.py:51
+#: hypha/apply/todo/options.py:53
 msgid "Report due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:52
+#: hypha/apply/todo/options.py:54
 msgid "Download exported submissions"
 msgstr ""
 
-#: hypha/apply/todo/options.py:55
-msgid "Failed to generate submissions export file"
+#: hypha/apply/todo/options.py:57
+msgid "Failed to generate submissions export file"
+msgstr ""
+
+#: hypha/apply/todo/options.py:59
+#, fuzzy
+#| msgid "Submitted a review"
+msgid "Download exported invoices"
+msgstr "Enviar una revisión"
+
+#: hypha/apply/todo/options.py:62
+msgid "Failed to generate invoices export file"
 msgstr ""
 
-#: hypha/apply/todo/options.py:65
+#: hypha/apply/todo/options.py:72
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.source.fund_name} "
@@ -8665,7 +9373,7 @@ msgid ""
 "comment: <q class=\"text-fg-muted italic align-bottom\">{msg}</q>"
 msgstr ""
 
-#: hypha/apply/todo/options.py:75
+#: hypha/apply/todo/options.py:82
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8673,7 +9381,7 @@ msgid ""
 "align-bottom \">\"{related.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:83
+#: hypha/apply/todo/options.py:90
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8682,7 +9390,7 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:91
+#: hypha/apply/todo/options.py:98
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8691,70 +9399,70 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:101
+#: hypha/apply/todo/options.py:108
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:109
+#: hypha/apply/todo/options.py:116
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:117
+#: hypha/apply/todo/options.py:124
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form(s) submission"
 msgstr ""
 
-#: hypha/apply/todo/options.py:125
+#: hypha/apply/todo/options.py:132
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form requires changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:134
+#: hypha/apply/todo/options.py:141
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form is waiting for assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:142
+#: hypha/apply/todo/options.py:149
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br> Project form is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:151
+#: hypha/apply/todo/options.py:158
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:159
+#: hypha/apply/todo/options.py:166
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contracting documents"
 msgstr ""
 
-#: hypha/apply/todo/options.py:167
+#: hypha/apply/todo/options.py:174
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Contract for project is waiting for review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:176
+#: hypha/apply/todo/options.py:183
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8762,7 +9470,7 @@ msgid ""
 "bottom\">\"{related.title}\"</span> is waiting for invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:184
+#: hypha/apply/todo/options.py:191
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8770,7 +9478,7 @@ msgid ""
 "{related.invoice_number} required changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:192
+#: hypha/apply/todo/options.py:199
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8778,7 +9486,7 @@ msgid ""
 "{related.invoice_number} is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:200
+#: hypha/apply/todo/options.py:207
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8786,7 +9494,7 @@ msgid ""
 "{related.invoice_number} is waiting to be paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:208
+#: hypha/apply/todo/options.py:215
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.project.fund_name} "
@@ -8795,19 +9503,29 @@ msgid ""
 "\">\"{related.project.title}\"</span> is due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:216
+#: hypha/apply/todo/options.py:223
 msgid "Your generated submission export file is ready for download"
 msgstr ""
 
-#: hypha/apply/todo/options.py:219 hypha/apply/todo/options.py:227
+#: hypha/apply/todo/options.py:226 hypha/apply/todo/options.py:234
+#: hypha/apply/todo/options.py:241 hypha/apply/todo/options.py:249
 msgid "export"
 msgstr ""
 
-#: hypha/apply/todo/options.py:223
+#: hypha/apply/todo/options.py:230
 msgid ""
 "There was an issue generating your submission export file, please try again."
 msgstr ""
 
+#: hypha/apply/todo/options.py:238
+msgid "Your generated invoice export file is ready for download"
+msgstr ""
+
+#: hypha/apply/todo/options.py:245
+msgid ""
+"There was an issue generating your invoice export file, please try again."
+msgstr ""
+
 #: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
 msgid "You don't have any pending task."
 msgstr ""
@@ -8867,143 +9585,178 @@ msgstr ""
 msgid "View users in this group"
 msgstr ""
 
-#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:63
+#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:67
 msgid "Remember me"
 msgstr ""
 
-#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:65
+#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:69
 msgid "On trusted devices only, keeps you logged in for a longer period."
 msgstr ""
 
-#: hypha/apply/users/forms.py:55
+#: hypha/apply/users/forms.py:57
 msgid "Email address"
 msgstr ""
 
-#: hypha/apply/users/forms.py:86
+#: hypha/apply/users/forms.py:90
 msgid "A user with that email already exists."
 msgstr ""
 
-#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/forms.py:91
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: hypha/apply/users/forms.py:200
+#: hypha/apply/users/forms.py:208
 msgid ""
 "You are registered using OAuth, please contact an admin if you need to "
 "change your email address."
 msgstr ""
 
-#: hypha/apply/users/forms.py:208
+#: hypha/apply/users/forms.py:216
 msgid "Slack names must not include spaces"
 msgstr ""
 
-#: hypha/apply/users/forms.py:251
+#: hypha/apply/users/forms.py:259
 msgid "Only includes active, non-superusers"
 msgstr ""
 
-#: hypha/apply/users/forms.py:261
-#: hypha/apply/users/templates/users/account.html:64
+#: hypha/apply/users/forms.py:269
+#: hypha/apply/users/templates/users/account.html:67
 #: hypha/apply/users/templates/users/activation/email.txt:13
 #: hypha/elevate/forms.py:20
 msgid "Password"
 msgstr ""
 
-#: hypha/apply/users/forms.py:262
+#: hypha/apply/users/forms.py:270
 msgid "Email change requires you to put password."
 msgstr ""
 
-#: hypha/apply/users/forms.py:275
+#: hypha/apply/users/forms.py:283
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: hypha/apply/users/forms.py:291
+#: hypha/apply/users/forms.py:299
 msgid "To proceed, type \"disable\" below and then click on \"confirm\":"
 msgstr ""
 
-#: hypha/apply/users/forms.py:301
+#: hypha/apply/users/forms.py:309
 msgid "Incorrect input."
 msgstr ""
 
-#: hypha/apply/users/middleware.py:52
+#: hypha/apply/users/middleware.py:56
 msgid "Two factor authentication required"
 msgstr ""
 
-#: hypha/apply/users/models.py:195
+#: hypha/apply/users/models.py:230
 msgid "email address"
 msgstr ""
 
-#: hypha/apply/users/models.py:197
+#: hypha/apply/users/models.py:232
 msgid "full name"
 msgstr ""
 
-#: hypha/apply/users/models.py:200
+#: hypha/apply/users/models.py:235
 msgid "slack name"
 msgstr ""
 
-#: hypha/apply/users/models.py:202
+#: hypha/apply/users/models.py:237
 msgid "This is the name we should \"@mention\" when sending notifications"
 msgstr ""
 
-#: hypha/apply/users/models.py:321
+#: hypha/apply/users/models.py:391
 msgid "user"
 msgstr ""
 
-#: hypha/apply/users/models.py:322
+#: hypha/apply/users/models.py:392
 msgid "users"
 msgstr ""
 
-#: hypha/apply/users/models.py:333
+#: hypha/apply/users/models.py:403
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Auth Settings"
 msgstr "Contrato aprobado"
 
-#: hypha/apply/users/models.py:335
+#: hypha/apply/users/models.py:405
 msgid "show consent checkbox?"
 msgstr ""
 
-#: hypha/apply/users/models.py:336
+#: hypha/apply/users/models.py:406
 msgid "consent text"
 msgstr ""
 
-#: hypha/apply/users/models.py:337
+#: hypha/apply/users/models.py:407
 msgid "consent help"
 msgstr ""
 
-#: hypha/apply/users/models.py:339
+#: hypha/apply/users/models.py:409
 msgid "login extra text"
 msgstr ""
 
-#: hypha/apply/users/models.py:341
+#: hypha/apply/users/models.py:411
 msgid "Displayed along side login form"
 msgstr ""
 
-#: hypha/apply/users/models.py:351
+#: hypha/apply/users/models.py:421
 msgid "User consent on login & register forms"
 msgstr ""
 
-#: hypha/apply/users/models.py:357
+#: hypha/apply/users/models.py:427
 msgid "Login form customizations"
 msgstr ""
 
-#: hypha/apply/users/models.py:382
+#: hypha/apply/users/models.py:452
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Pending signup"
 msgstr "Solicitud de aprobación"
 
-#: hypha/apply/users/models.py:383
+#: hypha/apply/users/models.py:453
 msgid "Pending signups"
 msgstr ""
 
-#: hypha/apply/users/models.py:401
+#: hypha/apply/users/models.py:471
 msgid "Confirm Access Token"
 msgstr ""
 
-#: hypha/apply/users/models.py:402
+#: hypha/apply/users/models.py:472
 msgid "Confirm Access Tokens"
 msgstr ""
 
+#: hypha/apply/users/passkey_views.py:160
+#, python-brace-format
+msgid "Maximum of {max} passkeys allowed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:197
+#: hypha/apply/users/passkey_views.py:278
+msgid "Invalid JSON"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:202
+#: hypha/apply/users/passkey_views.py:283
+msgid "No active WebAuthn challenge"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:230
+#: hypha/apply/users/passkey_views.py:351
+#: hypha/apply/users/passkey_views.py:358
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "Verification failed"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/users/passkey_views.py:248
+msgid "Could not save passkey"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:292
+msgid "Invalid credential"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:336
+msgid "Unknown credential"
+msgstr ""
+
 #: hypha/apply/users/roles.py:4
 msgid "Administrator"
 msgstr ""
@@ -9071,16 +9824,31 @@ msgid ""
 "contracting."
 msgstr ""
 
-#: hypha/apply/users/services.py:110
+#: hypha/apply/users/services.py:36
+#, python-format
+msgid "A passkey was added to your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:41
+#, python-format
+msgid "A passkey was removed from your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:152
 #, python-brace-format
 msgid "Log in to {user} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/services.py:134
+#: hypha/apply/users/services.py:176
 #, python-brace-format
 msgid "Welcome to {ORG_LONG_NAME}"
 msgstr ""
 
+#: hypha/apply/users/signals.py:31
+#, python-format
+msgid "Successful login to %(org)s"
+msgstr ""
+
 #: hypha/apply/users/templates/elevate/elevate.html:4
 #: hypha/apply/users/templates/elevate/elevate.html:10
 msgid "Confirm access"
@@ -9117,13 +9885,19 @@ msgid ""
 "inactivity."
 msgstr ""
 
+#: hypha/apply/users/templates/includes/delete_user_submissions_form.html:20
+#, fuzzy
+#| msgid "Submitted a review"
+msgid "Yes, delete"
+msgstr "Enviar una revisión"
+
 #: hypha/apply/users/templates/two_factor/_base.html:8
 #: hypha/apply/users/templates/users/change_password.html:9
 msgid "Back to account"
 msgstr ""
 
 #: hypha/apply/users/templates/two_factor/_base.html:9
-#: hypha/apply/users/templates/users/account.html:85
+#: hypha/apply/users/templates/users/account.html:88
 msgid "Two-Factor Authentication (2FA)"
 msgstr ""
 
@@ -9163,10 +9937,6 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
-msgid "Copied!"
-msgstr ""
-
 #: hypha/apply/users/templates/two_factor/core/backup_tokens.html:41
 msgid "Copy to Clipboard"
 msgstr ""
@@ -9377,32 +10147,42 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:60
+#: hypha/apply/users/templates/users/account.html:63
 msgid "Account Security"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:69
+#: hypha/apply/users/templates/users/account.html:72
 #: hypha/apply/users/templates/users/change_password.html:3
 msgid "Update password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:77
+#: hypha/apply/users/templates/users/account.html:80
 msgid "Set Password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:89
+#: hypha/apply/users/templates/users/account.html:92
 msgid "Backup codes"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:90
+#: hypha/apply/users/templates/users/account.html:93
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:9
 msgid "Disable 2FA"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:92
+#: hypha/apply/users/templates/users/account.html:95
 msgid "Enable 2FA"
 msgstr ""
 
+#: hypha/apply/users/templates/users/account.html:100
+msgid "Passkeys"
+msgstr ""
+
+#: hypha/apply/users/templates/users/account.html:102
+msgid ""
+"With passkeys you can use your fingerprint, face, or screen lock to login "
+"securely without a password."
+msgstr ""
+
 #: hypha/apply/users/templates/users/activation/confirm.html:4
 msgid "Confirm account creation"
 msgstr ""
@@ -9506,7 +10286,7 @@ msgid "Select User:"
 msgstr ""
 
 #: hypha/apply/users/templates/users/become.html:26
-#: hypha/templates/includes/user_menu.html:69
+#: hypha/apply/users/templates/users/includes/user_menu.html:69
 msgid "Switch User"
 msgstr ""
 
@@ -9534,7 +10314,7 @@ msgid "Email Change - Verify Email"
 msgstr ""
 
 #: hypha/apply/users/templates/users/email_change/done.html:4
-#: hypha/apply/users/views.py:230
+#: hypha/apply/users/views.py:235
 msgid "Verify Email"
 msgstr ""
 
@@ -9597,12 +10377,75 @@ msgid "If you did not request this email, please ignore it."
 msgstr ""
 
 #: hypha/apply/users/templates/users/emails/confirm_access.md:11
+#: hypha/apply/users/templates/users/emails/login_notification.md:11
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:12
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:12
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
 #, python-format
 msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
 msgstr ""
 
+#: hypha/apply/users/templates/users/emails/login_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that your account was successfully logged in to "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:6
+#, python-format
+msgid "Login time: %(login_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:8
+msgid ""
+"If you did not log in, please contact us immediately and consider changing "
+"your password."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a new passkey was added to your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:6
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:6
+#, python-format
+msgid "Passkey: %(passkey_name)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:7
+#, python-format
+msgid "Added: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:9
+msgid ""
+"If you did not add this passkey, please contact us immediately and consider "
+"removing it from your account."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a passkey was removed from your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:7
+#, python-format
+msgid "Removed: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:9
+msgid ""
+"If you did not remove this passkey, please contact us immediately and "
+"consider changing your password if you have one."
+msgstr ""
+
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
 #, python-format
 msgid ""
@@ -9648,6 +10491,77 @@ msgstr ""
 msgid "Set password for %(username)s at %(ORG_LONG_NAME)s"
 msgstr ""
 
+#: hypha/apply/users/templates/users/includes/okta_login_button.html:7
+msgid "Log in with Okta"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/org_login_button.html:7
+#, python-format
+msgid "Log in with your %(ORG_SHORT_NAME)s email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:14
+msgid "Log in with passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:18
+msgid "Failed to begin authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:19
+#, fuzzy
+#| msgid "Opened the submission while still sealed"
+msgid "Authentication failed"
+msgstr "Abierto el envío cuando aún estaba precintado"
+
+#: hypha/apply/users/templates/users/includes/password_login_button.html:7
+msgid "Log in with password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passwordless_login_button.html:7
+msgid "Log in without password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:27
+msgid "Goto your account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:31
+msgid "My account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:36
+msgid "Check latest notifications"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:40
+msgid "Activity feed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:44
+msgid "Goto your flagged submissions"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:48
+msgid "My flagged"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:53
+msgid "Goto wagtail admin"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:84
+msgid "Release User"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:92
+msgid "Log out"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
+msgid " or Sign up"
+msgstr ""
+
 #: hypha/apply/users/templates/users/login.html:23
 #: hypha/apply/users/templates/users/login.html:31
 msgid "Two factor verification"
@@ -9685,27 +10599,27 @@ msgstr ""
 msgid "OR"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:109
+#: hypha/apply/users/templates/users/login.html:115
 msgid "Or, alternatively, use one of your backup phones:"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:125
+#: hypha/apply/users/templates/users/login.html:131
 msgid "As a last resort, you can use a backup codes: "
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:130
+#: hypha/apply/users/templates/users/login.html:136
 msgid "Click here to use a backup code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:133
+#: hypha/apply/users/templates/users/login.html:139
 msgid "Use a Backup Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:149
+#: hypha/apply/users/templates/users/login.html:163
 msgid "Verification Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:153
+#: hypha/apply/users/templates/users/login.html:167
 msgid "Backup Code"
 msgstr ""
 
@@ -9743,6 +10657,62 @@ msgstr ""
 msgid "Use your password"
 msgstr ""
 
+#: hypha/apply/users/templates/users/partials/passkey-list.html:22
+#: hypha/apply/users/templates/users/partials/passkey-list.html:70
+msgid "Passkey name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:23
+msgid "Click to edit name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:26
+msgid "Save name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:32
+#, python-format
+msgid "Used %(when)s ago"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:34
+msgid "Never used"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:41
+msgid "Delete this passkey?"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:44
+msgid "Delete passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:52
+msgid "No passkeys registered."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:59
+msgid "Server error"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:60
+msgid "Registration failed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:61
+msgid ""
+"This authenticator already has a passkey registered. Try a different "
+"authenticator or device."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:69
+msgid "e.g. MacBook Touch ID"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:75
+msgid "Add passkey"
+msgstr ""
+
 #: hypha/apply/users/templates/users/password_reset/complete.html:3
 #: hypha/apply/users/templates/users/password_reset/confirm.html:10
 #: hypha/apply/users/templates/users/password_reset/form.html:4
@@ -9875,6 +10845,42 @@ msgid ""
 "email."
 msgstr ""
 
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:6
+msgid "Are you sure you want to delete these users?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:20
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:22
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:5
+msgid "Are you sure you want to delete this user?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:12
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:14
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted!"
+msgstr ""
+
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:12
 msgid "This account does not have 2FA enabled."
 msgstr ""
@@ -9883,50 +10889,50 @@ msgstr ""
 msgid "2FA is disabled"
 msgstr ""
 
-#: hypha/apply/users/utils.py:40
+#: hypha/apply/users/utils.py:43
 msgid "Email is already in use."
 msgstr ""
 
-#: hypha/apply/users/utils.py:130
+#: hypha/apply/users/utils.py:137
 #, python-brace-format
 msgid "Confirmation email for {unverified_email} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/views.py:117
+#: hypha/apply/users/views.py:120
 msgid "Profile updated."
 msgstr ""
 
-#: hypha/apply/users/views.py:161 hypha/apply/users/views.py:236
+#: hypha/apply/users/views.py:164 hypha/apply/users/views.py:241
 msgid "Hijack feature is not enabled."
 msgstr ""
 
-#: hypha/apply/users/views.py:190
+#: hypha/apply/users/views.py:193
 msgid "Password Page timed out. Try changing the email again."
 msgstr ""
 
-#: hypha/apply/users/views.py:211
+#: hypha/apply/users/views.py:216
 msgid "Alert! An attempt to update your email."
 msgstr ""
 
-#: hypha/apply/users/views.py:270
+#: hypha/apply/users/views.py:285
 #, python-brace-format
 msgid "Your email has been successfully updated to {email}!"
 msgstr ""
 
-#: hypha/apply/users/views.py:372
+#: hypha/apply/users/views.py:387
 msgid "Your password was successfully updated!"
 msgstr ""
 
-#: hypha/apply/users/views.py:377
+#: hypha/apply/users/views.py:392
 msgid "Please correct the errors below."
 msgstr ""
 
-#: hypha/apply/users/views.py:809
+#: hypha/apply/users/views.py:824
 #, python-brace-format
 msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgstr ""
 
-#: hypha/apply/users/views.py:870
+#: hypha/apply/users/views.py:885
 msgid "✓ Check your email for password set link."
 msgstr ""
 
@@ -10156,49 +11162,49 @@ msgstr ""
 msgid "Mobile site logo (if not set default will be used)"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:60
+#: hypha/core/models/system_settings.py:61
 #, python-brace-format
 msgid ""
 "Link for the site logo, e.g. \"{example_url}\". If not set, defaults to page "
 "with slug set to \"home\"."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:64
+#: hypha/core/models/system_settings.py:66
 msgid "Front page navigation content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:66
+#: hypha/core/models/system_settings.py:68
 msgid ""
 "This will overwrite the default front page navigation bar, html tags is "
 "allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:72
+#: hypha/core/models/system_settings.py:74
 msgid "Footer content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:74
+#: hypha/core/models/system_settings.py:76
 msgid "This will be added to the footer, html tags is allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:84
-#: hypha/core/models/system_settings.py:94
+#: hypha/core/models/system_settings.py:86
+#: hypha/core/models/system_settings.py:96
 msgid "Text"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:105
+#: hypha/core/models/system_settings.py:107
 msgid "Homepage"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:113
+#: hypha/core/models/system_settings.py:115
 msgid "Site logo"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:122
+#: hypha/core/models/system_settings.py:124
 msgid "404 page"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:129
+#: hypha/core/models/system_settings.py:131
 msgid "403 page"
 msgstr ""
 
@@ -10261,13 +11267,13 @@ msgstr ""
 msgid "renditions"
 msgstr ""
 
-#: hypha/settings/django.py:164 hypha/settings/local.py:105
+#: hypha/settings/django.py:163 hypha/settings/local.py:105
 msgid ""
 "This password has previously appeared in a data breach and should not be "
 "used. Please choose a different password."
 msgstr ""
 
-#: hypha/settings/django.py:167 hypha/settings/local.py:108
+#: hypha/settings/django.py:166 hypha/settings/local.py:108
 msgid "Your password must not have been detected in a major security breach."
 msgstr ""
 
@@ -10316,23 +11322,19 @@ msgstr ""
 msgid "current theme"
 msgstr ""
 
-#: hypha/templates/base-apply.html:32
-msgid "Toggle Light / Dark / Auto color theme"
-msgstr ""
-
-#: hypha/templates/base-apply.html:54
+#: hypha/templates/base-apply.html:50
 msgid "Menu"
 msgstr ""
 
-#: hypha/templates/base-apply.html:76
+#: hypha/templates/base-apply.html:72
 msgid "Copyright"
 msgstr ""
 
-#: hypha/templates/base-apply.html:79
+#: hypha/templates/base-apply.html:75
 msgid "Built with"
 msgstr ""
 
-#: hypha/templates/base-apply.html:85
+#: hypha/templates/base-apply.html:81
 msgid "Manage cookies"
 msgstr ""
 
@@ -10345,6 +11347,24 @@ msgstr ""
 msgid "Page:"
 msgstr ""
 
+#: hypha/templates/cotton/card_attachment.html:13
+#, python-format
+msgid "View file - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:21
+msgid "uploaded"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:33
+#, python-format
+msgid "File not found - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:40
+msgid "Missing file"
+msgstr ""
+
 #: hypha/templates/cotton/dropdown_menu.html:69
 #: hypha/templates/cotton/dropdown_menu.html:77
 #, fuzzy, python-format
@@ -10352,18 +11372,28 @@ msgstr ""
 msgid "Filter %(title)s"
 msgstr "Enviar una revisión"
 
-#. Translators: "delete" should match msgid "delete" (with context "confirm-delete")
-#: hypha/templates/cotton/modal/confirm.html:25
-msgid "Type <em>delete</em> below to confirm"
-msgstr ""
-
-#: hypha/templates/cotton/modal/confirm.html:41
+#: hypha/templates/cotton/modal/confirm.html:7
 #, fuzzy
 #| msgid "Submitted a review"
-msgctxt "confirm-delete"
 msgid "delete"
 msgstr "Enviar una revisión"
 
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "anonymize"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:24
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">delete</pre> below to "
+"confirm"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:25
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">anonymize</pre> below to "
+"confirm"
+msgstr ""
+
 #: hypha/templates/cotton/modal/header.html:11
 msgid "Close Modal"
 msgstr ""
@@ -10388,21 +11418,21 @@ msgstr ""
 msgid "* This must be a number"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Hide password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Show password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently visible"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently hidden"
 msgstr ""
 
@@ -10456,59 +11486,6 @@ msgstr ""
 msgid "Your Tasks"
 msgstr ""
 
-#: hypha/templates/includes/org_login_button.html:7
-#, python-format
-msgid "Log in with your %(ORG_SHORT_NAME)s email"
-msgstr ""
-
-#: hypha/templates/includes/password_login_button.html:7
-msgid "Log in with password"
-msgstr ""
-
-#: hypha/templates/includes/passwordless_login_button.html:7
-msgid "Log in without password"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:27
-msgid "Goto your account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:31
-msgid "My account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:36
-msgid "Check latest notifications"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:40
-msgid "Activity feed"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:44
-msgid "Goto your flagged submissions"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:48
-msgid "My flagged"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:53
-msgid "Goto wagtail admin"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:84
-msgid "Release User"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:91
-msgid "Log out"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:101
-msgid " or Sign up"
-msgstr ""
-
 #: hypha/templates/password_required.html:4
 #: hypha/templates/password_required.html:9
 msgid "Password required"
diff --git a/hypha/locale/fr/LC_MESSAGES/django.po b/hypha/locale/fr/LC_MESSAGES/django.po
index 909fce5229..eecc3db7a2 100644
--- a/hypha/locale/fr/LC_MESSAGES/django.po
+++ b/hypha/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-22 16:11+0000\n"
+"POT-Creation-Date: 2026-09-17 11:50+0000\n"
 "PO-Revision-Date: 2024-02-22 07:43+0000\n"
 "Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/hypha/hypha-core/"
@@ -28,310 +28,365 @@ msgstr ""
 msgid "Please provide data for: {fields}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:28
+#: hypha/apply/activity/adapters/activity_feed.py:27
 #, python-brace-format
 msgid "Submitted {source.title_text_display} for {source.page.title}"
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:29
 #: hypha/apply/activity/adapters/activity_feed.py:30
-#: hypha/apply/activity/adapters/activity_feed.py:31
 msgid "edited the submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:32
+#: hypha/apply/activity/adapters/activity_feed.py:31
 #, python-brace-format
 msgid "updated Lead from {old_lead} to {source.lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:33
+#: hypha/apply/activity/adapters/activity_feed.py:32
 #, python-brace-format
 msgid "batch updated Lead to {new_lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:35
+#: hypha/apply/activity/adapters/activity_feed.py:34
 #, python-brace-format
 msgid "sent a determination. Outcome: {determination.clean_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:38
+#: hypha/apply/activity/adapters/activity_feed.py:37
 msgid "Invited to submit a proposal"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:41
+#: hypha/apply/activity/adapters/activity_feed.py:40
 msgid "Submitted a review"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:42
+#: hypha/apply/activity/adapters/activity_feed.py:41
 msgid "Opened the submission while still sealed"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:45
+#: hypha/apply/activity/adapters/activity_feed.py:44
 #, python-brace-format
 msgid ""
 "{opinion.opinion_display}s with {opinion.review.author}s review of {source}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:48
+#: hypha/apply/activity/adapters/activity_feed.py:47
 #, python-brace-format
 msgid "deleted the opinion for review: {review_opinion.review}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:51
+#: hypha/apply/activity/adapters/activity_feed.py:50
 #, python-brace-format
 msgid "Created project with initial status of \"{status}\""
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:52
+#, python-brace-format
+msgid "Created SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:53
+#, python-brace-format
+msgid "Edited SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:54
+#, python-brace-format
+msgid "Created project form for project \"{related.project}\""
+msgstr ""
+
 #: hypha/apply/activity/adapters/activity_feed.py:55
+#, python-brace-format
+msgid "Edited project form for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:58
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid "updated the project title from {old_title} to {source.title}"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/activity_feed.py:57
+#: hypha/apply/activity/adapters/activity_feed.py:61
+#, python-brace-format
+msgid "updated contract number to {source.contract_number}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:63
 #, python-brace-format
 msgid "update Lead from {old_lead} to {source.lead}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:58
+#: hypha/apply/activity/adapters/activity_feed.py:64
 msgid "Requested approval"
 msgstr "Approbation demandée"
 
-#: hypha/apply/activity/adapters/activity_feed.py:60
+#: hypha/apply/activity/adapters/activity_feed.py:66
 #: hypha/apply/determinations/models.py:209
 #: hypha/apply/determinations/models.py:213
 #: hypha/apply/determinations/models.py:217
 #: hypha/apply/determinations/options.py:12
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
-#: hypha/apply/projects/utils.py:87
+#: hypha/apply/projects/utils.py:90
 msgid "Approved"
 msgstr "Approuvé"
 
-#: hypha/apply/activity/adapters/activity_feed.py:61
+#: hypha/apply/activity/adapters/activity_feed.py:67
 msgid "requested changes for acceptance"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:62
+#: hypha/apply/activity/adapters/activity_feed.py:68
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Submitted Contract Documents"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/activity/adapters/activity_feed.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:69
 #, python-brace-format
 msgid "Uploaded a {contract.state} contract"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:64
+#: hypha/apply/activity/adapters/activity_feed.py:70
 msgid "Approved contract"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/activity/adapters/activity_feed.py:66
-#: hypha/apply/projects/views/payment.py:275
+#: hypha/apply/activity/adapters/activity_feed.py:72
+#: hypha/apply/projects/views/invoice.py:280
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice added"
 msgstr "Facture créée"
 
-#: hypha/apply/activity/adapters/activity_feed.py:67
+#: hypha/apply/activity/adapters/activity_feed.py:73
 msgid "Submitted a report"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/activity/adapters/activity_feed.py:70
-#: hypha/apply/activity/options.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:74
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "deleted a report"
+msgstr "Signalement envoyé"
+
+#: hypha/apply/activity/adapters/activity_feed.py:77
+#: hypha/apply/activity/options.py:73
 msgid "disabled reporting"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:74
+#: hypha/apply/activity/adapters/activity_feed.py:81
 msgid "archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:75
+#: hypha/apply/activity/adapters/activity_feed.py:82
 msgid "un-archived this submission"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:76
+#: hypha/apply/activity/adapters/activity_feed.py:83
 msgid "deleted an invoice"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:131
-#: hypha/apply/funds/views/submission_edit.py:630
+#: hypha/apply/activity/adapters/activity_feed.py:85
+#, fuzzy, python-brace-format
+#| msgid "{user} has updated the partners on <{link}|{source.title}>"
+msgid "updated author from {old_author} to {source.user}"
+msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
+
+#: hypha/apply/activity/adapters/activity_feed.py:145
+#: hypha/apply/funds/views/submission_edit.py:631
 msgid "Reviewers updated."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:133
-#: hypha/apply/activity/adapters/slack.py:237
+#: hypha/apply/activity/adapters/activity_feed.py:147
+#: hypha/apply/activity/adapters/slack.py:257
 msgid "Added:"
 msgstr "Ajouté :"
 
-#: hypha/apply/activity/adapters/activity_feed.py:137
-#: hypha/apply/activity/adapters/slack.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:151
+#: hypha/apply/activity/adapters/slack.py:261
 msgid "Removed:"
 msgstr "Supprimé :"
 
-#: hypha/apply/activity/adapters/activity_feed.py:143
+#: hypha/apply/activity/adapters/activity_feed.py:157
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Batch reviewers updated:"
 msgstr "Partenaires mis à jour."
 
-#: hypha/apply/activity/adapters/activity_feed.py:146
+#: hypha/apply/activity/adapters/activity_feed.py:160
 #, python-brace-format
 msgid "{user} as {name}."
 msgstr "{user} en tant que {name}."
 
-#: hypha/apply/activity/adapters/activity_feed.py:165
+#: hypha/apply/activity/adapters/activity_feed.py:179
 #, python-brace-format
 msgid "Successfully deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:174
+#: hypha/apply/activity/adapters/activity_feed.py:188
 #, python-brace-format
 msgid "Successfully archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:187
+#: hypha/apply/activity/adapters/activity_feed.py:201
 #, python-brace-format
 msgid ""
 "Successfully updated status to {invoice_status} for invoices: "
 "{invoice_numbers}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:204
+#: hypha/apply/activity/adapters/activity_feed.py:218
 #, python-brace-format
 msgid "assigned Project form to {}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:210
+#: hypha/apply/activity/adapters/activity_feed.py:224
 #, python-brace-format
 msgid "removed the task {task.code} for {source} from the task list"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:215
+#: hypha/apply/activity/adapters/activity_feed.py:229
 #, python-brace-format
 msgid ""
 "removed the task {task.code} for {source} from whole team's{user_groups} "
 "task list."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:228
-#: hypha/apply/activity/adapters/activity_feed.py:260
+#: hypha/apply/activity/adapters/activity_feed.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:273
 #, python-brace-format
 msgid "Progressed from {old_display} to {new_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:291
+#: hypha/apply/activity/adapters/activity_feed.py:304
 #, python-brace-format
 msgid ""
 "Updated reporting frequency. New schedule is: {new_schedule} starting on "
 "{schedule_start}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:296
+#: hypha/apply/activity/adapters/activity_feed.py:309
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Skipped a Report"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/activity/adapters/activity_feed.py:298
+#: hypha/apply/activity/adapters/activity_feed.py:311
 msgid "Marked a Report as required"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:301
+#: hypha/apply/activity/adapters/activity_feed.py:314
 #, fuzzy, python-brace-format
 #| msgid "Updated Invoice status to: {invoice.status_display}"
 msgid "Updated Invoice status to: {invoice_status}."
 msgstr "Statut de la facture mis à jour vers : {invoice.status_display}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:350
+#: hypha/apply/activity/adapters/activity_feed.py:363
 #, python-brace-format
 msgid "Updated screening decision from \"{old_status}\" to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:353
+#: hypha/apply/activity/adapters/activity_feed.py:366
 #, python-brace-format
 msgid "Added screening decision to \"{new_status}\""
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:357
+#: hypha/apply/activity/adapters/activity_feed.py:370
 #, python-brace-format
 msgid "Removed \"{old_status}\" screening decision."
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:196
+#: hypha/apply/activity/adapters/base.py:203
 #, python-brace-format
 msgid "{adapter} [to: {recipient}]: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:200
+#: hypha/apply/activity/adapters/base.py:207
 #, python-brace-format
 msgid "{adapter}: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:90
+#: hypha/apply/activity/adapters/emails.py:92
 #, python-brace-format
 msgid "Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:96
+#: hypha/apply/activity/adapters/emails.py:98
 msgid "Multiple applications are now ready for your review"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:99
+#: hypha/apply/activity/adapters/emails.py:101
 #, python-brace-format
 msgid "Reminder: Application ready to review: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:102
+#: hypha/apply/activity/adapters/emails.py:104
 msgid "You are invited as a co-applicant"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:107
+#: hypha/apply/activity/adapters/emails.py:109
 #, python-brace-format
 msgid "Project is waiting for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:111
+#: hypha/apply/activity/adapters/emails.py:113
 #, python-brace-format
 msgid "Contract uploaded for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:116
+#: hypha/apply/activity/adapters/emails.py:118
 #, python-brace-format
 msgid "Contract Documents required approval for the project: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:126
+#: hypha/apply/activity/adapters/emails.py:128
 #, python-brace-format
 msgid "Project is waiting for the contract: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:130
+#: hypha/apply/activity/adapters/emails.py:132
 #, python-brace-format
 msgid "Project is ready for invoicing: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:134
+#: hypha/apply/activity/adapters/emails.py:136
 #, python-brace-format
 msgid "Project status has changed to {project_status}: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:140
+#: hypha/apply/activity/adapters/emails.py:142
 msgid "Project has been rejected, please update and resubmit"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:143
+#: hypha/apply/activity/adapters/emails.py:145
 #, python-brace-format
 msgid "Project documents are ready to be assigned for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:150
+#: hypha/apply/activity/adapters/emails.py:151
+#, python-brace-format
+msgid "New comment on application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:158
+#, fuzzy, python-brace-format
+#| msgid "{user} has edited <{link}|{source.title}>"
+msgid ""
+"Your application to {ORG_LONG_NAME} has been reviewed: "
+"{source.title_text_display}"
+msgstr "{user} a modifié <{link}|{source.title}>"
+
+#: hypha/apply/activity/adapters/emails.py:162
+#, python-brace-format
+msgid "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/emails.py:167
 #, python-brace-format
 msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:153
+#: hypha/apply/activity/adapters/emails.py:170
 #, python-brace-format
-msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+msgid "Your {ORG_LONG_NAME} project: {source.title}"
 msgstr ""
 
 #: hypha/apply/activity/adapters/slack.py:31
@@ -421,13 +476,19 @@ msgstr "{user} a modifié <{link}|{source.title}>"
 
 #: hypha/apply/activity/adapters/slack.py:73
 #, fuzzy, python-brace-format
+#| msgid "{user} has edited <{link}|{source.title}>"
+msgid "{user} has anonymized {source.title_text_display}"
+msgstr "{user} a modifié <{link}|{source.title}>"
+
+#: hypha/apply/activity/adapters/slack.py:76
+#, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid ""
 "{user} has deleted {review.author} review for <{link}|"
 "{source.title_text_display}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:76
+#: hypha/apply/activity/adapters/slack.py:79
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid ""
@@ -435,20 +496,20 @@ msgid ""
 "{source.title_text_display}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:79
+#: hypha/apply/activity/adapters/slack.py:82
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid "{user} has created a Project: <{link}|{source.title}>"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:82
+#: hypha/apply/activity/adapters/slack.py:85
 #, python-brace-format
 msgid ""
 "The lead of project <{link}|{source.title}> has been updated from {old_lead} "
 "to {source.lead} by {user}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:85
+#: hypha/apply/activity/adapters/slack.py:88
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "A new {comment.visibility} comment has been posted on <{link}|"
@@ -460,7 +521,14 @@ msgstr ""
 "Un nouveau commentaire {comment.visibility} a été publié sur <{link}|"
 "{source.title}> par {user}"
 
-#: hypha/apply/activity/adapters/slack.py:88
+#: hypha/apply/activity/adapters/slack.py:91
+#, python-brace-format
+msgid ""
+"The contract number of project <{link}|{source.title}> has been updated to "
+"{source.contract_number} by {user}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:94
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid ""
@@ -468,19 +536,19 @@ msgid ""
 "{source.title_text_display}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:91
+#: hypha/apply/activity/adapters/slack.py:97
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:94
+#: hypha/apply/activity/adapters/slack.py:100
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid "{user} has approved project <{link}|{source.title}>"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:97
+#: hypha/apply/activity/adapters/slack.py:103
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid ""
@@ -488,13 +556,13 @@ msgid ""
 ">"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:100
+#: hypha/apply/activity/adapters/slack.py:106
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:103
+#: hypha/apply/activity/adapters/slack.py:109
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid ""
@@ -502,19 +570,19 @@ msgid ""
 "{source.title}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:106
+#: hypha/apply/activity/adapters/slack.py:112
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid "{user} has approved contract for <{link}|{source.title}>"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:109
+#: hypha/apply/activity/adapters/slack.py:115
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid "{user} has created invoice for <{link}|{source.title}>"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:112
+#: hypha/apply/activity/adapters/slack.py:118
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} has updated the status of <{link}|{source.title}>: "
@@ -526,31 +594,37 @@ msgstr ""
 "{user} a mis à jour le statut de <{link}|{source.title}> : "
 "{old_phase.display_name} → {source.phase}"
 
-#: hypha/apply/activity/adapters/slack.py:115
+#: hypha/apply/activity/adapters/slack.py:121
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid "{user} has deleted invoice from <{link}|{source.title}>"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:118
+#: hypha/apply/activity/adapters/slack.py:124
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid "{user} has updated invoice for <{link}|{source.title}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:121
+#: hypha/apply/activity/adapters/slack.py:127
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:125
+#: hypha/apply/activity/adapters/slack.py:130
+#, fuzzy, python-brace-format
+#| msgid "{user} has updated the partners on <{link}|{source.title}>"
+msgid "{user} has deleted a report for <{link}|{source.title}>"
+msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
+
+#: hypha/apply/activity/adapters/slack.py:135
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid "{user} has created a new account for <{link}|{source}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:128
+#: hypha/apply/activity/adapters/slack.py:138
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid ""
@@ -558,75 +632,95 @@ msgid ""
 "roles: {roles}"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:132
+#: hypha/apply/activity/adapters/slack.py:142
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited <{link}|{source.title}>"
 msgid "{user} has archived the submission: {source.title_text_display}"
 msgstr "{user} a modifié <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:135
+#: hypha/apply/activity/adapters/slack.py:145
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid "{user} has unarchived the submission: {source.title_text_display}"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:231
+#: hypha/apply/activity/adapters/slack.py:148
+#, python-brace-format
+msgid ""
+"{user} has updated author from {old_author} to {source.user} for submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:151
+#, python-brace-format
+msgid ""
+"A new comment has been assigned to {assignee} by {user} on submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:251
 #, fuzzy, python-brace-format
 #| msgid "{user} has updated the partners on <{link}|{source.title}>"
 msgid "{user} has updated the reviewers on <{link}|{title}>"
 msgstr "{user} a mis à jour les partenaires sur <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:250
+#: hypha/apply/activity/adapters/slack.py:270
 #, python-brace-format
 msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:262
+#: hypha/apply/activity/adapters/slack.py:282
 #, python-brace-format
 msgid "{user} as {name},"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:268
+#: hypha/apply/activity/adapters/slack.py:288
 #, python-brace-format
 msgid ""
 "{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:288
+#: hypha/apply/activity/adapters/slack.py:308
 #, python-brace-format
 msgid "{user} has transitioned the following submissions: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:298
+#: hypha/apply/activity/adapters/slack.py:318
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was sent by email. Outcome: "
 "{determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:305
+#: hypha/apply/activity/adapters/slack.py:325
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was saved without sending an "
 "email. Outcome: {determination_outcome}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:321
+#: hypha/apply/activity/adapters/slack.py:341
 #, python-brace-format
 msgid "Determinations of {outcome} was sent for: {submissions_links}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:332
+#: hypha/apply/activity/adapters/slack.py:352
 #, python-brace-format
 msgid "{user} has deleted submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:339
+#: hypha/apply/activity/adapters/slack.py:361
+#, fuzzy, python-brace-format
+#| msgid "{user} has edited <{link}|{source.title}>"
+msgid "{user} has anonymized submissions: {title}"
+msgstr "{user} a modifié <{link}|{source.title}>"
+
+#: hypha/apply/activity/adapters/slack.py:368
 #, python-brace-format
 msgid "{user} has archived submissions: {title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/slack.py:353
+#: hypha/apply/activity/adapters/slack.py:382
 #, python-brace-format
 msgid ""
 "<{link}|{title}> is ready for review. The following are assigned as "
@@ -658,32 +752,36 @@ msgstr ""
 msgid "Last 3 months"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:16
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:70
+#: hypha/apply/activity/forms.py:17
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:47
 msgid "Attachments"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:20 hypha/apply/funds/forms.py:102
-#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:371
+#: hypha/apply/activity/forms.py:21 hypha/apply/funds/forms.py:102
+#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:389
 msgid "Select..."
 msgstr ""
 
-#: hypha/apply/activity/forms.py:21
+#: hypha/apply/activity/forms.py:22
 msgid "Assign to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:33
+#: hypha/apply/activity/forms.py:39
 msgid "Visible to"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:34
+#: hypha/apply/activity/forms.py:40
 msgid "Message"
 msgstr ""
 
-#: hypha/apply/activity/forms.py:38
+#: hypha/apply/activity/forms.py:44
 msgid "Select a relevant user role. Staff can view every comment."
 msgstr ""
 
+#: hypha/apply/activity/forms.py:73
+msgid "Write a comment..."
+msgstr ""
+
 #: hypha/apply/activity/management/commands/send_staff_email_digest.py:146
 msgid "Summary of all activities"
 msgstr ""
@@ -693,7 +791,8 @@ msgid "Activities Summary - "
 msgstr ""
 
 #: hypha/apply/activity/models.py:25
-#: hypha/apply/funds/models/co_applicants.py:9 hypha/apply/todo/options.py:69
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:12
+#: hypha/apply/funds/models/co_applicants.py:10 hypha/apply/todo/options.py:76
 msgid "Comment"
 msgstr ""
 
@@ -701,7 +800,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: hypha/apply/activity/models.py:36
+#: hypha/apply/activity/models.py:36 hypha/apply/funds/forms.py:336
 msgid "Applicants"
 msgstr ""
 
@@ -709,9 +808,9 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:231
-#: hypha/apply/funds/tables.py:469
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:81
+#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:245
+#: hypha/apply/funds/tables.py:533
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:86
 #: hypha/apply/funds/templates/submissions/all.html:437
 #: hypha/apply/funds/templates/submissions/all.html:478
 msgid "Reviewers"
@@ -729,7 +828,7 @@ msgstr ""
 msgid "activity attachments"
 msgstr ""
 
-#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:379
+#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:384
 msgid "message"
 msgstr ""
 
@@ -745,19 +844,19 @@ msgstr ""
 msgid "activities"
 msgstr ""
 
-#: hypha/apply/activity/models.py:329
+#: hypha/apply/activity/models.py:334
 msgid "verb"
 msgstr ""
 
-#: hypha/apply/activity/models.py:340
+#: hypha/apply/activity/models.py:345
 msgid "event"
 msgstr ""
 
-#: hypha/apply/activity/models.py:341
+#: hypha/apply/activity/models.py:346
 msgid "events"
 msgstr ""
 
-#: hypha/apply/activity/models.py:380
+#: hypha/apply/activity/models.py:385
 msgid "messages"
 msgstr ""
 
@@ -852,163 +951,217 @@ msgid "deleted submission"
 msgstr ""
 
 #: hypha/apply/activity/options.py:35
-msgid "deleted review"
+msgid "anonymized submission"
 msgstr ""
 
 #: hypha/apply/activity/options.py:36
-msgid "deleted review opinion"
+msgid "deleted review"
 msgstr ""
 
 #: hypha/apply/activity/options.py:37
-msgid "created project"
+msgid "deleted review opinion"
 msgstr ""
 
 #: hypha/apply/activity/options.py:38
-msgid "updated project lead"
+msgid "created project"
 msgstr ""
 
 #: hypha/apply/activity/options.py:39
+#, fuzzy
+#| msgid "Approved contract"
+msgid "created a project SOW"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/options.py:40
+#, fuzzy
+#| msgid "Approved contract"
+msgid "edited a project SOW"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/options.py:41
+#, fuzzy
+#| msgid "Approved contract"
+msgid "created a project form"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/options.py:42
+#, fuzzy
+#| msgid "Approved contract"
+msgid "edited a project form"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/options.py:43
+msgid "updated project lead"
+msgstr ""
+
+#: hypha/apply/activity/options.py:44
 msgid "updated project title"
 msgstr ""
 
-#: hypha/apply/activity/options.py:40
+#: hypha/apply/activity/options.py:47
+#, fuzzy
+#| msgid "Approved contract"
+msgid "updated project contract number"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/options.py:49
 msgid "edited review"
 msgstr ""
 
-#: hypha/apply/activity/options.py:41
+#: hypha/apply/activity/options.py:50
 #, fuzzy
 #| msgid "Requested approval"
 msgid "sent for approval"
 msgstr "Approbation demandée"
 
-#: hypha/apply/activity/options.py:42
+#: hypha/apply/activity/options.py:51
 #, fuzzy
 #| msgid "Approved contract"
 msgid "approved project"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/activity/options.py:43
+#: hypha/apply/activity/options.py:52
 msgid "assign project form approver"
 msgstr ""
 
-#: hypha/apply/activity/options.py:44
+#: hypha/apply/activity/options.py:53
 msgid "approved project form"
 msgstr ""
 
-#: hypha/apply/activity/options.py:45
+#: hypha/apply/activity/options.py:54
 msgid "transitioned project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:46
+#: hypha/apply/activity/options.py:55
 #, fuzzy
 #| msgid "Requested approval"
 msgid "requested project change"
 msgstr "Approbation demandée"
 
-#: hypha/apply/activity/options.py:49
+#: hypha/apply/activity/options.py:58
 msgid "submitted contract documents"
 msgstr ""
 
-#: hypha/apply/activity/options.py:51
+#: hypha/apply/activity/options.py:60
 msgid "uploaded document to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:52
+#: hypha/apply/activity/options.py:61
 msgid "uploaded contract to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:53
+#: hypha/apply/activity/options.py:62
 #, fuzzy
 #| msgid "Approved contract"
 msgid "approved contract"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/activity/options.py:54
+#: hypha/apply/activity/options.py:63
 msgid "created invoice for project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:55
+#: hypha/apply/activity/options.py:64
 msgid "updated invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:56
+#: hypha/apply/activity/options.py:65
 msgid "approve invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:57
+#: hypha/apply/activity/options.py:66
 msgid "deleted invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:58
+#: hypha/apply/activity/options.py:67
 msgid "sent project to compliance"
 msgstr ""
 
-#: hypha/apply/activity/options.py:59
+#: hypha/apply/activity/options.py:68
 msgid "updated invoice"
 msgstr ""
 
-#: hypha/apply/activity/options.py:60
+#: hypha/apply/activity/options.py:69
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "submitted report"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/activity/options.py:61
+#: hypha/apply/activity/options.py:70
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "deleted report"
+msgstr "Signalement envoyé"
+
+#: hypha/apply/activity/options.py:71
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "skipped report"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/activity/options.py:62
+#: hypha/apply/activity/options.py:72
 msgid "changed report frequency"
 msgstr ""
 
-#: hypha/apply/activity/options.py:64
+#: hypha/apply/activity/options.py:74
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "notified report"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/activity/options.py:65
+#: hypha/apply/activity/options.py:75
 msgid "reminder to review"
 msgstr ""
 
-#: hypha/apply/activity/options.py:66
+#: hypha/apply/activity/options.py:76
 msgid "batch deleted submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:69
+#: hypha/apply/activity/options.py:79
+msgid "batch anonymized submissions"
+msgstr ""
+
+#: hypha/apply/activity/options.py:83
 msgid "batch archive submissions"
 msgstr ""
 
-#: hypha/apply/activity/options.py:73
+#: hypha/apply/activity/options.py:87
 msgid "batch update invoice status"
 msgstr ""
 
-#: hypha/apply/activity/options.py:75
+#: hypha/apply/activity/options.py:89
 msgid "created new account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:76
+#: hypha/apply/activity/options.py:90
 msgid "edited account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:77
+#: hypha/apply/activity/options.py:91
 msgid "archived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:78
+#: hypha/apply/activity/options.py:92
 msgid "unarchived submission"
 msgstr ""
 
-#: hypha/apply/activity/options.py:79
+#: hypha/apply/activity/options.py:93
 msgid "remove task"
 msgstr ""
 
-#: hypha/apply/activity/options.py:80
+#: hypha/apply/activity/options.py:94
 msgid "invite co-applicant"
 msgstr ""
 
+#: hypha/apply/activity/options.py:95
+#, fuzzy
+#| msgid "Approved contract"
+msgid "updated author"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/options.py:96
+msgid "comment assigned"
+msgstr ""
+
 #: hypha/apply/activity/templates/activity/include/action_list.html:6
 msgid "There are no actions."
 msgstr ""
@@ -1040,13 +1193,13 @@ msgid "Filter"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/notifications.html:79
-#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:44
+#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:61
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:46
-#: hypha/apply/funds/models/co_applicants.py:8
+#: hypha/apply/funds/models/co_applicants.py:9
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:62
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:76
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:83
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:99
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:133
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:120
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:159
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:72
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:19
@@ -1072,90 +1225,124 @@ msgstr "Modifié"
 msgid "deleted"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:28
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:23
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Additional options"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:35
+#: hypha/apply/funds/templates/funds/comments.html:68
+#: hypha/apply/funds/templates/funds/comments.html:82
+msgid "Add Comment"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:36
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:150
 #, python-format
 msgid "This user is a %(role)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:37
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:48
+#, fuzzy
+#| msgid "Approved contract"
+msgid "message from determination"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:50
+#, python-format
+msgid "commented on %(related_name)s"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:53
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:159
 msgid "commented"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:52
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:69
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:173
 msgid "Assigned to you"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:54
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:71
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:175
 #, python-format
 msgid "Assigned to %(assigned_to)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:61
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:78
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:182
 #, python-format
 msgid "This is visible to %(visibility_text)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:72
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:193
 msgid "Edit comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:76
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:93
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:197
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:40
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:36
-#: hypha/apply/funds/models/co_applicants.py:10
+#: hypha/apply/funds/models/co_applicants.py:11
 #: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:10
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:118
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:55
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:90
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:98
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:122
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:106
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:97
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:76
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:130
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:170
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:29
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:148
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:50
 #: hypha/apply/review/templates/review/review_detail.html:82
 msgid "Edit"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:84
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:101
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:205
 msgid ""
 "Are you sure you want to delete this comment? This action cannot be undone."
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:85
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:102
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:206
 msgid "Delete comment"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:106
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:210
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:59
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:120
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:182
 #: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:21
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:26
 #: hypha/apply/funds/templates/funds/modals/edit_co_applicant_form.html:75
-#: hypha/apply/funds/templates/submissions/all.html:502
-#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:59
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
-#: hypha/apply/projects/views/payment.py:356
+#: hypha/apply/funds/templates/submissions/all.html:504
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:71
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:41
+#: hypha/apply/projects/views/invoice.py:361
 #: hypha/apply/review/templates/review/review_detail.html:92
-#: hypha/templates/cotton/modal/confirm.html:43
 #: hypha/templates/includes/dialog_form_base.html:28
 msgid "Delete"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:97
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:114
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:218
 msgid "updated"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:109
-msgid "View "
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:125
+#, python-format
+msgid "View %(related_name)s"
 msgstr ""
 
 #: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:27
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:78
-#: hypha/apply/funds/views/submission_edit.py:131
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:130
+#: hypha/apply/funds/views/submission_edit.py:318
 #: hypha/apply/funds/workflows/definitions/double_stage.py:20
 #: hypha/apply/funds/workflows/definitions/double_stage.py:48
 #: hypha/apply/funds/workflows/definitions/double_stage.py:98
@@ -1170,6 +1357,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:50
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:120
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:164
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:19
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:46
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:105
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:20
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:47
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:93
@@ -1179,18 +1370,18 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
 #: hypha/apply/projects/reports/templates/reports/report_form.html:60
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:30
-#: hypha/apply/projects/views/project.py:309
-#: hypha/apply/projects/views/project.py:345
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
-#: hypha/apply/projects/views/project.py:903
-#: hypha/apply/projects/views/project.py:942
-#: hypha/apply/projects/views/project.py:976
-#: hypha/apply/projects/views/project.py:1009
-#: hypha/apply/projects/views/project.py:1363
-#: hypha/apply/projects/views/project.py:1436
-#: hypha/apply/projects/views/project.py:1467
-#: hypha/apply/projects/views/project.py:1622
+#: hypha/apply/projects/views/project.py:313
+#: hypha/apply/projects/views/project.py:349
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
+#: hypha/apply/projects/views/project.py:954
+#: hypha/apply/projects/views/project.py:993
+#: hypha/apply/projects/views/project.py:1027
+#: hypha/apply/projects/views/project.py:1060
+#: hypha/apply/projects/views/project.py:1414
+#: hypha/apply/projects/views/project.py:1487
+#: hypha/apply/projects/views/project.py:1518
+#: hypha/apply/projects/views/project.py:1673
 #: hypha/apply/review/templates/review/review_edit_form.html:67
 #: hypha/apply/review/templates/review/review_form.html:84
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1205,6 +1396,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:58
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:59
 #: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:40
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:37
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:17
 #: hypha/apply/projects/templates/application_projects/project_form.html:33
 #: hypha/apply/users/templates/users/become.html:33
 #: hypha/templates/cotton/modal/confirm.html:48
@@ -1234,12 +1427,13 @@ msgid "Submissions"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:17
-#: hypha/apply/funds/tables.py:76
+#: hypha/apply/funds/tables.py:77
 #: hypha/apply/funds/templates/cotton/submission_list.html:38
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:41
-#: hypha/apply/funds/templates/funds/comments.html:37
-#: hypha/apply/projects/templates/application_projects/project_detail.html:31
-#: hypha/apply/review/views.py:432
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:29
+#: hypha/apply/funds/templates/funds/comments.html:25
+#: hypha/apply/projects/templates/application_projects/project_detail.html:26
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:24
+#: hypha/apply/review/views.py:441
 msgid "Comments"
 msgstr ""
 
@@ -1248,7 +1442,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
 #: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:62
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:68
 #: hypha/apply/review/templates/review/review_list.html:4
 #: hypha/apply/review/templates/review/review_list.html:9
 #: hypha/core/navigation.py:80
@@ -1282,6 +1476,7 @@ msgid "View your submission here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:16
+#: hypha/apply/activity/templates/messages/email/author_updated.html:11
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:29
 #: hypha/apply/activity/templates/messages/email/invited_to_proposal.html:11
 #: hypha/apply/activity/templates/messages/email/submission_confirmation.html:10
@@ -1289,6 +1484,7 @@ msgid "If you have any questions, please submit them here"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:18
+#: hypha/apply/activity/templates/messages/email/author_updated.html:13
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:31
 msgid "See our guide for more information"
 msgstr ""
@@ -1315,8 +1511,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/revisions_compare.html:42
 #: hypha/apply/funds/templates/funds/revisions_compare.html:43
 #: hypha/core/models/system_settings.py:21
-#: hypha/core/models/system_settings.py:79
-#: hypha/core/models/system_settings.py:89
+#: hypha/core/models/system_settings.py:81
+#: hypha/core/models/system_settings.py:91
 msgid "Title"
 msgstr ""
 
@@ -1339,11 +1535,30 @@ msgstr ""
 msgid "Please contact %(lead)s - %(email)s if you have any questions."
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/author_updated.html:6
+#, python-format
+msgid "You have been assigned as an Applicant to submission \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:10
+msgid "Link to your submission"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:15
+#, python-format
+msgid ""
+"If you have any issues accessing the submission or other general inquiries, "
+"please email us at %(ORG_EMAIL)s"
+msgstr ""
+
 #: hypha/apply/activity/templates/messages/email/base.html:5
 #: hypha/apply/users/templates/users/activation/email.txt:2
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:2
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:2
 #: hypha/apply/users/templates/users/emails/confirm_access.md:2
+#: hypha/apply/users/templates/users/emails/login_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:2
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:2
 #: hypha/apply/users/templates/users/emails/set_password.txt:2
 #: hypha/apply/users/templates/users/password_reset/email.txt:2
@@ -1356,6 +1571,9 @@ msgstr ""
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:7
 #: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/login_notification.md:14
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:15
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:15
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
 #: hypha/apply/users/templates/users/emails/set_password.txt:10
@@ -1388,6 +1606,21 @@ msgstr ""
 msgid "Read the full comment here"
 msgstr ""
 
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:5
+msgid "Hey there,"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:8
+#, python-format
+msgid "You have been assigned to a comment on \"%(title)s\"."
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:12
+#, fuzzy
+#| msgid "Approved contract"
+msgid "View it here"
+msgstr "Contrat approuvé"
+
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:13
 msgid "A new contract has been added to your Project"
 msgstr ""
@@ -1615,8 +1848,8 @@ msgid "no longer required"
 msgstr ""
 
 #: hypha/apply/activity/templates/messages/email/report_skipped.html:6
-#: hypha/apply/projects/models/project.py:818
-#: hypha/apply/projects/models/project.py:855
+#: hypha/apply/projects/models/project.py:847
+#: hypha/apply/projects/models/project.py:884
 msgid "required"
 msgstr ""
 
@@ -1714,7 +1947,7 @@ msgid "Please submit any questions related to your application here"
 msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:50
-#: hypha/apply/funds/tables.py:498
+#: hypha/apply/funds/tables.py:562
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:12
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:28
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:44
@@ -1725,7 +1958,7 @@ msgstr ""
 
 #: hypha/apply/activity/templatetags/activity_tags.py:61
 #: hypha/apply/funds/templates/cotton/submission_list.html:24
-#: hypha/apply/funds/templatetags/workflow_tags.py:72
+#: hypha/apply/funds/templatetags/workflow_tags.py:126
 #: hypha/apply/users/roles.py:5
 msgid "Applicant"
 msgstr ""
@@ -1740,22 +1973,26 @@ msgstr ""
 msgid "You can begin submitting invoices and reports for your project."
 msgstr ""
 
-#: hypha/apply/activity/views.py:61
+#: hypha/apply/activity/views.py:99
 msgid "You can only edit your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:64
+#: hypha/apply/activity/views.py:102
 msgid "You can not edit a deleted comment"
 msgstr ""
 
-#: hypha/apply/activity/views.py:92
+#: hypha/apply/activity/views.py:130
 msgid "You can only delete your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:95
+#: hypha/apply/activity/views.py:133
 msgid "You can not delete a deleted comment"
 msgstr ""
 
+#: hypha/apply/activity/views.py:183
+msgid "Comment added!"
+msgstr ""
+
 #: hypha/apply/categories/admin.py:13
 msgid "Category Questions"
 msgstr ""
@@ -1775,27 +2012,27 @@ msgstr ""
 msgid "{title} {child_verbose_name} {verbose_name} for {parent}"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:31
+#: hypha/apply/categories/blocks.py:37
 msgid "Multi select"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:35 hypha/apply/funds/blocks.py:96
-#: hypha/apply/funds/blocks.py:153 hypha/apply/funds/blocks.py:199
+#: hypha/apply/categories/blocks.py:41 hypha/apply/funds/blocks.py:113
+#: hypha/apply/funds/blocks.py:170 hypha/apply/funds/blocks.py:216
 #: hypha/apply/stream_forms/blocks.py:36
 msgid "Label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:37
+#: hypha/apply/categories/blocks.py:43
 msgid "Leave blank to use the default Category label"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:40 hypha/apply/funds/blocks.py:100
-#: hypha/apply/funds/blocks.py:157 hypha/apply/funds/blocks.py:202
+#: hypha/apply/categories/blocks.py:46 hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:174 hypha/apply/funds/blocks.py:219
 #: hypha/apply/stream_forms/blocks.py:37
 msgid "Help text"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:42
+#: hypha/apply/categories/blocks.py:48
 msgid "Leave blank to use the default Category help text"
 msgstr ""
 
@@ -1816,7 +2053,8 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:234
+#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:248
+#: hypha/apply/funds/tables.py:333
 #: hypha/apply/funds/templates/submissions/all.html:419
 #: hypha/apply/projects/templates/application_projects/modals/contracting_documents_upload.html:7
 #: hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html:7
@@ -1860,11 +2098,15 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:373
-#: hypha/apply/funds/tables.py:236
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:121
+#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:390
+#: hypha/apply/funds/tables.py:250
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:126
 #: hypha/apply/funds/templates/submissions/all.html:425
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:5
+#: hypha/apply/projects/forms/invoice.py:238 hypha/apply/projects/tables.py:115
+#: hypha/apply/projects/tables.py:152
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:58
+#: hypha/apply/projects/templates/application_projects/partials/invoice_tags.html:4
 msgid "Tags"
 msgstr ""
 
@@ -1938,12 +2180,12 @@ msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html:91
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:24
-#: hypha/apply/funds/tables.py:68
+#: hypha/apply/funds/tables.py:69
 #: hypha/apply/funds/templates/submissions/all.html:328
-#: hypha/apply/projects/models/payment.py:26
-#: hypha/apply/projects/models/project.py:218
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:56
-#: hypha/apply/projects/tables.py:42
+#: hypha/apply/projects/models/invoice.py:37
+#: hypha/apply/projects/models/project.py:219
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:63
+#: hypha/apply/projects/tables.py:40
 msgid "Submitted"
 msgstr ""
 
@@ -1985,7 +2227,7 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:13
 #: hypha/apply/dashboard/templates/dashboard/staff_dashboard.html:16
 #: hypha/apply/users/templates/users/account.html:35
-#: hypha/templates/includes/user_menu.html:57
+#: hypha/apply/users/templates/users/includes/user_menu.html:57
 msgid "Administration"
 msgstr ""
 
@@ -2000,7 +2242,7 @@ msgid "You don't have any PAFs for review right now"
 msgstr ""
 
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:27
-#: hypha/apply/funds/models/co_applicants.py:16
+#: hypha/apply/funds/models/co_applicants.py:17
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:6
 #: hypha/core/navigation.py:109
@@ -2092,11 +2334,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:27
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
 #: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:79
-#: hypha/apply/todo/options.py:87 hypha/apply/todo/options.py:95
+#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:86
+#: hypha/apply/todo/options.py:94 hypha/apply/todo/options.py:102
 #: hypha/apply/todo/templates/todo/todolist_item.html:16
 msgid "Draft"
 msgstr ""
@@ -2108,11 +2351,9 @@ msgstr ""
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:30
 #: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:11
 #: hypha/apply/determinations/templates/determinations/includes/determination_block.html:18
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:104
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:84
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:79
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:28
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:40
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "by"
 msgstr ""
@@ -2208,30 +2449,38 @@ msgstr ""
 #: hypha/apply/determinations/blocks.py:77
 #: hypha/apply/determinations/blocks.py:78
 #: hypha/apply/determinations/blocks.py:79
-#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:276
-#: hypha/apply/review/blocks.py:172 hypha/apply/review/blocks.py:173
-#: hypha/apply/review/blocks.py:174 hypha/apply/review/blocks.py:175
-#: hypha/apply/review/blocks.py:176 hypha/apply/review/blocks.py:177
-#: hypha/apply/review/blocks.py:178 hypha/apply/stream_forms/blocks.py:475
-#: hypha/apply/stream_forms/blocks.py:476
-#: hypha/apply/stream_forms/blocks.py:477
-#: hypha/apply/stream_forms/blocks.py:478
-#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482
-#: hypha/apply/stream_forms/blocks.py:483
-#: hypha/apply/stream_forms/blocks.py:484
-#: hypha/apply/stream_forms/blocks.py:485
-#: hypha/apply/stream_forms/blocks.py:486
-#: hypha/apply/stream_forms/blocks.py:487
-#: hypha/apply/stream_forms/blocks.py:488 hypha/apply/utils/blocks.py:74
+#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:303
+#: hypha/apply/funds/blocks.py:304 hypha/apply/funds/blocks.py:305
+#: hypha/apply/funds/blocks.py:306 hypha/apply/funds/blocks.py:307
+#: hypha/apply/funds/blocks.py:308 hypha/apply/funds/blocks.py:309
+#: hypha/apply/funds/blocks.py:310 hypha/apply/funds/blocks.py:311
+#: hypha/apply/funds/blocks.py:312 hypha/apply/funds/blocks.py:313
+#: hypha/apply/funds/blocks.py:314 hypha/apply/funds/blocks.py:315
+#: hypha/apply/funds/blocks.py:316 hypha/apply/funds/blocks.py:317
+#: hypha/apply/funds/blocks.py:318 hypha/apply/review/blocks.py:172
+#: hypha/apply/review/blocks.py:173 hypha/apply/review/blocks.py:174
+#: hypha/apply/review/blocks.py:175 hypha/apply/review/blocks.py:176
+#: hypha/apply/review/blocks.py:177 hypha/apply/review/blocks.py:178
+#: hypha/apply/stream_forms/blocks.py:513
+#: hypha/apply/stream_forms/blocks.py:514
+#: hypha/apply/stream_forms/blocks.py:515
+#: hypha/apply/stream_forms/blocks.py:516
+#: hypha/apply/stream_forms/blocks.py:517
+#: hypha/apply/stream_forms/blocks.py:518
+#: hypha/apply/stream_forms/blocks.py:519
+#: hypha/apply/stream_forms/blocks.py:520
+#: hypha/apply/stream_forms/blocks.py:521
+#: hypha/apply/stream_forms/blocks.py:522
+#: hypha/apply/stream_forms/blocks.py:523
+#: hypha/apply/stream_forms/blocks.py:524
+#: hypha/apply/stream_forms/blocks.py:525
+#: hypha/apply/stream_forms/blocks.py:526 hypha/apply/utils/blocks.py:74
 #: hypha/apply/utils/blocks.py:75
 msgid "Fields"
 msgstr ""
 
 #: hypha/apply/determinations/blocks.py:78 hypha/apply/review/blocks.py:174
-#: hypha/apply/stream_forms/blocks.py:473
+#: hypha/apply/stream_forms/blocks.py:511
 msgid "Paragraph"
 msgstr ""
 
@@ -2251,7 +2500,7 @@ msgid "Do you recommend requesting a proposal based on this concept note?"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:305
-#: hypha/apply/determinations/views.py:99
+#: hypha/apply/determinations/views.py:100
 msgid "-- No determination selected -- "
 msgstr ""
 
@@ -2332,22 +2581,22 @@ msgid "Rationale and appropriateness questions and comments"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:592
-#: hypha/apply/determinations/views.py:389
+#: hypha/apply/determinations/views.py:394
 msgid "-- No proposal form selected -- "
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:595
-#: hypha/apply/determinations/views.py:392
+#: hypha/apply/determinations/views.py:397
 msgid "Select the proposal form only for determination approval"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:599
-#: hypha/apply/determinations/views.py:396
+#: hypha/apply/determinations/views.py:401
 msgid "Select the proposal form to use for proposal stage."
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:602
-#: hypha/apply/determinations/views.py:399
+#: hypha/apply/determinations/views.py:404
 msgid "Proposal Form"
 msgstr ""
 
@@ -2403,11 +2652,12 @@ msgstr ""
 #: hypha/apply/determinations/models.py:214
 #: hypha/apply/determinations/models.py:218
 #: hypha/apply/determinations/options.py:10
-#: hypha/apply/funds/workflows/constants.py:93
+#: hypha/apply/funds/workflows/constants.py:97
 #: hypha/apply/funds/workflows/definitions/double_stage.py:147
 #: hypha/apply/funds/workflows/definitions/double_stage.py:326
 #: hypha/apply/funds/workflows/definitions/single_stage.py:149
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:214
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:198
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:138
 msgid "Dismissed"
@@ -2420,7 +2670,7 @@ msgid "Needs more info"
 msgstr ""
 
 #: hypha/apply/determinations/models.py:255
-#: hypha/apply/funds/workflows/registry.py:66
+#: hypha/apply/funds/workflows/registry.py:67
 msgid "Request"
 msgstr ""
 
@@ -2483,9 +2733,9 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:85
 #: hypha/apply/funds/templates/funds/application_base.html:125
 #: hypha/apply/funds/templates/funds/applicationsubmission_form.html:49
-#: hypha/apply/funds/views/submission_edit.py:129
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:320
+#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:319
 #: hypha/apply/projects/reports/templates/reports/report_form.html:69
 #: hypha/apply/projects/templates/application_projects/project_approval_form.html:52
 #: hypha/apply/projects/templates/application_projects/project_sow_form.html:48
@@ -2495,7 +2745,7 @@ msgid "Save draft"
 msgstr ""
 
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:108
-#: hypha/apply/funds/templates/funds/comments.html:108
+#: hypha/apply/funds/templates/funds/comments.html:96
 #: hypha/apply/review/templates/review/review_form.html:107
 #: hypha/templates/cotton/dropdown_menu.html:99
 msgid "Loading…"
@@ -2545,8 +2795,8 @@ msgstr ""
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:34
 #: hypha/apply/funds/templates/funds/application_preview.html:66
 #: hypha/apply/funds/templates/funds/submission-success.html:65
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:88
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:96
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:95
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:74
 msgid "Continue editing"
 msgstr ""
 
@@ -2573,44 +2823,44 @@ msgstr ""
 msgid "Add determination"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:120
+#: hypha/apply/determinations/views.py:121
 msgid "Improperly configured request, please try again."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:213
+#: hypha/apply/determinations/views.py:214
 #, python-brace-format
 msgid "Successfully determined as {outcome}: "
 msgstr ""
 
-#: hypha/apply/determinations/views.py:234
+#: hypha/apply/determinations/views.py:235
 #, python-brace-format
 msgid "Unable to determine submission \"{title}\" as already determined"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:286
+#: hypha/apply/determinations/views.py:291
 msgid "You do not have permission to create that determination."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:291
+#: hypha/apply/determinations/views.py:296
 msgid "A final determination has already been submitted."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:304
+#: hypha/apply/determinations/views.py:309
 msgid "There is a draft determination you do not have permission to edit."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:460
+#: hypha/apply/determinations/views.py:469
 msgid "A project was automatically created."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:504
+#: hypha/apply/determinations/views.py:513
 #, python-brace-format
 msgid ""
 "A determination of \"{current}\" exists but you tried to progress as "
 "\"{target}\""
 msgstr ""
 
-#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:554
+#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:626
 #: hypha/apply/users/roles.py:6
 msgid "Staff"
 msgstr ""
@@ -2665,10 +2915,11 @@ msgstr ""
 msgid "Sealed Rounds"
 msgstr ""
 
-#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:40
-#: hypha/apply/funds/tables.py:223 hypha/apply/funds/tables.py:314
-#: hypha/apply/funds/tables.py:437 hypha/apply/funds/tables.py:474
-#: hypha/apply/projects/filters.py:35 hypha/apply/projects/filters.py:51
+#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:41
+#: hypha/apply/funds/tables.py:237 hypha/apply/funds/tables.py:325
+#: hypha/apply/funds/tables.py:372 hypha/apply/funds/tables.py:501
+#: hypha/apply/funds/tables.py:538 hypha/apply/projects/filters.py:39
+#: hypha/apply/projects/filters.py:55
 msgid "Funds"
 msgstr ""
 
@@ -2677,7 +2928,7 @@ msgid "Request For Partners"
 msgstr ""
 
 #: hypha/apply/funds/admin.py:118 hypha/apply/funds/admin_helpers.py:73
-#: hypha/apply/funds/models/__init__.py:74
+#: hypha/apply/funds/models/__init__.py:75
 msgid "Labs"
 msgstr ""
 
@@ -2728,8 +2979,8 @@ msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:47
 #: hypha/apply/funds/templates/funds/application_base.html:135
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:321
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:320
 msgid "Preview"
 msgstr ""
 
@@ -2754,7 +3005,7 @@ msgstr ""
 msgid "state"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:413
+#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:477
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:22
 #: hypha/apply/funds/templates/funds/includes/round-block.html:12
 #: hypha/apply/funds/templates/funds/includes/round-block.html:20
@@ -2763,7 +3014,7 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:414
+#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:478
 #: hypha/apply/funds/templates/funds/includes/round-block.html:30
 #: hypha/apply/funds/templates/funds/includes/round-block.html:37
 #: hypha/apply/funds/templates/funds/includes/round-block.html:39
@@ -2772,14 +3023,14 @@ msgid "Closed"
 msgstr ""
 
 #: hypha/apply/funds/admin_helpers.py:92
-#: hypha/apply/projects/models/project.py:220
-#: hypha/apply/projects/models/project.py:226
+#: hypha/apply/projects/models/project.py:221
+#: hypha/apply/projects/models/project.py:227
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Not started"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:416
+#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:480
 msgid "Unpublished"
 msgstr ""
 
@@ -2792,142 +3043,148 @@ msgstr ""
 msgid "Copy {form_name}"
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:79
+#: hypha/apply/funds/admin_views.py:68
+msgid ""
+"Please select the date in the copied page. Newly copied pages have NONE "
+"value for the start and end date"
+msgstr ""
+
+#: hypha/apply/funds/admin_views.py:77
 #, python-brace-format
 msgid "Page '{0}' and {1} subpages copied."
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:85
+#: hypha/apply/funds/admin_views.py:83
 #, python-brace-format
 msgid "Page '{0}' copied."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:94
+#: hypha/apply/funds/blocks.py:111
 #, fuzzy
 #| msgid "Approved contract"
 msgid "The title of the project"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/funds/blocks.py:96
+#: hypha/apply/funds/blocks.py:113
 msgid "What is the title of your application?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:101
+#: hypha/apply/funds/blocks.py:118
 msgid "This project name can be changed if a full proposal is requested."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:103
+#: hypha/apply/funds/blocks.py:120
 msgid "Max length"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:106
+#: hypha/apply/funds/blocks.py:123
 msgid "Application title"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:134
 #, fuzzy
 #| msgid "Approved contract"
 msgid "The value of the project"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/funds/blocks.py:126
+#: hypha/apply/funds/blocks.py:143
 msgid "Requested amount"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:142
+#: hypha/apply/funds/blocks.py:159
 msgid "The name of the organization"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:146
+#: hypha/apply/funds/blocks.py:163
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:73
 #: hypha/apply/projects/reports/tables.py:24
 msgid "Organization name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:151
+#: hypha/apply/funds/blocks.py:168
 msgid "The applicant email address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:153
+#: hypha/apply/funds/blocks.py:170
 msgid "What email address should we use to contact you?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:159
+#: hypha/apply/funds/blocks.py:176
 msgid ""
 "We will use this email address to communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:172
+#: hypha/apply/funds/blocks.py:189
 msgid "The postal address of the user"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:177
+#: hypha/apply/funds/blocks.py:194
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:66
 #: hypha/apply/funds/templates/funds/revisions_compare.html:57
 #: hypha/apply/funds/templates/funds/revisions_compare.html:58
 msgid "Address"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:198 hypha/apply/funds/blocks.py:215
+#: hypha/apply/funds/blocks.py:215 hypha/apply/funds/blocks.py:232
 msgid "Full name"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:199
+#: hypha/apply/funds/blocks.py:216
 msgid "What is your name?"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:204
+#: hypha/apply/funds/blocks.py:221
 msgid "We will use this name when we communicate with you about your proposal."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:221
+#: hypha/apply/funds/blocks.py:238
 msgid "Duration"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:227
+#: hypha/apply/funds/blocks.py:244
 msgid "Days"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:228 hypha/apply/projects/reports/models.py:244
+#: hypha/apply/funds/blocks.py:245 hypha/apply/projects/reports/models.py:249
 msgid "Weeks"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:229 hypha/apply/projects/reports/models.py:245
+#: hypha/apply/funds/blocks.py:246 hypha/apply/projects/reports/models.py:250
 msgid "Months"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:232
+#: hypha/apply/funds/blocks.py:249
 #, python-brace-format
 msgid "{} day"
 msgid_plural "{} days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:235
+#: hypha/apply/funds/blocks.py:252
 #, python-brace-format
 msgid "{} week"
 msgid_plural "{} weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:238
+#: hypha/apply/funds/blocks.py:255
 #, python-brace-format
 msgid "{} month"
 msgid_plural "{} months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: hypha/apply/funds/blocks.py:244
+#: hypha/apply/funds/blocks.py:261
 msgid ""
 "Duration type is used to display duration choices in Days, Weeks or Months "
 "in application forms. Be careful, changing the duration type in the active "
 "round can result in data inconsistency."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:275 hypha/apply/stream_forms/blocks.py:473
-#: hypha/apply/stream_forms/blocks.py:474
-#: hypha/apply/stream_forms/blocks.py:489
-#: hypha/apply/stream_forms/blocks.py:490 hypha/apply/utils/blocks.py:85
+#: hypha/apply/funds/blocks.py:319 hypha/apply/stream_forms/blocks.py:511
+#: hypha/apply/stream_forms/blocks.py:512
+#: hypha/apply/stream_forms/blocks.py:527
+#: hypha/apply/stream_forms/blocks.py:528 hypha/apply/utils/blocks.py:85
 msgid "Custom"
 msgstr ""
 
@@ -2935,7 +3192,7 @@ msgstr ""
 msgid "Take action"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:448
+#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:458
 #, python-brace-format
 msgid "Update lead from {lead} to"
 msgstr ""
@@ -2967,67 +3224,68 @@ msgstr ""
 msgid "{role_name} Reviewer"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:376
+#: hypha/apply/funds/forms.py:393
 msgid "Tags are hierarchical in nature."
 msgstr ""
 
-#: hypha/apply/funds/forms.py:425 hypha/apply/stream_forms/blocks.py:118
+#: hypha/apply/funds/forms.py:442 hypha/apply/stream_forms/blocks.py:156
 msgid "Email"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:427 hypha/apply/funds/forms.py:460
+#: hypha/apply/funds/forms.py:444 hypha/apply/funds/forms.py:477
 msgid "Role"
 msgstr ""
 
-#: hypha/apply/funds/forms.py:433 hypha/apply/funds/forms.py:466
+#: hypha/apply/funds/forms.py:450 hypha/apply/funds/forms.py:483
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project permissions"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/funds/forms.py:435 hypha/apply/funds/forms.py:468
+#: hypha/apply/funds/forms.py:452 hypha/apply/funds/forms.py:485
 msgid ""
 "Enable same access level to these sections. Example: View role + Contracting "
 "= read-only contracting access."
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:39 hypha/apply/funds/tables.py:75
+#: hypha/apply/funds/models/__init__.py:40 hypha/apply/funds/tables.py:76
 #: hypha/apply/funds/templates/submissions/all.html:410
-#: hypha/apply/projects/tables.py:185 hypha/apply/projects/tables.py:262
+#: hypha/apply/projects/tables.py:203 hypha/apply/projects/tables.py:284
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
 msgid "Fund"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:47
+#: hypha/apply/funds/models/__init__.py:48
 msgid "RFP"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:48
+#: hypha/apply/funds/models/__init__.py:49
 msgid "RFPs"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:55
+#: hypha/apply/funds/models/__init__.py:56
 #: hypha/apply/funds/templates/cotton/submission_list.html:31
 #: hypha/apply/funds/templates/submissions/all.html:414
 msgid "Round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:56 hypha/apply/funds/tables.py:225
-#: hypha/apply/funds/tables.py:312 hypha/apply/funds/tables.py:479
+#: hypha/apply/funds/models/__init__.py:57 hypha/apply/funds/tables.py:239
+#: hypha/apply/funds/tables.py:327 hypha/apply/funds/tables.py:370
+#: hypha/apply/funds/tables.py:543
 #: hypha/apply/funds/templates/funds/rounds.html:5
 #: hypha/apply/funds/templates/funds/rounds.html:10
 msgid "Rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:63
+#: hypha/apply/funds/models/__init__.py:64
 msgid "Sealed round"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:64
+#: hypha/apply/funds/models/__init__.py:65
 msgid "Sealed rounds"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:73
+#: hypha/apply/funds/models/__init__.py:74
 msgid "Lab"
 msgstr ""
 
@@ -3241,86 +3499,87 @@ msgstr "Approuvé"
 msgid "assigned reviewers"
 msgstr "Approuvé"
 
-#: hypha/apply/funds/models/co_applicants.py:14
+#: hypha/apply/funds/models/co_applicants.py:15
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Document"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/funds/models/co_applicants.py:15
+#: hypha/apply/funds/models/co_applicants.py:16
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Contracting Document"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/funds/models/co_applicants.py:17
+#: hypha/apply/funds/models/co_applicants.py:18
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:10
 #: hypha/apply/projects/reports/templates/reports/report_list.html:6
 #: hypha/core/navigation.py:114
 msgid "Reports"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:21
+#: hypha/apply/funds/models/co_applicants.py:22
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:22
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:53
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
 msgid "Pending"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:22
-#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/workflows/constants.py:93
 #: hypha/apply/funds/workflows/definitions/double_stage.py:311
 #: hypha/apply/funds/workflows/definitions/single_stage.py:134
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:197
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:182
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:123
 msgid "Accepted"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/models/co_applicants.py:24
 msgid "Rejected"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:24
+#: hypha/apply/funds/models/co_applicants.py:25
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:14
 msgid "Expired"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:33
+#: hypha/apply/funds/models/co_applicants.py:34
 msgid "invited user email"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:42
-#: hypha/apply/funds/models/submissions.py:487
-#: hypha/apply/projects/models/payment.py:137
-#: hypha/apply/projects/models/project.py:262
+#: hypha/apply/funds/models/co_applicants.py:43
+#: hypha/apply/funds/models/submissions.py:495
+#: hypha/apply/projects/models/invoice.py:160
+#: hypha/apply/projects/models/project.py:267
 msgid "status"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:48
-#: hypha/apply/funds/models/co_applicants.py:77
+#: hypha/apply/funds/models/co_applicants.py:49
+#: hypha/apply/funds/models/co_applicants.py:83
 msgid "role"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:57
+#: hypha/apply/funds/models/co_applicants.py:58
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicant invite"
 msgstr "Facture créée"
 
-#: hypha/apply/funds/models/co_applicants.py:58
+#: hypha/apply/funds/models/co_applicants.py:59
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicant invites"
 msgstr "Facture créée"
 
-#: hypha/apply/funds/models/co_applicants.py:84
+#: hypha/apply/funds/models/co_applicants.py:90
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicant"
 msgstr "Facture créée"
 
-#: hypha/apply/funds/models/co_applicants.py:85
+#: hypha/apply/funds/models/co_applicants.py:91
 #, fuzzy
 #| msgid "Invoice created"
 msgid "co-applicants"
@@ -3601,19 +3860,20 @@ msgstr ""
 msgid "screening decisions"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:439
+#: hypha/apply/funds/models/submissions.py:447
 msgid "summary"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:502
+#: hypha/apply/funds/models/submissions.py:510
+#: hypha/apply/funds/models/submissions.py:1119
 msgid "submit time"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:531
+#: hypha/apply/funds/models/submissions.py:539
 msgid "application submission"
 msgstr ""
 
-#: hypha/apply/funds/models/submissions.py:532
+#: hypha/apply/funds/models/submissions.py:540
 msgid "application submissions"
 msgstr ""
 
@@ -3659,14 +3919,17 @@ msgid "Confirmation email"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:211
+#: hypha/apply/projects/models/invoice.py:21
 msgid "Failed"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:212
+#: hypha/apply/projects/models/invoice.py:22
 msgid "Success"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:213
+#: hypha/apply/projects/models/invoice.py:23
 msgid "In Progress"
 msgstr ""
 
@@ -3678,8 +3941,8 @@ msgstr ""
 msgid "submission export managers"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:24 hypha/apply/funds/permissions.py:34
-#: hypha/apply/funds/permissions.py:208 hypha/apply/projects/permissions.py:44
+#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
+#: hypha/apply/funds/permissions.py:212 hypha/apply/projects/permissions.py:44
 #: hypha/apply/projects/permissions.py:57
 #: hypha/apply/projects/permissions.py:124
 #: hypha/apply/projects/permissions.py:179
@@ -3687,40 +3950,42 @@ msgstr ""
 #: hypha/apply/projects/permissions.py:261
 #: hypha/apply/projects/permissions.py:327
 #: hypha/apply/projects/permissions.py:346
+#: hypha/apply/projects/permissions.py:423
+#: hypha/apply/projects/permissions.py:441
 msgid "Login Required"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
-#: hypha/apply/funds/permissions.py:211
+#: hypha/apply/funds/permissions.py:30 hypha/apply/funds/permissions.py:40
+#: hypha/apply/funds/permissions.py:215
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:25
 #: hypha/apply/funds/templates/funds/includes/submission-table-row.html:26
 msgid "Archived Submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:43
+#: hypha/apply/funds/permissions.py:46
 msgid "Co-applicant with edit role can edit submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:44
+#: hypha/apply/funds/permissions.py:47
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Co-applicant does not have edit role"
 msgstr "Facture créée"
 
-#: hypha/apply/funds/permissions.py:45
+#: hypha/apply/funds/permissions.py:48
 msgid "User can edit in current phase"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:155
+#: hypha/apply/funds/permissions.py:159
 msgid "Staff is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:157
+#: hypha/apply/funds/permissions.py:161
 msgid "Staff Admin is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:158 hypha/apply/funds/permissions.py:255
-#: hypha/apply/funds/permissions.py:263 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:162 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:289 hypha/apply/funds/permissions.py:305
 #: hypha/apply/projects/permissions.py:49
 #: hypha/apply/projects/permissions.py:77
 #: hypha/apply/projects/permissions.py:85
@@ -3741,175 +4006,181 @@ msgstr ""
 msgid "Forbidden Error"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:231
+#: hypha/apply/funds/permissions.py:259
 msgid "No access to view submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:233
+#: hypha/apply/funds/permissions.py:261
 msgid "Applicant cannot view submission screening"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:239
+#: hypha/apply/funds/permissions.py:267
 msgid "Co-applicant can't be added to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:245
+#: hypha/apply/funds/permissions.py:271
 msgid "Co-applicants can't be invited to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:250
+#: hypha/apply/funds/permissions.py:276
 msgid "Limit reached for this submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:252
+#: hypha/apply/funds/permissions.py:278
 msgid "Applicants can invite co-applicants to their application"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:254
+#: hypha/apply/funds/permissions.py:280
 msgid "Staff can invite co-applicant on behalf of applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:260
+#: hypha/apply/funds/permissions.py:286
 msgid "Submission user can access their submission's co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:262
+#: hypha/apply/funds/permissions.py:288
 msgid "Staff can access each submissions' co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:268
+#: hypha/apply/funds/permissions.py:294
 msgid "Co-applicant can't be updated to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:274
+#: hypha/apply/funds/permissions.py:298
 msgid "Co-applicants can't be updated to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:276
+#: hypha/apply/funds/permissions.py:300
 msgid "Same user who invited can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:278
+#: hypha/apply/funds/permissions.py:302
 msgid "Submission owner can delete the co-applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:280
+#: hypha/apply/funds/permissions.py:304
 msgid "Staff can delete any co-applicant of any submission"
 msgstr ""
 
-#: hypha/apply/funds/services.py:45
+#: hypha/apply/funds/services.py:47
 #, python-brace-format
 msgid "{count} submissions archived."
 msgstr ""
 
-#: hypha/apply/funds/services.py:78
+#: hypha/apply/funds/services.py:80
 #, python-brace-format
 msgid "{count} submissions deleted."
 msgstr ""
 
-#: hypha/apply/funds/services.py:108
+#: hypha/apply/funds/services.py:150
+#, python-brace-format
+msgid "{sub_number} submission anonymized"
+msgid_plural "{sub_number} submissions anonymized"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/funds/services.py:175
 #, python-brace-format
 msgid "Lead set to {lead} on "
 msgstr ""
 
-#: hypha/apply/funds/services.py:158
+#: hypha/apply/funds/services.py:225
 #, fuzzy, python-brace-format
 #| msgid "{user} as {name}."
 msgid "{user} as {name}"
 msgstr "{user} en tant que {name}."
 
-#: hypha/apply/funds/services.py:166
+#: hypha/apply/funds/services.py:233
 #, python-brace-format
 msgid "Batch reviewers updated: {reviewers_text} on "
 msgstr ""
 
-#: hypha/apply/funds/tables.py:70
+#: hypha/apply/funds/tables.py:71
 #: hypha/apply/funds/templates/cotton/submission_list.html:22
 #: hypha/apply/funds/templates/submissions/all.html:344
 #: hypha/apply/funds/templates/submissions/all.html:470
-#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
-#: hypha/apply/projects/forms/payment.py:208
+#: hypha/apply/projects/filters.py:43 hypha/apply/projects/filters.py:64
+#: hypha/apply/projects/forms/invoice.py:210
 #: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:183
-#: hypha/apply/projects/tables.py:260
+#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:200
+#: hypha/apply/projects/tables.py:282
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:58
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:6
 #: hypha/apply/users/admin_views.py:55 hypha/apply/users/admin_views.py:128
 msgid "Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:74
+#: hypha/apply/funds/tables.py:75
 msgid "Type"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:78
+#: hypha/apply/funds/tables.py:79
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "Last updated"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:100
+#: hypha/apply/funds/tables.py:101
 msgid "No submissions available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:210
+#: hypha/apply/funds/tables.py:224
 msgid "Statuses"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:226 hypha/apply/funds/tables.py:438
+#: hypha/apply/funds/tables.py:240 hypha/apply/funds/tables.py:502
 msgid "Leads"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 #: hypha/apply/funds/templates/submissions/all.html:382
 msgid "Screening"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 msgid "No Status"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:345
+#: hypha/apply/funds/tables.py:403
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:46
 msgid "Determined"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:346
+#: hypha/apply/funds/tables.py:404
 msgid "Start"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:347
+#: hypha/apply/funds/tables.py:405
 msgid "End"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/funds/tables.py:439
+#: hypha/apply/funds/tables.py:456 hypha/apply/funds/tables.py:503
 #: hypha/apply/users/admin_views.py:125
 msgid "Active"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/users/admin_views.py:125
+#: hypha/apply/funds/tables.py:456 hypha/apply/users/admin_views.py:125
 msgid "Inactive"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:415
+#: hypha/apply/funds/tables.py:479
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Not Started"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/funds/tables.py:440
+#: hypha/apply/funds/tables.py:504
 msgid "State"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:516 hypha/apply/funds/tables.py:547
+#: hypha/apply/funds/tables.py:580 hypha/apply/funds/tables.py:619
 msgid "No reviews available"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:525
+#: hypha/apply/funds/tables.py:597
 msgid "Submission"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:564
+#: hypha/apply/funds/tables.py:636
 msgid "No staff available"
 msgstr ""
 
@@ -3918,13 +4189,13 @@ msgid "Organization"
 msgstr ""
 
 #: hypha/apply/funds/templates/cotton/submission_list.html:35
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:87
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
 #: hypha/apply/funds/templates/funds/submission_sealed.html:14
 #: hypha/apply/funds/templates/submissions/all.html:431
 #: hypha/apply/funds/templates/submissions/all.html:474
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:10
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:14
-#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
+#: hypha/apply/projects/filters.py:45 hypha/apply/projects/filters.py:58
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:46
 #: hypha/apply/projects/templates/application_projects/project_sow_detail.html:10
 msgid "Lead"
@@ -3997,7 +4268,7 @@ msgid "(selected)"
 msgstr "Facture créée"
 
 #: hypha/apply/funds/templates/funds/application_base.html:105
-#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:127
 msgid "Preview and submit"
 msgstr ""
 
@@ -4055,7 +4326,6 @@ msgid "Reviews & assignees"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html:50
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:66
 msgid "View all"
 msgstr ""
 
@@ -4069,6 +4339,17 @@ msgstr ""
 msgid "Create new reminder"
 msgstr "Créé"
 
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:3
+msgid "Anonymize application"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:5
+msgid ""
+"Are you sure you want to anonymize this application? Personal data will be "
+"removed and the application will only be accessible via statistics in the "
+"Results view. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:3
 msgid "Delete application"
 msgstr ""
@@ -4080,80 +4361,71 @@ msgid ""
 "action cannot be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:22
-#: hypha/apply/funds/templates/funds/comments.html:18
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:18
+#: hypha/apply/funds/templates/funds/comments.html:14
 #: hypha/apply/projects/templates/application_projects/paf_export.html:76
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:107
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:109
 #: hypha/apply/projects/templates/application_projects/project_detail.html:17
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:15
 msgid "Application"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:32
-#: hypha/apply/funds/templates/funds/comments.html:28
-#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
-#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
-#: hypha/apply/projects/templates/application_projects/project_detail.html:24
-msgid "Project"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:50
-#: hypha/apply/funds/templates/funds/comments.html:46
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:38
+#: hypha/apply/funds/templates/funds/comments.html:34
 msgid "View message log"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:61
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:49
 msgid "Congratulations!"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:63
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:51
 #, python-format
 msgid "Your %(stage)s application has been accepted."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:68
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:56
 #, python-format
 msgid "Start your %(stage)s application."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:77
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:65
 msgid "This application has been archived. This is visible to accounts with "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:85
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:73
 msgid "This application is sealed."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 msgid "Drafted "
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:22
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Submitted "
 msgstr "Signalement envoyé"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:100
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:88
 #: hypha/apply/funds/templates/submissions/all.html:336
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:34
 msgid "Updated"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:129
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:117
 msgid "Delete Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:195
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:183
 msgid "Related submissions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:203
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:214
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:191
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:202
 msgid "View linked"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:223
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:211
 msgid "Other Submissions"
 msgstr ""
 
@@ -4212,6 +4484,10 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:154
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:204
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:94
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:140
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:171
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:189
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:127
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:160
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:177
@@ -4235,97 +4511,110 @@ msgstr ""
 msgid "Comments: %(title)s"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/comments.html:57
+#: hypha/apply/funds/templates/funds/comments.html:45
 msgid "Add communication"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/comments.html:80
-#: hypha/apply/funds/templates/funds/comments.html:94
-msgid "Add Comment"
-msgstr ""
-
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:4
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:5
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:6
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:88
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:66
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:4
 #: hypha/apply/projects/templates/application_projects/project_admin_detail.html:10
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:128
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:35
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:131
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:41
 msgid "Actions to take"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:15
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:16
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:12
 msgid "Unarchive Submission"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:26
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:28
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Add another project"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:30
 #: hypha/apply/funds/templates/funds/modals/create_project_form.html:2
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Create project"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:32
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
 msgid "Complete draft determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:42
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:9
 msgid "Complete draft review"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:45
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:50
 msgid "Assign reviewers"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:60
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:19
 msgid "View determination"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:68
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
 #: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:34
-#: hypha/apply/projects/views/payment.py:138
+#: hypha/apply/projects/views/invoice.py:147
 msgid "Update status"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:78
 msgid "Assign"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:97
 msgid "More actions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:101
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:106
 #: hypha/apply/funds/templates/funds/revisions_compare.html:88
 msgid "Revisions"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:111
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:116
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:69
 msgid "Translate"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:130
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:135
 #: hypha/apply/funds/views/reminders.py:69
 msgid "Create Reminder"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:138
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:178
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:53
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:140
+#, fuzzy
+#| msgid "Approved"
+msgid "Change Author"
+msgstr "Approuvé"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:181
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:59
 msgid "Download as PDF"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:158
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:30
-#: hypha/apply/funds/templates/submissions/all.html:490
+#: hypha/apply/funds/templates/submissions/all.html:491
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:32
 msgid "Archive"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:172
+#: hypha/apply/funds/templates/submissions/all.html:515
+msgid "Anonymize"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:8
 msgid "Co-applicants"
 msgstr ""
@@ -4341,8 +4630,8 @@ msgid "Not allowed"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:25
-#: hypha/apply/funds/views/co_applicants.py:58
-#: hypha/apply/funds/views/co_applicants.py:102
+#: hypha/apply/funds/views/co_applicants.py:57
+#: hypha/apply/funds/views/co_applicants.py:101
 msgid "Invite"
 msgstr ""
 
@@ -4368,7 +4657,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:16
 msgid ""
 "Are you sure you want to archive submission? Archived submissions will be "
-"hidden from the main list of submissions and can not be edited."
+"hidden from the main list of submissions and can not be edited. Submissions "
+"can be unarchived at any time."
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:16
@@ -4386,6 +4676,22 @@ msgstr ""
 msgid "You have no %(type)s rounds or labs assigned to you."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:18
+#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
+#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
+msgid "Project"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:30
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:18
+#, fuzzy, python-format
+#| msgid "Approved contract"
+msgctxt "project tab"
+msgid "Project"
+msgid_plural "Projects (%(counter)s)"
+msgstr[0] "Contrat approuvé"
+msgstr[1] "Contrat approuvé"
+
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:34
 msgid "No reminders yet."
 msgstr ""
@@ -4422,6 +4728,10 @@ msgstr ""
 msgid "Legal Name"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:54
+msgid "Edit user account"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:61
 #: hypha/apply/funds/templates/funds/revisions_compare.html:52
 #: hypha/apply/funds/templates/funds/revisions_compare.html:53
@@ -4452,7 +4762,7 @@ msgid ""
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:69
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:49
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:55
 msgid "Export"
 msgstr ""
 
@@ -4532,7 +4842,7 @@ msgid "selected"
 msgstr "Facture créée"
 
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:43
-#: hypha/templates/base.html:159
+#: hypha/templates/base.html:160
 msgid "Search..."
 msgstr ""
 
@@ -4540,17 +4850,17 @@ msgstr ""
 msgid "Search input"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:60
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:73
 #: hypha/apply/funds/templates/submissions/all.html:202
 msgid "Clear current filters & sorts"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:108
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:121
 #: hypha/templates/cotton/pagination.html:12
 msgid "Previous"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:109
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:122
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:6
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:10
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:47
@@ -4563,9 +4873,8 @@ msgid "Translate application"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:38
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:10
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:26
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 #: hypha/apply/projects/templates/application_projects/filters/widgets/date_range_input_widget.html:5
 msgid "to"
@@ -4586,22 +4895,25 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:20
 #: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:51
-#: hypha/apply/funds/views/submission_edit.py:535
-#: hypha/apply/funds/views/submission_edit.py:566
-#: hypha/apply/funds/views/submission_edit.py:595
-#: hypha/apply/funds/views/submission_edit.py:639
-#: hypha/apply/funds/views/submission_edit.py:669
-#: hypha/apply/funds/views/submission_edit.py:695
-#: hypha/apply/funds/views/translate.py:60
-#: hypha/apply/funds/views/translate.py:95
+#: hypha/apply/funds/views/submission_edit.py:536
+#: hypha/apply/funds/views/submission_edit.py:567
+#: hypha/apply/funds/views/submission_edit.py:596
+#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:670
+#: hypha/apply/funds/views/submission_edit.py:696
+#: hypha/apply/funds/views/submission_edit.py:726
+#: hypha/apply/funds/views/submission_edit.py:752
+#: hypha/apply/funds/views/translate.py:58
+#: hypha/apply/funds/views/translate.py:93
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:28
-#: hypha/apply/projects/views/payment.py:354
-#: hypha/apply/projects/views/project.py:423
-#: hypha/apply/projects/views/project.py:462
-#: hypha/apply/projects/views/project.py:506
-#: hypha/apply/projects/views/project.py:542
-#: hypha/apply/projects/views/project.py:1289
-#: hypha/apply/projects/views/project.py:1328
+#: hypha/apply/projects/views/invoice.py:359
+#: hypha/apply/projects/views/project.py:427
+#: hypha/apply/projects/views/project.py:466
+#: hypha/apply/projects/views/project.py:510
+#: hypha/apply/projects/views/project.py:546
+#: hypha/apply/projects/views/project.py:588
+#: hypha/apply/projects/views/project.py:1340
+#: hypha/apply/projects/views/project.py:1379
 msgid "Update"
 msgstr ""
 
@@ -4677,10 +4989,10 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:15
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:20
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:25
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:46
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:137
-#: hypha/apply/projects/views/project.py:1043
-#: hypha/apply/projects/views/project.py:1260
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:47
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
+#: hypha/apply/projects/views/project.py:1094
+#: hypha/apply/projects/views/project.py:1311
 msgid "Update Status"
 msgstr ""
 
@@ -4690,6 +5002,16 @@ msgstr ""
 msgid "Current status"
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:2
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Update Author"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:6
+msgid "Current Author"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/modals/update_lead_form.html:2
 #: hypha/apply/projects/templates/application_projects/modals/lead_update.html:2
 msgid "Update Lead"
@@ -4703,6 +5025,7 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html:2
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:12
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:13
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:2
 msgid "Update tags"
 msgstr ""
 
@@ -4756,7 +5079,7 @@ msgid "Reviews by %(object)s"
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:3
-#: hypha/apply/review/views.py:473
+#: hypha/apply/review/views.py:482
 msgid "Compare"
 msgstr ""
 
@@ -4845,11 +5168,11 @@ msgstr ""
 
 #: hypha/apply/funds/templates/funds/submission-success.html:77
 #: hypha/apply/users/templates/users/activation/confirm.html:43
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
 #: hypha/apply/users/templates/users/login.html:4
 #: hypha/apply/users/templates/users/login.html:86
 #: hypha/apply/users/templates/users/password_reset/complete.html:14
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:5
-#: hypha/templates/includes/user_menu.html:101
 msgid "Log in"
 msgstr ""
 
@@ -4908,6 +5231,13 @@ msgid ""
 "amount fields or data and are not included."
 msgstr ""
 
+#: hypha/apply/funds/templates/funds/submissions_result.html:53
+#, python-format
+msgid ""
+"%(count)s anonymized submission(s) are excluded because the active filter "
+"does not apply to anonymized data."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/tables/table.html:24
 #: hypha/apply/projects/templates/application_projects/tables/table.html:18
 msgid "Show"
@@ -5089,30 +5419,60 @@ msgstr "Approuvé"
 msgid "Assign Reviewer(s)"
 msgstr "Approuvé"
 
-#: hypha/apply/funds/templates/submissions/all.html:486
-msgid "Are you sure you want to archive the selected submissions?"
+#: hypha/apply/funds/templates/submissions/all.html:538
+msgid "No results matched your search"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "Try"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "clearing"
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/all.html:539
+msgid "the current query and try again"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:498
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:4
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Anonymize applications"
+msgstr "Facture créée"
+
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:9
+#, python-format
 msgid ""
-"Are you sure you want to delete the selected submissions? This action cannot "
+"Are you sure you want to anonymize %(count)s submission(s)? Personal data "
+"will be removed and applications will only be accessible via statistics in "
+"the Results view. All draft submissions will be deleted. This action cannot "
 "be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:524
-msgid "No results matched your search"
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:11
+msgid "Archive submissions"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "Try"
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:14
+#, python-format
+msgid ""
+"Are you sure you want to archive %(count)s submission(s)? Archived "
+"submissions will be hidden from the main list and cannot be edited. "
+"Submissions can be unarchived at any time."
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "clearing"
-msgstr ""
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:4
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Delete applications"
+msgstr "Facture créée"
 
-#: hypha/apply/funds/templates/submissions/all.html:525
-msgid "the current query and try again"
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:8
+#, python-format
+msgid ""
+"Are you sure you want to permanently delete %(count)s submission(s)? All "
+"data will be permanently removed. This action cannot be undone."
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:9
@@ -5120,6 +5480,7 @@ msgid "Submissions: Export as CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:11
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:11
 msgid "Export as CSV"
 msgstr ""
 
@@ -5136,6 +5497,8 @@ msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:23
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:24
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:23
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:24
 msgid "Generating downloadable CSV..."
 msgstr ""
 
@@ -5144,6 +5507,7 @@ msgid "Submissions: Download generated CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:42
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:42
 msgid "Download generated CSV"
 msgstr ""
 
@@ -5152,10 +5516,12 @@ msgid "Submissions: Generate downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:64
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:64
 msgid "Generation failed, click to retry generating downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:66
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:66
 msgid "Generate downloadable CSV"
 msgstr ""
 
@@ -5164,6 +5530,7 @@ msgid "Add tags"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:38
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 #, fuzzy
@@ -5321,12 +5688,12 @@ msgstr ""
 msgid "Filter by {label}"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:123
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
 msgid "Application #"
 msgstr ""
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
-#: hypha/apply/stream_forms/blocks.py:119
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:125
+#: hypha/apply/stream_forms/blocks.py:157
 msgid "URL"
 msgstr ""
 
@@ -5339,86 +5706,88 @@ msgstr ""
 msgid "No screening"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:251
+#: hypha/apply/funds/views/all.py:244
 msgid "Newest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:252
+#: hypha/apply/funds/views/all.py:245
 msgid "Oldest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:253
+#: hypha/apply/funds/views/all.py:246
 msgid "Most Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:254
+#: hypha/apply/funds/views/all.py:247
 msgid "Least Commented"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:255
+#: hypha/apply/funds/views/all.py:248
 msgid "Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:256
+#: hypha/apply/funds/views/all.py:249
 msgid "Least Recently Updated"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:257
+#: hypha/apply/funds/views/all.py:250
 msgid "Best Match"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:304
+#: hypha/apply/funds/views/all.py:297 hypha/apply/projects/views/invoice.py:671
 msgid "Started CSV generation."
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:405
+#: hypha/apply/funds/views/all.py:469
 #, python-brace-format
 msgid ""
 "A determination already exists for the following submissions and they have "
 "been excluded: {submissions}"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:418
+#: hypha/apply/funds/views/all.py:482
 msgid "Submissions expect different forms - please contact admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:431
+#: hypha/apply/funds/views/all.py:495
 msgid "Inconsistent states provided - please talk to an admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:458
+#: hypha/apply/funds/views/all.py:522
 msgid "Failed to update: "
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:463
+#: hypha/apply/funds/views/all.py:527
 #, python-brace-format
 msgid "Successfully updated status to {status}: "
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:94
+#: hypha/apply/funds/views/co_applicants.py:93
 msgid "Co-applicant invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:234
+#: hypha/apply/funds/views/co_applicants.py:229
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:18
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:74
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:14
 #: hypha/apply/projects/templates/application_projects/project_form.html:29
-#: hypha/apply/projects/views/payment.py:285
-#: hypha/apply/projects/views/project.py:2040
+#: hypha/apply/projects/views/invoice.py:290
+#: hypha/apply/projects/views/project.py:2131
 #: hypha/apply/users/templates/users/account.html:54
 msgid "Save"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:254
+#: hypha/apply/funds/views/co_applicants.py:249
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Co-applicant updated"
 msgstr "Facture créée"
 
-#: hypha/apply/funds/views/co_applicants.py:282
+#: hypha/apply/funds/views/co_applicants.py:277
 msgid "Co-applicant re-invited"
 msgstr ""
 
-#: hypha/apply/funds/views/co_applicants.py:304
+#: hypha/apply/funds/views/co_applicants.py:299
 msgid "Co-applicant deleted"
 msgstr ""
 
@@ -5434,38 +5803,49 @@ msgstr ""
 msgid "Reminder deleted"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_detail.py:311
+#: hypha/apply/funds/views/submission_delete.py:47
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "Submission anonymized."
+msgstr "Signalement envoyé"
+
+#: hypha/apply/funds/views/submission_detail.py:301
 msgid "Submission details"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:97
-#: hypha/apply/funds/views/submission_edit.py:276
+#: hypha/apply/funds/views/submission_edit.py:96
+#: hypha/apply/funds/views/submission_edit.py:275
 msgid "Draft saved"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:366
-#: hypha/apply/funds/views/submission_edit.py:392
+#: hypha/apply/funds/views/submission_edit.py:365
+#: hypha/apply/funds/views/submission_edit.py:391
 #: hypha/apply/funds/workflows/definitions/double_stage.py:133
 msgid "Progress"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:419
-#: hypha/apply/funds/views/submission_edit.py:461
-#: hypha/apply/projects/views/project.py:605
-#: hypha/apply/projects/views/project.py:664
+#: hypha/apply/funds/views/submission_edit.py:410
+msgid "This submission already has a project."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_edit.py:421
+#: hypha/apply/funds/views/submission_edit.py:463
+#: hypha/apply/projects/views/project.py:651
+#: hypha/apply/projects/views/project.py:710
 #: hypha/apply/review/templates/review/review_confirm_delete.html:23
 #: hypha/apply/users/templates/elevate/elevate.html:39
 #: hypha/apply/users/templates/two_factor/admin/disable.html:24
 #: hypha/apply/users/templates/two_factor/profile/disable.html:39
 #: hypha/apply/users/templates/users/partials/confirmation_code_sent.html:43
+#: hypha/templates/cotton/modal/confirm.html:43
 msgid "Confirm"
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:558
+#: hypha/apply/funds/views/submission_edit.py:559
 msgid "Submission Lead updated."
 msgstr ""
 
-#: hypha/apply/funds/views/submission_edit.py:687
+#: hypha/apply/funds/views/submission_edit.py:744
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Tags updated successfully."
@@ -5475,56 +5855,86 @@ msgstr "Partenaires mis à jour."
 msgid "User attempted to translate submission but is not org faculty"
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:154
+#: hypha/apply/funds/views/translate.py:152
 #, python-brace-format
 msgid "Submission translated from {fl} to {tl}."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:167
+#: hypha/apply/funds/views/translate.py:165
 msgid "Submission translation failed. Contact your Administrator."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:174
+#: hypha/apply/funds/views/translate.py:172
 msgid "Translation cleared."
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:59
+#: hypha/apply/funds/workflows/constants.py:63
 msgid "Received"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:63
+#: hypha/apply/funds/workflows/constants.py:67
 #: hypha/apply/funds/workflows/definitions/double_stage.py:74
 #: hypha/apply/funds/workflows/definitions/double_stage.py:211
 #: hypha/apply/funds/workflows/definitions/single_stage.py:74
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:83
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:129
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:69
 msgid "Internal Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:67
+#: hypha/apply/funds/workflows/constants.py:71
+#: hypha/apply/funds/workflows/definitions/double_stage.py:91
+#: hypha/apply/funds/workflows/definitions/double_stage.py:228
+#: hypha/apply/funds/workflows/definitions/double_stage.py:273
+#: hypha/apply/funds/workflows/definitions/single_stage.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:98
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
 msgid "Ready for Discussion"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:73
+#: hypha/apply/funds/workflows/constants.py:77
 msgid "More Information Requested"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:77
+#: hypha/apply/funds/workflows/constants.py:81
 #: hypha/apply/funds/workflows/definitions/double_stage.py:165
 msgid "Invited for Proposal"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:81
+#: hypha/apply/funds/workflows/constants.py:85
 #: hypha/apply/funds/workflows/definitions/double_stage.py:258
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:115
 msgid "External Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:85
+#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/workflows/definitions/single_stage.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage.py:58
+#: hypha/apply/funds/workflows/definitions/single_stage.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage.py:109
 #: hypha/apply/funds/workflows/definitions/single_stage.py:127
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:190
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:66
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:138
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:163
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:116
 msgid "Ready for Determination"
 msgstr ""
@@ -5539,6 +5949,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:35
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:107
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:150
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:33
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:90
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:137
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:34
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:80
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:123
@@ -5559,7 +5972,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:36
 #: hypha/apply/funds/workflows/definitions/double_stage.py:60
 #: hypha/apply/funds/workflows/definitions/double_stage.py:86
-msgid "Ready For Preliminary Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:122
+msgid "Ready for Preliminary Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:37
@@ -5593,6 +6007,12 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:155
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:188
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:67
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:96
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:173
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:190
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:37
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:84
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:128
@@ -5606,6 +6026,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:42
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:38
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:39
 msgid "Need screening"
@@ -5625,6 +6046,9 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:61
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:131
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:57
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:116
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:162
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:58
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:104
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:148
@@ -5640,6 +6064,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:79
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:92
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:139
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:78
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:66
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:112
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:66
@@ -5650,6 +6076,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage.py:72
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:80
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:68
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:67
 msgid "Need screening (revert)"
@@ -5672,18 +6099,6 @@ msgstr ""
 msgid "Open Review (revert)"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:91
-#: hypha/apply/funds/workflows/definitions/double_stage.py:228
-#: hypha/apply/funds/workflows/definitions/double_stage.py:273
-#: hypha/apply/funds/workflows/definitions/single_stage.py:92
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
-msgid "Ready For Discussion"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:118
 #: hypha/apply/funds/workflows/definitions/double_stage.py:256
 #: hypha/apply/funds/workflows/definitions/double_stage.py:299
@@ -5693,16 +6108,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:140
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:184
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:206
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:126
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:113
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:157
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:179
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:131
-msgid "Ready For Discussion (revert)"
-msgstr ""
-
-#: hypha/apply/funds/workflows/definitions/double_stage.py:122
-msgid "Ready for Preliminary Determination"
+msgid "Ready for Discussion (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:129
@@ -5719,6 +6132,7 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:223
 #: hypha/apply/funds/workflows/definitions/double_stage.py:245
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:108
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:65
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:81
 msgid "Open External Review"
 msgstr ""
@@ -5728,7 +6142,8 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:197
 #: hypha/apply/funds/workflows/definitions/double_stage.py:224
 #: hypha/apply/funds/workflows/definitions/double_stage.py:267
-msgid "Ready For Final Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:304
+msgid "Ready for Final Determination"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:179
@@ -5742,12 +6157,14 @@ msgstr ""
 #: hypha/apply/funds/workflows/definitions/double_stage.py:225
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:110
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:139
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:83
 msgid "Open Internal Review (revert)"
 msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:268
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:152
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:125
 msgid "Open External Review (revert)"
 msgstr ""
@@ -5767,10 +6184,6 @@ msgstr ""
 msgid "Accept but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:304
-msgid "Ready for Final Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:312
 msgid "Final Determination"
 msgstr ""
@@ -5783,23 +6196,9 @@ msgstr ""
 msgid "Accepted but additional info required"
 msgstr ""
 
-#: hypha/apply/funds/workflows/definitions/single_stage.py:35
-#: hypha/apply/funds/workflows/definitions/single_stage.py:58
-#: hypha/apply/funds/workflows/definitions/single_stage.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
-msgid "Ready For Determination"
-msgstr ""
-
 #: hypha/apply/funds/workflows/definitions/single_stage.py:41
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:43
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:40
 msgid "Application Received"
@@ -5807,6 +6206,7 @@ msgstr ""
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:135
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:198
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:183
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:171
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:124
 msgid "Application Outcome"
@@ -5821,24 +6221,67 @@ msgstr ""
 msgid "Community Review"
 msgstr ""
 
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:34
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:70
+msgid "Ready for Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:79
+msgid "Ready for Review (revert)"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:82
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Application Review"
+msgstr "Facture créée"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:91
+msgid "Open Internal Review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:95
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:141
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:172
+msgid "Waitlist"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:191
+msgid "Ready for Determination (revert)"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:193
+msgid "Waitlisted"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:199
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Not Accepted"
+msgstr "Contrat approuvé"
+
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:69
 #: hypha/apply/review/templates/review/review_detail.html:10
 msgid "Review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:69
+#: hypha/apply/funds/workflows/registry.py:70
 msgid "Request with same time review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:75
+#: hypha/apply/funds/workflows/registry.py:76
 msgid "Request with external review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:81
+#: hypha/apply/funds/workflows/registry.py:82
 msgid "Request with community review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:87
+#: hypha/apply/funds/workflows/registry.py:88
+msgid "Request external then internal review"
+msgstr ""
+
+#: hypha/apply/funds/workflows/registry.py:94
 msgid "Concept & Proposal"
 msgstr ""
 
@@ -5848,22 +6291,29 @@ msgid ""
 "usages and try again!"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:45
+#: hypha/apply/projects/admin.py:46
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Forms"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/admin.py:62
+#: hypha/apply/projects/admin.py:63
 msgid "SOW Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:79
+#: hypha/apply/projects/admin.py:80
 msgid "Report Forms"
 msgstr ""
 
-#: hypha/apply/projects/admin.py:99
+#: hypha/apply/projects/admin.py:101
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Invoice Tags"
+msgstr "Facture créée"
+
+#: hypha/apply/projects/admin.py:107
 #: hypha/apply/projects/templates/application_projects/project_list.html:6
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:4
 #: hypha/core/navigation.py:98 hypha/core/navigation.py:133
 msgid "Projects"
 msgstr ""
@@ -5881,17 +6331,17 @@ msgid "Vendor pending"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:22
-#: hypha/apply/projects/models/payment.py:34 hypha/apply/projects/utils.py:91
+#: hypha/apply/projects/models/invoice.py:45 hypha/apply/projects/utils.py:94
 msgid "Declined"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:23
-#: hypha/apply/projects/models/payment.py:32 hypha/apply/projects/utils.py:93
+#: hypha/apply/projects/models/invoice.py:43 hypha/apply/projects/utils.py:96
 msgid "Paid"
 msgstr ""
 
 #: hypha/apply/projects/constants.py:24
-#: hypha/apply/projects/models/payment.py:33 hypha/apply/projects/utils.py:95
+#: hypha/apply/projects/models/invoice.py:44 hypha/apply/projects/utils.py:98
 msgid "Payment failed"
 msgstr ""
 
@@ -5904,7 +6354,7 @@ msgstr ""
 msgid "Request for change"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:224
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Up to date"
@@ -5914,39 +6364,44 @@ msgstr "Contrat approuvé"
 msgid "Behind schedule"
 msgstr ""
 
-#: hypha/apply/projects/filters.py:66
+#: hypha/apply/projects/filters.py:61 hypha/apply/projects/tables.py:202
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
+msgid "Contractor"
+msgstr ""
+
+#: hypha/apply/projects/filters.py:73
 #: hypha/apply/projects/reports/templates/reports/reporting.html:6
 #: hypha/apply/projects/reports/templates/reports/reporting.html:11
-#: hypha/apply/projects/tables.py:186
+#: hypha/apply/projects/tables.py:205
 msgid "Reporting"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:108
+#: hypha/apply/projects/forms/invoice.py:110
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice file"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/forms/payment.py:110
+#: hypha/apply/projects/forms/invoice.py:112
 msgid "The invoice must be a PDF."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:115
+#: hypha/apply/projects/forms/invoice.py:117
 msgid ""
 "Files that are related to the invoice. They could be xls, microsoft office "
 "documents, open office documents, pdfs, txt files."
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:142
+#: hypha/apply/projects/forms/invoice.py:144
 msgid "Invoice File"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:408
+#: hypha/apply/projects/forms/invoice.py:179
+#: hypha/apply/projects/forms/project.py:418
 msgid "Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/payment.py:200
+#: hypha/apply/projects/forms/invoice.py:202
 msgid "File not found on submission"
 msgstr ""
 
@@ -5963,124 +6418,152 @@ msgid "You can only approve a signed contract"
 msgstr ""
 
 #: hypha/apply/projects/forms/project.py:93
+#: hypha/apply/projects/templates/application_projects/paf_export.html:6
+#: hypha/apply/projects/templates/application_projects/sow_export.html:6
+msgid "Project title"
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:95
+msgid ""
+"A submission can have several projects. Give this one a name so it can be "
+"told apart from the others."
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:101
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Select project lead"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/forms/project.py:98
+#: hypha/apply/projects/forms/project.py:106
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Initial project status"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/forms/project.py:104
+#: hypha/apply/projects/forms/project.py:112
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project end date"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/forms/project.py:123
+#: hypha/apply/projects/forms/project.py:132
 msgid "Project lead is a required field"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:222
+#: hypha/apply/projects/forms/project.py:232
 msgid "Project form status"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:307
+#: hypha/apply/projects/forms/project.py:317
 msgid "A Project can only be sent for Approval when Drafted."
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:385
-#: hypha/apply/projects/forms/project.py:400
+#: hypha/apply/projects/forms/project.py:395
+#: hypha/apply/projects/forms/project.py:410
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:78
 msgid "Contract"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:397
 msgid "Signed and approved"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:424
+#: hypha/apply/projects/forms/project.py:434
 msgid "Contract Document"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:482
+#: hypha/apply/projects/forms/project.py:492
 msgid "The end date must be after the start date."
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:27
+#: hypha/apply/projects/models/invoice.py:38
 msgid "Resubmitted"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:28
+#: hypha/apply/projects/models/invoice.py:39
 msgid "Changes requested by staff"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:29
+#: hypha/apply/projects/models/invoice.py:40
 msgid "Changes requested by finance"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:30
+#: hypha/apply/projects/models/invoice.py:41
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approved by staff"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/payment.py:31
+#: hypha/apply/projects/models/invoice.py:42
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approved by finance"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/payment.py:109
-msgid "paid value"
-msgstr ""
+#: hypha/apply/projects/models/invoice.py:82
+#, fuzzy
+#| msgid "Invoice created"
+msgid "invoice tag"
+msgstr "Facture créée"
 
-#: hypha/apply/projects/models/payment.py:116
-#: hypha/apply/projects/models/payment.py:289
-#: hypha/apply/projects/models/project.py:763
-#: hypha/apply/projects/models/project.py:795
+#: hypha/apply/projects/models/invoice.py:83
 #, fuzzy
-#| msgid "Submitted a report"
+#| msgid "Invoice created"
+msgid "invoice tags"
+msgstr "Facture créée"
+
+#: hypha/apply/projects/models/invoice.py:132
+msgid "paid value"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:139
+#: hypha/apply/projects/models/invoice.py:319
+#: hypha/apply/projects/models/project.py:792
+#: hypha/apply/projects/models/project.py:824
+#, fuzzy
+#| msgid "Submitted a report"
 msgid "document"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/projects/models/payment.py:120
-#: hypha/apply/projects/models/payment.py:123
+#: hypha/apply/projects/models/invoice.py:143
+#: hypha/apply/projects/models/invoice.py:146
 msgid "comment"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:121
+#: hypha/apply/projects/models/invoice.py:144
 msgid "This will be displayed as a comment in the comments tab"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:125
+#: hypha/apply/projects/models/invoice.py:148
 #, fuzzy
 #| msgid "Invoice created"
 msgid "invoice number"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/models/payment.py:132
+#: hypha/apply/projects/models/invoice.py:155
 #, fuzzy
 #| msgid "Invoice created"
 msgid "invoice amount"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/models/payment.py:134
+#: hypha/apply/projects/models/invoice.py:157
 #, fuzzy
 #| msgid "Invoice created"
 msgid "invoice date"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/models/payment.py:135
+#: hypha/apply/projects/models/invoice.py:158
 #, fuzzy
 #| msgid "Invoice created"
 msgid "paid date"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/models/payment.py:146
+#: hypha/apply/projects/models/invoice.py:168
+msgid "tags"
+msgstr ""
+
+#: hypha/apply/projects/models/invoice.py:175
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 #, fuzzy
@@ -6088,28 +6571,47 @@ msgstr "Facture créée"
 msgid "invoice"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/models/payment.py:147
+#: hypha/apply/projects/models/invoice.py:176
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:20
 msgid "invoices"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:150
-#, python-brace-format
-msgid "Invoice requested for {project}"
-msgstr ""
+#: hypha/apply/projects/models/invoice.py:180
+#, fuzzy, python-brace-format
+#| msgid "Requested approval"
+msgid "Invoice for {project}"
+msgstr "Approbation demandée"
+
+#: hypha/apply/projects/models/invoice.py:181
+#, fuzzy, python-brace-format
+#| msgid "Invoice created"
+msgid "Invoice {number} for {project}"
+msgstr "Facture créée"
 
-#: hypha/apply/projects/models/payment.py:298
+#: hypha/apply/projects/models/invoice.py:328
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "supporting document"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/projects/models/payment.py:299
+#: hypha/apply/projects/models/invoice.py:329
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "supporting documents"
 msgstr "Signalement envoyé"
 
+#: hypha/apply/projects/models/invoice.py:359
+#, fuzzy
+#| msgid "Invoice created"
+msgid "invoice export manager"
+msgstr "Facture créée"
+
+#: hypha/apply/projects/models/invoice.py:360
+#, fuzzy
+#| msgid "Invoice created"
+msgid "invoice export managers"
+msgstr "Facture créée"
+
 #: hypha/apply/projects/models/project.py:75
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:41
 #, fuzzy
@@ -6153,335 +6655,366 @@ msgstr ""
 msgid "{} approval"
 msgstr "Approbation demandée"
 
-#: hypha/apply/projects/models/project.py:215
+#: hypha/apply/projects/models/project.py:216
 msgid "In progress"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:248
-#: hypha/apply/projects/models/project.py:761
-#: hypha/apply/projects/models/project.py:793
+#: hypha/apply/projects/models/project.py:251
+#: hypha/apply/projects/models/project.py:790
+#: hypha/apply/projects/models/project.py:822
 msgid "title"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:250
+#: hypha/apply/projects/models/project.py:253
 msgid "value"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:257
+#: hypha/apply/projects/models/project.py:260
 msgid "proposed start date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:259
+#: hypha/apply/projects/models/project.py:262
 #, fuzzy
 #| msgid "Approved contract"
 msgid "proposed end date"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:269
+#: hypha/apply/projects/models/project.py:264
+#, fuzzy
+#| msgid "Approved contract"
+msgid "contract number"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/models/project.py:274
 msgid "locked"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:272
+#: hypha/apply/projects/models/project.py:277
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "submit contracting documents"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/projects/models/project.py:285
+#: hypha/apply/projects/models/project.py:290
 msgid "ID of this project at integrated payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:289
+#: hypha/apply/projects/models/project.py:294
 msgid "More details of the project integrated at payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:294
+#: hypha/apply/projects/models/project.py:299
 msgid "Reviewers role and their actions/comments"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:302 hypha/apply/todo/options.py:105
-#: hypha/apply/todo/options.py:113 hypha/apply/todo/options.py:121
-#: hypha/apply/todo/options.py:129 hypha/apply/todo/options.py:138
-#: hypha/apply/todo/options.py:146 hypha/apply/todo/options.py:155
-#: hypha/apply/todo/options.py:163 hypha/apply/todo/options.py:171
-#: hypha/apply/todo/options.py:180 hypha/apply/todo/options.py:188
-#: hypha/apply/todo/options.py:196 hypha/apply/todo/options.py:204
-#: hypha/apply/todo/options.py:212
+#: hypha/apply/projects/models/project.py:307 hypha/apply/todo/options.py:112
+#: hypha/apply/todo/options.py:120 hypha/apply/todo/options.py:128
+#: hypha/apply/todo/options.py:136 hypha/apply/todo/options.py:145
+#: hypha/apply/todo/options.py:153 hypha/apply/todo/options.py:162
+#: hypha/apply/todo/options.py:170 hypha/apply/todo/options.py:178
+#: hypha/apply/todo/options.py:187 hypha/apply/todo/options.py:195
+#: hypha/apply/todo/options.py:203 hypha/apply/todo/options.py:211
+#: hypha/apply/todo/options.py:219
 msgid "project"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:303
+#: hypha/apply/projects/models/project.py:308
 #, fuzzy
 #| msgid "Approved contract"
 msgid "projects"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:411
+#: hypha/apply/projects/models/project.py:418
 msgid "Proposed End Date must be after Proposed Start Date"
 msgstr ""
 
 #. Translators: SOW = Statement of Work
-#: hypha/apply/projects/models/project.py:518
+#: hypha/apply/projects/models/project.py:525
 #, fuzzy
 #| msgid "Approved contract"
 msgctxt "singular"
 msgid "project SOW"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:519
+#: hypha/apply/projects/models/project.py:526
 #, fuzzy
 #| msgid "Approved contract"
 msgctxt "plural"
 msgid "project SOW"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:541
+#: hypha/apply/projects/models/project.py:532
+#, python-brace-format
+msgid "Scope of Work for {project}"
+msgstr ""
+
+#: hypha/apply/projects/models/project.py:543
+#, fuzzy
+#| msgid "Approved contract"
+msgctxt "singular"
+msgid "project form"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/models/project.py:544
+#, fuzzy
+#| msgid "Approved contract"
+msgctxt "plural"
+msgid "project forms"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/models/project.py:550
+#, fuzzy, python-brace-format
+#| msgid "Requested approval"
+msgid "Project form for {project}"
+msgstr "Approbation demandée"
+
+#: hypha/apply/projects/models/project.py:572
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project form"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:542
+#: hypha/apply/projects/models/project.py:573
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project forms"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:579
 msgid "project SOW form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:549
+#: hypha/apply/projects/models/project.py:580
 msgid "project SOW forms"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:561
+#: hypha/apply/projects/models/project.py:592
 msgid "project report form"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:562
+#: hypha/apply/projects/models/project.py:593
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project report forms"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:569
+#: hypha/apply/projects/models/project.py:600
 msgid "user groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:602
 msgid ""
 "Only selected group's users will be listed for this ProjectFormReviewerRole"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:583
+#: hypha/apply/projects/models/project.py:614
 msgid "PAF reviewers role"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:584
+#: hypha/apply/projects/models/project.py:615
 msgid "PAF reviewers roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:595
+#: hypha/apply/projects/models/project.py:626
 msgid "Before"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:596
+#: hypha/apply/projects/models/project.py:627
 msgid "After"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:605
+#: hypha/apply/projects/models/project.py:636
 msgid "Number of days"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:637
 msgid "Relation to report due date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:610
+#: hypha/apply/projects/models/project.py:641
 msgid "project reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:642
 msgid "project reminder frequencies"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:617
+#: hypha/apply/projects/models/project.py:648
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "contracting group email"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:650
 msgid "finance group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:620
+#: hypha/apply/projects/models/project.py:651
 msgid "staff group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:622
+#: hypha/apply/projects/models/project.py:653
 msgid "Uncheck it to approve project parallelly"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:632
+#: hypha/apply/projects/models/project.py:663
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approve Project Sequentially"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:635
+#: hypha/apply/projects/models/project.py:666
 msgid "Project Form Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:638
+#: hypha/apply/projects/models/project.py:669
 msgid "Project Reviewers Roles"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:640
+#: hypha/apply/projects/models/project.py:671
 msgid ""
 "Reviewer Roles are needed to move projects to 'Internal Approval' stage. "
 "Delete all roles to skip internal approval process and to move all internal "
 "approval projects back to the 'Draft' stage with all approvals removed."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:647
-#: hypha/apply/projects/models/project.py:648
+#: hypha/apply/projects/models/project.py:678
+#: hypha/apply/projects/models/project.py:679
 msgid "Report reminder frequency"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:650
+#: hypha/apply/projects/models/project.py:681
 msgid ""
 "Set up a cron job to run `notify_report_due.py`. The script will use these "
 "reminder settings."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:656
+#: hypha/apply/projects/models/project.py:687
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:35
 #, fuzzy
 #| msgid "Approved contract"
 msgid "project settings"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:681
+#: hypha/apply/projects/models/project.py:712
 #, fuzzy
 #| msgid "Requested approval"
 msgid "PAF approval"
 msgstr "Approbation demandée"
 
-#: hypha/apply/projects/models/project.py:682
+#: hypha/apply/projects/models/project.py:713
 #, fuzzy
 #| msgid "Requested approval"
 msgid "PAF approvals"
 msgstr "Approbation demandée"
 
-#: hypha/apply/projects/models/project.py:685
+#: hypha/apply/projects/models/project.py:716
 #, python-brace-format
 msgid "Approval of {project} by {user}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:713
+#: hypha/apply/projects/models/project.py:744
 msgid "file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:716
+#: hypha/apply/projects/models/project.py:747
 #, fuzzy
 #| msgid "Approved"
 msgid "signed and approved"
 msgstr "Approuvé"
 
-#: hypha/apply/projects/models/project.py:718
+#: hypha/apply/projects/models/project.py:749
 msgid "counter signed?"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:728
+#: hypha/apply/projects/models/project.py:759
 #, fuzzy
 #| msgid "Approved contract"
 msgid "contract"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:729
+#: hypha/apply/projects/models/project.py:760
 #, fuzzy
 #| msgid "Approved contract"
 msgid "contracts"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Counter Signed"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Unsigned"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:740
+#: hypha/apply/projects/models/project.py:771
 #, python-brace-format
 msgid "Contract for {project} ({state})"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:768
+#: hypha/apply/projects/models/project.py:797
 #, python-brace-format
 msgid "Project file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:772
-#: hypha/apply/projects/models/project.py:773
+#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:802
 msgid "packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:800
+#: hypha/apply/projects/models/project.py:829
 msgid "contract packet file"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:830
 msgid "contract packet files"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:804
+#: hypha/apply/projects/models/project.py:833
 #, python-brace-format
 msgid "Contract file: {title}"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:814
 #: hypha/apply/projects/models/project.py:843
+#: hypha/apply/projects/models/project.py:872
 msgid "name"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:816
 #: hypha/apply/projects/models/project.py:845
+#: hypha/apply/projects/models/project.py:874
 msgid "recommended minimum"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:820
-#: hypha/apply/projects/models/project.py:857
+#: hypha/apply/projects/models/project.py:849
+#: hypha/apply/projects/models/project.py:886
 msgid "template"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:832
+#: hypha/apply/projects/models/project.py:861
 msgid "Document Category"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:833
+#: hypha/apply/projects/models/project.py:862
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Document Categories"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/models/project.py:850
+#: hypha/apply/projects/models/project.py:879
 msgid "allow document access for groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:851
+#: hypha/apply/projects/models/project.py:880
 msgid "Only selected group's users can access the document"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:869
+#: hypha/apply/projects/models/project.py:898
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Contrat Document Category"
 msgstr "Signalement envoyé"
 
-#: hypha/apply/projects/models/project.py:870
+#: hypha/apply/projects/models/project.py:899
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "Contract Document Categories"
@@ -6678,15 +7211,35 @@ msgstr ""
 msgid "Access allowed"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:424
+#: hypha/apply/projects/permissions.py:426
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Project is not in Draft state"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/permissions.py:429
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Only Staff can skip the PAF approval process"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/permissions.py:433
+msgid "Staff can skip PAF approval when no reviewer roles are configured"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:436
+msgid "PAF reviewer roles are configured, cannot skip approval process"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:445
 msgid "Project form is editable for active projects if no reviewer roles"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:427
+#: hypha/apply/projects/permissions.py:448
 msgid "Project form is editable in Draft by this user"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:428
+#: hypha/apply/projects/permissions.py:449
 msgid "You are not allowed to edit the project at this time"
 msgstr ""
 
@@ -6694,7 +7247,19 @@ msgstr ""
 msgid "Reporting Period"
 msgstr ""
 
-#: hypha/apply/projects/reports/forms.py:100
+#: hypha/apply/projects/reports/forms.py:101
+#: hypha/apply/projects/reports/forms.py:120
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Report due date"
+msgstr "Facture créée"
+
+#: hypha/apply/projects/reports/forms.py:112
+#: hypha/apply/projects/reports/forms.py:131
+msgid "A report for this date already exists."
+msgstr ""
+
+#: hypha/apply/projects/reports/forms.py:136
 msgid "Report on:"
 msgstr ""
 
@@ -6710,95 +7275,100 @@ msgctxt "project report (noun)"
 msgid "reports"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:204
+#: hypha/apply/projects/reports/models.py:131
+#, python-brace-format
+msgid "Report due {due_date} for {project}"
+msgstr ""
+
+#: hypha/apply/projects/reports/models.py:209
 #, fuzzy
 #| msgid "Approved contract"
 msgid "report version"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/reports/models.py:205
+#: hypha/apply/projects/reports/models.py:210
 #, fuzzy
 #| msgid "Approved contract"
 msgid "report versions"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/reports/models.py:220
+#: hypha/apply/projects/reports/models.py:225
 msgid "report private file"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:221
+#: hypha/apply/projects/reports/models.py:226
 msgid "report private files"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:240
+#: hypha/apply/projects/reports/models.py:245
 msgid "week"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:241
+#: hypha/apply/projects/reports/models.py:246
 msgid "month"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:242
+#: hypha/apply/projects/reports/models.py:247
 msgid "year"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:246
+#: hypha/apply/projects/reports/models.py:251
 msgid "Years"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:262
+#: hypha/apply/projects/reports/models.py:267
 msgid "report config"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:263
+#: hypha/apply/projects/reports/models.py:268
 msgid "report configs"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:267
+#: hypha/apply/projects/reports/models.py:272
 msgid "Disabled"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:272
+#: hypha/apply/projects/reports/models.py:277
 #, python-brace-format
 msgid "One time, that already has reported on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:277
+#: hypha/apply/projects/reports/models.py:282
 #, python-brace-format
 msgid "One time on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:285
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:316
 msgid "last day"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:291
+#: hypha/apply/projects/reports/models.py:307
 #, python-brace-format
 msgid "Once a year on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:294
+#: hypha/apply/projects/reports/models.py:310
 #, python-brace-format
 msgid "Every {occurrence} years on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:304
+#: hypha/apply/projects/reports/models.py:320
 #, python-brace-format
 msgid "Once a month on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:305
+#: hypha/apply/projects/reports/models.py:321
 #, python-brace-format
 msgid "Every {occurrence} months on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:312
+#: hypha/apply/projects/reports/models.py:328
 #, python-brace-format
 msgid "Once a week on {weekday}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:313
+#: hypha/apply/projects/reports/models.py:329
 #, python-brace-format
 msgid "Every {occurrence} weeks on {weekday}"
 msgstr ""
@@ -6817,70 +7387,94 @@ msgstr ""
 msgid "Last Notified"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "The"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "current"
-msgstr ""
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "next"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:11
+msgid "Edit this report date"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "reporting period is"
-msgstr ""
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:12
+#, fuzzy
+#| msgid "Edited"
+msgid "edit"
+msgstr "Modifié"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:8
-msgid "A report is due for the period"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:16
+msgid "Past due"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
 msgid "Continue Editing"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
-msgid "Add Report"
-msgstr ""
-
 #: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Create report"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:33
 #, python-format
 msgid ""
 " You're skipping the report for %(start_date)s - %(end_date)s. This will "
 "result in a gap in reporting for the project. You can undo this at any time. "
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:29
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:32
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:34
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:38
 msgid "Skip"
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:36
+msgid "Skip this report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:48
+msgid "Delete report requirement"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:26
 msgid "Enable"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:55
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:62
 msgid "Period End"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:101
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:108
 msgid "Unskip"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show less"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show more"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:130
 msgid "No reports submitted yet."
 msgstr ""
 
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:2
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:18
+msgid "Add report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:2
+#, fuzzy
+#| msgid "Created"
+msgid "Delete report"
+msgstr "Créé"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:4
+msgid ""
+"Are you sure you want to delete this report? This action cannot be undone."
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:2
+msgid "Edit report due date"
+msgstr ""
+
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:2
 msgid "Change reporting frequency"
 msgstr ""
@@ -6945,24 +7539,24 @@ msgstr ""
 msgid "View project"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 msgid "This report is for the period"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:56
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:32
 msgid "Report Skipped"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:58
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:37
 msgid "Public Report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:107
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:85
 msgid "View previous report"
 msgstr ""
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:115
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:93
 msgid "View next report"
 msgstr ""
 
@@ -7030,30 +7624,46 @@ msgstr "Signalement envoyé"
 msgid "No Projects Currently Reporting."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:78
-#: hypha/apply/projects/reports/views.py:100
+#: hypha/apply/projects/reports/views.py:83
+#: hypha/apply/projects/reports/views.py:105
 msgid "You do not have permission to access this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:125
+#: hypha/apply/projects/reports/views.py:130
 msgid "You do not have permission to update this report."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:372
+#: hypha/apply/projects/reports/views.py:377
 msgid "You do not have permission to update reporting configurations."
 msgstr ""
 
-#: hypha/apply/projects/reports/views.py:491
+#: hypha/apply/projects/reports/views.py:496
 msgid "Reporting disabled"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:31
+#: hypha/apply/projects/reports/views.py:532
+msgid "You do not have permission to add reports."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:572
+msgid "You do not have permission to edit report due dates."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:583
+msgid "A submitted report's due date cannot be edited."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:607
+msgid "You do not have permission to delete reports."
+msgstr ""
+
+#: hypha/apply/projects/tables.py:29
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice #"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/tables.py:43
+#: hypha/apply/projects/tables.py:41
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
@@ -7062,45 +7672,52 @@ msgstr "Facture créée"
 msgid "Invoice date"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/tables.py:45
+#: hypha/apply/projects/tables.py:43
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project Title"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/tables.py:103
+#: hypha/apply/projects/tables.py:114
 msgid "Vendor Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:137
+#: hypha/apply/projects/tables.py:151
 msgid "Project Name"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:188
+#: hypha/apply/projects/tables.py:204
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:66
+#, fuzzy
+#| msgid "Approved contract"
+msgid "Contract #"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/tables.py:207
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:48
 #, fuzzy
 #| msgid "Invoice created"
 msgid "End date"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/tables.py:213
+#: hypha/apply/projects/tables.py:232
 #, python-brace-format
 msgid "{count} outstanding"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:251
+#: hypha/apply/projects/tables.py:270
 msgid "Date requested"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:266
+#: hypha/apply/projects/tables.py:288
 msgid "Assignee"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:286
+#: hypha/apply/projects/tables.py:308
 msgid "Waiting for approval"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:288
+#: hypha/apply/projects/tables.py:310
 msgid "Waiting for assignee"
 msgstr ""
 
@@ -7149,8 +7766,8 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:170
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:60
 #: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:56
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
 #: hypha/apply/templates/forms/includes/field.html:55
 msgid "Upload"
 msgstr ""
@@ -7231,12 +7848,12 @@ msgid "Update approvers"
 msgstr "Contrat approuvé"
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:55
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:156
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:159
 msgid "Change approver"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:67
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:168
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:171
 #, fuzzy
 #| msgid "Approved"
 msgid "Assign approver"
@@ -7249,7 +7866,7 @@ msgstr "Approuvé"
 msgid "Project form"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:124
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:132
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:172
 msgid "Fill in"
 msgstr ""
@@ -7270,7 +7887,7 @@ msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:69
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:70
 msgid "Invoice"
 msgstr ""
 
@@ -7288,13 +7905,13 @@ msgstr ""
 msgid "Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:74
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:76
 msgid "Download invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:90
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:94
 #: hypha/apply/projects/templates/application_projects/paf_export.html:63
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:101
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:106
 msgid "Supporting Documents"
 msgstr ""
 
@@ -7375,6 +7992,10 @@ msgstr ""
 msgid "Project documents status"
 msgstr "Contrat approuvé"
 
+#: hypha/apply/projects/templates/application_projects/modals/project_contract_number_update.html:2
+msgid "Update contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
 #, fuzzy
 #| msgid "Approved contract"
@@ -7499,38 +8120,33 @@ msgid ""
 "invoicing & reporting stage."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/paf_export.html:6
-#: hypha/apply/projects/templates/application_projects/sow_export.html:6
-msgid "Project title"
-msgstr ""
-
 #: hypha/apply/projects/templates/application_projects/paf_export.html:7
 #: hypha/apply/projects/templates/application_projects/sow_export.html:7
 msgid "Project ID"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:18
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:49
 msgid "Approvals"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:32
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:66
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
 msgid "Submission lead"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:34
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:72
 msgid "Staff reviewers"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:41
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:75
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:78
 msgid "as"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:51
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:89
 msgid "Advisory council"
 msgstr ""
 
@@ -7552,6 +8168,29 @@ msgstr ""
 msgid "Submit contract documents"
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:9
+msgid "Invoices: Export as CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:12
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:72
+msgid ""
+"Are you sure you want to export the invoices as a CSV file? This file may "
+"contain sensitive information, so please handle it carefully."
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:22
+msgid "Invoices: Generating downloadable CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:40
+msgid "Invoices: Download generated CSV"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:62
+msgid "Invoices: Generate downloadable CSV"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:35
 msgid "Only editable when submitted or you have been requested to make changes"
 msgstr ""
@@ -7560,18 +8199,13 @@ msgstr ""
 msgid "Edit Invoice"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:29
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:52
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
-msgid "View comment"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:69
-msgid "show less"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:21
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:43
+msgid "Status & Activity"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
-msgid "Contractor"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:48
+msgid "When you leave a comment or change the statuses, it'll show up here!"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:22
@@ -7587,6 +8221,27 @@ msgstr ""
 msgid "Awaiting contract finalization..."
 msgstr ""
 
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:75
+#, fuzzy
+#| msgid "Approved contract"
+msgid "edit contract number"
+msgstr "Contrat approuvé"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
+msgid "Copied!"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "Copy contract number"
+msgstr "Signalement envoyé"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:91
+msgid "copy contract number"
+msgstr ""
+
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:10
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:14
 #, fuzzy
@@ -7632,22 +8287,22 @@ msgstr ""
 msgid "Update project status"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:23
-#: hypha/apply/projects/templates/application_projects/project_detail.html:54
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:49
 msgid "Project Information"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:83
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:94
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:97
 msgid "No reviews"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:174
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:177
 msgid "Download"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:182
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:57
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:185
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:63
 msgid "Download as DOCX"
 msgstr ""
 
@@ -7660,28 +8315,32 @@ msgstr ""
 msgid "Proposal attachments"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:45
+#: hypha/apply/projects/templates/application_projects/project_detail.html:40
 #, python-format
 msgid "This project is in %(status)s state."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:119
+#: hypha/apply/projects/templates/application_projects/project_detail.html:114
 msgid "Project form approvals"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#: hypha/apply/projects/templates/application_projects/project_detail.html:127
 msgid "Request changes or more information by "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:149
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+msgid "View comment"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_detail.html:144
 msgid "Pending approval from "
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:153
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
 msgid "nobody assigned yet"
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:161
+#: hypha/apply/projects/templates/application_projects/project_detail.html:156
 #, fuzzy
 #| msgid "Approved"
 msgid "approved"
@@ -7700,7 +8359,7 @@ msgstr ""
 msgid "No Projects Available."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:25
 #: hypha/apply/projects/templates/application_projects/sow_export.html:5
 msgid "Scope of Work"
 msgstr ""
@@ -7726,57 +8385,57 @@ msgstr ""
 msgid "{status} by {user_role}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:104
-#: hypha/apply/projects/templatetags/project_tags.py:109
-#: hypha/apply/projects/templatetags/project_tags.py:115
-#: hypha/apply/projects/templatetags/project_tags.py:119
-#: hypha/apply/projects/templatetags/project_tags.py:237
-#: hypha/apply/projects/templatetags/project_tags.py:249
-#: hypha/apply/projects/templatetags/project_tags.py:259
-#: hypha/apply/projects/templatetags/project_tags.py:278
-#: hypha/apply/projects/templatetags/project_tags.py:283
+#: hypha/apply/projects/templatetags/project_tags.py:117
+#: hypha/apply/projects/templatetags/project_tags.py:122
+#: hypha/apply/projects/templatetags/project_tags.py:128
+#: hypha/apply/projects/templatetags/project_tags.py:132
+#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:262
+#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:291
+#: hypha/apply/projects/templatetags/project_tags.py:296
 msgid "To do"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:105
+#: hypha/apply/projects/templatetags/project_tags.py:118
 msgid "Fill in the Project Form"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:110
+#: hypha/apply/projects/templatetags/project_tags.py:123
 msgid "Move project to next stage"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:116
+#: hypha/apply/projects/templatetags/project_tags.py:129
 msgid "Resubmit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:120
+#: hypha/apply/projects/templatetags/project_tags.py:133
 msgid "Submit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:124
-#: hypha/apply/projects/templatetags/project_tags.py:132
-#: hypha/apply/projects/templatetags/project_tags.py:136
-#: hypha/apply/projects/templatetags/project_tags.py:142
-#: hypha/apply/projects/templatetags/project_tags.py:158
-#: hypha/apply/projects/templatetags/project_tags.py:164
-#: hypha/apply/projects/templatetags/project_tags.py:179
-#: hypha/apply/projects/templatetags/project_tags.py:188
-#: hypha/apply/projects/templatetags/project_tags.py:194
-#: hypha/apply/projects/templatetags/project_tags.py:202
-#: hypha/apply/projects/templatetags/project_tags.py:211
-#: hypha/apply/projects/templatetags/project_tags.py:218
-#: hypha/apply/projects/templatetags/project_tags.py:225
-#: hypha/apply/projects/templatetags/project_tags.py:229
-#: hypha/apply/projects/templatetags/project_tags.py:243
-#: hypha/apply/projects/templatetags/project_tags.py:253
+#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:145
+#: hypha/apply/projects/templatetags/project_tags.py:149
+#: hypha/apply/projects/templatetags/project_tags.py:155
+#: hypha/apply/projects/templatetags/project_tags.py:171
+#: hypha/apply/projects/templatetags/project_tags.py:177
+#: hypha/apply/projects/templatetags/project_tags.py:192
+#: hypha/apply/projects/templatetags/project_tags.py:201
+#: hypha/apply/projects/templatetags/project_tags.py:207
+#: hypha/apply/projects/templatetags/project_tags.py:215
+#: hypha/apply/projects/templatetags/project_tags.py:224
+#: hypha/apply/projects/templatetags/project_tags.py:231
+#: hypha/apply/projects/templatetags/project_tags.py:238
+#: hypha/apply/projects/templatetags/project_tags.py:242
+#: hypha/apply/projects/templatetags/project_tags.py:256
 #: hypha/apply/projects/templatetags/project_tags.py:266
-#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:285
 msgid "Waiting for"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:126
-#: hypha/apply/projects/templatetags/project_tags.py:144
+#: hypha/apply/projects/templatetags/project_tags.py:139
+#: hypha/apply/projects/templatetags/project_tags.py:157
 #, python-brace-format
 msgid ""
 "Awaiting project documents to be created and approved by {ORG_SHORT_NAME} "
@@ -7784,219 +8443,237 @@ msgid ""
 "stage."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:133
+#: hypha/apply/projects/templatetags/project_tags.py:146
 msgid "Changes requested. Awaiting documents to be resubmitted."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:150
 msgid "Awaiting project form to be created."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:160
-#: hypha/apply/projects/templatetags/project_tags.py:196
+#: hypha/apply/projects/templatetags/project_tags.py:173
+#: hypha/apply/projects/templatetags/project_tags.py:209
 #, python-brace-format
 msgid "Awaiting approval. Assigned to {approver}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:166
-#: hypha/apply/projects/templatetags/project_tags.py:204
+#: hypha/apply/projects/templatetags/project_tags.py:179
+#: hypha/apply/projects/templatetags/project_tags.py:217
 #, python-brace-format
 msgid "Awaiting {reviewer_role} to assign an approver"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:180
+#: hypha/apply/projects/templatetags/project_tags.py:193
 msgid "Awaiting project form to be approved"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:189
+#: hypha/apply/projects/templatetags/project_tags.py:202
 msgid "Awaiting approval from other approvers teams"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:212
+#: hypha/apply/projects/templatetags/project_tags.py:225
 msgid "Awaiting project from assigned approvers"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:219
+#: hypha/apply/projects/templatetags/project_tags.py:232
 #, python-brace-format
 msgid "Awaiting signed contract from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:226
+#: hypha/apply/projects/templatetags/project_tags.py:239
 msgid "Awaiting signed contract from Staff/Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:230
+#: hypha/apply/projects/templatetags/project_tags.py:243
 msgid "Awaiting signed contract from Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:239
+#: hypha/apply/projects/templatetags/project_tags.py:252
 msgid "Awaiting contract documents to be submitted by you."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:244
+#: hypha/apply/projects/templatetags/project_tags.py:257
 msgid "Awaiting countersigned contract from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:263
 msgid "Awaiting contract documents submission by you"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:254
+#: hypha/apply/projects/templatetags/project_tags.py:267
 msgid "Awaiting contract documents submission from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:261
+#: hypha/apply/projects/templatetags/project_tags.py:274
 msgid "Review the contract for all relevant details and approve."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:268
+#: hypha/apply/projects/templatetags/project_tags.py:281
 #, python-brace-format
 msgid "Awaiting contract approval from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:273
+#: hypha/apply/projects/templatetags/project_tags.py:286
 msgid "Awaiting contract approval from Staff"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:292
 msgid "Add invoices"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:284
+#: hypha/apply/projects/templatetags/project_tags.py:297
 msgid "Review invoice and take action"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:303
+#: hypha/apply/projects/templatetags/project_tags.py:316
 #, python-brace-format
 msgid "Please download the signed contract uploaded by {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:305
+#: hypha/apply/projects/templatetags/project_tags.py:318
 msgid "Countersign"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:306
+#: hypha/apply/projects/templatetags/project_tags.py:319
 msgid "Upload it back"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:308
+#: hypha/apply/projects/templatetags/project_tags.py:321
 msgid "Please also make sure to upload other required contracting documents"
 msgstr ""
 
-#: hypha/apply/projects/utils.py:85
+#: hypha/apply/projects/utils.py:88
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Pending approval"
 msgstr "Approbation demandée"
 
-#: hypha/apply/projects/utils.py:89
+#: hypha/apply/projects/utils.py:92
 msgid "Request for change or more information"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:166
-#: hypha/apply/projects/views/payment.py:396
+#: hypha/apply/projects/views/invoice.py:175
+#: hypha/apply/projects/views/invoice.py:397
 #, python-brace-format
 msgid "<p>Invoice status updated to: {status}.</p>"
 msgstr ""
 
-#: hypha/apply/projects/views/payment.py:209
+#: hypha/apply/projects/views/invoice.py:218
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice updated."
 msgstr "Facture créée"
 
-#: hypha/apply/projects/views/payment.py:299
+#: hypha/apply/projects/views/invoice.py:304
 #, fuzzy
 #| msgid "Invoice created"
 msgid "<p>Invoice added.</p>"
 msgstr "Facture créée"
 
-#: hypha/apply/projects/views/payment.py:575
+#: hypha/apply/projects/views/invoice.py:574
 msgid "Sorry something went wrong"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:265
+#: hypha/apply/projects/views/invoice.py:712
+#, fuzzy
+#| msgid "Invoice created"
+msgid "Invoice tags updated."
+msgstr "Facture créée"
+
+#: hypha/apply/projects/views/project.py:269
 msgid "PAF has been submitted for approval"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:337
+#: hypha/apply/projects/views/project.py:341
 msgid "Document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:365
+#: hypha/apply/projects/views/project.py:369
 msgid "Document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:396
+#: hypha/apply/projects/views/project.py:400
 msgid "Contracting document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:443
+#: hypha/apply/projects/views/project.py:447
 msgid "Unassigned"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:452
+#: hypha/apply/projects/views/project.py:456
 msgid "Lead has been updated."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:498
+#: hypha/apply/projects/views/project.py:502
 msgid "Title has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:534
+#: hypha/apply/projects/views/project.py:538
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Dates has been updated"
 msgstr "Partenaires mis à jour."
 
-#: hypha/apply/projects/views/project.py:655
+#: hypha/apply/projects/views/project.py:580
+#, fuzzy
+#| msgid "Partners updated."
+msgid "Contract number has been updated"
+msgstr "Partenaires mis à jour."
+
+#: hypha/apply/projects/views/project.py:701
 msgid ""
 "Contractor documents have been approved.  You can receive invoices from "
 "vendor now."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:721
+#: hypha/apply/projects/views/project.py:766
 msgid "Countersigned contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:724
+#: hypha/apply/projects/views/project.py:769
 msgid "Signed contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:935
+#: hypha/apply/projects/views/project.py:986
 msgid "Contract documents submitted"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:999
+#: hypha/apply/projects/views/project.py:1050
 msgid "Contracting document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1077
+#: hypha/apply/projects/views/project.py:1128
 msgid "User don't have project form approver roles"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1083
+#: hypha/apply/projects/views/project.py:1134
 #, fuzzy, python-brace-format
 #| msgid "Updated Invoice status to: {invoice.status_display}"
 msgid "Updated project form status to: {paf_status}"
 msgstr "Statut de la facture mis à jour vers : {invoice.status_display}"
 
-#: hypha/apply/projects/views/project.py:1173
+#: hypha/apply/projects/views/project.py:1224
 msgid "Project form status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1226
+#: hypha/apply/projects/views/project.py:1277
 msgid "Project form has been approved"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1321
+#: hypha/apply/projects/views/project.py:1372
 msgid "Project status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1614
+#: hypha/apply/projects/views/project.py:1665
 msgid "Project form approvers have been updated"
 msgstr ""
 
+#: hypha/apply/projects/views/project.py:1799
+#, fuzzy
+#| msgid "Requested approval"
+msgid "No projects for this submission"
+msgstr "Approbation demandée"
+
 #: hypha/apply/review/admin_helpers.py:11
 msgid "Clone"
 msgstr ""
@@ -8025,7 +8702,7 @@ msgstr ""
 
 #: hypha/apply/review/blocks.py:149
 #: hypha/apply/review/templates/review/review_detail.html:48
-#: hypha/apply/review/views.py:431
+#: hypha/apply/review/views.py:440
 msgid "Visibility"
 msgstr ""
 
@@ -8090,7 +8767,7 @@ msgstr ""
 msgid "5. Excellent"
 msgstr ""
 
-#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:245
+#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:283
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:11
 msgid "No"
 msgstr ""
@@ -8099,7 +8776,7 @@ msgstr ""
 msgid "Maybe"
 msgstr ""
 
-#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:244
+#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:282
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:8
 msgid "Yes"
 msgstr ""
@@ -8158,13 +8835,13 @@ msgid "View Changes"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:40
-#: hypha/apply/review/views.py:429
+#: hypha/apply/review/views.py:438
 msgid "Recommendation"
 msgstr ""
 
 #: hypha/apply/review/templates/review/review_detail.html:66
 #: hypha/apply/review/templates/review/review_list.html:30
-#: hypha/apply/review/views.py:427
+#: hypha/apply/review/views.py:436
 msgid "Opinions"
 msgstr ""
 
@@ -8216,155 +8893,167 @@ msgstr ""
 msgid "Avg. score: {average}"
 msgstr ""
 
-#: hypha/apply/review/views.py:74
+#: hypha/apply/review/views.py:76
 msgid "Edit Review"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Update Review draft"
 msgstr ""
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Create Review"
 msgstr ""
 
-#: hypha/apply/review/views.py:428
+#: hypha/apply/review/views.py:437
 msgid "Overall Score"
 msgstr ""
 
-#: hypha/apply/review/views.py:430
+#: hypha/apply/review/views.py:439
 msgid "Revision"
 msgstr ""
 
-#: hypha/apply/review/views.py:470
+#: hypha/apply/review/views.py:479
 msgid "Current"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:114
-#: hypha/apply/stream_forms/blocks.py:217
+#: hypha/apply/stream_forms/blocks.py:123
+#: hypha/apply/stream_forms/blocks.py:255
 msgid "Required"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:124
+#: hypha/apply/stream_forms/blocks.py:142
+msgid "Personal information"
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:146
+msgid ""
+"Tick this if the answer will contain personally identifiable information, "
+"such as a name, address, phone number or date of birth. Only the applicant, "
+"their co-applicants and staff will be able to see the answer. Reviewers and "
+"other users will see that the question was asked, but not the answer."
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:162
 msgid "Format"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:125
-#: hypha/apply/stream_forms/blocks.py:156
-#: hypha/apply/stream_forms/blocks.py:171
+#: hypha/apply/stream_forms/blocks.py:163
+#: hypha/apply/stream_forms/blocks.py:194
+#: hypha/apply/stream_forms/blocks.py:209
 msgid "Default value"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:128
+#: hypha/apply/stream_forms/blocks.py:166
 msgid "Text field (single line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:147
+#: hypha/apply/stream_forms/blocks.py:185
 msgid "Max number of inputs"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:148
+#: hypha/apply/stream_forms/blocks.py:186
 msgid "Add new item"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:151
+#: hypha/apply/stream_forms/blocks.py:189
 msgid "Text field (single line) (multiple inputs)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:157
+#: hypha/apply/stream_forms/blocks.py:195
 msgid "Word limit"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:162
+#: hypha/apply/stream_forms/blocks.py:200
 msgid "Text field (multi line)"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:176
+#: hypha/apply/stream_forms/blocks.py:214
 msgid "Number field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:189
+#: hypha/apply/stream_forms/blocks.py:227
 msgid "Checkbox field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:201
-#: hypha/apply/stream_forms/blocks.py:219
+#: hypha/apply/stream_forms/blocks.py:239
+#: hypha/apply/stream_forms/blocks.py:257
 msgid "Choice"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:207
+#: hypha/apply/stream_forms/blocks.py:245
 msgid "Radio buttons"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:221
+#: hypha/apply/stream_forms/blocks.py:259
 msgid ""
 "Please create only two choices for toggle. First choice will revel the group "
 "and the second hide it. Additional choices will be ignored."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:231
+#: hypha/apply/stream_forms/blocks.py:269
 msgid "Group fields"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:233
+#: hypha/apply/stream_forms/blocks.py:271
 msgid "Remember to end group using Group fields end block."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:253
+#: hypha/apply/stream_forms/blocks.py:291
 msgid "Group fields end"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:255
+#: hypha/apply/stream_forms/blocks.py:293
 msgid "End of Group fields Block"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:262
+#: hypha/apply/stream_forms/blocks.py:300
 msgid "Dropdown field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:272
+#: hypha/apply/stream_forms/blocks.py:310
 msgid "Checkbox"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:278
+#: hypha/apply/stream_forms/blocks.py:316
 msgid "Multiple checkboxes field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:319
+#: hypha/apply/stream_forms/blocks.py:357
 msgid "Date field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:341
+#: hypha/apply/stream_forms/blocks.py:379
 msgid "Time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:373
+#: hypha/apply/stream_forms/blocks.py:411
 msgid "Date+time field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:405
+#: hypha/apply/stream_forms/blocks.py:443
 msgid "Image field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:418
+#: hypha/apply/stream_forms/blocks.py:456
 msgid "Single File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:424
-#: hypha/apply/stream_forms/blocks.py:443
+#: hypha/apply/stream_forms/blocks.py:462
+#: hypha/apply/stream_forms/blocks.py:481
 #, python-brace-format
 msgid "{help_text} Accepted file types are {file_types}"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:437
+#: hypha/apply/stream_forms/blocks.py:475
 msgid "Multiple File field"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:474
+#: hypha/apply/stream_forms/blocks.py:512
 msgid "Section header"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:493
+#: hypha/apply/stream_forms/blocks.py:531
 msgid "Form fields"
 msgstr ""
 
@@ -8402,25 +9091,20 @@ msgid ""
 "update your user account with the name you provide here."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:8
-#, python-format
-msgid "View file - %(filename)s"
-msgstr ""
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:14
-msgid "uploaded"
+#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
+msgid "No selection"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:25
-msgid "File not found"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "Contains personal information."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:32
-msgid "Missing file"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "(PII)"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
-msgid "No selection"
+#: hypha/apply/stream_forms/templates/stream_forms/render_redacted_field.html:12
+msgid "Hidden — contains personal information."
 msgstr ""
 
 #: hypha/apply/templates/forms/includes/field.html:11
@@ -8457,109 +9141,117 @@ msgstr ""
 msgid "tasks"
 msgstr ""
 
-#: hypha/apply/todo/options.py:30
+#: hypha/apply/todo/options.py:32
 msgid "Comment Task"
 msgstr ""
 
-#: hypha/apply/todo/options.py:31
+#: hypha/apply/todo/options.py:33
 msgid "Submission Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:32
+#: hypha/apply/todo/options.py:34
 msgid "Determination draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:33
+#: hypha/apply/todo/options.py:35
 msgid "Review Draft"
 msgstr ""
 
-#: hypha/apply/todo/options.py:34
+#: hypha/apply/todo/options.py:36
 msgid "Project waiting project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:35
+#: hypha/apply/todo/options.py:37
 msgid "Project waiting scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:36
+#: hypha/apply/todo/options.py:38
 msgid "Project submit project form(s)"
 msgstr ""
 
-#: hypha/apply/todo/options.py:37
+#: hypha/apply/todo/options.py:39
 msgid "Project submit scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:38
+#: hypha/apply/todo/options.py:40
 msgid "Project form required changes"
 msgstr ""
 
-#: hypha/apply/todo/options.py:39
+#: hypha/apply/todo/options.py:41
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project form waiting assignee"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/todo/options.py:40
+#: hypha/apply/todo/options.py:42
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Project form waiting approval"
 msgstr "Approbation demandée"
 
-#: hypha/apply/todo/options.py:41
+#: hypha/apply/todo/options.py:43
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting contract"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/todo/options.py:44
+#: hypha/apply/todo/options.py:46
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting contract document"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/todo/options.py:46
+#: hypha/apply/todo/options.py:48
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting contract review"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/todo/options.py:47
+#: hypha/apply/todo/options.py:49
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Project waiting invoice"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/todo/options.py:48
+#: hypha/apply/todo/options.py:50
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice required changes"
 msgstr "Facture créée"
 
-#: hypha/apply/todo/options.py:49
+#: hypha/apply/todo/options.py:51
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Invoice waiting approval"
 msgstr "Approbation demandée"
 
-#: hypha/apply/todo/options.py:50
+#: hypha/apply/todo/options.py:52
 #, fuzzy
 #| msgid "Invoice created"
 msgid "Invoice waiting paid"
 msgstr "Facture créée"
 
-#: hypha/apply/todo/options.py:51
+#: hypha/apply/todo/options.py:53
 msgid "Report due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:52
+#: hypha/apply/todo/options.py:54
 msgid "Download exported submissions"
 msgstr ""
 
-#: hypha/apply/todo/options.py:55
+#: hypha/apply/todo/options.py:57
 msgid "Failed to generate submissions export file"
 msgstr ""
 
-#: hypha/apply/todo/options.py:65
+#: hypha/apply/todo/options.py:59
+msgid "Download exported invoices"
+msgstr ""
+
+#: hypha/apply/todo/options.py:62
+msgid "Failed to generate invoices export file"
+msgstr ""
+
+#: hypha/apply/todo/options.py:72
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.source.fund_name} "
@@ -8567,7 +9259,7 @@ msgid ""
 "comment: <q class=\"text-fg-muted italic align-bottom\">{msg}</q>"
 msgstr ""
 
-#: hypha/apply/todo/options.py:75
+#: hypha/apply/todo/options.py:82
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8575,7 +9267,7 @@ msgid ""
 "align-bottom \">\"{related.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:83
+#: hypha/apply/todo/options.py:90
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8584,7 +9276,7 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:91
+#: hypha/apply/todo/options.py:98
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -8593,70 +9285,70 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:101
+#: hypha/apply/todo/options.py:108
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:109
+#: hypha/apply/todo/options.py:116
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:117
+#: hypha/apply/todo/options.py:124
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form(s) submission"
 msgstr ""
 
-#: hypha/apply/todo/options.py:125
+#: hypha/apply/todo/options.py:132
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form requires changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:134
+#: hypha/apply/todo/options.py:141
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form is waiting for assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:142
+#: hypha/apply/todo/options.py:149
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br> Project form is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:151
+#: hypha/apply/todo/options.py:158
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:159
+#: hypha/apply/todo/options.py:166
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contracting documents"
 msgstr ""
 
-#: hypha/apply/todo/options.py:167
+#: hypha/apply/todo/options.py:174
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Contract for project is waiting for review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:176
+#: hypha/apply/todo/options.py:183
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -8664,7 +9356,7 @@ msgid ""
 "bottom\">\"{related.title}\"</span> is waiting for invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:184
+#: hypha/apply/todo/options.py:191
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8672,7 +9364,7 @@ msgid ""
 "{related.invoice_number} required changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:192
+#: hypha/apply/todo/options.py:199
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8680,7 +9372,7 @@ msgid ""
 "{related.invoice_number} is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:200
+#: hypha/apply/todo/options.py:207
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -8688,7 +9380,7 @@ msgid ""
 "{related.invoice_number} is waiting to be paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:208
+#: hypha/apply/todo/options.py:215
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.project.fund_name} "
@@ -8697,19 +9389,29 @@ msgid ""
 "\">\"{related.project.title}\"</span> is due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:216
+#: hypha/apply/todo/options.py:223
 msgid "Your generated submission export file is ready for download"
 msgstr ""
 
-#: hypha/apply/todo/options.py:219 hypha/apply/todo/options.py:227
+#: hypha/apply/todo/options.py:226 hypha/apply/todo/options.py:234
+#: hypha/apply/todo/options.py:241 hypha/apply/todo/options.py:249
 msgid "export"
 msgstr ""
 
-#: hypha/apply/todo/options.py:223
+#: hypha/apply/todo/options.py:230
 msgid ""
 "There was an issue generating your submission export file, please try again."
 msgstr ""
 
+#: hypha/apply/todo/options.py:238
+msgid "Your generated invoice export file is ready for download"
+msgstr ""
+
+#: hypha/apply/todo/options.py:245
+msgid ""
+"There was an issue generating your invoice export file, please try again."
+msgstr ""
+
 #: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
 msgid "You don't have any pending task."
 msgstr ""
@@ -8769,143 +9471,176 @@ msgstr ""
 msgid "View users in this group"
 msgstr ""
 
-#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:63
+#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:67
 msgid "Remember me"
 msgstr ""
 
-#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:65
+#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:69
 msgid "On trusted devices only, keeps you logged in for a longer period."
 msgstr ""
 
-#: hypha/apply/users/forms.py:55
+#: hypha/apply/users/forms.py:57
 msgid "Email address"
 msgstr ""
 
-#: hypha/apply/users/forms.py:86
+#: hypha/apply/users/forms.py:90
 msgid "A user with that email already exists."
 msgstr ""
 
-#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/forms.py:91
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: hypha/apply/users/forms.py:200
+#: hypha/apply/users/forms.py:208
 msgid ""
 "You are registered using OAuth, please contact an admin if you need to "
 "change your email address."
 msgstr ""
 
-#: hypha/apply/users/forms.py:208
+#: hypha/apply/users/forms.py:216
 msgid "Slack names must not include spaces"
 msgstr ""
 
-#: hypha/apply/users/forms.py:251
+#: hypha/apply/users/forms.py:259
 msgid "Only includes active, non-superusers"
 msgstr ""
 
-#: hypha/apply/users/forms.py:261
-#: hypha/apply/users/templates/users/account.html:64
+#: hypha/apply/users/forms.py:269
+#: hypha/apply/users/templates/users/account.html:67
 #: hypha/apply/users/templates/users/activation/email.txt:13
 #: hypha/elevate/forms.py:20
 msgid "Password"
 msgstr ""
 
-#: hypha/apply/users/forms.py:262
+#: hypha/apply/users/forms.py:270
 msgid "Email change requires you to put password."
 msgstr ""
 
-#: hypha/apply/users/forms.py:275
+#: hypha/apply/users/forms.py:283
 msgid "Incorrect password. Please try again."
 msgstr ""
 
-#: hypha/apply/users/forms.py:291
+#: hypha/apply/users/forms.py:299
 msgid "To proceed, type \"disable\" below and then click on \"confirm\":"
 msgstr ""
 
-#: hypha/apply/users/forms.py:301
+#: hypha/apply/users/forms.py:309
 msgid "Incorrect input."
 msgstr ""
 
-#: hypha/apply/users/middleware.py:52
+#: hypha/apply/users/middleware.py:56
 msgid "Two factor authentication required"
 msgstr ""
 
-#: hypha/apply/users/models.py:195
+#: hypha/apply/users/models.py:230
 msgid "email address"
 msgstr ""
 
-#: hypha/apply/users/models.py:197
+#: hypha/apply/users/models.py:232
 msgid "full name"
 msgstr ""
 
-#: hypha/apply/users/models.py:200
+#: hypha/apply/users/models.py:235
 msgid "slack name"
 msgstr ""
 
-#: hypha/apply/users/models.py:202
+#: hypha/apply/users/models.py:237
 msgid "This is the name we should \"@mention\" when sending notifications"
 msgstr ""
 
-#: hypha/apply/users/models.py:321
+#: hypha/apply/users/models.py:391
 msgid "user"
 msgstr ""
 
-#: hypha/apply/users/models.py:322
+#: hypha/apply/users/models.py:392
 msgid "users"
 msgstr ""
 
-#: hypha/apply/users/models.py:333
+#: hypha/apply/users/models.py:403
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Auth Settings"
 msgstr "Contrat approuvé"
 
-#: hypha/apply/users/models.py:335
+#: hypha/apply/users/models.py:405
 msgid "show consent checkbox?"
 msgstr ""
 
-#: hypha/apply/users/models.py:336
+#: hypha/apply/users/models.py:406
 msgid "consent text"
 msgstr ""
 
-#: hypha/apply/users/models.py:337
+#: hypha/apply/users/models.py:407
 msgid "consent help"
 msgstr ""
 
-#: hypha/apply/users/models.py:339
+#: hypha/apply/users/models.py:409
 msgid "login extra text"
 msgstr ""
 
-#: hypha/apply/users/models.py:341
+#: hypha/apply/users/models.py:411
 msgid "Displayed along side login form"
 msgstr ""
 
-#: hypha/apply/users/models.py:351
+#: hypha/apply/users/models.py:421
 msgid "User consent on login & register forms"
 msgstr ""
 
-#: hypha/apply/users/models.py:357
+#: hypha/apply/users/models.py:427
 msgid "Login form customizations"
 msgstr ""
 
-#: hypha/apply/users/models.py:382
+#: hypha/apply/users/models.py:452
 #, fuzzy
 #| msgid "Requested approval"
 msgid "Pending signup"
 msgstr "Approbation demandée"
 
-#: hypha/apply/users/models.py:383
+#: hypha/apply/users/models.py:453
 msgid "Pending signups"
 msgstr ""
 
-#: hypha/apply/users/models.py:401
+#: hypha/apply/users/models.py:471
 msgid "Confirm Access Token"
 msgstr ""
 
-#: hypha/apply/users/models.py:402
+#: hypha/apply/users/models.py:472
 msgid "Confirm Access Tokens"
 msgstr ""
 
+#: hypha/apply/users/passkey_views.py:160
+#, python-brace-format
+msgid "Maximum of {max} passkeys allowed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:197
+#: hypha/apply/users/passkey_views.py:278
+msgid "Invalid JSON"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:202
+#: hypha/apply/users/passkey_views.py:283
+msgid "No active WebAuthn challenge"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:230
+#: hypha/apply/users/passkey_views.py:351
+#: hypha/apply/users/passkey_views.py:358
+msgid "Verification failed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:248
+msgid "Could not save passkey"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:292
+msgid "Invalid credential"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:336
+msgid "Unknown credential"
+msgstr ""
+
 #: hypha/apply/users/roles.py:4
 msgid "Administrator"
 msgstr ""
@@ -8971,16 +9706,31 @@ msgid ""
 "contracting."
 msgstr ""
 
-#: hypha/apply/users/services.py:110
+#: hypha/apply/users/services.py:36
+#, python-format
+msgid "A passkey was added to your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:41
+#, python-format
+msgid "A passkey was removed from your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:152
 #, python-brace-format
 msgid "Log in to {user} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/services.py:134
+#: hypha/apply/users/services.py:176
 #, python-brace-format
 msgid "Welcome to {ORG_LONG_NAME}"
 msgstr ""
 
+#: hypha/apply/users/signals.py:31
+#, python-format
+msgid "Successful login to %(org)s"
+msgstr ""
+
 #: hypha/apply/users/templates/elevate/elevate.html:4
 #: hypha/apply/users/templates/elevate/elevate.html:10
 msgid "Confirm access"
@@ -9017,13 +9767,17 @@ msgid ""
 "inactivity."
 msgstr ""
 
+#: hypha/apply/users/templates/includes/delete_user_submissions_form.html:20
+msgid "Yes, delete"
+msgstr ""
+
 #: hypha/apply/users/templates/two_factor/_base.html:8
 #: hypha/apply/users/templates/users/change_password.html:9
 msgid "Back to account"
 msgstr ""
 
 #: hypha/apply/users/templates/two_factor/_base.html:9
-#: hypha/apply/users/templates/users/account.html:85
+#: hypha/apply/users/templates/users/account.html:88
 msgid "Two-Factor Authentication (2FA)"
 msgstr ""
 
@@ -9063,10 +9817,6 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
-msgid "Copied!"
-msgstr ""
-
 #: hypha/apply/users/templates/two_factor/core/backup_tokens.html:41
 msgid "Copy to Clipboard"
 msgstr ""
@@ -9277,32 +10027,42 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:60
+#: hypha/apply/users/templates/users/account.html:63
 msgid "Account Security"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:69
+#: hypha/apply/users/templates/users/account.html:72
 #: hypha/apply/users/templates/users/change_password.html:3
 msgid "Update password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:77
+#: hypha/apply/users/templates/users/account.html:80
 msgid "Set Password"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:89
+#: hypha/apply/users/templates/users/account.html:92
 msgid "Backup codes"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:90
+#: hypha/apply/users/templates/users/account.html:93
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:9
 msgid "Disable 2FA"
 msgstr ""
 
-#: hypha/apply/users/templates/users/account.html:92
+#: hypha/apply/users/templates/users/account.html:95
 msgid "Enable 2FA"
 msgstr ""
 
+#: hypha/apply/users/templates/users/account.html:100
+msgid "Passkeys"
+msgstr ""
+
+#: hypha/apply/users/templates/users/account.html:102
+msgid ""
+"With passkeys you can use your fingerprint, face, or screen lock to login "
+"securely without a password."
+msgstr ""
+
 #: hypha/apply/users/templates/users/activation/confirm.html:4
 msgid "Confirm account creation"
 msgstr ""
@@ -9404,7 +10164,7 @@ msgid "Select User:"
 msgstr ""
 
 #: hypha/apply/users/templates/users/become.html:26
-#: hypha/templates/includes/user_menu.html:69
+#: hypha/apply/users/templates/users/includes/user_menu.html:69
 msgid "Switch User"
 msgstr ""
 
@@ -9432,7 +10192,7 @@ msgid "Email Change - Verify Email"
 msgstr ""
 
 #: hypha/apply/users/templates/users/email_change/done.html:4
-#: hypha/apply/users/views.py:230
+#: hypha/apply/users/views.py:235
 msgid "Verify Email"
 msgstr ""
 
@@ -9495,12 +10255,75 @@ msgid "If you did not request this email, please ignore it."
 msgstr ""
 
 #: hypha/apply/users/templates/users/emails/confirm_access.md:11
+#: hypha/apply/users/templates/users/emails/login_notification.md:11
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:12
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:12
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
 #, python-format
 msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
 msgstr ""
 
+#: hypha/apply/users/templates/users/emails/login_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that your account was successfully logged in to "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:6
+#, python-format
+msgid "Login time: %(login_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:8
+msgid ""
+"If you did not log in, please contact us immediately and consider changing "
+"your password."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a new passkey was added to your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:6
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:6
+#, python-format
+msgid "Passkey: %(passkey_name)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:7
+#, python-format
+msgid "Added: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:9
+msgid ""
+"If you did not add this passkey, please contact us immediately and consider "
+"removing it from your account."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a passkey was removed from your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:7
+#, python-format
+msgid "Removed: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:9
+msgid ""
+"If you did not remove this passkey, please contact us immediately and "
+"consider changing your password if you have one."
+msgstr ""
+
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
 #, python-format
 msgid ""
@@ -9546,6 +10369,75 @@ msgstr ""
 msgid "Set password for %(username)s at %(ORG_LONG_NAME)s"
 msgstr ""
 
+#: hypha/apply/users/templates/users/includes/okta_login_button.html:7
+msgid "Log in with Okta"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/org_login_button.html:7
+#, python-format
+msgid "Log in with your %(ORG_SHORT_NAME)s email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:14
+msgid "Log in with passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:18
+msgid "Failed to begin authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:19
+msgid "Authentication failed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/password_login_button.html:7
+msgid "Log in with password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/passwordless_login_button.html:7
+msgid "Log in without password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:27
+msgid "Goto your account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:31
+msgid "My account"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:36
+msgid "Check latest notifications"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:40
+msgid "Activity feed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:44
+msgid "Goto your flagged submissions"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:48
+msgid "My flagged"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:53
+msgid "Goto wagtail admin"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:84
+msgid "Release User"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:92
+msgid "Log out"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
+msgid " or Sign up"
+msgstr ""
+
 #: hypha/apply/users/templates/users/login.html:23
 #: hypha/apply/users/templates/users/login.html:31
 msgid "Two factor verification"
@@ -9583,27 +10475,27 @@ msgstr ""
 msgid "OR"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:109
+#: hypha/apply/users/templates/users/login.html:115
 msgid "Or, alternatively, use one of your backup phones:"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:125
+#: hypha/apply/users/templates/users/login.html:131
 msgid "As a last resort, you can use a backup codes: "
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:130
+#: hypha/apply/users/templates/users/login.html:136
 msgid "Click here to use a backup code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:133
+#: hypha/apply/users/templates/users/login.html:139
 msgid "Use a Backup Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:149
+#: hypha/apply/users/templates/users/login.html:163
 msgid "Verification Code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:153
+#: hypha/apply/users/templates/users/login.html:167
 msgid "Backup Code"
 msgstr ""
 
@@ -9641,6 +10533,62 @@ msgstr ""
 msgid "Use your password"
 msgstr ""
 
+#: hypha/apply/users/templates/users/partials/passkey-list.html:22
+#: hypha/apply/users/templates/users/partials/passkey-list.html:70
+msgid "Passkey name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:23
+msgid "Click to edit name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:26
+msgid "Save name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:32
+#, python-format
+msgid "Used %(when)s ago"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:34
+msgid "Never used"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:41
+msgid "Delete this passkey?"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:44
+msgid "Delete passkey"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:52
+msgid "No passkeys registered."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:59
+msgid "Server error"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:60
+msgid "Registration failed"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:61
+msgid ""
+"This authenticator already has a passkey registered. Try a different "
+"authenticator or device."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:69
+msgid "e.g. MacBook Touch ID"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:75
+msgid "Add passkey"
+msgstr ""
+
 #: hypha/apply/users/templates/users/password_reset/complete.html:3
 #: hypha/apply/users/templates/users/password_reset/confirm.html:10
 #: hypha/apply/users/templates/users/password_reset/form.html:4
@@ -9773,6 +10721,42 @@ msgid ""
 "email."
 msgstr ""
 
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:6
+msgid "Are you sure you want to delete these users?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:20
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:22
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:5
+msgid "Are you sure you want to delete this user?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:12
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:14
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted!"
+msgstr ""
+
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:12
 msgid "This account does not have 2FA enabled."
 msgstr ""
@@ -9781,52 +10765,52 @@ msgstr ""
 msgid "2FA is disabled"
 msgstr ""
 
-#: hypha/apply/users/utils.py:40
+#: hypha/apply/users/utils.py:43
 msgid "Email is already in use."
 msgstr ""
 
-#: hypha/apply/users/utils.py:130
+#: hypha/apply/users/utils.py:137
 #, python-brace-format
 msgid "Confirmation email for {unverified_email} at {ORG_LONG_NAME}"
 msgstr ""
 
-#: hypha/apply/users/views.py:117
+#: hypha/apply/users/views.py:120
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Profile updated."
 msgstr "Partenaires mis à jour."
 
-#: hypha/apply/users/views.py:161 hypha/apply/users/views.py:236
+#: hypha/apply/users/views.py:164 hypha/apply/users/views.py:241
 msgid "Hijack feature is not enabled."
 msgstr ""
 
-#: hypha/apply/users/views.py:190
+#: hypha/apply/users/views.py:193
 msgid "Password Page timed out. Try changing the email again."
 msgstr ""
 
-#: hypha/apply/users/views.py:211
+#: hypha/apply/users/views.py:216
 msgid "Alert! An attempt to update your email."
 msgstr ""
 
-#: hypha/apply/users/views.py:270
+#: hypha/apply/users/views.py:285
 #, python-brace-format
 msgid "Your email has been successfully updated to {email}!"
 msgstr ""
 
-#: hypha/apply/users/views.py:372
+#: hypha/apply/users/views.py:387
 msgid "Your password was successfully updated!"
 msgstr ""
 
-#: hypha/apply/users/views.py:377
+#: hypha/apply/users/views.py:392
 msgid "Please correct the errors below."
 msgstr ""
 
-#: hypha/apply/users/views.py:809
+#: hypha/apply/users/views.py:824
 #, python-brace-format
 msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgstr ""
 
-#: hypha/apply/users/views.py:870
+#: hypha/apply/users/views.py:885
 msgid "✓ Check your email for password set link."
 msgstr ""
 
@@ -10056,49 +11040,49 @@ msgstr ""
 msgid "Mobile site logo (if not set default will be used)"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:60
+#: hypha/core/models/system_settings.py:61
 #, python-brace-format
 msgid ""
 "Link for the site logo, e.g. \"{example_url}\". If not set, defaults to page "
 "with slug set to \"home\"."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:64
+#: hypha/core/models/system_settings.py:66
 msgid "Front page navigation content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:66
+#: hypha/core/models/system_settings.py:68
 msgid ""
 "This will overwrite the default front page navigation bar, html tags is "
 "allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:72
+#: hypha/core/models/system_settings.py:74
 msgid "Footer content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:74
+#: hypha/core/models/system_settings.py:76
 msgid "This will be added to the footer, html tags is allowed."
 msgstr ""
 
-#: hypha/core/models/system_settings.py:84
-#: hypha/core/models/system_settings.py:94
+#: hypha/core/models/system_settings.py:86
+#: hypha/core/models/system_settings.py:96
 msgid "Text"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:105
+#: hypha/core/models/system_settings.py:107
 msgid "Homepage"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:113
+#: hypha/core/models/system_settings.py:115
 msgid "Site logo"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:122
+#: hypha/core/models/system_settings.py:124
 msgid "404 page"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:129
+#: hypha/core/models/system_settings.py:131
 msgid "403 page"
 msgstr ""
 
@@ -10160,13 +11144,13 @@ msgstr ""
 msgid "renditions"
 msgstr ""
 
-#: hypha/settings/django.py:164 hypha/settings/local.py:105
+#: hypha/settings/django.py:163 hypha/settings/local.py:105
 msgid ""
 "This password has previously appeared in a data breach and should not be "
 "used. Please choose a different password."
 msgstr ""
 
-#: hypha/settings/django.py:167 hypha/settings/local.py:108
+#: hypha/settings/django.py:166 hypha/settings/local.py:108
 msgid "Your password must not have been detected in a major security breach."
 msgstr ""
 
@@ -10215,23 +11199,19 @@ msgstr ""
 msgid "current theme"
 msgstr ""
 
-#: hypha/templates/base-apply.html:32
-msgid "Toggle Light / Dark / Auto color theme"
-msgstr ""
-
-#: hypha/templates/base-apply.html:54
+#: hypha/templates/base-apply.html:50
 msgid "Menu"
 msgstr ""
 
-#: hypha/templates/base-apply.html:76
+#: hypha/templates/base-apply.html:72
 msgid "Copyright"
 msgstr ""
 
-#: hypha/templates/base-apply.html:79
+#: hypha/templates/base-apply.html:75
 msgid "Built with"
 msgstr ""
 
-#: hypha/templates/base-apply.html:85
+#: hypha/templates/base-apply.html:81
 msgid "Manage cookies"
 msgstr ""
 
@@ -10244,20 +11224,48 @@ msgstr ""
 msgid "Page:"
 msgstr ""
 
+#: hypha/templates/cotton/card_attachment.html:13
+#, python-format
+msgid "View file - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:21
+msgid "uploaded"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:33
+#, python-format
+msgid "File not found - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:40
+msgid "Missing file"
+msgstr ""
+
 #: hypha/templates/cotton/dropdown_menu.html:69
 #: hypha/templates/cotton/dropdown_menu.html:77
 #, python-format
 msgid "Filter %(title)s"
 msgstr ""
 
-#. Translators: "delete" should match msgid "delete" (with context "confirm-delete")
-#: hypha/templates/cotton/modal/confirm.html:25
-msgid "Type <em>delete</em> below to confirm"
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "delete"
 msgstr ""
 
-#: hypha/templates/cotton/modal/confirm.html:41
-msgctxt "confirm-delete"
-msgid "delete"
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "anonymize"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:24
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">delete</pre> below to "
+"confirm"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:25
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">anonymize</pre> below to "
+"confirm"
 msgstr ""
 
 #: hypha/templates/cotton/modal/header.html:11
@@ -10284,21 +11292,21 @@ msgstr ""
 msgid "* This must be a number"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Hide password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 msgid "Show password"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently visible"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently hidden"
 msgstr ""
 
@@ -10352,59 +11360,6 @@ msgstr ""
 msgid "Your Tasks"
 msgstr ""
 
-#: hypha/templates/includes/org_login_button.html:7
-#, python-format
-msgid "Log in with your %(ORG_SHORT_NAME)s email"
-msgstr ""
-
-#: hypha/templates/includes/password_login_button.html:7
-msgid "Log in with password"
-msgstr ""
-
-#: hypha/templates/includes/passwordless_login_button.html:7
-msgid "Log in without password"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:27
-msgid "Goto your account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:31
-msgid "My account"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:36
-msgid "Check latest notifications"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:40
-msgid "Activity feed"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:44
-msgid "Goto your flagged submissions"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:48
-msgid "My flagged"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:53
-msgid "Goto wagtail admin"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:84
-msgid "Release User"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:91
-msgid "Log out"
-msgstr ""
-
-#: hypha/templates/includes/user_menu.html:101
-msgid " or Sign up"
-msgstr ""
-
 #: hypha/templates/password_required.html:4
 #: hypha/templates/password_required.html:9
 msgid "Password required"
diff --git a/hypha/locale/ru/LC_MESSAGES/django.po b/hypha/locale/ru/LC_MESSAGES/django.po
index 5560041652..74b2dec46e 100644
--- a/hypha/locale/ru/LC_MESSAGES/django.po
+++ b/hypha/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-22 16:11+0000\n"
+"POT-Creation-Date: 2026-09-17 11:50+0000\n"
 "PO-Revision-Date: 2024-04-23 14:50+0000\n"
 "Last-Translator: arctic_garden <siaurine.roze@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/hypha/hypha-core/"
@@ -32,50 +32,50 @@ msgstr "инвойсы"
 msgid "Please provide data for: {fields}"
 msgstr "Пожалуйста, предоставьте способ подачи заявок соискателями"
 
-#: hypha/apply/activity/adapters/activity_feed.py:28
+#: hypha/apply/activity/adapters/activity_feed.py:27
 #, fuzzy, python-brace-format
 #| msgid "Submitted {source.title} for {source.page.title}"
 msgid "Submitted {source.title_text_display} for {source.page.title}"
 msgstr "Подано {source.title} для {source.page.title}"
 
+#: hypha/apply/activity/adapters/activity_feed.py:29
 #: hypha/apply/activity/adapters/activity_feed.py:30
-#: hypha/apply/activity/adapters/activity_feed.py:31
 #, fuzzy
 #| msgid "edited submission"
 msgid "edited the submission"
 msgstr "отредактированная заявка"
 
-#: hypha/apply/activity/adapters/activity_feed.py:32
+#: hypha/apply/activity/adapters/activity_feed.py:31
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "updated Lead from {old_lead} to {source.lead}"
 msgstr "Руководитель изменен с {old_lead} на {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:33
+#: hypha/apply/activity/adapters/activity_feed.py:32
 #, fuzzy, python-brace-format
 #| msgid "Batch Lead changed to {new_lead}"
 msgid "batch updated Lead to {new_lead}"
 msgstr "Лидер группы был изменен на {new_lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:35
+#: hypha/apply/activity/adapters/activity_feed.py:34
 #, fuzzy, python-brace-format
 #| msgid "Sent a determination. Outcome: {determination.clean_outcome}"
 msgid "sent a determination. Outcome: {determination.clean_outcome}"
 msgstr "Отправлено заключение. Результат: {determination.clean_outcome}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:38
+#: hypha/apply/activity/adapters/activity_feed.py:37
 msgid "Invited to submit a proposal"
 msgstr "Предложено подать заявку"
 
-#: hypha/apply/activity/adapters/activity_feed.py:41
+#: hypha/apply/activity/adapters/activity_feed.py:40
 msgid "Submitted a review"
 msgstr "Подал(а) ревью"
 
-#: hypha/apply/activity/adapters/activity_feed.py:42
+#: hypha/apply/activity/adapters/activity_feed.py:41
 msgid "Opened the submission while still sealed"
 msgstr "Открыл(а) заявку которая была запечатанной"
 
-#: hypha/apply/activity/adapters/activity_feed.py:45
+#: hypha/apply/activity/adapters/activity_feed.py:44
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} {opinion.opinion_display}s with {opinion.review.author}s review of "
@@ -85,162 +85,201 @@ msgid ""
 msgstr ""
 "{user} {opinion.opinion_display} с ревью {opinion.review.author} на {source}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:48
+#: hypha/apply/activity/adapters/activity_feed.py:47
 #, fuzzy, python-brace-format
 #| msgid "{user} deleted the opinion for review: {review_opinion.review}"
 msgid "deleted the opinion for review: {review_opinion.review}"
 msgstr "{user} удалил мнение по поводу ревью: {review_opinion.review}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:51
+#: hypha/apply/activity/adapters/activity_feed.py:50
 #, python-brace-format
 msgid "Created project with initial status of \"{status}\""
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:52
+#, python-brace-format
+msgid "Created SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:53
+#, python-brace-format
+msgid "Edited SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:54
+#, fuzzy, python-brace-format
+#| msgid "Awaiting approval form to be created."
+msgid "Created project form for project \"{related.project}\""
+msgstr "Ожидание создания формы для утверждения."
+
 #: hypha/apply/activity/adapters/activity_feed.py:55
 #, fuzzy, python-brace-format
+#| msgid "Awaiting approval form to be created."
+msgid "Edited project form for project \"{related.project}\""
+msgstr "Ожидание создания формы для утверждения."
+
+#: hypha/apply/activity/adapters/activity_feed.py:58
+#, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "updated the project title from {old_title} to {source.title}"
 msgstr "Руководитель изменен с {old_lead} на {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:57
+#: hypha/apply/activity/adapters/activity_feed.py:61
+#, python-brace-format
+msgid "updated contract number to {source.contract_number}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:63
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "update Lead from {old_lead} to {source.lead}"
 msgstr "Руководитель изменен с {old_lead} на {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:58
+#: hypha/apply/activity/adapters/activity_feed.py:64
 msgid "Requested approval"
 msgstr "Запрошено одобрение"
 
-#: hypha/apply/activity/adapters/activity_feed.py:60
+#: hypha/apply/activity/adapters/activity_feed.py:66
 #: hypha/apply/determinations/models.py:209
 #: hypha/apply/determinations/models.py:213
 #: hypha/apply/determinations/models.py:217
 #: hypha/apply/determinations/options.py:12
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
-#: hypha/apply/projects/utils.py:87
+#: hypha/apply/projects/utils.py:90
 msgid "Approved"
 msgstr "Одобрено"
 
-#: hypha/apply/activity/adapters/activity_feed.py:61
+#: hypha/apply/activity/adapters/activity_feed.py:67
 #, fuzzy
 #| msgid "Requested changes for acceptance: \"{comment}\""
 msgid "requested changes for acceptance"
 msgstr "Запрошены изменения по принятой заявке: \"{comment}\""
 
-#: hypha/apply/activity/adapters/activity_feed.py:62
+#: hypha/apply/activity/adapters/activity_feed.py:68
 msgid "Submitted Contract Documents"
 msgstr "Поданы контрактные документы"
 
-#: hypha/apply/activity/adapters/activity_feed.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:69
 #, python-brace-format
 msgid "Uploaded a {contract.state} contract"
 msgstr "Загружен {contract.state} контракт"
 
-#: hypha/apply/activity/adapters/activity_feed.py:64
+#: hypha/apply/activity/adapters/activity_feed.py:70
 msgid "Approved contract"
 msgstr "Контракт одобрен"
 
-#: hypha/apply/activity/adapters/activity_feed.py:66
-#: hypha/apply/projects/views/payment.py:275
+#: hypha/apply/activity/adapters/activity_feed.py:72
+#: hypha/apply/projects/views/invoice.py:280
 msgid "Invoice added"
 msgstr "Добавлен инвойс"
 
-#: hypha/apply/activity/adapters/activity_feed.py:67
+#: hypha/apply/activity/adapters/activity_feed.py:73
 msgid "Submitted a report"
 msgstr "Отчет подан"
 
-#: hypha/apply/activity/adapters/activity_feed.py:70
-#: hypha/apply/activity/options.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:74
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "deleted a report"
+msgstr "Отчет подан"
+
+#: hypha/apply/activity/adapters/activity_feed.py:77
+#: hypha/apply/activity/options.py:73
 msgid "disabled reporting"
 msgstr "отчетность отключена"
 
-#: hypha/apply/activity/adapters/activity_feed.py:74
+#: hypha/apply/activity/adapters/activity_feed.py:81
 #, fuzzy
 #| msgid "archived submission"
 msgid "archived this submission"
 msgstr "архивная заявка"
 
-#: hypha/apply/activity/adapters/activity_feed.py:75
+#: hypha/apply/activity/adapters/activity_feed.py:82
 #, fuzzy
 #| msgid "unarchived submission"
 msgid "un-archived this submission"
 msgstr "разархивированная заявка"
 
-#: hypha/apply/activity/adapters/activity_feed.py:76
+#: hypha/apply/activity/adapters/activity_feed.py:83
 #, fuzzy
 #| msgid "Deleted an invoice"
 msgid "deleted an invoice"
 msgstr "Удалил инвойс"
 
-#: hypha/apply/activity/adapters/activity_feed.py:131
-#: hypha/apply/funds/views/submission_edit.py:630
+#: hypha/apply/activity/adapters/activity_feed.py:85
+#, fuzzy, python-brace-format
+#| msgid "Lead changed from {old_lead} to {source.lead}"
+msgid "updated author from {old_author} to {source.user}"
+msgstr "Руководитель изменен с {old_lead} на {source.lead}"
+
+#: hypha/apply/activity/adapters/activity_feed.py:145
+#: hypha/apply/funds/views/submission_edit.py:631
 msgid "Reviewers updated."
 msgstr "Ревьюеры обновлены."
 
-#: hypha/apply/activity/adapters/activity_feed.py:133
-#: hypha/apply/activity/adapters/slack.py:237
+#: hypha/apply/activity/adapters/activity_feed.py:147
+#: hypha/apply/activity/adapters/slack.py:257
 msgid "Added:"
 msgstr "Добавлен:"
 
-#: hypha/apply/activity/adapters/activity_feed.py:137
-#: hypha/apply/activity/adapters/slack.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:151
+#: hypha/apply/activity/adapters/slack.py:261
 msgid "Removed:"
 msgstr "Удален:"
 
-#: hypha/apply/activity/adapters/activity_feed.py:143
+#: hypha/apply/activity/adapters/activity_feed.py:157
 #, fuzzy
 #| msgid "Batch Reviewers Updated."
 msgid "Batch reviewers updated:"
 msgstr "Список ревьюеров обновлен."
 
-#: hypha/apply/activity/adapters/activity_feed.py:146
+#: hypha/apply/activity/adapters/activity_feed.py:160
 #, python-brace-format
 msgid "{user} as {name}."
 msgstr "{user} в качестве {name}."
 
-#: hypha/apply/activity/adapters/activity_feed.py:165
+#: hypha/apply/activity/adapters/activity_feed.py:179
 #, python-brace-format
 msgid "Successfully deleted submissions: {title}"
 msgstr "Успешно удалены заявки: {title}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:174
+#: hypha/apply/activity/adapters/activity_feed.py:188
 #, python-brace-format
 msgid "Successfully archived submissions: {title}"
 msgstr "Успешно заархивированы заявки: {title}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:187
+#: hypha/apply/activity/adapters/activity_feed.py:201
 #, python-brace-format
 msgid ""
 "Successfully updated status to {invoice_status} for invoices: "
 "{invoice_numbers}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:204
+#: hypha/apply/activity/adapters/activity_feed.py:218
 #, fuzzy, python-brace-format
 #| msgid "assign paf approver"
 msgid "assigned Project form to {}"
 msgstr "назначить подтверждающего для формы утверждения проекта"
 
-#: hypha/apply/activity/adapters/activity_feed.py:210
+#: hypha/apply/activity/adapters/activity_feed.py:224
 #, python-brace-format
 msgid "removed the task {task.code} for {source} from the task list"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:215
+#: hypha/apply/activity/adapters/activity_feed.py:229
 #, python-brace-format
 msgid ""
 "removed the task {task.code} for {source} from whole team's{user_groups} "
 "task list."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:228
-#: hypha/apply/activity/adapters/activity_feed.py:260
+#: hypha/apply/activity/adapters/activity_feed.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:273
 #, python-brace-format
 msgid "Progressed from {old_display} to {new_display}"
 msgstr "Переведено из {old_display} в {new_display}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:291
+#: hypha/apply/activity/adapters/activity_feed.py:304
 #, python-brace-format
 msgid ""
 "Updated reporting frequency. New schedule is: {new_schedule} starting on "
@@ -249,122 +288,143 @@ msgstr ""
 "Обновлена частота отчетов. Новое расписание: {new_schedule} начинающееся "
 "{schedule_start}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:296
+#: hypha/apply/activity/adapters/activity_feed.py:309
 #, fuzzy
 #| msgid "skipped report"
 msgid "Skipped a Report"
 msgstr "пропущенный отчет"
 
-#: hypha/apply/activity/adapters/activity_feed.py:298
+#: hypha/apply/activity/adapters/activity_feed.py:311
 #, fuzzy
 #| msgid "More information required"
 msgid "Marked a Report as required"
 msgstr "Требуется дополнительная информация"
 
-#: hypha/apply/activity/adapters/activity_feed.py:301
+#: hypha/apply/activity/adapters/activity_feed.py:314
 #, python-brace-format
 msgid "Updated Invoice status to: {invoice_status}."
 msgstr "Обновлен статус инвойса: {invoice_status}."
 
-#: hypha/apply/activity/adapters/activity_feed.py:350
+#: hypha/apply/activity/adapters/activity_feed.py:363
 #, fuzzy, python-brace-format
 #| msgid "Screening decision from {old_status} to {new_status}"
 msgid "Updated screening decision from \"{old_status}\" to \"{new_status}\""
 msgstr "Решение по отбору от {old_status} в {new_status}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:353
+#: hypha/apply/activity/adapters/activity_feed.py:366
 #, fuzzy, python-brace-format
 #| msgid "Screening decision from {old_status} to {new_status}"
 msgid "Added screening decision to \"{new_status}\""
 msgstr "Решение по отбору от {old_status} в {new_status}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:357
+#: hypha/apply/activity/adapters/activity_feed.py:370
 #, python-brace-format
 msgid "Removed \"{old_status}\" screening decision."
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:196
+#: hypha/apply/activity/adapters/base.py:203
 #, python-brace-format
 msgid "{adapter} [to: {recipient}]: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:200
+#: hypha/apply/activity/adapters/base.py:207
 #, python-brace-format
 msgid "{adapter}: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:90
+#: hypha/apply/activity/adapters/emails.py:92
 #, fuzzy, python-brace-format
 #| msgid "Application ready to review: {source.title}"
 msgid "Application ready to review: {source.title_text_display}"
 msgstr "Заявка готова для ревью: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:96
+#: hypha/apply/activity/adapters/emails.py:98
 msgid "Multiple applications are now ready for your review"
 msgstr "Несколько заявок ожидают вашего ревью"
 
-#: hypha/apply/activity/adapters/emails.py:99
+#: hypha/apply/activity/adapters/emails.py:101
 #, fuzzy, python-brace-format
 #| msgid "Reminder: Application ready to review: {source.title}"
 msgid "Reminder: Application ready to review: {source.title_text_display}"
 msgstr "Напоминание: Заявка ожидает ревью: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:102
+#: hypha/apply/activity/adapters/emails.py:104
 #, fuzzy
 #| msgid "edited applicant"
 msgid "You are invited as a co-applicant"
 msgstr "заявитель отредактирован"
 
-#: hypha/apply/activity/adapters/emails.py:107
+#: hypha/apply/activity/adapters/emails.py:109
 #, python-brace-format
 msgid "Project is waiting for approval: {source.title}"
 msgstr "Проект ожидает одобрения: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:111
+#: hypha/apply/activity/adapters/emails.py:113
 #, python-brace-format
 msgid "Contract uploaded for the project: {source.title}"
 msgstr "Контракт загружен для проекта: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:116
+#: hypha/apply/activity/adapters/emails.py:118
 #, python-brace-format
 msgid "Contract Documents required approval for the project: {source.title}"
 msgstr ""
 "Контрактные документы, требующие утверждения для проекта: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:126
+#: hypha/apply/activity/adapters/emails.py:128
 #, python-brace-format
 msgid "Project is waiting for the contract: {source.title}"
 msgstr "Проект в ожидании контракта: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:130
+#: hypha/apply/activity/adapters/emails.py:132
 #, python-brace-format
 msgid "Project is ready for invoicing: {source.title}"
 msgstr "Проект готов к инвойсу: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:134
+#: hypha/apply/activity/adapters/emails.py:136
 #, python-brace-format
 msgid "Project status has changed to {project_status}: {source.title}"
 msgstr "Статус проекта поменялся на {project_status}: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:140
+#: hypha/apply/activity/adapters/emails.py:142
 msgid "Project has been rejected, please update and resubmit"
 msgstr "Проект был отклонен, пожалуйста отредактируйте и подайте заново"
 
-#: hypha/apply/activity/adapters/emails.py:143
+#: hypha/apply/activity/adapters/emails.py:145
 #, python-brace-format
 msgid "Project documents are ready to be assigned for approval: {source.title}"
 msgstr ""
 "Документы по проекту готовы для передачи на согласование: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:150
+#: hypha/apply/activity/adapters/emails.py:151
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
+msgid "New comment on application to {ORG_LONG_NAME}: {source.title}"
+msgstr "Ваша заявка в {ORG_LONG_NAME}: {source.title}"
+
+#: hypha/apply/activity/adapters/emails.py:158
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
+msgid ""
+"Your application to {ORG_LONG_NAME} has been reviewed: "
+"{source.title_text_display}"
+msgstr "Ваша заявка в {ORG_LONG_NAME}: {source.title}"
+
+#: hypha/apply/activity/adapters/emails.py:162
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
+msgid "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+msgstr "Ваша заявка в {ORG_LONG_NAME}: {source.title}"
+
+#: hypha/apply/activity/adapters/emails.py:167
 #, fuzzy, python-brace-format
 #| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
 msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
 msgstr "Ваша заявка в {ORG_LONG_NAME}: {source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:153
-#, python-brace-format
-msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+#: hypha/apply/activity/adapters/emails.py:170
+#, fuzzy, python-brace-format
+#| msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+msgid "Your {ORG_LONG_NAME} project: {source.title}"
 msgstr "Ваш {ORG_LONG_NAME} проект: {source.title}"
 
 #: hypha/apply/activity/adapters/slack.py:31
@@ -477,6 +537,12 @@ msgstr "{user} удалил {source.title}"
 
 #: hypha/apply/activity/adapters/slack.py:73
 #, fuzzy, python-brace-format
+#| msgid "{user} has deleted {source.title}"
+msgid "{user} has anonymized {source.title_text_display}"
+msgstr "{user} удалил {source.title}"
+
+#: hypha/apply/activity/adapters/slack.py:76
+#, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} has deleted {review.author} review for <{link}|{source.title}>"
 msgid ""
@@ -484,7 +550,7 @@ msgid ""
 "{source.title_text_display}>"
 msgstr "{user} удалил ревью {review.author} на проект <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:76
+#: hypha/apply/activity/adapters/slack.py:79
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} has deleted {review_opinion.author} review opinion for <{link}|"
@@ -496,12 +562,12 @@ msgstr ""
 "{user} удалил мнение {review_opinion.author} по проекту <{link}|"
 "{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:79
+#: hypha/apply/activity/adapters/slack.py:82
 #, python-brace-format
 msgid "{user} has created a Project: <{link}|{source.title}>"
 msgstr "{user} создал Проект: <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:82
+#: hypha/apply/activity/adapters/slack.py:85
 #, python-brace-format
 msgid ""
 "The lead of project <{link}|{source.title}> has been updated from {old_lead} "
@@ -510,7 +576,7 @@ msgstr ""
 "Руководитель проекта <{link}|{source.title}> был обновлен с {old_lead} на "
 "{source.lead} от {user}"
 
-#: hypha/apply/activity/adapters/slack.py:85
+#: hypha/apply/activity/adapters/slack.py:88
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "The lead of project <{link}|{source.title}> has been updated from "
@@ -522,7 +588,19 @@ msgstr ""
 "Руководитель проекта <{link}|{source.title}> был обновлен с {old_lead} на "
 "{source.lead} от {user}"
 
-#: hypha/apply/activity/adapters/slack.py:88
+#: hypha/apply/activity/adapters/slack.py:91
+#, fuzzy, python-brace-format
+#| msgid ""
+#| "The lead of project <{link}|{source.title}> has been updated from "
+#| "{old_lead} to {source.lead} by {user}"
+msgid ""
+"The contract number of project <{link}|{source.title}> has been updated to "
+"{source.contract_number} by {user}"
+msgstr ""
+"Руководитель проекта <{link}|{source.title}> был обновлен с {old_lead} на "
+"{source.lead} от {user}"
+
+#: hypha/apply/activity/adapters/slack.py:94
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited {review.author} review for <{link}|{source.title}>"
 msgid ""
@@ -531,17 +609,17 @@ msgid ""
 msgstr ""
 "{user} отредактировал ревью {review.author} на проект <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:91
+#: hypha/apply/activity/adapters/slack.py:97
 #, python-brace-format
 msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgstr "{user} запросил одобрение по проекту <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:94
+#: hypha/apply/activity/adapters/slack.py:100
 #, python-brace-format
 msgid "{user} has approved project <{link}|{source.title}>"
 msgstr "{user} одобрил проект <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:97
+#: hypha/apply/activity/adapters/slack.py:103
 #, python-brace-format
 msgid ""
 "{user} has requested changes for project acceptance on <{link}|{source.title}"
@@ -549,12 +627,12 @@ msgid ""
 msgstr ""
 "{user} запросил изменения по статусу одобрения заявки <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:100
+#: hypha/apply/activity/adapters/slack.py:106
 #, python-brace-format
 msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgstr "{user} обновил контракт для <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:103
+#: hypha/apply/activity/adapters/slack.py:109
 #, python-brace-format
 msgid ""
 "{user} has submitted the contracting document for project <{link}|"
@@ -562,17 +640,17 @@ msgid ""
 msgstr ""
 "{user} отозвал контрактные документы по проекту <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:106
+#: hypha/apply/activity/adapters/slack.py:112
 #, python-brace-format
 msgid "{user} has approved contract for <{link}|{source.title}>"
 msgstr "{user} одобрил контракт для <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:109
+#: hypha/apply/activity/adapters/slack.py:115
 #, python-brace-format
 msgid "{user} has created invoice for <{link}|{source.title}>"
 msgstr "{user} создал инвойс для <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:112
+#: hypha/apply/activity/adapters/slack.py:118
 #, python-brace-format
 msgid ""
 "{user} has changed the status of <{link_related}|invoice> on <{link}|"
@@ -581,27 +659,33 @@ msgstr ""
 "{user} изменил статус <{link_related}|invoice> на проект <{link}|"
 "{source.title}> на {invoice.status_display}"
 
-#: hypha/apply/activity/adapters/slack.py:115
+#: hypha/apply/activity/adapters/slack.py:121
 #, python-brace-format
 msgid "{user} has deleted invoice from <{link}|{source.title}>"
 msgstr "{user} удалил инвойс от проекта <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:118
+#: hypha/apply/activity/adapters/slack.py:124
 #, python-brace-format
 msgid "{user} has updated invoice for <{link}|{source.title}>"
 msgstr "{user} обновил инвойс для проекта <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:121
+#: hypha/apply/activity/adapters/slack.py:127
 #, python-brace-format
 msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgstr "{user} подал отчет по проекту <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:125
+#: hypha/apply/activity/adapters/slack.py:130
+#, fuzzy, python-brace-format
+#| msgid "{user} has submitted a report for <{link}|{source.title}>"
+msgid "{user} has deleted a report for <{link}|{source.title}>"
+msgstr "{user} подал отчет по проекту <{link}|{source.title}>"
+
+#: hypha/apply/activity/adapters/slack.py:135
 #, python-brace-format
 msgid "{user} has created a new account for <{link}|{source}>"
 msgstr "{user} создал новый аккаунт для <{link}|{source}>"
 
-#: hypha/apply/activity/adapters/slack.py:128
+#: hypha/apply/activity/adapters/slack.py:138
 #, python-brace-format
 msgid ""
 "{user} has edited account for <{link}|{source}> that now has following "
@@ -610,35 +694,49 @@ msgstr ""
 "{user} изменил аккаунт для <{link}|{source}> у которого теперь следующая "
 "роль: {roles}"
 
-#: hypha/apply/activity/adapters/slack.py:132
+#: hypha/apply/activity/adapters/slack.py:142
 #, fuzzy, python-brace-format
 #| msgid "{user} has archived the submission: {source.title}"
 msgid "{user} has archived the submission: {source.title_text_display}"
 msgstr "{user} архивировал заявку: {source.title}"
 
-#: hypha/apply/activity/adapters/slack.py:135
+#: hypha/apply/activity/adapters/slack.py:145
 #, fuzzy, python-brace-format
 #| msgid "{user} has unarchived the submission: {source.title}"
 msgid "{user} has unarchived the submission: {source.title_text_display}"
 msgstr "{user} разархивировал заявку: {source.title}"
 
-#: hypha/apply/activity/adapters/slack.py:231
+#: hypha/apply/activity/adapters/slack.py:148
+#, python-brace-format
+msgid ""
+"{user} has updated author from {old_author} to {source.user} for submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:151
+#, python-brace-format
+msgid ""
+"A new comment has been assigned to {assignee} by {user} on submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:251
 #, python-brace-format
 msgid "{user} has updated the reviewers on <{link}|{title}>"
 msgstr "{user} обновил ревьюеров по проекту <{link}|{title}>"
 
-#: hypha/apply/activity/adapters/slack.py:250
+#: hypha/apply/activity/adapters/slack.py:270
 #, python-brace-format
 msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
 msgstr ""
 "{user} пакетно изменил руководителя на {new_lead} для: {submissions_text}"
 
-#: hypha/apply/activity/adapters/slack.py:262
+#: hypha/apply/activity/adapters/slack.py:282
 #, python-brace-format
 msgid "{user} as {name},"
 msgstr "{user} в качестве {name},"
 
-#: hypha/apply/activity/adapters/slack.py:268
+#: hypha/apply/activity/adapters/slack.py:288
 #, python-brace-format
 msgid ""
 "{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
@@ -646,12 +744,12 @@ msgstr ""
 "{user} добавил групповым редактированием {reviewers_text} в качестве "
 "ревьюеров для: {submissions_text}"
 
-#: hypha/apply/activity/adapters/slack.py:288
+#: hypha/apply/activity/adapters/slack.py:308
 #, python-brace-format
 msgid "{user} has transitioned the following submissions: {submissions_links}"
 msgstr "{user} передал следующие заявки: {submissions_links}"
 
-#: hypha/apply/activity/adapters/slack.py:298
+#: hypha/apply/activity/adapters/slack.py:318
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was sent by email. Outcome: "
@@ -660,7 +758,7 @@ msgstr ""
 "Заключение для <{link}|{submission_title}> было отправлено по электронной "
 "почте. Результат: {determination_outcome}"
 
-#: hypha/apply/activity/adapters/slack.py:305
+#: hypha/apply/activity/adapters/slack.py:325
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was saved without sending an "
@@ -669,22 +767,28 @@ msgstr ""
 "Заключение для <{link}|{submission_title}> было сохранено без отправки по "
 "электронной почте. Результат: {determination_outcome}"
 
-#: hypha/apply/activity/adapters/slack.py:321
+#: hypha/apply/activity/adapters/slack.py:341
 #, python-brace-format
 msgid "Determinations of {outcome} was sent for: {submissions_links}"
 msgstr "Заключение о {outcome} было отправлено для: {submissions_links}"
 
-#: hypha/apply/activity/adapters/slack.py:332
+#: hypha/apply/activity/adapters/slack.py:352
 #, python-brace-format
 msgid "{user} has deleted submissions: {title}"
 msgstr "{user} удалил отправленные заявки: {title}"
 
-#: hypha/apply/activity/adapters/slack.py:339
+#: hypha/apply/activity/adapters/slack.py:361
+#, fuzzy, python-brace-format
+#| msgid "{user} has archived submissions: {title}"
+msgid "{user} has anonymized submissions: {title}"
+msgstr "{user} архивировал заявки: {title}"
+
+#: hypha/apply/activity/adapters/slack.py:368
 #, python-brace-format
 msgid "{user} has archived submissions: {title}"
 msgstr "{user} архивировал заявки: {title}"
 
-#: hypha/apply/activity/adapters/slack.py:353
+#: hypha/apply/activity/adapters/slack.py:382
 #, python-brace-format
 msgid ""
 "<{link}|{title}> is ready for review. The following are assigned as "
@@ -719,40 +823,46 @@ msgstr "В этом месяце"
 msgid "Last 3 months"
 msgstr "Наименьшее количество комментариев"
 
-#: hypha/apply/activity/forms.py:16
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:70
+#: hypha/apply/activity/forms.py:17
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:47
 #, fuzzy
 #| msgid "Attachements"
 msgid "Attachments"
 msgstr "Приложения"
 
-#: hypha/apply/activity/forms.py:20 hypha/apply/funds/forms.py:102
-#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:371
+#: hypha/apply/activity/forms.py:21 hypha/apply/funds/forms.py:102
+#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:389
 #, fuzzy
 #| msgid "Selected"
 msgid "Select..."
 msgstr "Выбранные"
 
-#: hypha/apply/activity/forms.py:21
+#: hypha/apply/activity/forms.py:22
 #, fuzzy
 #| msgid "Assign"
 msgid "Assign to"
 msgstr "Назначить"
 
-#: hypha/apply/activity/forms.py:33
+#: hypha/apply/activity/forms.py:39
 #, fuzzy
 #| msgid "Visibility"
 msgid "Visible to"
 msgstr "Видимость"
 
-#: hypha/apply/activity/forms.py:34
+#: hypha/apply/activity/forms.py:40
 msgid "Message"
 msgstr "Сообщение"
 
-#: hypha/apply/activity/forms.py:38
+#: hypha/apply/activity/forms.py:44
 msgid "Select a relevant user role. Staff can view every comment."
 msgstr ""
 
+#: hypha/apply/activity/forms.py:73
+#, fuzzy
+#| msgid "made a comment"
+msgid "Write a comment..."
+msgstr "добавил комментарий"
+
 #: hypha/apply/activity/management/commands/send_staff_email_digest.py:146
 msgid "Summary of all activities"
 msgstr "Краткий обзор всех мероприятий"
@@ -762,7 +872,8 @@ msgid "Activities Summary - "
 msgstr "Обзор мероприятий - "
 
 #: hypha/apply/activity/models.py:25
-#: hypha/apply/funds/models/co_applicants.py:9 hypha/apply/todo/options.py:69
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:12
+#: hypha/apply/funds/models/co_applicants.py:10 hypha/apply/todo/options.py:76
 #, fuzzy
 #| msgid "Comments"
 msgid "Comment"
@@ -774,7 +885,7 @@ msgstr "Комментарии"
 msgid "Action"
 msgstr "Активные"
 
-#: hypha/apply/activity/models.py:36
+#: hypha/apply/activity/models.py:36 hypha/apply/funds/forms.py:336
 #, fuzzy
 #| msgid "Applicant"
 msgid "Applicants"
@@ -786,9 +897,9 @@ msgstr "Заявитель"
 msgid "Staff only"
 msgstr "Флаг для сотрудников"
 
-#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:231
-#: hypha/apply/funds/tables.py:469
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:81
+#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:245
+#: hypha/apply/funds/tables.py:533
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:86
 #: hypha/apply/funds/templates/submissions/all.html:437
 #: hypha/apply/funds/templates/submissions/all.html:478
 msgid "Reviewers"
@@ -810,7 +921,7 @@ msgstr "Приложения к предложению"
 msgid "activity attachments"
 msgstr "Приложения к предложению"
 
-#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:379
+#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:384
 #, fuzzy
 #| msgid "Message"
 msgid "message"
@@ -834,19 +945,19 @@ msgstr "Лента активности"
 msgid "activities"
 msgstr "Другие комментарии"
 
-#: hypha/apply/activity/models.py:329
+#: hypha/apply/activity/models.py:334
 msgid "verb"
 msgstr "действие"
 
-#: hypha/apply/activity/models.py:340
+#: hypha/apply/activity/models.py:345
 msgid "event"
 msgstr ""
 
-#: hypha/apply/activity/models.py:341
+#: hypha/apply/activity/models.py:346
 msgid "events"
 msgstr ""
 
-#: hypha/apply/activity/models.py:380
+#: hypha/apply/activity/models.py:385
 #, fuzzy
 #| msgid "Message"
 msgid "messages"
@@ -941,159 +1052,219 @@ msgid "deleted submission"
 msgstr "удаленная заявка"
 
 #: hypha/apply/activity/options.py:35
+#, fuzzy
+#| msgid "archived submission"
+msgid "anonymized submission"
+msgstr "архивная заявка"
+
+#: hypha/apply/activity/options.py:36
 msgid "deleted review"
 msgstr "удаленное ревью"
 
-#: hypha/apply/activity/options.py:36
+#: hypha/apply/activity/options.py:37
 msgid "deleted review opinion"
 msgstr "удалено ревью"
 
-#: hypha/apply/activity/options.py:37
+#: hypha/apply/activity/options.py:38
 msgid "created project"
 msgstr "созданный проект"
 
-#: hypha/apply/activity/options.py:38
+#: hypha/apply/activity/options.py:39
+#, fuzzy
+#| msgid "created project"
+msgid "created a project SOW"
+msgstr "созданный проект"
+
+#: hypha/apply/activity/options.py:40
+#, fuzzy
+#| msgid "Project"
+msgid "edited a project SOW"
+msgstr "Проект"
+
+#: hypha/apply/activity/options.py:41
+#, fuzzy
+#| msgid "created project"
+msgid "created a project form"
+msgstr "созданный проект"
+
+#: hypha/apply/activity/options.py:42
+#, fuzzy
+#| msgid "Project SOW Form"
+msgid "edited a project form"
+msgstr "Форма технического задания проекта"
+
+#: hypha/apply/activity/options.py:43
 msgid "updated project lead"
 msgstr "руководитель проекта обновлен"
 
-#: hypha/apply/activity/options.py:39
+#: hypha/apply/activity/options.py:44
 #, fuzzy
 #| msgid "updated project lead"
 msgid "updated project title"
 msgstr "руководитель проекта обновлен"
 
-#: hypha/apply/activity/options.py:40
+#: hypha/apply/activity/options.py:47
+#, fuzzy
+#| msgid "updated project lead"
+msgid "updated project contract number"
+msgstr "руководитель проекта обновлен"
+
+#: hypha/apply/activity/options.py:49
 msgid "edited review"
 msgstr "отредактированное ревью"
 
-#: hypha/apply/activity/options.py:41
+#: hypha/apply/activity/options.py:50
 msgid "sent for approval"
 msgstr "отправлено на утверждение"
 
-#: hypha/apply/activity/options.py:42
+#: hypha/apply/activity/options.py:51
 msgid "approved project"
 msgstr "утвержденный проект"
 
-#: hypha/apply/activity/options.py:43
+#: hypha/apply/activity/options.py:52
 #, fuzzy
 #| msgid "assign paf approver"
 msgid "assign project form approver"
 msgstr "назначить подтверждающего для формы утверждения проекта"
 
-#: hypha/apply/activity/options.py:44
+#: hypha/apply/activity/options.py:53
 #, fuzzy
 #| msgid "approved project"
 msgid "approved project form"
 msgstr "утвержденный проект"
 
-#: hypha/apply/activity/options.py:45
+#: hypha/apply/activity/options.py:54
 msgid "transitioned project"
 msgstr "переданный проект"
 
-#: hypha/apply/activity/options.py:46
+#: hypha/apply/activity/options.py:55
 msgid "requested project change"
 msgstr "запрошенное изменение проекта"
 
-#: hypha/apply/activity/options.py:49
+#: hypha/apply/activity/options.py:58
 msgid "submitted contract documents"
 msgstr "представленная контрактная документация"
 
-#: hypha/apply/activity/options.py:51
+#: hypha/apply/activity/options.py:60
 msgid "uploaded document to project"
 msgstr "загруженный в проект документ"
 
-#: hypha/apply/activity/options.py:52
+#: hypha/apply/activity/options.py:61
 msgid "uploaded contract to project"
 msgstr "загруженный в проект контракт"
 
-#: hypha/apply/activity/options.py:53
+#: hypha/apply/activity/options.py:62
 msgid "approved contract"
 msgstr "утвержденный контракт"
 
-#: hypha/apply/activity/options.py:54
+#: hypha/apply/activity/options.py:63
 msgid "created invoice for project"
 msgstr "созданный для проекта инвойс"
 
-#: hypha/apply/activity/options.py:55
+#: hypha/apply/activity/options.py:64
 msgid "updated invoice status"
 msgstr "обновленный статус инвойса"
 
-#: hypha/apply/activity/options.py:56
+#: hypha/apply/activity/options.py:65
 msgid "approve invoice"
 msgstr "утвердить инвойс"
 
-#: hypha/apply/activity/options.py:57
+#: hypha/apply/activity/options.py:66
 msgid "deleted invoice"
 msgstr "удаленный инвойс"
 
-#: hypha/apply/activity/options.py:58
+#: hypha/apply/activity/options.py:67
 msgid "sent project to compliance"
 msgstr "отправить проект на согласование"
 
-#: hypha/apply/activity/options.py:59
+#: hypha/apply/activity/options.py:68
 msgid "updated invoice"
 msgstr "обновленный инвойс"
 
-#: hypha/apply/activity/options.py:60
+#: hypha/apply/activity/options.py:69
 msgid "submitted report"
 msgstr "поданный отчет"
 
-#: hypha/apply/activity/options.py:61
+#: hypha/apply/activity/options.py:70
+#, fuzzy
+#| msgid "deleted review"
+msgid "deleted report"
+msgstr "удаленное ревью"
+
+#: hypha/apply/activity/options.py:71
 msgid "skipped report"
 msgstr "пропущенный отчет"
 
-#: hypha/apply/activity/options.py:62
+#: hypha/apply/activity/options.py:72
 msgid "changed report frequency"
 msgstr "изменена периодичность отчетов"
 
-#: hypha/apply/activity/options.py:64
+#: hypha/apply/activity/options.py:74
 msgid "notified report"
 msgstr "уведомляющий отчет"
 
-#: hypha/apply/activity/options.py:65
+#: hypha/apply/activity/options.py:75
 msgid "reminder to review"
 msgstr "напоминание о ревью"
 
-#: hypha/apply/activity/options.py:66
+#: hypha/apply/activity/options.py:76
 msgid "batch deleted submissions"
 msgstr "групповое удаление заявок"
 
-#: hypha/apply/activity/options.py:69
+#: hypha/apply/activity/options.py:79
+#, fuzzy
+#| msgid "batch archive submissions"
+msgid "batch anonymized submissions"
+msgstr "заявки, архивированные групповым редактированием"
+
+#: hypha/apply/activity/options.py:83
 msgid "batch archive submissions"
 msgstr "заявки, архивированные групповым редактированием"
 
-#: hypha/apply/activity/options.py:73
+#: hypha/apply/activity/options.py:87
 #, fuzzy
 #| msgid "updated invoice status"
 msgid "batch update invoice status"
 msgstr "обновленный статус инвойса"
 
-#: hypha/apply/activity/options.py:75
+#: hypha/apply/activity/options.py:89
 msgid "created new account"
 msgstr "создал новую учётную запись"
 
-#: hypha/apply/activity/options.py:76
+#: hypha/apply/activity/options.py:90
 msgid "edited account"
 msgstr "аккаунт отредактирован"
 
-#: hypha/apply/activity/options.py:77
+#: hypha/apply/activity/options.py:91
 msgid "archived submission"
 msgstr "архивная заявка"
 
-#: hypha/apply/activity/options.py:78
+#: hypha/apply/activity/options.py:92
 msgid "unarchived submission"
 msgstr "разархивированная заявка"
 
-#: hypha/apply/activity/options.py:79
+#: hypha/apply/activity/options.py:93
 msgid "remove task"
 msgstr ""
 
-#: hypha/apply/activity/options.py:80
+#: hypha/apply/activity/options.py:94
 #, fuzzy
 #| msgid "edited applicant"
 msgid "invite co-applicant"
 msgstr "заявитель отредактирован"
 
+#: hypha/apply/activity/options.py:95
+#, fuzzy
+#| msgid "updated partners"
+msgid "updated author"
+msgstr "партнеры обновлены"
+
+#: hypha/apply/activity/options.py:96
+#, fuzzy
+#| msgid "Comments"
+msgid "comment assigned"
+msgstr "Комментарии"
+
 #: hypha/apply/activity/templates/activity/include/action_list.html:6
 msgid "There are no actions."
 msgstr "Нет действий."
@@ -1125,13 +1296,13 @@ msgid "Filter"
 msgstr "Фильтр"
 
 #: hypha/apply/activity/templates/activity/notifications.html:79
-#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:44
+#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:61
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:46
-#: hypha/apply/funds/models/co_applicants.py:8
+#: hypha/apply/funds/models/co_applicants.py:9
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:62
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:76
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:83
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:99
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:133
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:120
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:159
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:72
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:19
@@ -1159,100 +1330,136 @@ msgstr "Последнее редактирование"
 msgid "deleted"
 msgstr "Удалить"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:28
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:23
+#, fuzzy
+#| msgid "Add determination"
+msgid "Additional options"
+msgstr "Добавить решение"
+
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:35
+#: hypha/apply/funds/templates/funds/comments.html:68
+#: hypha/apply/funds/templates/funds/comments.html:82
+#, fuzzy
+#| msgid "added comment"
+msgid "Add Comment"
+msgstr "добавлен комментарий"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:36
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:150
 #, python-format
 msgid "This user is a %(role)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:37
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:48
+#, fuzzy
+#| msgid "Ready for Determination"
+msgid "message from determination"
+msgstr "Готово к решению"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:50
+#, python-format
+msgid "commented on %(related_name)s"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:53
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:159
 #, fuzzy
 #| msgid "Comments"
 msgid "commented"
 msgstr "Комментарии"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:52
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:69
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:173
 #, fuzzy
 #| msgid "PAF assigned to {}"
 msgid "Assigned to you"
 msgstr "Форма утверждения проекта назначена на {}"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:54
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:71
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:175
 #, python-format
 msgid "Assigned to %(assigned_to)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:61
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:78
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:182
 #, python-format
 msgid "This is visible to %(visibility_text)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:72
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:193
 #, fuzzy
 #| msgid "added comment"
 msgid "Edit comment"
 msgstr "добавлен комментарий"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:76
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:93
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:197
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:40
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:36
-#: hypha/apply/funds/models/co_applicants.py:10
+#: hypha/apply/funds/models/co_applicants.py:11
 #: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:10
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:118
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:55
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:90
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:98
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:122
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:106
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:97
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:76
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:130
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:170
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:29
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:148
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:50
 #: hypha/apply/review/templates/review/review_detail.html:82
 msgid "Edit"
 msgstr "Редактировать"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:84
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:101
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:205
 #, fuzzy
 #| msgid "Are you sure you want to delete selected submissions?"
 msgid ""
 "Are you sure you want to delete this comment? This action cannot be undone."
 msgstr "Вы уверены, что хотите удалить выбранные заявки?"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:85
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:102
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:206
 #, fuzzy
 #| msgid "Other comments"
 msgid "Delete comment"
 msgstr "Другие комментарии"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:106
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:210
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:59
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:120
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:182
 #: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:21
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:26
 #: hypha/apply/funds/templates/funds/modals/edit_co_applicant_form.html:75
-#: hypha/apply/funds/templates/submissions/all.html:502
-#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:59
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
-#: hypha/apply/projects/views/payment.py:356
+#: hypha/apply/funds/templates/submissions/all.html:504
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:71
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:41
+#: hypha/apply/projects/views/invoice.py:361
 #: hypha/apply/review/templates/review/review_detail.html:92
-#: hypha/templates/cotton/modal/confirm.html:43
 #: hypha/templates/includes/dialog_form_base.html:28
 msgid "Delete"
 msgstr "Удалить"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:97
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:114
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:218
 msgid "updated"
 msgstr "обновлено"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:109
-msgid "View "
-msgstr "Просмотреть "
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:125
+#, python-format
+msgid "View %(related_name)s"
+msgstr ""
 
 #: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:27
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:78
-#: hypha/apply/funds/views/submission_edit.py:131
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:130
+#: hypha/apply/funds/views/submission_edit.py:318
 #: hypha/apply/funds/workflows/definitions/double_stage.py:20
 #: hypha/apply/funds/workflows/definitions/double_stage.py:48
 #: hypha/apply/funds/workflows/definitions/double_stage.py:98
@@ -1267,6 +1474,10 @@ msgstr "Просмотреть "
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:50
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:120
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:164
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:19
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:46
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:105
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:20
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:47
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:93
@@ -1276,18 +1487,18 @@ msgstr "Просмотреть "
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
 #: hypha/apply/projects/reports/templates/reports/report_form.html:60
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:30
-#: hypha/apply/projects/views/project.py:309
-#: hypha/apply/projects/views/project.py:345
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
-#: hypha/apply/projects/views/project.py:903
-#: hypha/apply/projects/views/project.py:942
-#: hypha/apply/projects/views/project.py:976
-#: hypha/apply/projects/views/project.py:1009
-#: hypha/apply/projects/views/project.py:1363
-#: hypha/apply/projects/views/project.py:1436
-#: hypha/apply/projects/views/project.py:1467
-#: hypha/apply/projects/views/project.py:1622
+#: hypha/apply/projects/views/project.py:313
+#: hypha/apply/projects/views/project.py:349
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
+#: hypha/apply/projects/views/project.py:954
+#: hypha/apply/projects/views/project.py:993
+#: hypha/apply/projects/views/project.py:1027
+#: hypha/apply/projects/views/project.py:1060
+#: hypha/apply/projects/views/project.py:1414
+#: hypha/apply/projects/views/project.py:1487
+#: hypha/apply/projects/views/project.py:1518
+#: hypha/apply/projects/views/project.py:1673
 #: hypha/apply/review/templates/review/review_edit_form.html:67
 #: hypha/apply/review/templates/review/review_form.html:84
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1302,6 +1513,8 @@ msgstr "Подать"
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:58
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:59
 #: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:40
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:37
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:17
 #: hypha/apply/projects/templates/application_projects/project_form.html:33
 #: hypha/apply/users/templates/users/become.html:33
 #: hypha/templates/cotton/modal/confirm.html:48
@@ -1336,12 +1549,13 @@ msgid "Submissions"
 msgstr "Заявки"
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:17
-#: hypha/apply/funds/tables.py:76
+#: hypha/apply/funds/tables.py:77
 #: hypha/apply/funds/templates/cotton/submission_list.html:38
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:41
-#: hypha/apply/funds/templates/funds/comments.html:37
-#: hypha/apply/projects/templates/application_projects/project_detail.html:31
-#: hypha/apply/review/views.py:432
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:29
+#: hypha/apply/funds/templates/funds/comments.html:25
+#: hypha/apply/projects/templates/application_projects/project_detail.html:26
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:24
+#: hypha/apply/review/views.py:441
 msgid "Comments"
 msgstr "Комментарии"
 
@@ -1350,7 +1564,7 @@ msgstr "Комментарии"
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
 #: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:62
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:68
 #: hypha/apply/review/templates/review/review_list.html:4
 #: hypha/apply/review/templates/review/review_list.html:9
 #: hypha/core/navigation.py:80
@@ -1390,6 +1604,7 @@ msgid "View your submission here"
 msgstr "Просмотреть заявку"
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:16
+#: hypha/apply/activity/templates/messages/email/author_updated.html:11
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:29
 #: hypha/apply/activity/templates/messages/email/invited_to_proposal.html:11
 #: hypha/apply/activity/templates/messages/email/submission_confirmation.html:10
@@ -1397,6 +1612,7 @@ msgid "If you have any questions, please submit them here"
 msgstr "Если у вас есть вопросы, пожалуйста, задайте их здесь"
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:18
+#: hypha/apply/activity/templates/messages/email/author_updated.html:13
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:31
 msgid "See our guide for more information"
 msgstr "Более подробную информацию вы найдете в нашем руководстве"
@@ -1425,8 +1641,8 @@ msgstr "Проектные документы готовы к отправке 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:42
 #: hypha/apply/funds/templates/funds/revisions_compare.html:43
 #: hypha/core/models/system_settings.py:21
-#: hypha/core/models/system_settings.py:79
-#: hypha/core/models/system_settings.py:89
+#: hypha/core/models/system_settings.py:81
+#: hypha/core/models/system_settings.py:91
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1451,11 +1667,38 @@ msgstr ""
 "Пожалуйста, свяжитесь с %(lead)s по адресу электронной почты %(email)s, если "
 "у вас возникнут вопросы."
 
+#: hypha/apply/activity/templates/messages/email/author_updated.html:6
+#, fuzzy, python-format
+#| msgid "You have been added as a partner the following submission."
+msgid "You have been assigned as an Applicant to submission \"%(title)s\"."
+msgstr "Вы были добавлены в качестве партнера следующей заявки."
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:10
+#, fuzzy
+#| msgid "View submission"
+msgid "Link to your submission"
+msgstr "Просмотреть заявку"
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:15
+#, fuzzy, python-format
+#| msgid ""
+#| "If you have any issues accessing the submission system or other general "
+#| "inquiries, please email us at %(ORG_EMAIL)s"
+msgid ""
+"If you have any issues accessing the submission or other general inquiries, "
+"please email us at %(ORG_EMAIL)s"
+msgstr ""
+"Если у вас возникли проблемы с доступом к системе подачи заявок или другие "
+"общие вопросы, пожалуйста, напишите нам по адресу %(ORG_EMAIL)s"
+
 #: hypha/apply/activity/templates/messages/email/base.html:5
 #: hypha/apply/users/templates/users/activation/email.txt:2
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:2
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:2
 #: hypha/apply/users/templates/users/emails/confirm_access.md:2
+#: hypha/apply/users/templates/users/emails/login_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:2
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:2
 #: hypha/apply/users/templates/users/emails/set_password.txt:2
 #: hypha/apply/users/templates/users/password_reset/email.txt:2
@@ -1468,6 +1711,9 @@ msgstr "Уважаемый(ая) %(user)s,"
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:7
 #: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/login_notification.md:14
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:15
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:15
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
 #: hypha/apply/users/templates/users/emails/set_password.txt:10
@@ -1503,6 +1749,22 @@ msgstr "Был оставлен новый комментарий для \"%(tit
 msgid "Read the full comment here"
 msgstr "Полный текст комментария читайте здесь"
 
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:5
+msgid "Hey there,"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:8
+#, fuzzy, python-format
+#| msgid "There has been a new comment on \"%(title)s\" by %(user)s."
+msgid "You have been assigned to a comment on \"%(title)s\"."
+msgstr "Был оставлен новый комментарий для \"%(title)s\" от %(user)s."
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:12
+#, fuzzy
+#| msgid "View project page"
+msgid "View it here"
+msgstr "Просмотреть страницу проекта"
+
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:13
 msgid "A new contract has been added to your Project"
 msgstr "В ваш проект был добавлен новый контракт"
@@ -1779,8 +2041,8 @@ msgid "no longer required"
 msgstr "больше не требуется"
 
 #: hypha/apply/activity/templates/messages/email/report_skipped.html:6
-#: hypha/apply/projects/models/project.py:818
-#: hypha/apply/projects/models/project.py:855
+#: hypha/apply/projects/models/project.py:847
+#: hypha/apply/projects/models/project.py:884
 msgid "required"
 msgstr "требуется"
 
@@ -1904,7 +2166,7 @@ msgid "Please submit any questions related to your application here"
 msgstr "Пожалуйста, задавайте любые вопросы, связанные с вашей заявкой, здесь"
 
 #: hypha/apply/activity/templatetags/activity_tags.py:50
-#: hypha/apply/funds/tables.py:498
+#: hypha/apply/funds/tables.py:562
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:12
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:28
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:44
@@ -1915,7 +2177,7 @@ msgstr "Ревьюер"
 
 #: hypha/apply/activity/templatetags/activity_tags.py:61
 #: hypha/apply/funds/templates/cotton/submission_list.html:24
-#: hypha/apply/funds/templatetags/workflow_tags.py:72
+#: hypha/apply/funds/templatetags/workflow_tags.py:126
 #: hypha/apply/users/roles.py:5
 msgid "Applicant"
 msgstr "Заявитель"
@@ -1930,24 +2192,30 @@ msgstr ""
 msgid "You can begin submitting invoices and reports for your project."
 msgstr ""
 
-#: hypha/apply/activity/views.py:61
+#: hypha/apply/activity/views.py:99
 #, fuzzy
 #| msgid "You can only approve a signed contract"
 msgid "You can only edit your own comments"
 msgstr "Вы можете утвердить только подписанный контракт"
 
-#: hypha/apply/activity/views.py:64
+#: hypha/apply/activity/views.py:102
 msgid "You can not edit a deleted comment"
 msgstr ""
 
-#: hypha/apply/activity/views.py:92
+#: hypha/apply/activity/views.py:130
 msgid "You can only delete your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:95
+#: hypha/apply/activity/views.py:133
 msgid "You can not delete a deleted comment"
 msgstr ""
 
+#: hypha/apply/activity/views.py:183
+#, fuzzy
+#| msgid "Comments"
+msgid "Comment added!"
+msgstr "Комментарии"
+
 #: hypha/apply/categories/admin.py:13
 #, fuzzy
 #| msgid "Categories"
@@ -1969,27 +2237,27 @@ msgstr ""
 msgid "{title} {child_verbose_name} {verbose_name} for {parent}"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:31
+#: hypha/apply/categories/blocks.py:37
 msgid "Multi select"
 msgstr "Выбор нескольких вариантов"
 
-#: hypha/apply/categories/blocks.py:35 hypha/apply/funds/blocks.py:96
-#: hypha/apply/funds/blocks.py:153 hypha/apply/funds/blocks.py:199
+#: hypha/apply/categories/blocks.py:41 hypha/apply/funds/blocks.py:113
+#: hypha/apply/funds/blocks.py:170 hypha/apply/funds/blocks.py:216
 #: hypha/apply/stream_forms/blocks.py:36
 msgid "Label"
 msgstr "Ярлык"
 
-#: hypha/apply/categories/blocks.py:37
+#: hypha/apply/categories/blocks.py:43
 msgid "Leave blank to use the default Category label"
 msgstr "Оставьте пустым, чтобы использовать метку категории по умолчанию"
 
-#: hypha/apply/categories/blocks.py:40 hypha/apply/funds/blocks.py:100
-#: hypha/apply/funds/blocks.py:157 hypha/apply/funds/blocks.py:202
+#: hypha/apply/categories/blocks.py:46 hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:174 hypha/apply/funds/blocks.py:219
 #: hypha/apply/stream_forms/blocks.py:37
 msgid "Help text"
 msgstr "Текст справки"
 
-#: hypha/apply/categories/blocks.py:42
+#: hypha/apply/categories/blocks.py:48
 msgid "Leave blank to use the default Category help text"
 msgstr ""
 "Оставьте поле пустым, чтобы использовать текст справки по умолчанию для "
@@ -2016,7 +2284,8 @@ msgstr "Сделать фильтр доступным для дашборда"
 msgid "Options"
 msgstr "Опции"
 
-#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:234
+#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:248
+#: hypha/apply/funds/tables.py:333
 #: hypha/apply/funds/templates/submissions/all.html:419
 #: hypha/apply/projects/templates/application_projects/modals/contracting_documents_upload.html:7
 #: hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html:7
@@ -2063,11 +2332,15 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:373
-#: hypha/apply/funds/tables.py:236
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:121
+#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:390
+#: hypha/apply/funds/tables.py:250
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:126
 #: hypha/apply/funds/templates/submissions/all.html:425
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:5
+#: hypha/apply/projects/forms/invoice.py:238 hypha/apply/projects/tables.py:115
+#: hypha/apply/projects/tables.py:152
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:58
+#: hypha/apply/projects/templates/application_projects/partials/invoice_tags.html:4
 msgid "Tags"
 msgstr ""
 
@@ -2147,12 +2420,12 @@ msgstr "Нет активных инвойсов."
 
 #: hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html:91
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:24
-#: hypha/apply/funds/tables.py:68
+#: hypha/apply/funds/tables.py:69
 #: hypha/apply/funds/templates/submissions/all.html:328
-#: hypha/apply/projects/models/payment.py:26
-#: hypha/apply/projects/models/project.py:218
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:56
-#: hypha/apply/projects/tables.py:42
+#: hypha/apply/projects/models/invoice.py:37
+#: hypha/apply/projects/models/project.py:219
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:63
+#: hypha/apply/projects/tables.py:40
 msgid "Submitted"
 msgstr "Подано"
 
@@ -2196,7 +2469,7 @@ msgstr "Ваши предыдущие ревью"
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:13
 #: hypha/apply/dashboard/templates/dashboard/staff_dashboard.html:16
 #: hypha/apply/users/templates/users/account.html:35
-#: hypha/templates/includes/user_menu.html:57
+#: hypha/apply/users/templates/users/includes/user_menu.html:57
 #, fuzzy
 #| msgid "Add determination"
 msgid "Administration"
@@ -2217,7 +2490,7 @@ msgid "You don't have any PAFs for review right now"
 msgstr "У вас еще нет резервных кодов."
 
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:27
-#: hypha/apply/funds/models/co_applicants.py:16
+#: hypha/apply/funds/models/co_applicants.py:17
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:6
 #: hypha/core/navigation.py:109
@@ -2311,11 +2584,12 @@ msgstr "Нет активных проектов"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:27
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
 #: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:79
-#: hypha/apply/todo/options.py:87 hypha/apply/todo/options.py:95
+#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:86
+#: hypha/apply/todo/options.py:94 hypha/apply/todo/options.py:102
 #: hypha/apply/todo/templates/todo/todolist_item.html:16
 msgid "Draft"
 msgstr "Черновик"
@@ -2329,11 +2603,9 @@ msgstr "Черновик"
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:30
 #: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:11
 #: hypha/apply/determinations/templates/determinations/includes/determination_block.html:18
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:104
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:84
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:79
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:28
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:40
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "by"
 msgstr "от"
@@ -2447,30 +2719,38 @@ msgstr "Отправить уведомление"
 #: hypha/apply/determinations/blocks.py:77
 #: hypha/apply/determinations/blocks.py:78
 #: hypha/apply/determinations/blocks.py:79
-#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:276
-#: hypha/apply/review/blocks.py:172 hypha/apply/review/blocks.py:173
-#: hypha/apply/review/blocks.py:174 hypha/apply/review/blocks.py:175
-#: hypha/apply/review/blocks.py:176 hypha/apply/review/blocks.py:177
-#: hypha/apply/review/blocks.py:178 hypha/apply/stream_forms/blocks.py:475
-#: hypha/apply/stream_forms/blocks.py:476
-#: hypha/apply/stream_forms/blocks.py:477
-#: hypha/apply/stream_forms/blocks.py:478
-#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482
-#: hypha/apply/stream_forms/blocks.py:483
-#: hypha/apply/stream_forms/blocks.py:484
-#: hypha/apply/stream_forms/blocks.py:485
-#: hypha/apply/stream_forms/blocks.py:486
-#: hypha/apply/stream_forms/blocks.py:487
-#: hypha/apply/stream_forms/blocks.py:488 hypha/apply/utils/blocks.py:74
+#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:303
+#: hypha/apply/funds/blocks.py:304 hypha/apply/funds/blocks.py:305
+#: hypha/apply/funds/blocks.py:306 hypha/apply/funds/blocks.py:307
+#: hypha/apply/funds/blocks.py:308 hypha/apply/funds/blocks.py:309
+#: hypha/apply/funds/blocks.py:310 hypha/apply/funds/blocks.py:311
+#: hypha/apply/funds/blocks.py:312 hypha/apply/funds/blocks.py:313
+#: hypha/apply/funds/blocks.py:314 hypha/apply/funds/blocks.py:315
+#: hypha/apply/funds/blocks.py:316 hypha/apply/funds/blocks.py:317
+#: hypha/apply/funds/blocks.py:318 hypha/apply/review/blocks.py:172
+#: hypha/apply/review/blocks.py:173 hypha/apply/review/blocks.py:174
+#: hypha/apply/review/blocks.py:175 hypha/apply/review/blocks.py:176
+#: hypha/apply/review/blocks.py:177 hypha/apply/review/blocks.py:178
+#: hypha/apply/stream_forms/blocks.py:513
+#: hypha/apply/stream_forms/blocks.py:514
+#: hypha/apply/stream_forms/blocks.py:515
+#: hypha/apply/stream_forms/blocks.py:516
+#: hypha/apply/stream_forms/blocks.py:517
+#: hypha/apply/stream_forms/blocks.py:518
+#: hypha/apply/stream_forms/blocks.py:519
+#: hypha/apply/stream_forms/blocks.py:520
+#: hypha/apply/stream_forms/blocks.py:521
+#: hypha/apply/stream_forms/blocks.py:522
+#: hypha/apply/stream_forms/blocks.py:523
+#: hypha/apply/stream_forms/blocks.py:524
+#: hypha/apply/stream_forms/blocks.py:525
+#: hypha/apply/stream_forms/blocks.py:526 hypha/apply/utils/blocks.py:74
 #: hypha/apply/utils/blocks.py:75
 msgid "Fields"
 msgstr "Поля"
 
 #: hypha/apply/determinations/blocks.py:78 hypha/apply/review/blocks.py:174
-#: hypha/apply/stream_forms/blocks.py:473
+#: hypha/apply/stream_forms/blocks.py:511
 msgid "Paragraph"
 msgstr "Параграф"
 
@@ -2492,7 +2772,7 @@ msgid "Do you recommend requesting a proposal based on this concept note?"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:305
-#: hypha/apply/determinations/views.py:99
+#: hypha/apply/determinations/views.py:100
 msgid "-- No determination selected -- "
 msgstr "-- Нет выбранных решений -- "
 
@@ -2573,22 +2853,22 @@ msgid "Rationale and appropriateness questions and comments"
 msgstr "Вопросы и комментарии по обоснованию и целесообразности"
 
 #: hypha/apply/determinations/forms.py:592
-#: hypha/apply/determinations/views.py:389
+#: hypha/apply/determinations/views.py:394
 msgid "-- No proposal form selected -- "
 msgstr "-- Не выбрана форма предложения... "
 
 #: hypha/apply/determinations/forms.py:595
-#: hypha/apply/determinations/views.py:392
+#: hypha/apply/determinations/views.py:397
 msgid "Select the proposal form only for determination approval"
 msgstr "Выберите форму предложения только для утверждения решения"
 
 #: hypha/apply/determinations/forms.py:599
-#: hypha/apply/determinations/views.py:396
+#: hypha/apply/determinations/views.py:401
 msgid "Select the proposal form to use for proposal stage."
 msgstr "Выберите форму предложения для использования на этапе предложения."
 
 #: hypha/apply/determinations/forms.py:602
-#: hypha/apply/determinations/views.py:399
+#: hypha/apply/determinations/views.py:404
 msgid "Proposal Form"
 msgstr "Форма для предложения"
 
@@ -2660,11 +2940,12 @@ msgstr "Сообщение о решении"
 #: hypha/apply/determinations/models.py:214
 #: hypha/apply/determinations/models.py:218
 #: hypha/apply/determinations/options.py:10
-#: hypha/apply/funds/workflows/constants.py:93
+#: hypha/apply/funds/workflows/constants.py:97
 #: hypha/apply/funds/workflows/definitions/double_stage.py:147
 #: hypha/apply/funds/workflows/definitions/double_stage.py:326
 #: hypha/apply/funds/workflows/definitions/single_stage.py:149
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:214
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:198
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:138
 msgid "Dismissed"
@@ -2679,7 +2960,7 @@ msgid "Needs more info"
 msgstr "0. Требуется дополнительная информация"
 
 #: hypha/apply/determinations/models.py:255
-#: hypha/apply/funds/workflows/registry.py:66
+#: hypha/apply/funds/workflows/registry.py:67
 msgid "Request"
 msgstr "Запрос"
 
@@ -2746,9 +3027,9 @@ msgstr "Просмотреть заявку"
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:85
 #: hypha/apply/funds/templates/funds/application_base.html:125
 #: hypha/apply/funds/templates/funds/applicationsubmission_form.html:49
-#: hypha/apply/funds/views/submission_edit.py:129
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:320
+#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:319
 #: hypha/apply/projects/reports/templates/reports/report_form.html:69
 #: hypha/apply/projects/templates/application_projects/project_approval_form.html:52
 #: hypha/apply/projects/templates/application_projects/project_sow_form.html:48
@@ -2758,7 +3039,7 @@ msgid "Save draft"
 msgstr "Сохранить черновик"
 
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:108
-#: hypha/apply/funds/templates/funds/comments.html:108
+#: hypha/apply/funds/templates/funds/comments.html:96
 #: hypha/apply/review/templates/review/review_form.html:107
 #: hypha/templates/cotton/dropdown_menu.html:99
 msgid "Loading…"
@@ -2819,8 +3100,8 @@ msgstr "Получить"
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:34
 #: hypha/apply/funds/templates/funds/application_preview.html:66
 #: hypha/apply/funds/templates/funds/submission-success.html:65
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:88
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:96
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:95
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:74
 #, fuzzy
 #| msgid "Continue Editing"
 msgid "Continue editing"
@@ -2851,40 +3132,40 @@ msgstr "Обновить черновик"
 msgid "Add determination"
 msgstr "Добавить решение"
 
-#: hypha/apply/determinations/views.py:120
+#: hypha/apply/determinations/views.py:121
 msgid "Improperly configured request, please try again."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:213
+#: hypha/apply/determinations/views.py:214
 #, python-brace-format
 msgid "Successfully determined as {outcome}: "
 msgstr "Успешно вынесено решение {outcome}: "
 
-#: hypha/apply/determinations/views.py:234
+#: hypha/apply/determinations/views.py:235
 #, python-brace-format
 msgid "Unable to determine submission \"{title}\" as already determined"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:286
+#: hypha/apply/determinations/views.py:291
 msgid "You do not have permission to create that determination."
 msgstr "У вас недостаточно прав на вынесение решения."
 
-#: hypha/apply/determinations/views.py:291
+#: hypha/apply/determinations/views.py:296
 msgid "A final determination has already been submitted."
 msgstr "Окончательное решение уже представлено."
 
-#: hypha/apply/determinations/views.py:304
+#: hypha/apply/determinations/views.py:309
 msgid "There is a draft determination you do not have permission to edit."
 msgstr ""
 "Существует черновик решения, на редактирование которого у вас нет прав."
 
-#: hypha/apply/determinations/views.py:460
+#: hypha/apply/determinations/views.py:469
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "A project was automatically created."
 msgstr "Проект ожидает вашего ревью."
 
-#: hypha/apply/determinations/views.py:504
+#: hypha/apply/determinations/views.py:513
 #, python-brace-format
 msgid ""
 "A determination of \"{current}\" exists but you tried to progress as "
@@ -2893,7 +3174,7 @@ msgstr ""
 "Существует решение со статусом \"{current}\", когда вы пытались перевести "
 "его в статус \"{target}\""
 
-#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:554
+#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:626
 #: hypha/apply/users/roles.py:6
 msgid "Staff"
 msgstr "Сотрудники"
@@ -2968,10 +3249,11 @@ msgstr "Флаг для сотрудников"
 msgid "Sealed Rounds"
 msgstr "Раунды и закрытые раунды"
 
-#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:40
-#: hypha/apply/funds/tables.py:223 hypha/apply/funds/tables.py:314
-#: hypha/apply/funds/tables.py:437 hypha/apply/funds/tables.py:474
-#: hypha/apply/projects/filters.py:35 hypha/apply/projects/filters.py:51
+#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:41
+#: hypha/apply/funds/tables.py:237 hypha/apply/funds/tables.py:325
+#: hypha/apply/funds/tables.py:372 hypha/apply/funds/tables.py:501
+#: hypha/apply/funds/tables.py:538 hypha/apply/projects/filters.py:39
+#: hypha/apply/projects/filters.py:55
 msgid "Funds"
 msgstr "Фонды"
 
@@ -2982,7 +3264,7 @@ msgid "Request For Partners"
 msgstr "запрошенное изменение проекта"
 
 #: hypha/apply/funds/admin.py:118 hypha/apply/funds/admin_helpers.py:73
-#: hypha/apply/funds/models/__init__.py:74
+#: hypha/apply/funds/models/__init__.py:75
 msgid "Labs"
 msgstr "Лаборатории"
 
@@ -3044,8 +3326,8 @@ msgstr "Фонд или запрос предложений"
 
 #: hypha/apply/funds/admin_helpers.py:47
 #: hypha/apply/funds/templates/funds/application_base.html:135
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:321
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:320
 #, fuzzy
 #| msgid "Review"
 msgid "Preview"
@@ -3075,7 +3357,7 @@ msgstr "Раунды и закрытые раунды"
 msgid "state"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:413
+#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:477
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:22
 #: hypha/apply/funds/templates/funds/includes/round-block.html:12
 #: hypha/apply/funds/templates/funds/includes/round-block.html:20
@@ -3084,7 +3366,7 @@ msgstr ""
 msgid "Open"
 msgstr "Открыто"
 
-#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:414
+#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:478
 #: hypha/apply/funds/templates/funds/includes/round-block.html:30
 #: hypha/apply/funds/templates/funds/includes/round-block.html:37
 #: hypha/apply/funds/templates/funds/includes/round-block.html:39
@@ -3093,14 +3375,14 @@ msgid "Closed"
 msgstr "Закрыто"
 
 #: hypha/apply/funds/admin_helpers.py:92
-#: hypha/apply/projects/models/project.py:220
-#: hypha/apply/projects/models/project.py:226
+#: hypha/apply/projects/models/project.py:221
+#: hypha/apply/projects/models/project.py:227
 #, fuzzy
 #| msgid "Project start date: "
 msgid "Not started"
 msgstr "Дата начала проекта: "
 
-#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:416
+#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:480
 msgid "Unpublished"
 msgstr ""
 
@@ -3113,121 +3395,127 @@ msgstr ""
 msgid "Copy {form_name}"
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:79
+#: hypha/apply/funds/admin_views.py:68
+msgid ""
+"Please select the date in the copied page. Newly copied pages have NONE "
+"value for the start and end date"
+msgstr ""
+
+#: hypha/apply/funds/admin_views.py:77
 #, python-brace-format
 msgid "Page '{0}' and {1} subpages copied."
 msgstr "Страница '{0}' и {1} подстраницы скопированы."
 
-#: hypha/apply/funds/admin_views.py:85
+#: hypha/apply/funds/admin_views.py:83
 #, python-brace-format
 msgid "Page '{0}' copied."
 msgstr "Страница '{0}' скопирована."
 
-#: hypha/apply/funds/blocks.py:94
+#: hypha/apply/funds/blocks.py:111
 #, fuzzy
 #| msgid "The title of the main news feed."
 msgid "The title of the project"
 msgstr "Заголовок основной ленты новостей."
 
-#: hypha/apply/funds/blocks.py:96
+#: hypha/apply/funds/blocks.py:113
 msgid "What is the title of your application?"
 msgstr "Как называется ваша заявка?"
 
-#: hypha/apply/funds/blocks.py:101
+#: hypha/apply/funds/blocks.py:118
 msgid "This project name can be changed if a full proposal is requested."
 msgstr ""
 "Это название проекта может быть изменено, если будет запрошено полное "
 "предложение."
 
-#: hypha/apply/funds/blocks.py:103
+#: hypha/apply/funds/blocks.py:120
 msgid "Max length"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:106
+#: hypha/apply/funds/blocks.py:123
 msgid "Application title"
 msgstr "Название заявки"
 
-#: hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:134
 #, fuzzy
 #| msgid "Created project"
 msgid "The value of the project"
 msgstr "Создал(а) проект"
 
-#: hypha/apply/funds/blocks.py:126
+#: hypha/apply/funds/blocks.py:143
 msgid "Requested amount"
 msgstr "Запрашиваемая сумма"
 
-#: hypha/apply/funds/blocks.py:142
+#: hypha/apply/funds/blocks.py:159
 msgid "The name of the organization"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:146
+#: hypha/apply/funds/blocks.py:163
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:73
 #: hypha/apply/projects/reports/tables.py:24
 msgid "Organization name"
 msgstr "Название организации"
 
-#: hypha/apply/funds/blocks.py:151
+#: hypha/apply/funds/blocks.py:168
 #, fuzzy
 #| msgid "email address"
 msgid "The applicant email address"
 msgstr "адрес электронной почты"
 
-#: hypha/apply/funds/blocks.py:153
+#: hypha/apply/funds/blocks.py:170
 msgid "What email address should we use to contact you?"
 msgstr "Какой адрес электронной почты мы можем использовать для связи с вами?"
 
-#: hypha/apply/funds/blocks.py:159
+#: hypha/apply/funds/blocks.py:176
 msgid ""
 "We will use this email address to communicate with you about your proposal."
 msgstr ""
 "Мы будем использовать этот адрес электронной почты для связи с вами по "
 "поводу вашего предложения."
 
-#: hypha/apply/funds/blocks.py:172
+#: hypha/apply/funds/blocks.py:189
 msgid "The postal address of the user"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:177
+#: hypha/apply/funds/blocks.py:194
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:66
 #: hypha/apply/funds/templates/funds/revisions_compare.html:57
 #: hypha/apply/funds/templates/funds/revisions_compare.html:58
 msgid "Address"
 msgstr "Адрес"
 
-#: hypha/apply/funds/blocks.py:198 hypha/apply/funds/blocks.py:215
+#: hypha/apply/funds/blocks.py:215 hypha/apply/funds/blocks.py:232
 msgid "Full name"
 msgstr "Полное имя"
 
-#: hypha/apply/funds/blocks.py:199
+#: hypha/apply/funds/blocks.py:216
 msgid "What is your name?"
 msgstr "Какое имя вы предпочитаете использовать?"
 
-#: hypha/apply/funds/blocks.py:204
+#: hypha/apply/funds/blocks.py:221
 msgid "We will use this name when we communicate with you about your proposal."
 msgstr ""
 "Мы будем использовать это имя при общении с вами по поводу вашего "
 "предложения."
 
-#: hypha/apply/funds/blocks.py:221
+#: hypha/apply/funds/blocks.py:238
 #, fuzzy
 #| msgid "Project Duration"
 msgid "Duration"
 msgstr "Длительность проекта"
 
-#: hypha/apply/funds/blocks.py:227
+#: hypha/apply/funds/blocks.py:244
 msgid "Days"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:228 hypha/apply/projects/reports/models.py:244
+#: hypha/apply/funds/blocks.py:245 hypha/apply/projects/reports/models.py:249
 msgid "Weeks"
 msgstr "Недели"
 
-#: hypha/apply/funds/blocks.py:229 hypha/apply/projects/reports/models.py:245
+#: hypha/apply/funds/blocks.py:246 hypha/apply/projects/reports/models.py:250
 msgid "Months"
 msgstr "Месяца"
 
-#: hypha/apply/funds/blocks.py:232
+#: hypha/apply/funds/blocks.py:249
 #, python-brace-format
 msgid "{} day"
 msgid_plural "{} days"
@@ -3235,7 +3523,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: hypha/apply/funds/blocks.py:235
+#: hypha/apply/funds/blocks.py:252
 #, fuzzy, python-brace-format
 #| msgid "week"
 msgid "{} week"
@@ -3244,7 +3532,7 @@ msgstr[0] "неделя"
 msgstr[1] "неделя"
 msgstr[2] "неделя"
 
-#: hypha/apply/funds/blocks.py:238
+#: hypha/apply/funds/blocks.py:255
 #, fuzzy, python-brace-format
 #| msgid "month"
 msgid "{} month"
@@ -3253,17 +3541,17 @@ msgstr[0] "месяц"
 msgstr[1] "месяц"
 msgstr[2] "месяц"
 
-#: hypha/apply/funds/blocks.py:244
+#: hypha/apply/funds/blocks.py:261
 msgid ""
 "Duration type is used to display duration choices in Days, Weeks or Months "
 "in application forms. Be careful, changing the duration type in the active "
 "round can result in data inconsistency."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:275 hypha/apply/stream_forms/blocks.py:473
-#: hypha/apply/stream_forms/blocks.py:474
-#: hypha/apply/stream_forms/blocks.py:489
-#: hypha/apply/stream_forms/blocks.py:490 hypha/apply/utils/blocks.py:85
+#: hypha/apply/funds/blocks.py:319 hypha/apply/stream_forms/blocks.py:511
+#: hypha/apply/stream_forms/blocks.py:512
+#: hypha/apply/stream_forms/blocks.py:527
+#: hypha/apply/stream_forms/blocks.py:528 hypha/apply/utils/blocks.py:85
 msgid "Custom"
 msgstr "Настроить"
 
@@ -3271,7 +3559,7 @@ msgstr "Настроить"
 msgid "Take action"
 msgstr "Выполнить действие"
 
-#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:448
+#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:458
 #, python-brace-format
 msgid "Update lead from {lead} to"
 msgstr "Обновить руководителя с {lead} на"
@@ -3306,48 +3594,48 @@ msgstr "---"
 msgid "{role_name} Reviewer"
 msgstr "{role_name} Ревьюер"
 
-#: hypha/apply/funds/forms.py:376
+#: hypha/apply/funds/forms.py:393
 #, fuzzy
 #| msgid "Meta terms are hierarchical in nature."
 msgid "Tags are hierarchical in nature."
 msgstr "Мета-термины имеют иерархическую структуру."
 
-#: hypha/apply/funds/forms.py:425 hypha/apply/stream_forms/blocks.py:118
+#: hypha/apply/funds/forms.py:442 hypha/apply/stream_forms/blocks.py:156
 msgid "Email"
 msgstr "Электронная почта"
 
-#: hypha/apply/funds/forms.py:427 hypha/apply/funds/forms.py:460
+#: hypha/apply/funds/forms.py:444 hypha/apply/funds/forms.py:477
 msgid "Role"
 msgstr "Роль"
 
-#: hypha/apply/funds/forms.py:433 hypha/apply/funds/forms.py:466
+#: hypha/apply/funds/forms.py:450 hypha/apply/funds/forms.py:483
 #, fuzzy
 #| msgid "Project Duration"
 msgid "Project permissions"
 msgstr "Длительность проекта"
 
-#: hypha/apply/funds/forms.py:435 hypha/apply/funds/forms.py:468
+#: hypha/apply/funds/forms.py:452 hypha/apply/funds/forms.py:485
 msgid ""
 "Enable same access level to these sections. Example: View role + Contracting "
 "= read-only contracting access."
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:39 hypha/apply/funds/tables.py:75
+#: hypha/apply/funds/models/__init__.py:40 hypha/apply/funds/tables.py:76
 #: hypha/apply/funds/templates/submissions/all.html:410
-#: hypha/apply/projects/tables.py:185 hypha/apply/projects/tables.py:262
+#: hypha/apply/projects/tables.py:203 hypha/apply/projects/tables.py:284
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
 msgid "Fund"
 msgstr "Фонд"
 
-#: hypha/apply/funds/models/__init__.py:47
+#: hypha/apply/funds/models/__init__.py:48
 msgid "RFP"
 msgstr "Запрос предложения"
 
-#: hypha/apply/funds/models/__init__.py:48
+#: hypha/apply/funds/models/__init__.py:49
 msgid "RFPs"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:55
+#: hypha/apply/funds/models/__init__.py:56
 #: hypha/apply/funds/templates/cotton/submission_list.html:31
 #: hypha/apply/funds/templates/submissions/all.html:414
 #, fuzzy
@@ -3355,26 +3643,27 @@ msgstr ""
 msgid "Round"
 msgstr "Раунды"
 
-#: hypha/apply/funds/models/__init__.py:56 hypha/apply/funds/tables.py:225
-#: hypha/apply/funds/tables.py:312 hypha/apply/funds/tables.py:479
+#: hypha/apply/funds/models/__init__.py:57 hypha/apply/funds/tables.py:239
+#: hypha/apply/funds/tables.py:327 hypha/apply/funds/tables.py:370
+#: hypha/apply/funds/tables.py:543
 #: hypha/apply/funds/templates/funds/rounds.html:5
 #: hypha/apply/funds/templates/funds/rounds.html:10
 msgid "Rounds"
 msgstr "Раунды"
 
-#: hypha/apply/funds/models/__init__.py:63
+#: hypha/apply/funds/models/__init__.py:64
 #, fuzzy
 #| msgid "Sealed"
 msgid "Sealed round"
 msgstr "Закрыто"
 
-#: hypha/apply/funds/models/__init__.py:64
+#: hypha/apply/funds/models/__init__.py:65
 #, fuzzy
 #| msgid "Rounds and Sealed Rounds"
 msgid "Sealed rounds"
 msgstr "Раунды и закрытые раунды"
 
-#: hypha/apply/funds/models/__init__.py:73
+#: hypha/apply/funds/models/__init__.py:74
 msgid "Lab"
 msgstr "Лаборатория"
 
@@ -3626,92 +3915,93 @@ msgstr "Назначить ревьюеров"
 msgid "assigned reviewers"
 msgstr "Назначить ревьюеров"
 
-#: hypha/apply/funds/models/co_applicants.py:14
+#: hypha/apply/funds/models/co_applicants.py:15
 #, fuzzy
 #| msgid "Project documents"
 msgid "Project Document"
 msgstr "Документы по проекту"
 
-#: hypha/apply/funds/models/co_applicants.py:15
+#: hypha/apply/funds/models/co_applicants.py:16
 #, fuzzy
 #| msgid "Contracting documents"
 msgid "Contracting Document"
 msgstr "Документы для заключения контракта"
 
-#: hypha/apply/funds/models/co_applicants.py:17
+#: hypha/apply/funds/models/co_applicants.py:18
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:10
 #: hypha/apply/projects/reports/templates/reports/report_list.html:6
 #: hypha/core/navigation.py:114
 msgid "Reports"
 msgstr "Отчеты"
 
-#: hypha/apply/funds/models/co_applicants.py:21
+#: hypha/apply/funds/models/co_applicants.py:22
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:22
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:53
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
 msgid "Pending"
 msgstr "Ожидание"
 
-#: hypha/apply/funds/models/co_applicants.py:22
-#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/workflows/constants.py:93
 #: hypha/apply/funds/workflows/definitions/double_stage.py:311
 #: hypha/apply/funds/workflows/definitions/single_stage.py:134
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:197
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:182
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:123
 msgid "Accepted"
 msgstr "Принято"
 
-#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/models/co_applicants.py:24
 #, fuzzy
 #| msgid "Selected"
 msgid "Rejected"
 msgstr "Выбранные"
 
-#: hypha/apply/funds/models/co_applicants.py:24
+#: hypha/apply/funds/models/co_applicants.py:25
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:14
 msgid "Expired"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:33
+#: hypha/apply/funds/models/co_applicants.py:34
 #, fuzzy
 #| msgid "Send reset email"
 msgid "invited user email"
 msgstr "Отправить письмо для сброса пароля"
 
-#: hypha/apply/funds/models/co_applicants.py:42
-#: hypha/apply/funds/models/submissions.py:487
-#: hypha/apply/projects/models/payment.py:137
-#: hypha/apply/projects/models/project.py:262
+#: hypha/apply/funds/models/co_applicants.py:43
+#: hypha/apply/funds/models/submissions.py:495
+#: hypha/apply/projects/models/invoice.py:160
+#: hypha/apply/projects/models/project.py:267
 #, fuzzy
 #| msgid "Status"
 msgid "status"
 msgstr "Статус"
 
-#: hypha/apply/funds/models/co_applicants.py:48
-#: hypha/apply/funds/models/co_applicants.py:77
+#: hypha/apply/funds/models/co_applicants.py:49
+#: hypha/apply/funds/models/co_applicants.py:83
 msgid "role"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:57
+#: hypha/apply/funds/models/co_applicants.py:58
 #, fuzzy
 #| msgid "edited applicant"
 msgid "co-applicant invite"
 msgstr "заявитель отредактирован"
 
-#: hypha/apply/funds/models/co_applicants.py:58
+#: hypha/apply/funds/models/co_applicants.py:59
 #, fuzzy
 #| msgid "edited applicant"
 msgid "co-applicant invites"
 msgstr "заявитель отредактирован"
 
-#: hypha/apply/funds/models/co_applicants.py:84
+#: hypha/apply/funds/models/co_applicants.py:90
 #, fuzzy
 #| msgid "Applicant"
 msgid "co-applicant"
 msgstr "Заявитель"
 
-#: hypha/apply/funds/models/co_applicants.py:85
+#: hypha/apply/funds/models/co_applicants.py:91
 #, fuzzy
 #| msgid "Applicant"
 msgid "co-applicants"
@@ -4087,23 +4377,24 @@ msgstr "Решение в результате скрининга"
 msgid "screening decisions"
 msgstr "Решения по результатам скрининга"
 
-#: hypha/apply/funds/models/submissions.py:439
+#: hypha/apply/funds/models/submissions.py:447
 #, fuzzy
 #| msgid "Summary"
 msgid "summary"
 msgstr "Резюме"
 
-#: hypha/apply/funds/models/submissions.py:502
+#: hypha/apply/funds/models/submissions.py:510
+#: hypha/apply/funds/models/submissions.py:1119
 msgid "submit time"
 msgstr "время подачи"
 
-#: hypha/apply/funds/models/submissions.py:531
+#: hypha/apply/funds/models/submissions.py:539
 #, fuzzy
 #| msgid "Related submissions"
 msgid "application submission"
 msgstr "Связанные заявки"
 
-#: hypha/apply/funds/models/submissions.py:532
+#: hypha/apply/funds/models/submissions.py:540
 #, fuzzy
 #| msgid "Related submissions"
 msgid "application submissions"
@@ -4157,14 +4448,17 @@ msgid "Confirmation email"
 msgstr "Подтверждение по электронной почте"
 
 #: hypha/apply/funds/models/utils.py:211
+#: hypha/apply/projects/models/invoice.py:21
 msgid "Failed"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:212
+#: hypha/apply/projects/models/invoice.py:22
 msgid "Success"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:213
+#: hypha/apply/projects/models/invoice.py:23
 #, fuzzy
 #| msgid "Progress"
 msgid "In Progress"
@@ -4182,8 +4476,8 @@ msgstr "Руководитель заявки"
 msgid "submission export managers"
 msgstr "Руководитель заявки"
 
-#: hypha/apply/funds/permissions.py:24 hypha/apply/funds/permissions.py:34
-#: hypha/apply/funds/permissions.py:208 hypha/apply/projects/permissions.py:44
+#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
+#: hypha/apply/funds/permissions.py:212 hypha/apply/projects/permissions.py:44
 #: hypha/apply/projects/permissions.py:57
 #: hypha/apply/projects/permissions.py:124
 #: hypha/apply/projects/permissions.py:179
@@ -4191,42 +4485,44 @@ msgstr "Руководитель заявки"
 #: hypha/apply/projects/permissions.py:261
 #: hypha/apply/projects/permissions.py:327
 #: hypha/apply/projects/permissions.py:346
+#: hypha/apply/projects/permissions.py:423
+#: hypha/apply/projects/permissions.py:441
 #, fuzzy
 #| msgid " Required"
 msgid "Login Required"
 msgstr " Требуется"
 
-#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
-#: hypha/apply/funds/permissions.py:211
+#: hypha/apply/funds/permissions.py:30 hypha/apply/funds/permissions.py:40
+#: hypha/apply/funds/permissions.py:215
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:25
 #: hypha/apply/funds/templates/funds/includes/submission-table-row.html:26
 msgid "Archived Submission"
 msgstr "Архивированные заявки"
 
-#: hypha/apply/funds/permissions.py:43
+#: hypha/apply/funds/permissions.py:46
 msgid "Co-applicant with edit role can edit submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:44
+#: hypha/apply/funds/permissions.py:47
 #, fuzzy
 #| msgid "edited applicant"
 msgid "Co-applicant does not have edit role"
 msgstr "заявитель отредактирован"
 
-#: hypha/apply/funds/permissions.py:45
+#: hypha/apply/funds/permissions.py:48
 msgid "User can edit in current phase"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:155
+#: hypha/apply/funds/permissions.py:159
 msgid "Staff is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:157
+#: hypha/apply/funds/permissions.py:161
 msgid "Staff Admin is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:158 hypha/apply/funds/permissions.py:255
-#: hypha/apply/funds/permissions.py:263 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:162 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:289 hypha/apply/funds/permissions.py:305
 #: hypha/apply/projects/permissions.py:49
 #: hypha/apply/projects/permissions.py:77
 #: hypha/apply/projects/permissions.py:85
@@ -4247,194 +4543,202 @@ msgstr ""
 msgid "Forbidden Error"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:231
+#: hypha/apply/funds/permissions.py:259
 #, fuzzy
 #| msgid "No active submissions"
 msgid "No access to view submission"
 msgstr "Нет активных заявок"
 
-#: hypha/apply/funds/permissions.py:233
+#: hypha/apply/funds/permissions.py:261
 msgid "Applicant cannot view submission screening"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:239
+#: hypha/apply/funds/permissions.py:267
 #, fuzzy
 #| msgid "New partner(s) has been added to your submission."
 msgid "Co-applicant can't be added to archived submission"
 msgstr "К вашей заявке добавлен новый партнер(ы)."
 
-#: hypha/apply/funds/permissions.py:245
+#: hypha/apply/funds/permissions.py:271
 msgid "Co-applicants can't be invited to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:250
+#: hypha/apply/funds/permissions.py:276
 #, fuzzy
 #| msgid "archived submission"
 msgid "Limit reached for this submission"
 msgstr "архивная заявка"
 
-#: hypha/apply/funds/permissions.py:252
+#: hypha/apply/funds/permissions.py:278
 msgid "Applicants can invite co-applicants to their application"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:254
+#: hypha/apply/funds/permissions.py:280
 msgid "Staff can invite co-applicant on behalf of applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:260
+#: hypha/apply/funds/permissions.py:286
 msgid "Submission user can access their submission's co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:262
+#: hypha/apply/funds/permissions.py:288
 msgid "Staff can access each submissions' co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:268
+#: hypha/apply/funds/permissions.py:294
 msgid "Co-applicant can't be updated to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:274
+#: hypha/apply/funds/permissions.py:298
 msgid "Co-applicants can't be updated to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:276
+#: hypha/apply/funds/permissions.py:300
 #, fuzzy
 #| msgid "Are you sure you want to delete"
 msgid "Same user who invited can delete the co-applicant"
 msgstr "Вы уверены, что хотите удалить"
 
-#: hypha/apply/funds/permissions.py:278
+#: hypha/apply/funds/permissions.py:302
 #, fuzzy
 #| msgid "Are you sure you want to delete"
 msgid "Submission owner can delete the co-applicant"
 msgstr "Вы уверены, что хотите удалить"
 
-#: hypha/apply/funds/permissions.py:280
+#: hypha/apply/funds/permissions.py:304
 msgid "Staff can delete any co-applicant of any submission"
 msgstr ""
 
-#: hypha/apply/funds/services.py:45
+#: hypha/apply/funds/services.py:47
 #, fuzzy, python-brace-format
 #| msgid "This submission has been archived."
 msgid "{count} submissions archived."
 msgstr "Эта заявка была архивирована."
 
-#: hypha/apply/funds/services.py:78
+#: hypha/apply/funds/services.py:80
 #, fuzzy, python-brace-format
 #| msgid "Number of submission"
 msgid "{count} submissions deleted."
 msgstr "Номер заявки"
 
-#: hypha/apply/funds/services.py:108
+#: hypha/apply/funds/services.py:150
+#, fuzzy, python-brace-format
+#| msgid "This submission has been archived."
+msgid "{sub_number} submission anonymized"
+msgid_plural "{sub_number} submissions anonymized"
+msgstr[0] "Эта заявка была архивирована."
+msgstr[1] "Эта заявка была архивирована."
+msgstr[2] "Эта заявка была архивирована."
+
+#: hypha/apply/funds/services.py:175
 #, python-brace-format
 msgid "Lead set to {lead} on "
 msgstr ""
 
-#: hypha/apply/funds/services.py:158
+#: hypha/apply/funds/services.py:225
 #, fuzzy, python-brace-format
 #| msgid "{user} as {name}."
 msgid "{user} as {name}"
 msgstr "{user} в качестве {name}."
 
-#: hypha/apply/funds/services.py:166
+#: hypha/apply/funds/services.py:233
 #, fuzzy, python-brace-format
 #| msgid "Batch reviewers added: {reviewers_text} to "
 msgid "Batch reviewers updated: {reviewers_text} on "
 msgstr "Групповые ревьюеры добавлены: {reviewers_text} to "
 
-#: hypha/apply/funds/tables.py:70
+#: hypha/apply/funds/tables.py:71
 #: hypha/apply/funds/templates/cotton/submission_list.html:22
 #: hypha/apply/funds/templates/submissions/all.html:344
 #: hypha/apply/funds/templates/submissions/all.html:470
-#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
-#: hypha/apply/projects/forms/payment.py:208
+#: hypha/apply/projects/filters.py:43 hypha/apply/projects/filters.py:64
+#: hypha/apply/projects/forms/invoice.py:210
 #: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:183
-#: hypha/apply/projects/tables.py:260
+#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:200
+#: hypha/apply/projects/tables.py:282
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:58
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:6
 #: hypha/apply/users/admin_views.py:55 hypha/apply/users/admin_views.py:128
 msgid "Status"
 msgstr "Статус"
 
-#: hypha/apply/funds/tables.py:74
+#: hypha/apply/funds/tables.py:75
 msgid "Type"
 msgstr "Тип"
 
-#: hypha/apply/funds/tables.py:78
+#: hypha/apply/funds/tables.py:79
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "Last updated"
 msgstr "Последний раз обновлено"
 
-#: hypha/apply/funds/tables.py:100
+#: hypha/apply/funds/tables.py:101
 msgid "No submissions available"
 msgstr "Нет доступных заявок"
 
-#: hypha/apply/funds/tables.py:210
+#: hypha/apply/funds/tables.py:224
 msgid "Statuses"
 msgstr "Статусы"
 
-#: hypha/apply/funds/tables.py:226 hypha/apply/funds/tables.py:438
+#: hypha/apply/funds/tables.py:240 hypha/apply/funds/tables.py:502
 msgid "Leads"
 msgstr "Руководители"
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 #: hypha/apply/funds/templates/submissions/all.html:382
 msgid "Screening"
 msgstr "Скрининг"
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 msgid "No Status"
 msgstr "Нет статуса"
 
-#: hypha/apply/funds/tables.py:345
+#: hypha/apply/funds/tables.py:403
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:46
 msgid "Determined"
 msgstr "Решено"
 
-#: hypha/apply/funds/tables.py:346
+#: hypha/apply/funds/tables.py:404
 #, fuzzy
 #| msgid "Start your"
 msgid "Start"
 msgstr "Начните свой"
 
-#: hypha/apply/funds/tables.py:347
+#: hypha/apply/funds/tables.py:405
 msgid "End"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/funds/tables.py:439
+#: hypha/apply/funds/tables.py:456 hypha/apply/funds/tables.py:503
 #: hypha/apply/users/admin_views.py:125
 msgid "Active"
 msgstr "Активные"
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/users/admin_views.py:125
+#: hypha/apply/funds/tables.py:456 hypha/apply/users/admin_views.py:125
 #, fuzzy
 #| msgid "Active"
 msgid "Inactive"
 msgstr "Активные"
 
-#: hypha/apply/funds/tables.py:415
+#: hypha/apply/funds/tables.py:479
 #, fuzzy
 #| msgid "No Status"
 msgid "Not Started"
 msgstr "Нет статуса"
 
-#: hypha/apply/funds/tables.py:440
+#: hypha/apply/funds/tables.py:504
 #, fuzzy
 #| msgid "Statuses"
 msgid "State"
 msgstr "Статусы"
 
-#: hypha/apply/funds/tables.py:516 hypha/apply/funds/tables.py:547
+#: hypha/apply/funds/tables.py:580 hypha/apply/funds/tables.py:619
 msgid "No reviews available"
 msgstr "Нет доступных ревью"
 
-#: hypha/apply/funds/tables.py:525
+#: hypha/apply/funds/tables.py:597
 msgid "Submission"
 msgstr "Заявка"
 
-#: hypha/apply/funds/tables.py:564
+#: hypha/apply/funds/tables.py:636
 msgid "No staff available"
 msgstr "Нет доступных сотрудников"
 
@@ -4445,13 +4749,13 @@ msgid "Organization"
 msgstr "Название организации"
 
 #: hypha/apply/funds/templates/cotton/submission_list.html:35
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:87
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
 #: hypha/apply/funds/templates/funds/submission_sealed.html:14
 #: hypha/apply/funds/templates/submissions/all.html:431
 #: hypha/apply/funds/templates/submissions/all.html:474
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:10
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:14
-#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
+#: hypha/apply/projects/filters.py:45 hypha/apply/projects/filters.py:58
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:46
 #: hypha/apply/projects/templates/application_projects/project_sow_detail.html:10
 msgid "Lead"
@@ -4540,7 +4844,7 @@ msgid "(selected)"
 msgstr "Выбранные"
 
 #: hypha/apply/funds/templates/funds/application_base.html:105
-#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:127
 msgid "Preview and submit"
 msgstr ""
 
@@ -4605,7 +4909,6 @@ msgid "Reviews & assignees"
 msgstr "Ревью и назначенные ревьюеры"
 
 #: hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html:50
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:66
 msgid "View all"
 msgstr "Просмотреть все"
 
@@ -4619,6 +4922,19 @@ msgstr "Напоминания"
 msgid "Create new reminder"
 msgstr "Создать напоминание"
 
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:3
+#, fuzzy
+#| msgid "View application"
+msgid "Anonymize application"
+msgstr "Просмотреть заявку"
+
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:5
+msgid ""
+"Are you sure you want to anonymize this application? Personal data will be "
+"removed and the application will only be accessible via statistics in the "
+"Results view. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:3
 #, fuzzy
 #| msgid "Screen application"
@@ -4632,90 +4948,81 @@ msgid ""
 "action cannot be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:22
-#: hypha/apply/funds/templates/funds/comments.html:18
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:18
+#: hypha/apply/funds/templates/funds/comments.html:14
 #: hypha/apply/projects/templates/application_projects/paf_export.html:76
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:107
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:109
 #: hypha/apply/projects/templates/application_projects/project_detail.html:17
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:15
 #, fuzzy
 #| msgid "application"
 msgid "Application"
 msgstr "заявка"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:32
-#: hypha/apply/funds/templates/funds/comments.html:28
-#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
-#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
-#: hypha/apply/projects/templates/application_projects/project_detail.html:24
-msgid "Project"
-msgstr "Проект"
-
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:50
-#: hypha/apply/funds/templates/funds/comments.html:46
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:38
+#: hypha/apply/funds/templates/funds/comments.html:34
 msgid "View message log"
 msgstr "Просмотр журнала сообщений"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:61
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:49
 msgid "Congratulations!"
 msgstr "Поздравляем!"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:63
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:51
 #, python-format
 msgid "Your %(stage)s application has been accepted."
 msgstr "Ваша %(stage)s заявка была принята."
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:68
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:56
 #, python-format
 msgid "Start your %(stage)s application."
 msgstr "Начать вашу %(stage)s заявку."
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:77
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:65
 #, fuzzy
 #| msgid "This submission has been archived."
 msgid "This application has been archived. This is visible to accounts with "
 msgstr "Эта заявка была архивирована."
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:85
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:73
 #, fuzzy
 #| msgid "This submission is sealed"
 msgid "This application is sealed."
 msgstr "Подача заявок на этот грант закрыта"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 #, fuzzy
 #| msgid "Draft"
 msgid "Drafted "
 msgstr "Черновик"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:22
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 #, fuzzy
 #| msgid "Submitted"
 msgid "Submitted "
 msgstr "Подано"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:100
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:88
 #: hypha/apply/funds/templates/submissions/all.html:336
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:34
 msgid "Updated"
 msgstr "Обновлено"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:129
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:117
 #, fuzzy
 #| msgid "Delete Submissions"
 msgid "Delete Submission"
 msgstr "Удалить заявки"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:195
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:183
 msgid "Related submissions"
 msgstr "Связанные заявки"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:203
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:214
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:191
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:202
 msgid "View linked"
 msgstr "Просмотр связанных"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:223
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:211
 #, fuzzy
 #| msgid "Delete Submissions"
 msgid "Other Submissions"
@@ -4780,6 +5087,10 @@ msgstr "Отклонить"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:154
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:204
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:94
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:140
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:171
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:189
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:127
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:160
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:177
@@ -4806,101 +5117,112 @@ msgstr ""
 msgid "Comments: %(title)s"
 msgstr "Корректировки для %(title)s"
 
-#: hypha/apply/funds/templates/funds/comments.html:57
+#: hypha/apply/funds/templates/funds/comments.html:45
 #, fuzzy
 #| msgid "Communications"
 msgid "Add communication"
 msgstr "Коммуникация"
 
-#: hypha/apply/funds/templates/funds/comments.html:80
-#: hypha/apply/funds/templates/funds/comments.html:94
-#, fuzzy
-#| msgid "added comment"
-msgid "Add Comment"
-msgstr "добавлен комментарий"
-
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:4
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:5
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:6
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:88
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:66
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:4
 #: hypha/apply/projects/templates/application_projects/project_admin_detail.html:10
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:128
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:35
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:131
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:41
 msgid "Actions to take"
 msgstr "Действия, которые нужно выполнить"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:15
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:16
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:12
 msgid "Unarchive Submission"
 msgstr "Разархивировать заявку"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:26
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:28
+#, fuzzy
+#| msgid "Created project"
+msgid "Add another project"
+msgstr "Создал(а) проект"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:30
 #: hypha/apply/funds/templates/funds/modals/create_project_form.html:2
 #, fuzzy
 #| msgid "Created project"
 msgid "Create project"
 msgstr "Создал(а) проект"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:32
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
 msgid "Complete draft determination"
 msgstr "Завершить черновик решения"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:42
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:9
 msgid "Complete draft review"
 msgstr "Завершить черновик ревью"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:45
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:50
 msgid "Assign reviewers"
 msgstr "Назначить ревьюеров"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:60
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:19
 msgid "View determination"
 msgstr "Просмотреть решение"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:68
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
 #: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:34
-#: hypha/apply/projects/views/payment.py:138
+#: hypha/apply/projects/views/invoice.py:147
 msgid "Update status"
 msgstr "Обновить статус"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:78
 msgid "Assign"
 msgstr "Назначить"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:97
 msgid "More actions"
 msgstr "Больше действий"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:101
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:106
 #: hypha/apply/funds/templates/funds/revisions_compare.html:88
 msgid "Revisions"
 msgstr "Корректировки"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:111
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:116
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:69
 msgid "Translate"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:130
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:135
 #: hypha/apply/funds/views/reminders.py:69
 msgid "Create Reminder"
 msgstr "Создать напоминание"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:138
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:178
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:53
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:140
+#, fuzzy
+#| msgid "Change Approver"
+msgid "Change Author"
+msgstr "Изменить подтверждающего"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:181
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:59
 msgid "Download as PDF"
 msgstr "Скачать в PDF"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:158
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:30
-#: hypha/apply/funds/templates/submissions/all.html:490
+#: hypha/apply/funds/templates/submissions/all.html:491
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:32
 msgid "Archive"
 msgstr "Архивировать"
 
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:172
+#: hypha/apply/funds/templates/submissions/all.html:515
+msgid "Anonymize"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:8
 #, fuzzy
 #| msgid "Applicant"
@@ -4922,8 +5244,8 @@ msgid "Not allowed"
 msgstr "Не найдено"
 
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:25
-#: hypha/apply/funds/views/co_applicants.py:58
-#: hypha/apply/funds/views/co_applicants.py:102
+#: hypha/apply/funds/views/co_applicants.py:57
+#: hypha/apply/funds/views/co_applicants.py:101
 msgid "Invite"
 msgstr ""
 
@@ -4951,7 +5273,8 @@ msgstr "Архивировать заявку"
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:16
 msgid ""
 "Are you sure you want to archive submission? Archived submissions will be "
-"hidden from the main list of submissions and can not be edited."
+"hidden from the main list of submissions and can not be edited. Submissions "
+"can be unarchived at any time."
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:16
@@ -4971,6 +5294,23 @@ msgstr "архивировано"
 msgid "You have no %(type)s rounds or labs assigned to you."
 msgstr "У вас нет назначенных на вас раундов или лабораторий типа %(type)s."
 
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:18
+#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
+#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
+msgid "Project"
+msgstr "Проект"
+
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:30
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:18
+#, fuzzy, python-format
+#| msgid "Project"
+msgctxt "project tab"
+msgid "Project"
+msgid_plural "Projects (%(counter)s)"
+msgstr[0] "Проект"
+msgstr[1] "Проект"
+msgstr[2] "Проект"
+
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:34
 msgid "No reminders yet."
 msgstr "Пока нет напоминаний."
@@ -5007,6 +5347,12 @@ msgstr "Длительность проекта"
 msgid "Legal Name"
 msgstr "Юридическое название"
 
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:54
+#, fuzzy
+#| msgid "edited account"
+msgid "Edit user account"
+msgstr "аккаунт отредактирован"
+
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:61
 #: hypha/apply/funds/templates/funds/revisions_compare.html:52
 #: hypha/apply/funds/templates/funds/revisions_compare.html:53
@@ -5041,7 +5387,7 @@ msgid ""
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:69
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:49
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:55
 msgid "Export"
 msgstr "Экспортировать"
 
@@ -5131,7 +5477,7 @@ msgid "selected"
 msgstr "Выбранные"
 
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:43
-#: hypha/templates/base.html:159
+#: hypha/templates/base.html:160
 #, fuzzy
 #| msgid "Search"
 msgid "Search..."
@@ -5141,19 +5487,19 @@ msgstr "Поиск"
 msgid "Search input"
 msgstr "Ввод данных для поиска"
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:60
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:73
 #: hypha/apply/funds/templates/submissions/all.html:202
 msgid "Clear current filters & sorts"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:108
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:121
 #: hypha/templates/cotton/pagination.html:12
 #, fuzzy
 #| msgid "previous"
 msgid "Previous"
 msgstr "предыдущий"
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:109
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:122
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:6
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:10
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:47
@@ -5168,9 +5514,8 @@ msgid "Translate application"
 msgstr "Выполнить скрининг заявки"
 
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:38
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:10
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:26
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 #: hypha/apply/projects/templates/application_projects/filters/widgets/date_range_input_widget.html:5
 msgid "to"
@@ -5193,22 +5538,25 @@ msgstr "Обновить ревьюеров"
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:20
 #: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:51
-#: hypha/apply/funds/views/submission_edit.py:535
-#: hypha/apply/funds/views/submission_edit.py:566
-#: hypha/apply/funds/views/submission_edit.py:595
-#: hypha/apply/funds/views/submission_edit.py:639
-#: hypha/apply/funds/views/submission_edit.py:669
-#: hypha/apply/funds/views/submission_edit.py:695
-#: hypha/apply/funds/views/translate.py:60
-#: hypha/apply/funds/views/translate.py:95
+#: hypha/apply/funds/views/submission_edit.py:536
+#: hypha/apply/funds/views/submission_edit.py:567
+#: hypha/apply/funds/views/submission_edit.py:596
+#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:670
+#: hypha/apply/funds/views/submission_edit.py:696
+#: hypha/apply/funds/views/submission_edit.py:726
+#: hypha/apply/funds/views/submission_edit.py:752
+#: hypha/apply/funds/views/translate.py:58
+#: hypha/apply/funds/views/translate.py:93
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:28
-#: hypha/apply/projects/views/payment.py:354
-#: hypha/apply/projects/views/project.py:423
-#: hypha/apply/projects/views/project.py:462
-#: hypha/apply/projects/views/project.py:506
-#: hypha/apply/projects/views/project.py:542
-#: hypha/apply/projects/views/project.py:1289
-#: hypha/apply/projects/views/project.py:1328
+#: hypha/apply/projects/views/invoice.py:359
+#: hypha/apply/projects/views/project.py:427
+#: hypha/apply/projects/views/project.py:466
+#: hypha/apply/projects/views/project.py:510
+#: hypha/apply/projects/views/project.py:546
+#: hypha/apply/projects/views/project.py:588
+#: hypha/apply/projects/views/project.py:1340
+#: hypha/apply/projects/views/project.py:1379
 msgid "Update"
 msgstr "Обновить"
 
@@ -5292,10 +5640,10 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:15
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:20
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:25
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:46
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:137
-#: hypha/apply/projects/views/project.py:1043
-#: hypha/apply/projects/views/project.py:1260
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:47
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
+#: hypha/apply/projects/views/project.py:1094
+#: hypha/apply/projects/views/project.py:1311
 msgid "Update Status"
 msgstr "Обновить статус"
 
@@ -5305,6 +5653,18 @@ msgstr "Обновить статус"
 msgid "Current status"
 msgstr "Текущий статус"
 
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:2
+#, fuzzy
+#| msgid "Update status"
+msgid "Update Author"
+msgstr "Обновить статус"
+
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:6
+#, fuzzy
+#| msgid "current"
+msgid "Current Author"
+msgstr "текущий"
+
 #: hypha/apply/funds/templates/funds/modals/update_lead_form.html:2
 #: hypha/apply/projects/templates/application_projects/modals/lead_update.html:2
 msgid "Update Lead"
@@ -5320,6 +5680,7 @@ msgstr "Текущий статус"
 #: hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html:2
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:12
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:13
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:2
 #, fuzzy
 #| msgid "Update status"
 msgid "Update tags"
@@ -5381,7 +5742,7 @@ msgid "Reviews by %(object)s"
 msgstr "Ревью от %(object)s"
 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:3
-#: hypha/apply/review/views.py:473
+#: hypha/apply/review/views.py:482
 msgid "Compare"
 msgstr "Сравнить"
 
@@ -5499,11 +5860,11 @@ msgstr "Просмотреть заявку"
 
 #: hypha/apply/funds/templates/funds/submission-success.html:77
 #: hypha/apply/users/templates/users/activation/confirm.html:43
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
 #: hypha/apply/users/templates/users/login.html:4
 #: hypha/apply/users/templates/users/login.html:86
 #: hypha/apply/users/templates/users/password_reset/complete.html:14
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:5
-#: hypha/templates/includes/user_menu.html:101
 msgid "Log in"
 msgstr "Вход в систему"
 
@@ -5569,6 +5930,13 @@ msgid ""
 "amount fields or data and are not included."
 msgstr "В некоторых заявках отсутствуют значения, и они не включены в список."
 
+#: hypha/apply/funds/templates/funds/submissions_result.html:53
+#, python-format
+msgid ""
+"%(count)s anonymized submission(s) are excluded because the active filter "
+"does not apply to anonymized data."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/tables/table.html:24
 #: hypha/apply/projects/templates/application_projects/tables/table.html:18
 msgid "Show"
@@ -5802,36 +6170,67 @@ msgstr "Назначить руководителя"
 msgid "Assign Reviewer(s)"
 msgstr "Назначить ревьюеров"
 
-#: hypha/apply/funds/templates/submissions/all.html:486
-msgid "Are you sure you want to archive the selected submissions?"
-msgstr "Вы уверены, что хотите архивировать выбранные заявки?"
-
-#: hypha/apply/funds/templates/submissions/all.html:498
-#, fuzzy
-#| msgid "Are you sure you want to delete selected submissions?"
-msgid ""
-"Are you sure you want to delete the selected submissions? This action cannot "
-"be undone."
-msgstr "Вы уверены, что хотите удалить выбранные заявки?"
-
-#: hypha/apply/funds/templates/submissions/all.html:524
+#: hypha/apply/funds/templates/submissions/all.html:538
 msgid "No results matched your search"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "Try"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 #, fuzzy
 #| msgid "Clear"
 msgid "clearing"
 msgstr "Очистить"
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "the current query and try again"
 msgstr ""
 
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:4
+#, fuzzy
+#| msgid "View application"
+msgid "Anonymize applications"
+msgstr "Просмотреть заявку"
+
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:9
+#, python-format
+msgid ""
+"Are you sure you want to anonymize %(count)s submission(s)? Personal data "
+"will be removed and applications will only be accessible via statistics in "
+"the Results view. All draft submissions will be deleted. This action cannot "
+"be undone."
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:11
+#, fuzzy
+#| msgid "Archive Submissions"
+msgid "Archive submissions"
+msgstr "Архивировать заявки"
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:14
+#, python-format
+msgid ""
+"Are you sure you want to archive %(count)s submission(s)? Archived "
+"submissions will be hidden from the main list and cannot be edited. "
+"Submissions can be unarchived at any time."
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:4
+#, fuzzy
+#| msgid "Screen application"
+msgid "Delete applications"
+msgstr "Выполнить скрининг заявки"
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:8
+#, fuzzy, python-format
+#| msgid "Are you sure you want to delete selected submissions?"
+msgid ""
+"Are you sure you want to permanently delete %(count)s submission(s)? All "
+"data will be permanently removed. This action cannot be undone."
+msgstr "Вы уверены, что хотите удалить выбранные заявки?"
+
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:9
 #, fuzzy
 #| msgid "Submission lead"
@@ -5839,6 +6238,7 @@ msgid "Submissions: Export as CSV"
 msgstr "Руководитель заявки"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:11
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:11
 #, fuzzy
 #| msgid "Export Users"
 msgid "Export as CSV"
@@ -5859,6 +6259,8 @@ msgstr "Руководитель заявки"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:23
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:24
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:23
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:24
 msgid "Generating downloadable CSV..."
 msgstr ""
 
@@ -5869,6 +6271,7 @@ msgid "Submissions: Download generated CSV"
 msgstr "Руководитель заявки"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:42
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:42
 #, fuzzy
 #| msgid "Download as DOCX"
 msgid "Download generated CSV"
@@ -5881,10 +6284,12 @@ msgid "Submissions: Generate downloadable CSV"
 msgstr "Руководитель заявки"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:64
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:64
 msgid "Generation failed, click to retry generating downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:66
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:66
 #, fuzzy
 #| msgid "Generate Codes"
 msgid "Generate downloadable CSV"
@@ -5895,6 +6300,7 @@ msgid "Add tags"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:38
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 msgid "Add"
@@ -6064,14 +6470,14 @@ msgstr "Нет доступных раундов"
 msgid "Filter by {label}"
 msgstr "Фильтр по"
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:123
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
 #, fuzzy
 #| msgid "application"
 msgid "Application #"
 msgstr "заявка"
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
-#: hypha/apply/stream_forms/blocks.py:119
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:125
+#: hypha/apply/stream_forms/blocks.py:157
 msgid "URL"
 msgstr "URL"
 
@@ -6084,39 +6490,39 @@ msgstr ""
 msgid "No screening"
 msgstr "Отсутствует скрининг"
 
-#: hypha/apply/funds/views/all.py:251
+#: hypha/apply/funds/views/all.py:244
 msgid "Newest"
 msgstr "Самые новые"
 
-#: hypha/apply/funds/views/all.py:252
+#: hypha/apply/funds/views/all.py:245
 msgid "Oldest"
 msgstr "Самые старые"
 
-#: hypha/apply/funds/views/all.py:253
+#: hypha/apply/funds/views/all.py:246
 msgid "Most Commented"
 msgstr "Больше всего комментариев"
 
-#: hypha/apply/funds/views/all.py:254
+#: hypha/apply/funds/views/all.py:247
 msgid "Least Commented"
 msgstr "Наименьшее количество комментариев"
 
-#: hypha/apply/funds/views/all.py:255
+#: hypha/apply/funds/views/all.py:248
 msgid "Recently Updated"
 msgstr "Недавно обновлено"
 
-#: hypha/apply/funds/views/all.py:256
+#: hypha/apply/funds/views/all.py:249
 msgid "Least Recently Updated"
 msgstr "Недавно обновленные"
 
-#: hypha/apply/funds/views/all.py:257
+#: hypha/apply/funds/views/all.py:250
 msgid "Best Match"
 msgstr "Наилучшее совпадение"
 
-#: hypha/apply/funds/views/all.py:304
+#: hypha/apply/funds/views/all.py:297 hypha/apply/projects/views/invoice.py:671
 msgid "Started CSV generation."
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:405
+#: hypha/apply/funds/views/all.py:469
 #, python-brace-format
 msgid ""
 "A determination already exists for the following submissions and they have "
@@ -6125,52 +6531,54 @@ msgstr ""
 "По следующим заявкам уже были приняты решения и эти заявки исключены: "
 "{submissions}"
 
-#: hypha/apply/funds/views/all.py:418
+#: hypha/apply/funds/views/all.py:482
 msgid "Submissions expect different forms - please contact admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:431
+#: hypha/apply/funds/views/all.py:495
 msgid "Inconsistent states provided - please talk to an admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:458
+#: hypha/apply/funds/views/all.py:522
 msgid "Failed to update: "
 msgstr "Не удалось обновить: "
 
-#: hypha/apply/funds/views/all.py:463
+#: hypha/apply/funds/views/all.py:527
 #, fuzzy, python-brace-format
 #| msgid "Successfully deleted submissions: {title}"
 msgid "Successfully updated status to {status}: "
 msgstr "Успешно удалены заявки: {title}"
 
-#: hypha/apply/funds/views/co_applicants.py:94
+#: hypha/apply/funds/views/co_applicants.py:93
 #, fuzzy
 #| msgid "edited applicant"
 msgid "Co-applicant invited"
 msgstr "заявитель отредактирован"
 
-#: hypha/apply/funds/views/co_applicants.py:234
+#: hypha/apply/funds/views/co_applicants.py:229
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:18
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:74
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:14
 #: hypha/apply/projects/templates/application_projects/project_form.html:29
-#: hypha/apply/projects/views/payment.py:285
-#: hypha/apply/projects/views/project.py:2040
+#: hypha/apply/projects/views/invoice.py:290
+#: hypha/apply/projects/views/project.py:2131
 #: hypha/apply/users/templates/users/account.html:54
 msgid "Save"
 msgstr "Сохранить"
 
-#: hypha/apply/funds/views/co_applicants.py:254
+#: hypha/apply/funds/views/co_applicants.py:249
 #, fuzzy
 #| msgid "Last updated"
 msgid "Co-applicant updated"
 msgstr "Последний раз обновлено"
 
-#: hypha/apply/funds/views/co_applicants.py:282
+#: hypha/apply/funds/views/co_applicants.py:277
 #, fuzzy
 #| msgid "edited applicant"
 msgid "Co-applicant re-invited"
 msgstr "заявитель отредактирован"
 
-#: hypha/apply/funds/views/co_applicants.py:304
+#: hypha/apply/funds/views/co_applicants.py:299
 #, fuzzy
 #| msgid "edited applicant"
 msgid "Co-applicant deleted"
@@ -6188,42 +6596,53 @@ msgstr "Создать"
 msgid "Reminder deleted"
 msgstr "Напоминание удалено"
 
-#: hypha/apply/funds/views/submission_detail.py:311
+#: hypha/apply/funds/views/submission_delete.py:47
+#, fuzzy
+#| msgid "Submission lead"
+msgid "Submission anonymized."
+msgstr "Руководитель заявки"
+
+#: hypha/apply/funds/views/submission_detail.py:301
 #, fuzzy
 #| msgid "Submission lead"
 msgid "Submission details"
 msgstr "Руководитель заявки"
 
-#: hypha/apply/funds/views/submission_edit.py:97
-#: hypha/apply/funds/views/submission_edit.py:276
+#: hypha/apply/funds/views/submission_edit.py:96
+#: hypha/apply/funds/views/submission_edit.py:275
 msgid "Draft saved"
 msgstr "Черновик сохранен"
 
-#: hypha/apply/funds/views/submission_edit.py:366
-#: hypha/apply/funds/views/submission_edit.py:392
+#: hypha/apply/funds/views/submission_edit.py:365
+#: hypha/apply/funds/views/submission_edit.py:391
 #: hypha/apply/funds/workflows/definitions/double_stage.py:133
 msgid "Progress"
 msgstr "Прогресс"
 
-#: hypha/apply/funds/views/submission_edit.py:419
-#: hypha/apply/funds/views/submission_edit.py:461
-#: hypha/apply/projects/views/project.py:605
-#: hypha/apply/projects/views/project.py:664
+#: hypha/apply/funds/views/submission_edit.py:410
+msgid "This submission already has a project."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_edit.py:421
+#: hypha/apply/funds/views/submission_edit.py:463
+#: hypha/apply/projects/views/project.py:651
+#: hypha/apply/projects/views/project.py:710
 #: hypha/apply/review/templates/review/review_confirm_delete.html:23
 #: hypha/apply/users/templates/elevate/elevate.html:39
 #: hypha/apply/users/templates/two_factor/admin/disable.html:24
 #: hypha/apply/users/templates/two_factor/profile/disable.html:39
 #: hypha/apply/users/templates/users/partials/confirmation_code_sent.html:43
+#: hypha/templates/cotton/modal/confirm.html:43
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: hypha/apply/funds/views/submission_edit.py:558
+#: hypha/apply/funds/views/submission_edit.py:559
 #, fuzzy
 #| msgid "Submission lead"
 msgid "Submission Lead updated."
 msgstr "Руководитель заявки"
 
-#: hypha/apply/funds/views/submission_edit.py:687
+#: hypha/apply/funds/views/submission_edit.py:744
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Tags updated successfully."
@@ -6233,58 +6652,88 @@ msgstr "Партнеры обновлены."
 msgid "User attempted to translate submission but is not org faculty"
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:154
+#: hypha/apply/funds/views/translate.py:152
 #, python-brace-format
 msgid "Submission translated from {fl} to {tl}."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:167
+#: hypha/apply/funds/views/translate.py:165
 msgid "Submission translation failed. Contact your Administrator."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:174
+#: hypha/apply/funds/views/translate.py:172
 #, fuzzy
 #| msgid "transitioned"
 msgid "Translation cleared."
 msgstr "переход выполнен"
 
-#: hypha/apply/funds/workflows/constants.py:59
+#: hypha/apply/funds/workflows/constants.py:63
 msgid "Received"
 msgstr "Получено"
 
-#: hypha/apply/funds/workflows/constants.py:63
+#: hypha/apply/funds/workflows/constants.py:67
 #: hypha/apply/funds/workflows/definitions/double_stage.py:74
 #: hypha/apply/funds/workflows/definitions/double_stage.py:211
 #: hypha/apply/funds/workflows/definitions/single_stage.py:74
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:83
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:129
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:69
 msgid "Internal Review"
 msgstr "Внутреннее ревью"
 
-#: hypha/apply/funds/workflows/constants.py:67
+#: hypha/apply/funds/workflows/constants.py:71
+#: hypha/apply/funds/workflows/definitions/double_stage.py:91
+#: hypha/apply/funds/workflows/definitions/double_stage.py:228
+#: hypha/apply/funds/workflows/definitions/double_stage.py:273
+#: hypha/apply/funds/workflows/definitions/single_stage.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:98
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
 msgid "Ready for Discussion"
 msgstr "Готово к обсуждению"
 
-#: hypha/apply/funds/workflows/constants.py:73
+#: hypha/apply/funds/workflows/constants.py:77
 msgid "More Information Requested"
 msgstr "Требуется больше информации"
 
-#: hypha/apply/funds/workflows/constants.py:77
+#: hypha/apply/funds/workflows/constants.py:81
 #: hypha/apply/funds/workflows/definitions/double_stage.py:165
 msgid "Invited for Proposal"
 msgstr "Приглашено к предложению"
 
-#: hypha/apply/funds/workflows/constants.py:81
+#: hypha/apply/funds/workflows/constants.py:85
 #: hypha/apply/funds/workflows/definitions/double_stage.py:258
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:115
 msgid "External Review"
 msgstr "Внешнее ревью"
 
-#: hypha/apply/funds/workflows/constants.py:85
+#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/workflows/definitions/single_stage.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage.py:58
+#: hypha/apply/funds/workflows/definitions/single_stage.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage.py:109
 #: hypha/apply/funds/workflows/definitions/single_stage.py:127
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:190
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:66
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:138
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:163
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:116
 msgid "Ready for Determination"
 msgstr "Готово к решению"
@@ -6299,6 +6748,9 @@ msgstr "Готово к решению"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:35
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:107
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:150
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:33
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:90
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:137
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:34
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:80
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:123
@@ -6319,7 +6771,8 @@ msgstr "Открыто ревью"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:36
 #: hypha/apply/funds/workflows/definitions/double_stage.py:60
 #: hypha/apply/funds/workflows/definitions/double_stage.py:86
-msgid "Ready For Preliminary Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:122
+msgid "Ready for Preliminary Determination"
 msgstr "Готово к предварительному решению"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:37
@@ -6353,6 +6806,12 @@ msgstr "Пригласить к предложению"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:155
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:188
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:67
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:96
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:173
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:190
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:37
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:84
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:128
@@ -6366,6 +6825,7 @@ msgstr "Отклонить"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:42
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:38
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:39
 msgid "Need screening"
@@ -6385,6 +6845,9 @@ msgstr "Концептуальная записка получена"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:61
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:131
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:57
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:116
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:162
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:58
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:104
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:148
@@ -6400,6 +6863,8 @@ msgstr "Требуется дополнительная информация"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:79
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:92
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:139
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:78
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:66
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:112
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:66
@@ -6410,6 +6875,7 @@ msgstr "Закрыть ревью"
 #: hypha/apply/funds/workflows/definitions/single_stage.py:72
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:80
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:68
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:67
 msgid "Need screening (revert)"
@@ -6432,18 +6898,6 @@ msgstr "{ORG_SHORT_NAME} ревью"
 msgid "Open Review (revert)"
 msgstr "Открыть ревью (отменить)"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:91
-#: hypha/apply/funds/workflows/definitions/double_stage.py:228
-#: hypha/apply/funds/workflows/definitions/double_stage.py:273
-#: hypha/apply/funds/workflows/definitions/single_stage.py:92
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
-msgid "Ready For Discussion"
-msgstr "Готово к обсуждению"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:118
 #: hypha/apply/funds/workflows/definitions/double_stage.py:256
 #: hypha/apply/funds/workflows/definitions/double_stage.py:299
@@ -6453,18 +6907,18 @@ msgstr "Готово к обсуждению"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:140
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:184
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:206
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:126
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:113
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:157
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:179
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:131
-msgid "Ready For Discussion (revert)"
+#, fuzzy
+#| msgid "Ready For Discussion (revert)"
+msgid "Ready for Discussion (revert)"
 msgstr "Готово к обсуждению (отменить)"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:122
-msgid "Ready for Preliminary Determination"
-msgstr "Готово к предварительному решению"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:129
 msgid "Concept Accepted"
 msgstr "Концепция принята"
@@ -6479,6 +6933,7 @@ msgstr "Предварительное решение"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:223
 #: hypha/apply/funds/workflows/definitions/double_stage.py:245
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:108
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:65
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:81
 msgid "Open External Review"
 msgstr "Открытое внешнее ревью"
@@ -6488,8 +6943,9 @@ msgstr "Открытое внешнее ревью"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:197
 #: hypha/apply/funds/workflows/definitions/double_stage.py:224
 #: hypha/apply/funds/workflows/definitions/double_stage.py:267
-msgid "Ready For Final Determination"
-msgstr "Готово к итоговому решению"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:304
+msgid "Ready for Final Determination"
+msgstr "Готово к финальному решению"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:179
 msgid "Proposal Received"
@@ -6502,12 +6958,14 @@ msgstr "Предложение получено (отменить)"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:225
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:110
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:139
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:83
 msgid "Open Internal Review (revert)"
 msgstr "Открыть внутреннее ревью (отменить)"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:268
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:152
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:125
 msgid "Open External Review (revert)"
 msgstr "Открыть внешнее ревью (отменить)"
@@ -6527,10 +6985,6 @@ msgstr "Открыть внешнее ревью (отменить)"
 msgid "Accept but additional info required"
 msgstr "Принято, но требуется дополнительная информация"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:304
-msgid "Ready for Final Determination"
-msgstr "Готово к финальному решению"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:312
 msgid "Final Determination"
 msgstr "Финальное решение"
@@ -6543,23 +6997,9 @@ msgstr "Финальное решение"
 msgid "Accepted but additional info required"
 msgstr "Принято, но требуется дополнительная информация"
 
-#: hypha/apply/funds/workflows/definitions/single_stage.py:35
-#: hypha/apply/funds/workflows/definitions/single_stage.py:58
-#: hypha/apply/funds/workflows/definitions/single_stage.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
-msgid "Ready For Determination"
-msgstr "Готово для заключения"
-
 #: hypha/apply/funds/workflows/definitions/single_stage.py:41
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:43
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:40
 msgid "Application Received"
@@ -6567,6 +7007,7 @@ msgstr "Заявка получена"
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:135
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:198
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:183
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:171
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:124
 msgid "Application Outcome"
@@ -6581,28 +7022,81 @@ msgstr "Открыть коммьюнити ревью"
 msgid "Community Review"
 msgstr "Коммьюнити ревью"
 
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:34
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:70
+#, fuzzy
+#| msgid "marked ready for review"
+msgid "Ready for Review"
+msgstr "отмечено как готовое к ревью"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:79
+#, fuzzy
+#| msgid "Open Review (revert)"
+msgid "Ready for Review (revert)"
+msgstr "Открыть ревью (отменить)"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:82
+#, fuzzy
+#| msgid "Application Received"
+msgid "Application Review"
+msgstr "Заявка получена"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:91
+#, fuzzy
+#| msgid "Open External Review"
+msgid "Open Internal Review"
+msgstr "Открытое внешнее ревью"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:95
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:141
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:172
+msgid "Waitlist"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:191
+#, fuzzy
+#| msgid "Ready for Determination"
+msgid "Ready for Determination (revert)"
+msgstr "Готово к решению"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:193
+msgid "Waitlisted"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:199
+#, fuzzy
+#| msgid "Accepted"
+msgid "Not Accepted"
+msgstr "Принято"
+
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:69
 #: hypha/apply/review/templates/review/review_detail.html:10
 msgid "Review"
 msgstr "Ревью"
 
-#: hypha/apply/funds/workflows/registry.py:69
+#: hypha/apply/funds/workflows/registry.py:70
 msgid "Request with same time review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:75
+#: hypha/apply/funds/workflows/registry.py:76
 #, fuzzy
 #| msgid "Open External Review"
 msgid "Request with external review"
 msgstr "Открытое внешнее ревью"
 
-#: hypha/apply/funds/workflows/registry.py:81
+#: hypha/apply/funds/workflows/registry.py:82
 #, fuzzy
 #| msgid "Open Community Review"
 msgid "Request with community review"
 msgstr "Открыть коммьюнити ревью"
 
-#: hypha/apply/funds/workflows/registry.py:87
+#: hypha/apply/funds/workflows/registry.py:88
+#, fuzzy
+#| msgid "Open External Review"
+msgid "Request external then internal review"
+msgstr "Открытое внешнее ревью"
+
+#: hypha/apply/funds/workflows/registry.py:94
 #, fuzzy
 #| msgid "Invite to Proposal"
 msgid "Concept & Proposal"
@@ -6620,26 +7114,33 @@ msgstr ""
 "Объект, который вы пытаетесь удалить, где-то используется. Пожалуйста, "
 "удалите все используемые объекты и попробуйте снова!."
 
-#: hypha/apply/projects/admin.py:45
+#: hypha/apply/projects/admin.py:46
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "Project Forms"
 msgstr "Форма технического задания проекта"
 
-#: hypha/apply/projects/admin.py:62
+#: hypha/apply/projects/admin.py:63
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "SOW Forms"
 msgstr "Форма технического задания проекта"
 
-#: hypha/apply/projects/admin.py:79
+#: hypha/apply/projects/admin.py:80
 #, fuzzy
 #| msgid "Reports"
 msgid "Report Forms"
 msgstr "Отчеты"
 
-#: hypha/apply/projects/admin.py:99
+#: hypha/apply/projects/admin.py:101
+#, fuzzy
+#| msgid "Invoices"
+msgid "Invoice Tags"
+msgstr "Инвойсы"
+
+#: hypha/apply/projects/admin.py:107
 #: hypha/apply/projects/templates/application_projects/project_list.html:6
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:4
 #: hypha/core/navigation.py:98 hypha/core/navigation.py:133
 msgid "Projects"
 msgstr "Проекты"
@@ -6661,17 +7162,17 @@ msgid "Vendor pending"
 msgstr "Вендор "
 
 #: hypha/apply/projects/constants.py:22
-#: hypha/apply/projects/models/payment.py:34 hypha/apply/projects/utils.py:91
+#: hypha/apply/projects/models/invoice.py:45 hypha/apply/projects/utils.py:94
 msgid "Declined"
 msgstr "Отклонено"
 
 #: hypha/apply/projects/constants.py:23
-#: hypha/apply/projects/models/payment.py:32 hypha/apply/projects/utils.py:93
+#: hypha/apply/projects/models/invoice.py:43 hypha/apply/projects/utils.py:96
 msgid "Paid"
 msgstr "Оплачено"
 
 #: hypha/apply/projects/constants.py:24
-#: hypha/apply/projects/models/payment.py:33 hypha/apply/projects/utils.py:95
+#: hypha/apply/projects/models/invoice.py:44 hypha/apply/projects/utils.py:98
 msgid "Payment failed"
 msgstr "Платеж не прошел"
 
@@ -6687,7 +7188,7 @@ msgstr "Ожидание"
 msgid "Request for change"
 msgstr "запрошенное изменение проекта"
 
-#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:224
 #, fuzzy
 #| msgid "Update"
 msgid "Up to date"
@@ -6699,24 +7200,29 @@ msgstr "Обновить"
 msgid "Behind schedule"
 msgstr "Новое расписание"
 
-#: hypha/apply/projects/filters.py:66
+#: hypha/apply/projects/filters.py:61 hypha/apply/projects/tables.py:202
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
+msgid "Contractor"
+msgstr "Исполнитель"
+
+#: hypha/apply/projects/filters.py:73
 #: hypha/apply/projects/reports/templates/reports/reporting.html:6
 #: hypha/apply/projects/reports/templates/reports/reporting.html:11
-#: hypha/apply/projects/tables.py:186
+#: hypha/apply/projects/tables.py:205
 msgid "Reporting"
 msgstr "Отчетность"
 
-#: hypha/apply/projects/forms/payment.py:108
+#: hypha/apply/projects/forms/invoice.py:110
 #, fuzzy
 #| msgid "Invoice File"
 msgid "Invoice file"
 msgstr "Файл инвойса"
 
-#: hypha/apply/projects/forms/payment.py:110
+#: hypha/apply/projects/forms/invoice.py:112
 msgid "The invoice must be a PDF."
 msgstr "Инвойс должен быть в формате PDF."
 
-#: hypha/apply/projects/forms/payment.py:115
+#: hypha/apply/projects/forms/invoice.py:117
 msgid ""
 "Files that are related to the invoice. They could be xls, microsoft office "
 "documents, open office documents, pdfs, txt files."
@@ -6724,16 +7230,16 @@ msgstr ""
 "Файлы, относящиеся к инвойсу. Это могут быть файлы xls, документы microsoft "
 "office, документы open office, pdf, txt."
 
-#: hypha/apply/projects/forms/payment.py:142
+#: hypha/apply/projects/forms/invoice.py:144
 msgid "Invoice File"
 msgstr "Файл инвойса"
 
-#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:408
+#: hypha/apply/projects/forms/invoice.py:179
+#: hypha/apply/projects/forms/project.py:418
 msgid "Document"
 msgstr "Документ"
 
-#: hypha/apply/projects/forms/payment.py:200
+#: hypha/apply/projects/forms/invoice.py:202
 msgid "File not found on submission"
 msgstr "Файл не найден при отправке"
 
@@ -6750,132 +7256,164 @@ msgid "You can only approve a signed contract"
 msgstr "Вы можете утвердить только подписанный контракт"
 
 #: hypha/apply/projects/forms/project.py:93
+#: hypha/apply/projects/templates/application_projects/paf_export.html:6
+#: hypha/apply/projects/templates/application_projects/sow_export.html:6
+#, fuzzy
+#| msgid "Project file: {title}"
+msgid "Project title"
+msgstr "Файл проекта: {title}"
+
+#: hypha/apply/projects/forms/project.py:95
+msgid ""
+"A submission can have several projects. Give this one a name so it can be "
+"told apart from the others."
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:101
 #, fuzzy
 #| msgid "Select Project Lead"
 msgid "Select project lead"
 msgstr "Выберите руководителя проекта"
 
-#: hypha/apply/projects/forms/project.py:98
+#: hypha/apply/projects/forms/project.py:106
 #, fuzzy
 #| msgid "Update Project Status"
 msgid "Initial project status"
 msgstr "Обновить статус проекта"
 
-#: hypha/apply/projects/forms/project.py:104
+#: hypha/apply/projects/forms/project.py:112
 #, fuzzy
 #| msgid "Project name"
 msgid "Project end date"
 msgstr "Название проекта"
 
-#: hypha/apply/projects/forms/project.py:123
+#: hypha/apply/projects/forms/project.py:132
 msgid "Project lead is a required field"
 msgstr "Руководитель проекта - это обязательное поле"
 
-#: hypha/apply/projects/forms/project.py:222
+#: hypha/apply/projects/forms/project.py:232
 #, fuzzy
 #| msgid "Project's current status"
 msgid "Project form status"
 msgstr "Текущий статус проекта"
 
-#: hypha/apply/projects/forms/project.py:307
+#: hypha/apply/projects/forms/project.py:317
 msgid "A Project can only be sent for Approval when Drafted."
 msgstr "Проект может быть отправлен на утверждение только в черновом варианте."
 
-#: hypha/apply/projects/forms/project.py:385
-#: hypha/apply/projects/forms/project.py:400
+#: hypha/apply/projects/forms/project.py:395
+#: hypha/apply/projects/forms/project.py:410
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:78
 msgid "Contract"
 msgstr "Контракт"
 
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:397
 #, fuzzy
 #| msgid "assign paf approver"
 msgid "Signed and approved"
 msgstr "назначить подтверждающего для формы утверждения проекта"
 
-#: hypha/apply/projects/forms/project.py:424
+#: hypha/apply/projects/forms/project.py:434
 msgid "Contract Document"
 msgstr "Контрактный документ"
 
-#: hypha/apply/projects/forms/project.py:482
+#: hypha/apply/projects/forms/project.py:492
 #, fuzzy
 #| msgid "Proposed End Date must be after Proposed Start Date"
 msgid "The end date must be after the start date."
 msgstr "Предлагаемая дата окончания должна быть после предлагаемой даты начала"
 
-#: hypha/apply/projects/models/payment.py:27
+#: hypha/apply/projects/models/invoice.py:38
 msgid "Resubmitted"
 msgstr "Повторно подано"
 
-#: hypha/apply/projects/models/payment.py:28
+#: hypha/apply/projects/models/invoice.py:39
 msgid "Changes requested by staff"
 msgstr "Требуются изменения по запросу сотрудников"
 
-#: hypha/apply/projects/models/payment.py:29
+#: hypha/apply/projects/models/invoice.py:40
 msgid "Changes requested by finance"
 msgstr "Требуются изменения по запросу финансового отдела"
 
-#: hypha/apply/projects/models/payment.py:30
+#: hypha/apply/projects/models/invoice.py:41
 msgid "Approved by staff"
 msgstr "Одобрено сотрудниками"
 
-#: hypha/apply/projects/models/payment.py:31
+#: hypha/apply/projects/models/invoice.py:42
 msgid "Approved by finance"
 msgstr "Одобрено финансовым отделом"
 
-#: hypha/apply/projects/models/payment.py:109
+#: hypha/apply/projects/models/invoice.py:82
+#, fuzzy
+#| msgid "Invoice added"
+msgid "invoice tag"
+msgstr "Добавлен инвойс"
+
+#: hypha/apply/projects/models/invoice.py:83
+#, fuzzy
+#| msgid "invoices"
+msgid "invoice tags"
+msgstr "инвойсы"
+
+#: hypha/apply/projects/models/invoice.py:132
 #, fuzzy
 #| msgid "Total value"
 msgid "paid value"
 msgstr "Итоговое значение"
 
-#: hypha/apply/projects/models/payment.py:116
-#: hypha/apply/projects/models/payment.py:289
-#: hypha/apply/projects/models/project.py:763
-#: hypha/apply/projects/models/project.py:795
+#: hypha/apply/projects/models/invoice.py:139
+#: hypha/apply/projects/models/invoice.py:319
+#: hypha/apply/projects/models/project.py:792
+#: hypha/apply/projects/models/project.py:824
 #, fuzzy
 #| msgid "Document"
 msgid "document"
 msgstr "Документ"
 
-#: hypha/apply/projects/models/payment.py:120
-#: hypha/apply/projects/models/payment.py:123
+#: hypha/apply/projects/models/invoice.py:143
+#: hypha/apply/projects/models/invoice.py:146
 #, fuzzy
 #| msgid "Comments"
 msgid "comment"
 msgstr "Комментарии"
 
-#: hypha/apply/projects/models/payment.py:121
+#: hypha/apply/projects/models/invoice.py:144
 #, fuzzy
 #| msgid "Extra text to be displayed on register form"
 msgid "This will be displayed as a comment in the comments tab"
 msgstr "Дополнительный текст для отображения в форме регистрации"
 
-#: hypha/apply/projects/models/payment.py:125
+#: hypha/apply/projects/models/invoice.py:148
 #, fuzzy
 #| msgid "Invoice number"
 msgid "invoice number"
 msgstr "Номер инвойса"
 
-#: hypha/apply/projects/models/payment.py:132
+#: hypha/apply/projects/models/invoice.py:155
 #, fuzzy
 #| msgid "Invoice amount"
 msgid "invoice amount"
 msgstr "Сумма инвойса"
 
-#: hypha/apply/projects/models/payment.py:134
+#: hypha/apply/projects/models/invoice.py:157
 #, fuzzy
 #| msgid "Invoice added"
 msgid "invoice date"
 msgstr "Добавлен инвойс"
 
-#: hypha/apply/projects/models/payment.py:135
+#: hypha/apply/projects/models/invoice.py:158
 #, fuzzy
 #| msgid "Paid"
 msgid "paid date"
 msgstr "Оплачено"
 
-#: hypha/apply/projects/models/payment.py:146
+#: hypha/apply/projects/models/invoice.py:168
+#, fuzzy
+#| msgid "All Leads"
+msgid "tags"
+msgstr "Все руководители"
+
+#: hypha/apply/projects/models/invoice.py:175
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 #, fuzzy
@@ -6883,28 +7421,47 @@ msgstr "Оплачено"
 msgid "invoice"
 msgstr "инвойсы"
 
-#: hypha/apply/projects/models/payment.py:147
+#: hypha/apply/projects/models/invoice.py:176
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:20
 msgid "invoices"
 msgstr "инвойсы"
 
-#: hypha/apply/projects/models/payment.py:150
-#, python-brace-format
-msgid "Invoice requested for {project}"
+#: hypha/apply/projects/models/invoice.py:180
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Invoice for {project}"
+msgstr "Инвойс запрошен для {project}"
+
+#: hypha/apply/projects/models/invoice.py:181
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Invoice {number} for {project}"
 msgstr "Инвойс запрошен для {project}"
 
-#: hypha/apply/projects/models/payment.py:298
+#: hypha/apply/projects/models/invoice.py:328
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "supporting document"
 msgstr "Сопроводительные документы"
 
-#: hypha/apply/projects/models/payment.py:299
+#: hypha/apply/projects/models/invoice.py:329
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "supporting documents"
 msgstr "Сопроводительные документы"
 
+#: hypha/apply/projects/models/invoice.py:359
+#, fuzzy
+#| msgid "Submission lead"
+msgid "invoice export manager"
+msgstr "Руководитель заявки"
+
+#: hypha/apply/projects/models/invoice.py:360
+#, fuzzy
+#| msgid "Submission lead"
+msgid "invoice export managers"
+msgstr "Руководитель заявки"
+
 #: hypha/apply/projects/models/project.py:75
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:41
 #, fuzzy
@@ -6947,141 +7504,173 @@ msgstr "Завершить"
 msgid "{} approval"
 msgstr "{} одобрение"
 
-#: hypha/apply/projects/models/project.py:215
+#: hypha/apply/projects/models/project.py:216
 #, fuzzy
 #| msgid "Progress"
 msgid "In progress"
 msgstr "Прогресс"
 
-#: hypha/apply/projects/models/project.py:248
-#: hypha/apply/projects/models/project.py:761
-#: hypha/apply/projects/models/project.py:793
+#: hypha/apply/projects/models/project.py:251
+#: hypha/apply/projects/models/project.py:790
+#: hypha/apply/projects/models/project.py:822
 #, fuzzy
 #| msgid "Title"
 msgid "title"
 msgstr "Заголовок"
 
-#: hypha/apply/projects/models/project.py:250
+#: hypha/apply/projects/models/project.py:253
 #, fuzzy
 #| msgid "Total value"
 msgid "value"
 msgstr "Итоговое значение"
 
-#: hypha/apply/projects/models/project.py:257
+#: hypha/apply/projects/models/project.py:260
 #, fuzzy
 #| msgid "Proposed Start Date"
 msgid "proposed start date"
 msgstr "Предлагаемая дата начала"
 
-#: hypha/apply/projects/models/project.py:259
+#: hypha/apply/projects/models/project.py:262
 #, fuzzy
 #| msgid "Proposed End Date"
 msgid "proposed end date"
 msgstr "Предлагаемая дата завершения"
 
-#: hypha/apply/projects/models/project.py:269
+#: hypha/apply/projects/models/project.py:264
+#, fuzzy
+#| msgid "Contract number"
+msgid "contract number"
+msgstr "Номер контракта"
+
+#: hypha/apply/projects/models/project.py:274
 msgid "locked"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:272
+#: hypha/apply/projects/models/project.py:277
 #, fuzzy
 #| msgid "Submit contracting documents"
 msgid "submit contracting documents"
 msgstr "Подать документы на заключение контракта"
 
-#: hypha/apply/projects/models/project.py:285
+#: hypha/apply/projects/models/project.py:290
 msgid "ID of this project at integrated payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:289
+#: hypha/apply/projects/models/project.py:294
 msgid "More details of the project integrated at payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:294
+#: hypha/apply/projects/models/project.py:299
 #, fuzzy
 #| msgid "Review invoice and take action"
 msgid "Reviewers role and their actions/comments"
 msgstr "Проверьте инвойс и возьмите в работу"
 
-#: hypha/apply/projects/models/project.py:302 hypha/apply/todo/options.py:105
-#: hypha/apply/todo/options.py:113 hypha/apply/todo/options.py:121
-#: hypha/apply/todo/options.py:129 hypha/apply/todo/options.py:138
-#: hypha/apply/todo/options.py:146 hypha/apply/todo/options.py:155
-#: hypha/apply/todo/options.py:163 hypha/apply/todo/options.py:171
-#: hypha/apply/todo/options.py:180 hypha/apply/todo/options.py:188
-#: hypha/apply/todo/options.py:196 hypha/apply/todo/options.py:204
-#: hypha/apply/todo/options.py:212
+#: hypha/apply/projects/models/project.py:307 hypha/apply/todo/options.py:112
+#: hypha/apply/todo/options.py:120 hypha/apply/todo/options.py:128
+#: hypha/apply/todo/options.py:136 hypha/apply/todo/options.py:145
+#: hypha/apply/todo/options.py:153 hypha/apply/todo/options.py:162
+#: hypha/apply/todo/options.py:170 hypha/apply/todo/options.py:178
+#: hypha/apply/todo/options.py:187 hypha/apply/todo/options.py:195
+#: hypha/apply/todo/options.py:203 hypha/apply/todo/options.py:211
+#: hypha/apply/todo/options.py:219
 #, fuzzy
 #| msgid "Project"
 msgid "project"
 msgstr "Проект"
 
-#: hypha/apply/projects/models/project.py:303
+#: hypha/apply/projects/models/project.py:308
 #, fuzzy
 #| msgid "Project"
 msgid "projects"
 msgstr "Проект"
 
-#: hypha/apply/projects/models/project.py:411
+#: hypha/apply/projects/models/project.py:418
 msgid "Proposed End Date must be after Proposed Start Date"
 msgstr "Предлагаемая дата окончания должна быть после предлагаемой даты начала"
 
 #. Translators: SOW = Statement of Work
-#: hypha/apply/projects/models/project.py:518
+#: hypha/apply/projects/models/project.py:525
 #, fuzzy
 #| msgid "Project"
 msgctxt "singular"
 msgid "project SOW"
 msgstr "Проект"
 
-#: hypha/apply/projects/models/project.py:519
+#: hypha/apply/projects/models/project.py:526
 #, fuzzy
 #| msgid "Project"
 msgctxt "plural"
 msgid "project SOW"
 msgstr "Проект"
 
-#: hypha/apply/projects/models/project.py:541
+#: hypha/apply/projects/models/project.py:532
+#, fuzzy, python-brace-format
+#| msgid "Scope of work (SOW)"
+msgid "Scope of Work for {project}"
+msgstr "Объем работ"
+
+#: hypha/apply/projects/models/project.py:543
+#, fuzzy
+#| msgid "Project SOW Form"
+msgctxt "singular"
+msgid "project form"
+msgstr "Форма технического задания проекта"
+
+#: hypha/apply/projects/models/project.py:544
+#, fuzzy
+#| msgid "Project SOW Form"
+msgctxt "plural"
+msgid "project forms"
+msgstr "Форма технического задания проекта"
+
+#: hypha/apply/projects/models/project.py:550
+#, fuzzy, python-brace-format
+#| msgid "A Project is awaiting your review."
+msgid "Project form for {project}"
+msgstr "Проект ожидает вашего ревью."
+
+#: hypha/apply/projects/models/project.py:572
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "project form"
 msgstr "Форма технического задания проекта"
 
-#: hypha/apply/projects/models/project.py:542
+#: hypha/apply/projects/models/project.py:573
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "project forms"
 msgstr "Форма технического задания проекта"
 
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:579
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "project SOW form"
 msgstr "Форма технического задания проекта"
 
-#: hypha/apply/projects/models/project.py:549
+#: hypha/apply/projects/models/project.py:580
 #, fuzzy
 #| msgid "Project SOW Form"
 msgid "project SOW forms"
 msgstr "Форма технического задания проекта"
 
-#: hypha/apply/projects/models/project.py:561
+#: hypha/apply/projects/models/project.py:592
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "project report form"
 msgstr "Форма утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:562
+#: hypha/apply/projects/models/project.py:593
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "project report forms"
 msgstr "Форма утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:569
+#: hypha/apply/projects/models/project.py:600
 msgid "user groups"
 msgstr "пользовательские группы"
 
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:602
 #, fuzzy
 #| msgid "Only selected group's users will be listed for this PAFReviewerRole"
 msgid ""
@@ -7090,238 +7679,238 @@ msgstr ""
 "Только пользователи выбранной группы будут указаны для этой роли ревьюеров "
 "формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:583
+#: hypha/apply/projects/models/project.py:614
 #, fuzzy
 #| msgid "All reviewers"
 msgid "PAF reviewers role"
 msgstr "Все ревьюеры"
 
-#: hypha/apply/projects/models/project.py:584
+#: hypha/apply/projects/models/project.py:615
 #, fuzzy
 #| msgid "PAF Reviewers Roles"
 msgid "PAF reviewers roles"
 msgstr "Роли ревьюеров формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:595
+#: hypha/apply/projects/models/project.py:626
 msgid "Before"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:596
+#: hypha/apply/projects/models/project.py:627
 msgid "After"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:605
+#: hypha/apply/projects/models/project.py:636
 #, fuzzy
 #| msgid "Number field"
 msgid "Number of days"
 msgstr "Числовое поле"
 
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:637
 msgid "Relation to report due date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:610
+#: hypha/apply/projects/models/project.py:641
 #, fuzzy
 #| msgid "Report frequency"
 msgid "project reminder frequency"
 msgstr "Периодичность отчетов"
 
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:642
 #, fuzzy
 #| msgid "Report frequency"
 msgid "project reminder frequencies"
 msgstr "Периодичность отчетов"
 
-#: hypha/apply/projects/models/project.py:617
+#: hypha/apply/projects/models/project.py:648
 #, fuzzy
 #| msgid "Contact email"
 msgid "contracting group email"
 msgstr "Контактный адрес электронной почты"
 
-#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:650
 msgid "finance group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:620
+#: hypha/apply/projects/models/project.py:651
 msgid "staff group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:622
+#: hypha/apply/projects/models/project.py:653
 msgid "Uncheck it to approve project parallelly"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:632
+#: hypha/apply/projects/models/project.py:663
 #, fuzzy
 #| msgid "approved project"
 msgid "Approve Project Sequentially"
 msgstr "утвержденный проект"
 
-#: hypha/apply/projects/models/project.py:635
+#: hypha/apply/projects/models/project.py:666
 #, fuzzy
 #| msgid "PAF Reviewers Roles"
 msgid "Project Form Reviewers Roles"
 msgstr "Роли ревьюеров формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:638
+#: hypha/apply/projects/models/project.py:669
 #, fuzzy
 #| msgid "PAF Reviewers Roles"
 msgid "Project Reviewers Roles"
 msgstr "Роли ревьюеров формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:640
+#: hypha/apply/projects/models/project.py:671
 msgid ""
 "Reviewer Roles are needed to move projects to 'Internal Approval' stage. "
 "Delete all roles to skip internal approval process and to move all internal "
 "approval projects back to the 'Draft' stage with all approvals removed."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:647
-#: hypha/apply/projects/models/project.py:648
+#: hypha/apply/projects/models/project.py:678
+#: hypha/apply/projects/models/project.py:679
 #, fuzzy
 #| msgid "Report frequency"
 msgid "Report reminder frequency"
 msgstr "Периодичность отчетов"
 
-#: hypha/apply/projects/models/project.py:650
+#: hypha/apply/projects/models/project.py:681
 msgid ""
 "Set up a cron job to run `notify_report_due.py`. The script will use these "
 "reminder settings."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:656
+#: hypha/apply/projects/models/project.py:687
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:35
 #, fuzzy
 #| msgid " project settings"
 msgid "project settings"
 msgstr " настройки проекта"
 
-#: hypha/apply/projects/models/project.py:681
+#: hypha/apply/projects/models/project.py:712
 #, fuzzy
 #| msgid "PAF Approvals"
 msgid "PAF approval"
 msgstr "Подтверждения формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:682
+#: hypha/apply/projects/models/project.py:713
 #, fuzzy
 #| msgid "PAF Approvals"
 msgid "PAF approvals"
 msgstr "Подтверждения формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:685
+#: hypha/apply/projects/models/project.py:716
 #, python-brace-format
 msgid "Approval of {project} by {user}"
 msgstr "Подтверждение для {project} от {user}"
 
-#: hypha/apply/projects/models/project.py:713
+#: hypha/apply/projects/models/project.py:744
 #, fuzzy
 #| msgid "Profile"
 msgid "file"
 msgstr "Профиль"
 
-#: hypha/apply/projects/models/project.py:716
+#: hypha/apply/projects/models/project.py:747
 #, fuzzy
 #| msgid "assign paf approver"
 msgid "signed and approved"
 msgstr "назначить подтверждающего для формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:718
+#: hypha/apply/projects/models/project.py:749
 #, fuzzy
 #| msgid "Counter Signed"
 msgid "counter signed?"
 msgstr "Подписан ответной подписью"
 
-#: hypha/apply/projects/models/project.py:728
+#: hypha/apply/projects/models/project.py:759
 #, fuzzy
 #| msgid "Contract"
 msgid "contract"
 msgstr "Контракт"
 
-#: hypha/apply/projects/models/project.py:729
+#: hypha/apply/projects/models/project.py:760
 #, fuzzy
 #| msgid "Contract"
 msgid "contracts"
 msgstr "Контракт"
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Counter Signed"
 msgstr "Подписан ответной подписью"
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Unsigned"
 msgstr "Не подписанный"
 
-#: hypha/apply/projects/models/project.py:740
+#: hypha/apply/projects/models/project.py:771
 #, python-brace-format
 msgid "Contract for {project} ({state})"
 msgstr "Контракт для {project} ({state})"
 
-#: hypha/apply/projects/models/project.py:768
+#: hypha/apply/projects/models/project.py:797
 #, python-brace-format
 msgid "Project file: {title}"
 msgstr "Файл проекта: {title}"
 
-#: hypha/apply/projects/models/project.py:772
-#: hypha/apply/projects/models/project.py:773
+#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:802
 #, fuzzy
 #| msgid "Update Profile"
 msgid "packet files"
 msgstr "Обновить профиль"
 
-#: hypha/apply/projects/models/project.py:800
+#: hypha/apply/projects/models/project.py:829
 #, fuzzy
 #| msgid "Contact Details"
 msgid "contract packet file"
 msgstr "Контактные данные"
 
-#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:830
 #, fuzzy
 #| msgid "Contact Details"
 msgid "contract packet files"
 msgstr "Контактные данные"
 
-#: hypha/apply/projects/models/project.py:804
+#: hypha/apply/projects/models/project.py:833
 #, python-brace-format
 msgid "Contract file: {title}"
 msgstr "Файл контракта: {title}"
 
-#: hypha/apply/projects/models/project.py:814
 #: hypha/apply/projects/models/project.py:843
+#: hypha/apply/projects/models/project.py:872
 #, fuzzy
 #| msgid "Username"
 msgid "name"
 msgstr "Имя пользователя"
 
-#: hypha/apply/projects/models/project.py:816
 #: hypha/apply/projects/models/project.py:845
+#: hypha/apply/projects/models/project.py:874
 #, fuzzy
 #| msgid "Recommendation"
 msgid "recommended minimum"
 msgstr "Рекомендация"
 
-#: hypha/apply/projects/models/project.py:820
-#: hypha/apply/projects/models/project.py:857
+#: hypha/apply/projects/models/project.py:849
+#: hypha/apply/projects/models/project.py:886
 #, fuzzy
 #| msgid "View template"
 msgid "template"
 msgstr "Посмотреть шаблон"
 
-#: hypha/apply/projects/models/project.py:832
+#: hypha/apply/projects/models/project.py:861
 #, fuzzy
 #| msgid "Category"
 msgid "Document Category"
 msgstr "Категория"
 
-#: hypha/apply/projects/models/project.py:833
+#: hypha/apply/projects/models/project.py:862
 #, fuzzy
 #| msgid "Project documents"
 msgid "Project Document Categories"
 msgstr "Документы по проекту"
 
-#: hypha/apply/projects/models/project.py:850
+#: hypha/apply/projects/models/project.py:879
 msgid "allow document access for groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:851
+#: hypha/apply/projects/models/project.py:880
 #, fuzzy
 #| msgid "Only selected group's users will be listed for this PAFReviewerRole"
 msgid "Only selected group's users can access the document"
@@ -7329,13 +7918,13 @@ msgstr ""
 "Только пользователи выбранной группы будут указаны для этой роли ревьюеров "
 "формы утверждения проекта"
 
-#: hypha/apply/projects/models/project.py:869
+#: hypha/apply/projects/models/project.py:898
 #, fuzzy
 #| msgid "Contract Document"
 msgid "Contrat Document Category"
 msgstr "Контрактный документ"
 
-#: hypha/apply/projects/models/project.py:870
+#: hypha/apply/projects/models/project.py:899
 #, fuzzy
 #| msgid "Contract Document"
 msgid "Contract Document Categories"
@@ -7553,15 +8142,38 @@ msgstr ""
 msgid "Access allowed"
 msgstr "Принять"
 
-#: hypha/apply/projects/permissions.py:424
+#: hypha/apply/projects/permissions.py:426
+#, fuzzy
+#| msgid "Projects in contracting"
+msgid "Project is not in Draft state"
+msgstr "Проекты на стадии заключения контрактов"
+
+#: hypha/apply/projects/permissions.py:429
+#, fuzzy
+#| msgid "You can only approve a signed contract"
+msgid "Only Staff can skip the PAF approval process"
+msgstr "Вы можете утвердить только подписанный контракт"
+
+#: hypha/apply/projects/permissions.py:433
+msgid "Staff can skip PAF approval when no reviewer roles are configured"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:436
+#, fuzzy
+#| msgid "Approval form not configured. Please add an approval form in the"
+msgid "PAF reviewer roles are configured, cannot skip approval process"
+msgstr ""
+"Форма утверждения не сконфигурирована. Пожалуйста, добавьте форму утверждения"
+
+#: hypha/apply/projects/permissions.py:445
 msgid "Project form is editable for active projects if no reviewer roles"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:427
+#: hypha/apply/projects/permissions.py:448
 msgid "Project form is editable in Draft by this user"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:428
+#: hypha/apply/projects/permissions.py:449
 msgid "You are not allowed to edit the project at this time"
 msgstr "В настоящее время у вас нет доступа к редактированию проекта"
 
@@ -7569,7 +8181,21 @@ msgstr "В настоящее время у вас нет доступа к ре
 msgid "Reporting Period"
 msgstr "Отчетный период"
 
-#: hypha/apply/projects/reports/forms.py:100
+#: hypha/apply/projects/reports/forms.py:101
+#: hypha/apply/projects/reports/forms.py:120
+#, fuzzy
+#| msgid "Report"
+msgid "Report due date"
+msgstr "Отчет"
+
+#: hypha/apply/projects/reports/forms.py:112
+#: hypha/apply/projects/reports/forms.py:131
+#, fuzzy
+#| msgid "A user with that email already exists."
+msgid "A report for this date already exists."
+msgstr "Пользователь с таким электронным адресом уже существует."
+
+#: hypha/apply/projects/reports/forms.py:136
 #, fuzzy
 #| msgid "Report"
 msgid "Report on:"
@@ -7589,105 +8215,111 @@ msgctxt "project report (noun)"
 msgid "reports"
 msgstr "Отчеты"
 
-#: hypha/apply/projects/reports/models.py:204
+#: hypha/apply/projects/reports/models.py:131
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Report due {due_date} for {project}"
+msgstr "Инвойс запрошен для {project}"
+
+#: hypha/apply/projects/reports/models.py:209
 #, fuzzy
 #| msgid "For Conversion"
 msgid "report version"
 msgstr "Для конвертации"
 
-#: hypha/apply/projects/reports/models.py:205
+#: hypha/apply/projects/reports/models.py:210
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report versions"
 msgstr "отчётный период составляет"
 
-#: hypha/apply/projects/reports/models.py:220
+#: hypha/apply/projects/reports/models.py:225
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report private file"
 msgstr "отчётный период составляет"
 
-#: hypha/apply/projects/reports/models.py:221
+#: hypha/apply/projects/reports/models.py:226
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report private files"
 msgstr "отчётный период составляет"
 
-#: hypha/apply/projects/reports/models.py:240
+#: hypha/apply/projects/reports/models.py:245
 msgid "week"
 msgstr "неделя"
 
-#: hypha/apply/projects/reports/models.py:241
+#: hypha/apply/projects/reports/models.py:246
 msgid "month"
 msgstr "месяц"
 
-#: hypha/apply/projects/reports/models.py:242
+#: hypha/apply/projects/reports/models.py:247
 msgid "year"
 msgstr "год"
 
-#: hypha/apply/projects/reports/models.py:246
+#: hypha/apply/projects/reports/models.py:251
 msgid "Years"
 msgstr "Годы"
 
-#: hypha/apply/projects/reports/models.py:262
+#: hypha/apply/projects/reports/models.py:267
 #, fuzzy
 #| msgid "Reporting"
 msgid "report config"
 msgstr "Отчетность"
 
-#: hypha/apply/projects/reports/models.py:263
+#: hypha/apply/projects/reports/models.py:268
 #, fuzzy
 #| msgid "Reporting"
 msgid "report configs"
 msgstr "Отчетность"
 
-#: hypha/apply/projects/reports/models.py:267
+#: hypha/apply/projects/reports/models.py:272
 #, fuzzy
 #| msgid "Disable 2FA"
 msgid "Disabled"
 msgstr "Отключить 2FA"
 
-#: hypha/apply/projects/reports/models.py:272
+#: hypha/apply/projects/reports/models.py:277
 #, python-brace-format
 msgid "One time, that already has reported on {date}"
 msgstr "Один раз, когда уже сообщалось о {date}"
 
-#: hypha/apply/projects/reports/models.py:277
+#: hypha/apply/projects/reports/models.py:282
 #, python-brace-format
 msgid "One time on {date}"
 msgstr "Один раз в {date}"
 
-#: hypha/apply/projects/reports/models.py:285
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:316
 msgid "last day"
 msgstr "последний день"
 
-#: hypha/apply/projects/reports/models.py:291
+#: hypha/apply/projects/reports/models.py:307
 #, python-brace-format
 msgid "Once a year on {month} {day}"
 msgstr "Раз в год в {month} {day}"
 
-#: hypha/apply/projects/reports/models.py:294
+#: hypha/apply/projects/reports/models.py:310
 #, python-brace-format
 msgid "Every {occurrence} years on {month} {day}"
 msgstr "Каждый {occurrence} год в {month} {day}"
 
-#: hypha/apply/projects/reports/models.py:304
+#: hypha/apply/projects/reports/models.py:320
 #, python-brace-format
 msgid "Once a month on the {day}"
 msgstr "Раз в месяц в {day}"
 
-#: hypha/apply/projects/reports/models.py:305
+#: hypha/apply/projects/reports/models.py:321
 #, python-brace-format
 msgid "Every {occurrence} months on the {day}"
 msgstr "Каждый {occurrence} месяц, {day} числа"
 
-#: hypha/apply/projects/reports/models.py:312
+#: hypha/apply/projects/reports/models.py:328
 #, python-brace-format
 msgid "Once a week on {weekday}"
 msgstr "Раз в неделю в {weekday}"
 
-#: hypha/apply/projects/reports/models.py:313
+#: hypha/apply/projects/reports/models.py:329
 #, python-brace-format
 msgid "Every {occurrence} weeks on {weekday}"
 msgstr "Каждую {occurrence} неделю в {weekday}"
@@ -7710,35 +8342,35 @@ msgstr "Даты"
 msgid "Last Notified"
 msgstr "Наименьшее количество комментариев"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "The"
-msgstr "Это"
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "current"
-msgstr "текущий"
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "next"
-msgstr "следующее"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:11
+#, fuzzy
+#| msgid "Edit Report"
+msgid "Edit this report date"
+msgstr "Редактировать отчет"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "reporting period is"
-msgstr "отчётный период составляет"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:12
+#, fuzzy
+#| msgid "Last edited"
+msgid "edit"
+msgstr "Последнее редактирование"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:8
-msgid "A report is due for the period"
-msgstr "Отчет должен быть представлен за период"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:16
+#, fuzzy
+#| msgid "Past 7 days"
+msgid "Past due"
+msgstr "За последние 7 дней"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
 msgid "Continue Editing"
 msgstr "Продолжить редактирование"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
-msgid "Add Report"
-msgstr "Добавить отчет"
-
 #: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+#, fuzzy
+#| msgid "Save report"
+msgid "Create report"
+msgstr "Сохранить отчет"
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:33
 #, fuzzy, python-format
 #| msgid ""
 #| "This will result in a gap in reporting for the project. You can undo this "
@@ -7750,39 +8382,77 @@ msgstr ""
 "Это приведет к разрыву в отчетности по проекту. Вы можете отменить это в "
 "любое время."
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:29
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:32
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:34
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:38
 msgid "Skip"
 msgstr "Пропустить"
 
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:36
+#, fuzzy
+#| msgid "Skip report"
+msgid "Skip this report date"
+msgstr "Пропустить отчет"
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:48
+#, fuzzy
+#| msgid "Other comments"
+msgid "Delete report requirement"
+msgstr "Другие комментарии"
+
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:26
 msgid "Enable"
 msgstr "Включить"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:55
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:62
 msgid "Period End"
 msgstr "Период завершен"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:101
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:108
 msgid "Unskip"
 msgstr "Отменить пропуск"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 #, fuzzy
 #| msgid "Show less..."
 msgid "Show less"
 msgstr "Показать меньше..."
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show more"
 msgstr "Показать больше"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:130
 #, fuzzy
 #| msgid "No reports submitted"
 msgid "No reports submitted yet."
 msgstr "Нет поданных отчетов"
 
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:2
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:18
+#, fuzzy
+#| msgid "Add Report"
+msgid "Add report date"
+msgstr "Добавить отчет"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:2
+#, fuzzy
+#| msgid "Delete user"
+msgid "Delete report"
+msgstr "Удалить пользователя"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:4
+#, fuzzy
+#| msgid "Are you sure you want to delete selected submissions?"
+msgid ""
+"Are you sure you want to delete this report? This action cannot be undone."
+msgstr "Вы уверены, что хотите удалить выбранные заявки?"
+
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:2
+#, fuzzy
+#| msgid "Edit Report"
+msgid "Edit report due date"
+msgstr "Редактировать отчет"
+
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:2
 msgid "Change reporting frequency"
 msgstr "Изменить периодичность отчетности"
@@ -7849,24 +8519,24 @@ msgstr "Отчет"
 msgid "View project"
 msgstr "Просмотреть страницу проекта"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 msgid "This report is for the period"
 msgstr "Данный отчет составлен за период"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:56
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:32
 msgid "Report Skipped"
 msgstr "Отчет пропущен"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:58
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:37
 msgid "Public Report"
 msgstr "Публичный отчет"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:107
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:85
 msgid "View previous report"
 msgstr "Просмотреть предыдущий отчет"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:115
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:93
 msgid "View next report"
 msgstr "Просмотреть следующий отчет"
 
@@ -7946,36 +8616,58 @@ msgstr "поданный отчет"
 msgid "No Projects Currently Reporting."
 msgstr "Проекты на стадии заключения контрактов"
 
-#: hypha/apply/projects/reports/views.py:78
-#: hypha/apply/projects/reports/views.py:100
+#: hypha/apply/projects/reports/views.py:83
+#: hypha/apply/projects/reports/views.py:105
 #, fuzzy
 #| msgid "You do not have permission to create that determination."
 msgid "You do not have permission to access this report."
 msgstr "У вас недостаточно прав на вынесение решения."
 
-#: hypha/apply/projects/reports/views.py:125
+#: hypha/apply/projects/reports/views.py:130
 #, fuzzy
 #| msgid "You do not have permission to create that determination."
 msgid "You do not have permission to update this report."
 msgstr "У вас недостаточно прав на вынесение решения."
 
-#: hypha/apply/projects/reports/views.py:372
+#: hypha/apply/projects/reports/views.py:377
 #, fuzzy
 #| msgid "You do not have permission to create that determination."
 msgid "You do not have permission to update reporting configurations."
 msgstr "У вас недостаточно прав на вынесение решения."
 
-#: hypha/apply/projects/reports/views.py:491
+#: hypha/apply/projects/reports/views.py:496
 msgid "Reporting disabled"
 msgstr "Подача отчетов отключена"
 
-#: hypha/apply/projects/tables.py:31
+#: hypha/apply/projects/reports/views.py:532
+#, fuzzy
+#| msgid "You do not have permission to create that determination."
+msgid "You do not have permission to add reports."
+msgstr "У вас недостаточно прав на вынесение решения."
+
+#: hypha/apply/projects/reports/views.py:572
+#, fuzzy
+#| msgid "You do not have permission to create that determination."
+msgid "You do not have permission to edit report due dates."
+msgstr "У вас недостаточно прав на вынесение решения."
+
+#: hypha/apply/projects/reports/views.py:583
+msgid "A submitted report's due date cannot be edited."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:607
+#, fuzzy
+#| msgid "You do not have permission to create that determination."
+msgid "You do not have permission to delete reports."
+msgstr "У вас недостаточно прав на вынесение решения."
+
+#: hypha/apply/projects/tables.py:29
 #, fuzzy
 #| msgid "Invoice"
 msgid "Invoice #"
 msgstr "Инвойс"
 
-#: hypha/apply/projects/tables.py:43
+#: hypha/apply/projects/tables.py:41
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
@@ -7984,53 +8676,60 @@ msgstr "Инвойс"
 msgid "Invoice date"
 msgstr "Добавлен инвойс"
 
-#: hypha/apply/projects/tables.py:45
+#: hypha/apply/projects/tables.py:43
 #, fuzzy
 #| msgid "Project file: {title}"
 msgid "Project Title"
 msgstr "Файл проекта: {title}"
 
-#: hypha/apply/projects/tables.py:103
+#: hypha/apply/projects/tables.py:114
 #, fuzzy
 #| msgid "Vendor "
 msgid "Vendor Name"
 msgstr "Вендор "
 
-#: hypha/apply/projects/tables.py:137
+#: hypha/apply/projects/tables.py:151
 msgid "Project Name"
 msgstr "Название проекта"
 
-#: hypha/apply/projects/tables.py:188
+#: hypha/apply/projects/tables.py:204
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:66
+#, fuzzy
+#| msgid "Contract"
+msgid "Contract #"
+msgstr "Контракт"
+
+#: hypha/apply/projects/tables.py:207
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:48
 #, fuzzy
 #| msgid "End Date"
 msgid "End date"
 msgstr "Дата окончания"
 
-#: hypha/apply/projects/tables.py:213
+#: hypha/apply/projects/tables.py:232
 #, python-brace-format
 msgid "{count} outstanding"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:251
+#: hypha/apply/projects/tables.py:270
 #, fuzzy
 #| msgid "Date submitted"
 msgid "Date requested"
 msgstr "Дата подачи"
 
-#: hypha/apply/projects/tables.py:266
+#: hypha/apply/projects/tables.py:288
 #, fuzzy
 #| msgid "Assign"
 msgid "Assignee"
 msgstr "Назначить"
 
-#: hypha/apply/projects/tables.py:286
+#: hypha/apply/projects/tables.py:308
 #, fuzzy
 #| msgid "Awaiting your approval"
 msgid "Waiting for approval"
 msgstr "Ожидает вашего подтверждения"
 
-#: hypha/apply/projects/tables.py:288
+#: hypha/apply/projects/tables.py:310
 #, fuzzy
 #| msgid "PAF waiting for assignee"
 msgid "Waiting for assignee"
@@ -8079,8 +8778,8 @@ msgstr "Контрактный отдел "
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:170
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:60
 #: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:56
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
 #: hypha/apply/templates/forms/includes/field.html:55
 msgid "Upload"
 msgstr "Загрузить"
@@ -8163,12 +8862,12 @@ msgid "Update approvers"
 msgstr "Просмотр/обновление утверждающих лиц"
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:55
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:156
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:159
 msgid "Change approver"
 msgstr "Изменить утверждающего"
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:67
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:168
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:171
 msgid "Assign approver"
 msgstr "Назначить утверждающего"
 
@@ -8181,7 +8880,7 @@ msgstr "Назначить утверждающего"
 msgid "Project form"
 msgstr "Форма технического задания проекта"
 
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:124
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:132
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:172
 msgid "Fill in"
 msgstr "Заполнить"
@@ -8206,7 +8905,7 @@ msgstr "Просмотреть заявку"
 
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:69
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:70
 msgid "Invoice"
 msgstr "Инвойс"
 
@@ -8224,15 +8923,15 @@ msgstr "Оплачено"
 msgid "Vendor"
 msgstr "Вендор"
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:74
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:76
 #, fuzzy
 #| msgid "deleted invoice"
 msgid "Download invoice"
 msgstr "удаленный инвойс"
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:90
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:94
 #: hypha/apply/projects/templates/application_projects/paf_export.html:63
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:101
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:106
 msgid "Supporting Documents"
 msgstr "Сопроводительные документы"
 
@@ -8329,6 +9028,12 @@ msgstr "Обновить статус инвойса"
 msgid "Project documents status"
 msgstr "Документы по проекту"
 
+#: hypha/apply/projects/templates/application_projects/modals/project_contract_number_update.html:2
+#, fuzzy
+#| msgid "Contract number"
+msgid "Update contract number"
+msgstr "Номер контракта"
+
 #: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
 #, fuzzy
 #| msgid "Update Project Status"
@@ -8474,19 +9179,12 @@ msgid ""
 "Upload a signed contract that will sent to applicant for countersigning."
 msgstr "Подписанный договор будет отправлен заявителю после вашей подачи."
 
-#: hypha/apply/projects/templates/application_projects/modals/upload_contract.html:14
-msgid ""
-"NOTE: Selecting \"Signed and approved\" indicates the uploaded contract is "
-"already signed by both parties and the current project will move to the "
-"invoicing & reporting stage."
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/paf_export.html:6
-#: hypha/apply/projects/templates/application_projects/sow_export.html:6
-#, fuzzy
-#| msgid "Project file: {title}"
-msgid "Project title"
-msgstr "Файл проекта: {title}"
+#: hypha/apply/projects/templates/application_projects/modals/upload_contract.html:14
+msgid ""
+"NOTE: Selecting \"Signed and approved\" indicates the uploaded contract is "
+"already signed by both parties and the current project will move to the "
+"invoicing & reporting stage."
+msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:7
 #: hypha/apply/projects/templates/application_projects/sow_export.html:7
@@ -8496,27 +9194,27 @@ msgid "Project ID"
 msgstr "Проект"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:18
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:49
 msgid "Approvals"
 msgstr "Утверждения"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:32
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:66
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
 msgid "Submission lead"
 msgstr "Руководитель заявки"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:34
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:72
 msgid "Staff reviewers"
 msgstr "Ревьюеры-сотрудники"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:41
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:75
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:78
 msgid "as"
 msgstr "в качестве"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:51
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:89
 msgid "Advisory council"
 msgstr "Консультативный совет"
 
@@ -8542,6 +9240,37 @@ msgstr "Вы уверены, что хотите подать документы
 msgid "Submit contract documents"
 msgstr "Подать документы на подготовку контракта"
 
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:9
+#, fuzzy
+#| msgid "Export Users"
+msgid "Invoices: Export as CSV"
+msgstr "Экспортировать пользователей"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:12
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:72
+msgid ""
+"Are you sure you want to export the invoices as a CSV file? This file may "
+"contain sensitive information, so please handle it carefully."
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:22
+#, fuzzy
+#| msgid "Submission lead"
+msgid "Invoices: Generating downloadable CSV"
+msgstr "Руководитель заявки"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:40
+#, fuzzy
+#| msgid "Download as DOCX"
+msgid "Invoices: Download generated CSV"
+msgstr "Скачать в DOCX"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:62
+#, fuzzy
+#| msgid "Generate Codes"
+msgid "Invoices: Generate downloadable CSV"
+msgstr "Генерировать коды"
+
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:35
 #, fuzzy
 #| msgid ""
@@ -8555,23 +9284,16 @@ msgstr ""
 msgid "Edit Invoice"
 msgstr "Редактировать инвойс"
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:29
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:52
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
-#, fuzzy
-#| msgid "added comment"
-msgid "View comment"
-msgstr "добавлен комментарий"
-
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:69
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:21
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:43
 #, fuzzy
-#| msgid "Show less..."
-msgid "show less"
-msgstr "Показать меньше..."
+#| msgid "Activity feed"
+msgid "Status & Activity"
+msgstr "Лента активности"
 
-#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
-msgid "Contractor"
-msgstr "Исполнитель"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:48
+msgid "When you leave a comment or change the statuses, it'll show up here!"
+msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:22
 #, fuzzy
@@ -8592,6 +9314,29 @@ msgstr "Файл проекта: {title}"
 msgid "Awaiting contract finalization..."
 msgstr "Ожидает решения"
 
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:75
+#, fuzzy
+#| msgid "Contract number"
+msgid "edit contract number"
+msgstr "Номер контракта"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
+msgid "Copied!"
+msgstr "Скопировано!"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#, fuzzy
+#| msgid "Contract number"
+msgid "Copy contract number"
+msgstr "Номер контракта"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:91
+#, fuzzy
+#| msgid "Contract number"
+msgid "copy contract number"
+msgstr "Номер контракта"
+
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:10
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:14
 #, fuzzy
@@ -8641,24 +9386,24 @@ msgstr "Текущий статус"
 msgid "Update project status"
 msgstr "Обновить статус проекта"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:23
-#: hypha/apply/projects/templates/application_projects/project_detail.html:54
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:49
 msgid "Project Information"
 msgstr "Информация о проекте"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:83
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:94
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:97
 msgid "No reviews"
 msgstr "Нет ревью"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:174
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:177
 #, fuzzy
 #| msgid "Download PDF"
 msgid "Download"
 msgstr "Загрузить PDF"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:182
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:57
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:185
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:63
 msgid "Download as DOCX"
 msgstr "Скачать в DOCX"
 
@@ -8674,33 +9419,39 @@ msgstr ""
 msgid "Proposal attachments"
 msgstr "Приложения к предложению"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:45
+#: hypha/apply/projects/templates/application_projects/project_detail.html:40
 #, fuzzy, python-format
 #| msgid " This project is in %(status)s state. "
 msgid "This project is in %(status)s state."
 msgstr " Этот проект находится в состоянии %(status)s. "
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:119
+#: hypha/apply/projects/templates/application_projects/project_detail.html:114
 #, fuzzy
 #| msgid "sent for approval"
 msgid "Project form approvals"
 msgstr "отправлено на утверждение"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#: hypha/apply/projects/templates/application_projects/project_detail.html:127
 msgid "Request changes or more information by "
 msgstr "Запросить изменения или дополнительную информацию можно у "
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:149
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#, fuzzy
+#| msgid "added comment"
+msgid "View comment"
+msgstr "добавлен комментарий"
+
+#: hypha/apply/projects/templates/application_projects/project_detail.html:144
 msgid "Pending approval from "
 msgstr "В ожидании одобрения от "
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:153
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
 #, fuzzy
 #| msgid " (nobody assigned yet)"
 msgid "nobody assigned yet"
 msgstr " (пока никто не назначен)"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:161
+#: hypha/apply/projects/templates/application_projects/project_detail.html:156
 #, fuzzy
 #| msgid "Approved"
 msgid "approved"
@@ -8719,7 +9470,7 @@ msgstr "Просмотр, поиск и фильтр всех проектов"
 msgid "No Projects Available."
 msgstr "Нет доступных проектов."
 
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:25
 #: hypha/apply/projects/templates/application_projects/sow_export.html:5
 #, fuzzy
 #| msgid "Scope of work (SOW)"
@@ -8751,61 +9502,61 @@ msgstr "Подтвердить"
 msgid "{status} by {user_role}"
 msgstr "{status} от {user_role}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:104
-#: hypha/apply/projects/templatetags/project_tags.py:109
-#: hypha/apply/projects/templatetags/project_tags.py:115
-#: hypha/apply/projects/templatetags/project_tags.py:119
-#: hypha/apply/projects/templatetags/project_tags.py:237
-#: hypha/apply/projects/templatetags/project_tags.py:249
-#: hypha/apply/projects/templatetags/project_tags.py:259
-#: hypha/apply/projects/templatetags/project_tags.py:278
-#: hypha/apply/projects/templatetags/project_tags.py:283
+#: hypha/apply/projects/templatetags/project_tags.py:117
+#: hypha/apply/projects/templatetags/project_tags.py:122
+#: hypha/apply/projects/templatetags/project_tags.py:128
+#: hypha/apply/projects/templatetags/project_tags.py:132
+#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:262
+#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:291
+#: hypha/apply/projects/templatetags/project_tags.py:296
 msgid "To do"
 msgstr "Выполнить"
 
-#: hypha/apply/projects/templatetags/project_tags.py:105
+#: hypha/apply/projects/templatetags/project_tags.py:118
 #, fuzzy
 #| msgid "Fill in the Approval Form(PAF)"
 msgid "Fill in the Project Form"
 msgstr "Заполните форму утверждения"
 
-#: hypha/apply/projects/templatetags/project_tags.py:110
+#: hypha/apply/projects/templatetags/project_tags.py:123
 #, fuzzy
 #| msgid "Goto project page"
 msgid "Move project to next stage"
 msgstr "Перейти на страницу проекта"
 
-#: hypha/apply/projects/templatetags/project_tags.py:116
+#: hypha/apply/projects/templatetags/project_tags.py:129
 msgid "Resubmit project documents for approval"
 msgstr "Повторно представить документы проекта на утверждение"
 
-#: hypha/apply/projects/templatetags/project_tags.py:120
+#: hypha/apply/projects/templatetags/project_tags.py:133
 msgid "Submit project documents for approval"
 msgstr "Предоставить проектную документацию на утверждение"
 
-#: hypha/apply/projects/templatetags/project_tags.py:124
-#: hypha/apply/projects/templatetags/project_tags.py:132
-#: hypha/apply/projects/templatetags/project_tags.py:136
-#: hypha/apply/projects/templatetags/project_tags.py:142
-#: hypha/apply/projects/templatetags/project_tags.py:158
-#: hypha/apply/projects/templatetags/project_tags.py:164
-#: hypha/apply/projects/templatetags/project_tags.py:179
-#: hypha/apply/projects/templatetags/project_tags.py:188
-#: hypha/apply/projects/templatetags/project_tags.py:194
-#: hypha/apply/projects/templatetags/project_tags.py:202
-#: hypha/apply/projects/templatetags/project_tags.py:211
-#: hypha/apply/projects/templatetags/project_tags.py:218
-#: hypha/apply/projects/templatetags/project_tags.py:225
-#: hypha/apply/projects/templatetags/project_tags.py:229
-#: hypha/apply/projects/templatetags/project_tags.py:243
-#: hypha/apply/projects/templatetags/project_tags.py:253
+#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:145
+#: hypha/apply/projects/templatetags/project_tags.py:149
+#: hypha/apply/projects/templatetags/project_tags.py:155
+#: hypha/apply/projects/templatetags/project_tags.py:171
+#: hypha/apply/projects/templatetags/project_tags.py:177
+#: hypha/apply/projects/templatetags/project_tags.py:192
+#: hypha/apply/projects/templatetags/project_tags.py:201
+#: hypha/apply/projects/templatetags/project_tags.py:207
+#: hypha/apply/projects/templatetags/project_tags.py:215
+#: hypha/apply/projects/templatetags/project_tags.py:224
+#: hypha/apply/projects/templatetags/project_tags.py:231
+#: hypha/apply/projects/templatetags/project_tags.py:238
+#: hypha/apply/projects/templatetags/project_tags.py:242
+#: hypha/apply/projects/templatetags/project_tags.py:256
 #: hypha/apply/projects/templatetags/project_tags.py:266
-#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:285
 msgid "Waiting for"
 msgstr "В ожидании"
 
-#: hypha/apply/projects/templatetags/project_tags.py:126
-#: hypha/apply/projects/templatetags/project_tags.py:144
+#: hypha/apply/projects/templatetags/project_tags.py:139
+#: hypha/apply/projects/templatetags/project_tags.py:157
 #, python-brace-format
 msgid ""
 "Awaiting project documents to be created and approved by {ORG_SHORT_NAME} "
@@ -8816,186 +9567,198 @@ msgstr ""
 "Пожалуйста, свяжитесь снова, когда проект будет готов к этапу оформления "
 "контракта."
 
-#: hypha/apply/projects/templatetags/project_tags.py:133
+#: hypha/apply/projects/templatetags/project_tags.py:146
 msgid "Changes requested. Awaiting documents to be resubmitted."
 msgstr "Запрошены изменения. Ожидание повторной подачи документов."
 
-#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:150
 #, fuzzy
 #| msgid "Awaiting approval form to be created."
 msgid "Awaiting project form to be created."
 msgstr "Ожидание создания формы для утверждения."
 
-#: hypha/apply/projects/templatetags/project_tags.py:160
-#: hypha/apply/projects/templatetags/project_tags.py:196
+#: hypha/apply/projects/templatetags/project_tags.py:173
+#: hypha/apply/projects/templatetags/project_tags.py:209
 #, python-brace-format
 msgid "Awaiting approval. Assigned to {approver}"
 msgstr "Ожидает утверждения. Назначен на {approver}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:166
-#: hypha/apply/projects/templatetags/project_tags.py:204
+#: hypha/apply/projects/templatetags/project_tags.py:179
+#: hypha/apply/projects/templatetags/project_tags.py:217
 #, python-brace-format
 msgid "Awaiting {reviewer_role} to assign an approver"
 msgstr "Ожидание {reviewer_role} для назначения утверждающего лица"
 
-#: hypha/apply/projects/templatetags/project_tags.py:180
+#: hypha/apply/projects/templatetags/project_tags.py:193
 #, fuzzy
 #| msgid "Awaiting PAF approval form to be approved"
 msgid "Awaiting project form to be approved"
 msgstr "Ожидание одобрения формы утверждения проекта"
 
-#: hypha/apply/projects/templatetags/project_tags.py:189
+#: hypha/apply/projects/templatetags/project_tags.py:202
 msgid "Awaiting approval from other approvers teams"
 msgstr "Ожидание одобрения со стороны других команд утверждения"
 
-#: hypha/apply/projects/templatetags/project_tags.py:212
+#: hypha/apply/projects/templatetags/project_tags.py:225
 #, fuzzy
 #| msgid "Awaiting project approval from assigned approvers"
 msgid "Awaiting project from assigned approvers"
 msgstr "Ожидание одобрения проекта назначенными ответственными"
 
-#: hypha/apply/projects/templatetags/project_tags.py:219
+#: hypha/apply/projects/templatetags/project_tags.py:232
 #, python-brace-format
 msgid "Awaiting signed contract from {ORG_SHORT_NAME}"
 msgstr "Ожидаем подписания контракта от {ORG_SHORT_NAME}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:226
+#: hypha/apply/projects/templatetags/project_tags.py:239
 #, fuzzy
 #| msgid "Awaiting signed contract from Contracting team"
 msgid "Awaiting signed contract from Staff/Contracting team"
 msgstr "Ожидание подписания контракта со стороны подрядчика"
 
-#: hypha/apply/projects/templatetags/project_tags.py:230
+#: hypha/apply/projects/templatetags/project_tags.py:243
 msgid "Awaiting signed contract from Contracting team"
 msgstr "Ожидание подписания контракта со стороны подрядчика"
 
-#: hypha/apply/projects/templatetags/project_tags.py:239
+#: hypha/apply/projects/templatetags/project_tags.py:252
 msgid "Awaiting contract documents to be submitted by you."
 msgstr "Ожидаем представления вами документов по контракту."
 
-#: hypha/apply/projects/templatetags/project_tags.py:244
+#: hypha/apply/projects/templatetags/project_tags.py:257
 msgid "Awaiting countersigned contract from Vendor"
 msgstr "Ожидание подписания контракта с поставщиком"
 
-#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:263
 msgid "Awaiting contract documents submission by you"
 msgstr "Ожидаем предоставления контрактной документации с вашей стороны"
 
-#: hypha/apply/projects/templatetags/project_tags.py:254
+#: hypha/apply/projects/templatetags/project_tags.py:267
 msgid "Awaiting contract documents submission from Vendor"
 msgstr "Ожидание представления контрактной документации от поставщика"
 
-#: hypha/apply/projects/templatetags/project_tags.py:261
+#: hypha/apply/projects/templatetags/project_tags.py:274
 msgid "Review the contract for all relevant details and approve."
 msgstr ""
 "Проверьте контракт на наличие всех необходимых деталей и утвердите его."
 
-#: hypha/apply/projects/templatetags/project_tags.py:268
+#: hypha/apply/projects/templatetags/project_tags.py:281
 #, python-brace-format
 msgid "Awaiting contract approval from {ORG_SHORT_NAME}"
 msgstr "Ожидает одобрения контракта от {ORG_SHORT_NAME}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:273
+#: hypha/apply/projects/templatetags/project_tags.py:286
 msgid "Awaiting contract approval from Staff"
 msgstr "Ожидает одобрения контракта со стороны сотрудников"
 
-#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:292
 msgid "Add invoices"
 msgstr "Добавить инвойсы"
 
-#: hypha/apply/projects/templatetags/project_tags.py:284
+#: hypha/apply/projects/templatetags/project_tags.py:297
 msgid "Review invoice and take action"
 msgstr "Проверьте инвойс и возьмите в работу"
 
-#: hypha/apply/projects/templatetags/project_tags.py:303
+#: hypha/apply/projects/templatetags/project_tags.py:316
 #, python-brace-format
 msgid "Please download the signed contract uploaded by {ORG_SHORT_NAME}"
 msgstr ""
 "Пожалуйста, загрузите подписанный договор, загруженный {ORG_SHORT_NAME}"
 
-#: hypha/apply/projects/templatetags/project_tags.py:305
+#: hypha/apply/projects/templatetags/project_tags.py:318
 msgid "Countersign"
 msgstr "Вторая подпись"
 
-#: hypha/apply/projects/templatetags/project_tags.py:306
+#: hypha/apply/projects/templatetags/project_tags.py:319
 msgid "Upload it back"
 msgstr "Загрузить обратно"
 
-#: hypha/apply/projects/templatetags/project_tags.py:308
+#: hypha/apply/projects/templatetags/project_tags.py:321
 msgid "Please also make sure to upload other required contracting documents"
 msgstr ""
 "Пожалуйста, не забудьте загрузить и другие необходимые документы для "
 "заключения договора"
 
-#: hypha/apply/projects/utils.py:85
+#: hypha/apply/projects/utils.py:88
 msgid "Pending approval"
 msgstr "В ожидании утверждения"
 
-#: hypha/apply/projects/utils.py:89
+#: hypha/apply/projects/utils.py:92
 msgid "Request for change or more information"
 msgstr "Запрос на изменение или дополнительную информацию"
 
-#: hypha/apply/projects/views/payment.py:166
-#: hypha/apply/projects/views/payment.py:396
+#: hypha/apply/projects/views/invoice.py:175
+#: hypha/apply/projects/views/invoice.py:397
 #, python-brace-format
 msgid "<p>Invoice status updated to: {status}.</p>"
 msgstr "<p>Статус инвойса обновлен до: {status}.</p>"
 
-#: hypha/apply/projects/views/payment.py:209
+#: hypha/apply/projects/views/invoice.py:218
 #, fuzzy
 #| msgid "Invoice added"
 msgid "Invoice updated."
 msgstr "Добавлен инвойс"
 
-#: hypha/apply/projects/views/payment.py:299
+#: hypha/apply/projects/views/invoice.py:304
 msgid "<p>Invoice added.</p>"
 msgstr "<p>Инвойс добавлен.</p>"
 
-#: hypha/apply/projects/views/payment.py:575
+#: hypha/apply/projects/views/invoice.py:574
 msgid "Sorry something went wrong"
 msgstr "Извините, что-то пошло не так"
 
-#: hypha/apply/projects/views/project.py:265
+#: hypha/apply/projects/views/invoice.py:712
+#, fuzzy
+#| msgid "Invoice added"
+msgid "Invoice tags updated."
+msgstr "Добавлен инвойс"
+
+#: hypha/apply/projects/views/project.py:269
 msgid "PAF has been submitted for approval"
 msgstr "Форма утверждения проекта была подана на подтверждение"
 
-#: hypha/apply/projects/views/project.py:337
+#: hypha/apply/projects/views/project.py:341
 msgid "Document has been uploaded"
 msgstr "Документ был загружен"
 
-#: hypha/apply/projects/views/project.py:365
+#: hypha/apply/projects/views/project.py:369
 msgid "Document has been removed"
 msgstr "Документ был удален"
 
-#: hypha/apply/projects/views/project.py:396
+#: hypha/apply/projects/views/project.py:400
 msgid "Contracting document has been removed"
 msgstr "Контрактный документ был удален"
 
-#: hypha/apply/projects/views/project.py:443
+#: hypha/apply/projects/views/project.py:447
 #, fuzzy
 #| msgid "Unsigned"
 msgid "Unassigned"
 msgstr "Не подписанный"
 
-#: hypha/apply/projects/views/project.py:452
+#: hypha/apply/projects/views/project.py:456
 #, fuzzy
 #| msgid "Lead has been updated"
 msgid "Lead has been updated."
 msgstr "Руководитель был обновлен"
 
-#: hypha/apply/projects/views/project.py:498
+#: hypha/apply/projects/views/project.py:502
 #, fuzzy
 #| msgid "Lead has been updated"
 msgid "Title has been updated"
 msgstr "Руководитель был обновлен"
 
-#: hypha/apply/projects/views/project.py:534
+#: hypha/apply/projects/views/project.py:538
 #, fuzzy
 #| msgid "Lead has been updated"
 msgid "Dates has been updated"
 msgstr "Руководитель был обновлен"
 
-#: hypha/apply/projects/views/project.py:655
+#: hypha/apply/projects/views/project.py:580
+#, fuzzy
+#| msgid "Contracting document has been uploaded"
+msgid "Contract number has been updated"
+msgstr "Контрактный документ загружен"
+
+#: hypha/apply/projects/views/project.py:701
 #, fuzzy
 #| msgid ""
 #| "Contractor documents have been approved. You can receive invoices from "
@@ -9007,57 +9770,63 @@ msgstr ""
 "Контрактные документы утверждены. Теперь вы можете получать инвойсы от "
 "поставщика."
 
-#: hypha/apply/projects/views/project.py:721
+#: hypha/apply/projects/views/project.py:766
 msgid "Countersigned contract uploaded"
 msgstr "Контракт, подписанный всеми сторонами, загружен"
 
-#: hypha/apply/projects/views/project.py:724
+#: hypha/apply/projects/views/project.py:769
 msgid "Signed contract uploaded"
 msgstr "Подписанный контракт загружен"
 
-#: hypha/apply/projects/views/project.py:935
+#: hypha/apply/projects/views/project.py:986
 msgid "Contract documents submitted"
 msgstr "Контрактные документы представлены"
 
-#: hypha/apply/projects/views/project.py:999
+#: hypha/apply/projects/views/project.py:1050
 msgid "Contracting document has been uploaded"
 msgstr "Контрактный документ загружен"
 
-#: hypha/apply/projects/views/project.py:1077
+#: hypha/apply/projects/views/project.py:1128
 #, fuzzy
 #| msgid "assign paf approver"
 msgid "User don't have project form approver roles"
 msgstr "назначить подтверждающего для формы утверждения проекта"
 
-#: hypha/apply/projects/views/project.py:1083
+#: hypha/apply/projects/views/project.py:1134
 #, fuzzy, python-brace-format
 #| msgid "<p>{role} has updated PAF status to {paf_status}.</p>"
 msgid "Updated project form status to: {paf_status}"
 msgstr ""
 "<p>{role} обновил статус формы утверждения проекта на {paf_status}.</p>"
 
-#: hypha/apply/projects/views/project.py:1173
+#: hypha/apply/projects/views/project.py:1224
 #, fuzzy
 #| msgid "Project status has been updated"
 msgid "Project form status has been updated"
 msgstr "Статус проекта был обновлен"
 
-#: hypha/apply/projects/views/project.py:1226
+#: hypha/apply/projects/views/project.py:1277
 #, fuzzy
 #| msgid "PAF has been approved"
 msgid "Project form has been approved"
 msgstr "Форма утверждения проекта была подтверждена"
 
-#: hypha/apply/projects/views/project.py:1321
+#: hypha/apply/projects/views/project.py:1372
 msgid "Project status has been updated"
 msgstr "Статус проекта был обновлен"
 
-#: hypha/apply/projects/views/project.py:1614
+#: hypha/apply/projects/views/project.py:1665
 #, fuzzy
 #| msgid "PAF approvers have been updated"
 msgid "Project form approvers have been updated"
 msgstr "Подтверждающие формы утверждения проекта были обновлены"
 
+#: hypha/apply/projects/views/project.py:1799
+#, fuzzy
+#| msgid "archived submission"
+msgid "No projects for this submission"
+msgstr "архивная заявка"
+
 #: hypha/apply/review/admin_helpers.py:11
 msgid "Clone"
 msgstr ""
@@ -9090,7 +9859,7 @@ msgstr "Рекомендация"
 
 #: hypha/apply/review/blocks.py:149
 #: hypha/apply/review/templates/review/review_detail.html:48
-#: hypha/apply/review/views.py:431
+#: hypha/apply/review/views.py:440
 msgid "Visibility"
 msgstr "Видимость"
 
@@ -9169,7 +9938,7 @@ msgstr "4. Хорошо"
 msgid "5. Excellent"
 msgstr "5. Отлично"
 
-#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:245
+#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:283
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:11
 msgid "No"
 msgstr "Нет"
@@ -9178,7 +9947,7 @@ msgstr "Нет"
 msgid "Maybe"
 msgstr "Возможно"
 
-#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:244
+#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:282
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:8
 msgid "Yes"
 msgstr "Да"
@@ -9241,13 +10010,13 @@ msgid "View Changes"
 msgstr "Изменить"
 
 #: hypha/apply/review/templates/review/review_detail.html:40
-#: hypha/apply/review/views.py:429
+#: hypha/apply/review/views.py:438
 msgid "Recommendation"
 msgstr "Рекомендация"
 
 #: hypha/apply/review/templates/review/review_detail.html:66
 #: hypha/apply/review/templates/review/review_list.html:30
-#: hypha/apply/review/views.py:427
+#: hypha/apply/review/views.py:436
 #, fuzzy
 #| msgid "Options"
 msgid "Opinions"
@@ -9321,165 +10090,179 @@ msgstr "Рекомендация"
 msgid "Avg. score: {average}"
 msgstr "Средний балл: {average}"
 
-#: hypha/apply/review/views.py:74
+#: hypha/apply/review/views.py:76
 msgid "Edit Review"
 msgstr "Редактировать ревью"
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Update Review draft"
 msgstr "Обновить черновик ревью"
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Create Review"
 msgstr "Создать ревью"
 
-#: hypha/apply/review/views.py:428
+#: hypha/apply/review/views.py:437
 #, fuzzy
 #| msgid "Total:"
 msgid "Overall Score"
 msgstr "Всего:"
 
-#: hypha/apply/review/views.py:430
+#: hypha/apply/review/views.py:439
 #, fuzzy
 #| msgid "Revisions"
 msgid "Revision"
 msgstr "Корректировки"
 
-#: hypha/apply/review/views.py:470
+#: hypha/apply/review/views.py:479
 #, fuzzy
 #| msgid "current"
 msgid "Current"
 msgstr "текущий"
 
-#: hypha/apply/stream_forms/blocks.py:114
-#: hypha/apply/stream_forms/blocks.py:217
+#: hypha/apply/stream_forms/blocks.py:123
+#: hypha/apply/stream_forms/blocks.py:255
 msgid "Required"
 msgstr "Требуется"
 
-#: hypha/apply/stream_forms/blocks.py:124
+#: hypha/apply/stream_forms/blocks.py:142
+#, fuzzy
+#| msgid "Proposal Information"
+msgid "Personal information"
+msgstr "Информация о предложении"
+
+#: hypha/apply/stream_forms/blocks.py:146
+msgid ""
+"Tick this if the answer will contain personally identifiable information, "
+"such as a name, address, phone number or date of birth. Only the applicant, "
+"their co-applicants and staff will be able to see the answer. Reviewers and "
+"other users will see that the question was asked, but not the answer."
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:162
 msgid "Format"
 msgstr "Формат"
 
-#: hypha/apply/stream_forms/blocks.py:125
-#: hypha/apply/stream_forms/blocks.py:156
-#: hypha/apply/stream_forms/blocks.py:171
+#: hypha/apply/stream_forms/blocks.py:163
+#: hypha/apply/stream_forms/blocks.py:194
+#: hypha/apply/stream_forms/blocks.py:209
 msgid "Default value"
 msgstr "Значение по умолчанию"
 
-#: hypha/apply/stream_forms/blocks.py:128
+#: hypha/apply/stream_forms/blocks.py:166
 msgid "Text field (single line)"
 msgstr "Текстовое поле (одна строка)"
 
-#: hypha/apply/stream_forms/blocks.py:147
+#: hypha/apply/stream_forms/blocks.py:185
 msgid "Max number of inputs"
 msgstr "Максимальное количество входов"
 
-#: hypha/apply/stream_forms/blocks.py:148
+#: hypha/apply/stream_forms/blocks.py:186
 msgid "Add new item"
 msgstr "Добавить новый пункт"
 
-#: hypha/apply/stream_forms/blocks.py:151
+#: hypha/apply/stream_forms/blocks.py:189
 msgid "Text field (single line) (multiple inputs)"
 msgstr "Текстовое поле (одна строка) (несколько входов)"
 
-#: hypha/apply/stream_forms/blocks.py:157
+#: hypha/apply/stream_forms/blocks.py:195
 msgid "Word limit"
 msgstr "Ограничение по количеству слов"
 
-#: hypha/apply/stream_forms/blocks.py:162
+#: hypha/apply/stream_forms/blocks.py:200
 msgid "Text field (multi line)"
 msgstr "Текстовое поле (многострочное)"
 
-#: hypha/apply/stream_forms/blocks.py:176
+#: hypha/apply/stream_forms/blocks.py:214
 msgid "Number field"
 msgstr "Числовое поле"
 
-#: hypha/apply/stream_forms/blocks.py:189
+#: hypha/apply/stream_forms/blocks.py:227
 msgid "Checkbox field"
 msgstr "Поле с чекбоксом"
 
-#: hypha/apply/stream_forms/blocks.py:201
-#: hypha/apply/stream_forms/blocks.py:219
+#: hypha/apply/stream_forms/blocks.py:239
+#: hypha/apply/stream_forms/blocks.py:257
 msgid "Choice"
 msgstr "Выбор"
 
-#: hypha/apply/stream_forms/blocks.py:207
+#: hypha/apply/stream_forms/blocks.py:245
 msgid "Radio buttons"
 msgstr "Кнопки радио"
 
-#: hypha/apply/stream_forms/blocks.py:221
+#: hypha/apply/stream_forms/blocks.py:259
 msgid ""
 "Please create only two choices for toggle. First choice will revel the group "
 "and the second hide it. Additional choices will be ignored."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:231
+#: hypha/apply/stream_forms/blocks.py:269
 msgid "Group fields"
 msgstr "Групповые поля"
 
-#: hypha/apply/stream_forms/blocks.py:233
+#: hypha/apply/stream_forms/blocks.py:271
 msgid "Remember to end group using Group fields end block."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:253
+#: hypha/apply/stream_forms/blocks.py:291
 #, fuzzy
 #| msgid "Group fields"
 msgid "Group fields end"
 msgstr "Групповые поля"
 
-#: hypha/apply/stream_forms/blocks.py:255
+#: hypha/apply/stream_forms/blocks.py:293
 #, fuzzy
 #| msgid "Group fields"
 msgid "End of Group fields Block"
 msgstr "Групповые поля"
 
-#: hypha/apply/stream_forms/blocks.py:262
+#: hypha/apply/stream_forms/blocks.py:300
 msgid "Dropdown field"
 msgstr "Выпадающее поле"
 
-#: hypha/apply/stream_forms/blocks.py:272
+#: hypha/apply/stream_forms/blocks.py:310
 msgid "Checkbox"
 msgstr "Чекбокс"
 
-#: hypha/apply/stream_forms/blocks.py:278
+#: hypha/apply/stream_forms/blocks.py:316
 msgid "Multiple checkboxes field"
 msgstr "Поле для выбора нескольких чекбоксов"
 
-#: hypha/apply/stream_forms/blocks.py:319
+#: hypha/apply/stream_forms/blocks.py:357
 msgid "Date field"
 msgstr "Поле для даты"
 
-#: hypha/apply/stream_forms/blocks.py:341
+#: hypha/apply/stream_forms/blocks.py:379
 msgid "Time field"
 msgstr "Поле для времени"
 
-#: hypha/apply/stream_forms/blocks.py:373
+#: hypha/apply/stream_forms/blocks.py:411
 msgid "Date+time field"
 msgstr "Поле даты и времени"
 
-#: hypha/apply/stream_forms/blocks.py:405
+#: hypha/apply/stream_forms/blocks.py:443
 msgid "Image field"
 msgstr "Поле для изображения"
 
-#: hypha/apply/stream_forms/blocks.py:418
+#: hypha/apply/stream_forms/blocks.py:456
 msgid "Single File field"
 msgstr "Поле для одного файла"
 
-#: hypha/apply/stream_forms/blocks.py:424
-#: hypha/apply/stream_forms/blocks.py:443
+#: hypha/apply/stream_forms/blocks.py:462
+#: hypha/apply/stream_forms/blocks.py:481
 #, python-brace-format
 msgid "{help_text} Accepted file types are {file_types}"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:437
+#: hypha/apply/stream_forms/blocks.py:475
 msgid "Multiple File field"
 msgstr "Поле для загрузки нескольких файлов"
 
-#: hypha/apply/stream_forms/blocks.py:474
+#: hypha/apply/stream_forms/blocks.py:512
 msgid "Section header"
 msgstr "Заголовок раздела"
 
-#: hypha/apply/stream_forms/blocks.py:493
+#: hypha/apply/stream_forms/blocks.py:531
 msgid "Form fields"
 msgstr "Поля формы"
 
@@ -9523,32 +10306,27 @@ msgid ""
 "update your user account with the name you provide here."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:8
-#, python-format
-msgid "View file - %(filename)s"
-msgstr ""
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:14
+#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
 #, fuzzy
-#| msgid "Reupload"
-msgid "uploaded"
-msgstr "Загрузить повторно"
+#| msgid "No screening"
+msgid "No selection"
+msgstr "Отсутствует скрининг"
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:25
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
 #, fuzzy
-#| msgid "File not found on submission"
-msgid "File not found"
-msgstr "Файл не найден при отправке"
+#| msgid "Contact information"
+msgid "Contains personal information."
+msgstr "Контактная информация"
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:32
-msgid "Missing file"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "(PII)"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
+#: hypha/apply/stream_forms/templates/stream_forms/render_redacted_field.html:12
 #, fuzzy
-#| msgid "No screening"
-msgid "No selection"
-msgstr "Отсутствует скрининг"
+#| msgid "updated contracting information"
+msgid "Hidden — contains personal information."
+msgstr "обновленная информация о контрактах"
 
 #: hypha/apply/templates/forms/includes/field.html:11
 msgid "This field is required."
@@ -9586,133 +10364,145 @@ msgstr ""
 msgid "tasks"
 msgstr ""
 
-#: hypha/apply/todo/options.py:30
+#: hypha/apply/todo/options.py:32
 #, fuzzy
 #| msgid "Comments"
 msgid "Comment Task"
 msgstr "Комментарии"
 
-#: hypha/apply/todo/options.py:31
+#: hypha/apply/todo/options.py:33
 #, fuzzy
 #| msgid "Submission"
 msgid "Submission Draft"
 msgstr "Заявка"
 
-#: hypha/apply/todo/options.py:32
+#: hypha/apply/todo/options.py:34
 #, fuzzy
 #| msgid "Update Determination draft"
 msgid "Determination draft"
 msgstr "Обновить черновик решения"
 
-#: hypha/apply/todo/options.py:33
+#: hypha/apply/todo/options.py:35
 #, fuzzy
 #| msgid "Review for"
 msgid "Review Draft"
 msgstr "Ревью для"
 
-#: hypha/apply/todo/options.py:34
+#: hypha/apply/todo/options.py:36
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "Project waiting project form"
 msgstr "Проекты, ожидающие утверждения"
 
-#: hypha/apply/todo/options.py:35
+#: hypha/apply/todo/options.py:37
 #, fuzzy
 #| msgid "Project scope of work(SOW)"
 msgid "Project waiting scope of work"
 msgstr "Объем работ по проекту"
 
-#: hypha/apply/todo/options.py:36
+#: hypha/apply/todo/options.py:38
 #, fuzzy
 #| msgid "approved project"
 msgid "Project submit project form(s)"
 msgstr "утвержденный проект"
 
-#: hypha/apply/todo/options.py:37
+#: hypha/apply/todo/options.py:39
 #, fuzzy
 #| msgid "Project scope of work(SOW)"
 msgid "Project submit scope of work"
 msgstr "Объем работ по проекту"
 
-#: hypha/apply/todo/options.py:38
+#: hypha/apply/todo/options.py:40
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project form required changes"
 msgstr "Проект ожидает вашего ревью."
 
-#: hypha/apply/todo/options.py:39
+#: hypha/apply/todo/options.py:41
 #, fuzzy
 #| msgid "PAF assigned to {}"
 msgid "Project form waiting assignee"
 msgstr "Форма утверждения проекта назначена на {}"
 
-#: hypha/apply/todo/options.py:40
+#: hypha/apply/todo/options.py:42
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "Project form waiting approval"
 msgstr "Проекты, ожидающие утверждения"
 
-#: hypha/apply/todo/options.py:41
+#: hypha/apply/todo/options.py:43
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting contract"
 msgstr "Проект ожидает заключения контракта"
 
-#: hypha/apply/todo/options.py:44
+#: hypha/apply/todo/options.py:46
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting contract document"
 msgstr "Проект ожидает заключения контракта"
 
-#: hypha/apply/todo/options.py:46
+#: hypha/apply/todo/options.py:48
 #, fuzzy
 #| msgid "A Project is waiting for contract"
 msgid "Project waiting contract review"
 msgstr "Проект ожидает заключения контракта"
 
-#: hypha/apply/todo/options.py:47
+#: hypha/apply/todo/options.py:49
 #, fuzzy
 #| msgid "Project Invoices"
 msgid "Project waiting invoice"
 msgstr "Инвойсы проекта"
 
-#: hypha/apply/todo/options.py:48
+#: hypha/apply/todo/options.py:50
 #, fuzzy
 #| msgid "Invoice added"
 msgid "Invoice required changes"
 msgstr "Добавлен инвойс"
 
-#: hypha/apply/todo/options.py:49
+#: hypha/apply/todo/options.py:51
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "Invoice waiting approval"
 msgstr "Проекты, ожидающие утверждения"
 
-#: hypha/apply/todo/options.py:50
+#: hypha/apply/todo/options.py:52
 #, fuzzy
 #| msgid "Invoice added"
 msgid "Invoice waiting paid"
 msgstr "Добавлен инвойс"
 
-#: hypha/apply/todo/options.py:51
+#: hypha/apply/todo/options.py:53
 #, fuzzy
 #| msgid "Report"
 msgid "Report due"
 msgstr "Отчет"
 
-#: hypha/apply/todo/options.py:52
+#: hypha/apply/todo/options.py:54
 #, fuzzy
 #| msgid "Related submissions"
 msgid "Download exported submissions"
 msgstr "Связанные заявки"
 
-#: hypha/apply/todo/options.py:55
+#: hypha/apply/todo/options.py:57
 #, fuzzy
 #| msgid "Filter submissions to calculate values"
 msgid "Failed to generate submissions export file"
 msgstr "Отфильтровать заявки для вычисления значений"
 
-#: hypha/apply/todo/options.py:65
+#: hypha/apply/todo/options.py:59
+#, fuzzy
+#| msgid "Related submissions"
+msgid "Download exported invoices"
+msgstr "Связанные заявки"
+
+#: hypha/apply/todo/options.py:62
+#, fuzzy
+#| msgid "Filter submissions to calculate values"
+msgid "Failed to generate invoices export file"
+msgstr "Отфильтровать заявки для вычисления значений"
+
+#: hypha/apply/todo/options.py:72
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.source.fund_name} "
@@ -9720,7 +10510,7 @@ msgid ""
 "comment: <q class=\"text-fg-muted italic align-bottom\">{msg}</q>"
 msgstr ""
 
-#: hypha/apply/todo/options.py:75
+#: hypha/apply/todo/options.py:82
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9728,7 +10518,7 @@ msgid ""
 "align-bottom \">\"{related.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:83
+#: hypha/apply/todo/options.py:90
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -9737,7 +10527,7 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:91
+#: hypha/apply/todo/options.py:98
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -9746,70 +10536,70 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:101
+#: hypha/apply/todo/options.py:108
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:109
+#: hypha/apply/todo/options.py:116
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:117
+#: hypha/apply/todo/options.py:124
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form(s) submission"
 msgstr ""
 
-#: hypha/apply/todo/options.py:125
+#: hypha/apply/todo/options.py:132
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form requires changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:134
+#: hypha/apply/todo/options.py:141
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form is waiting for assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:142
+#: hypha/apply/todo/options.py:149
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br> Project form is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:151
+#: hypha/apply/todo/options.py:158
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:159
+#: hypha/apply/todo/options.py:166
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contracting documents"
 msgstr ""
 
-#: hypha/apply/todo/options.py:167
+#: hypha/apply/todo/options.py:174
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Contract for project is waiting for review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:176
+#: hypha/apply/todo/options.py:183
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9817,7 +10607,7 @@ msgid ""
 "bottom\">\"{related.title}\"</span> is waiting for invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:184
+#: hypha/apply/todo/options.py:191
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9825,7 +10615,7 @@ msgid ""
 "{related.invoice_number} required changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:192
+#: hypha/apply/todo/options.py:199
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9833,7 +10623,7 @@ msgid ""
 "{related.invoice_number} is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:200
+#: hypha/apply/todo/options.py:207
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9841,7 +10631,7 @@ msgid ""
 "{related.invoice_number} is waiting to be paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:208
+#: hypha/apply/todo/options.py:215
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.project.fund_name} "
@@ -9850,21 +10640,31 @@ msgid ""
 "\">\"{related.project.title}\"</span> is due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:216
+#: hypha/apply/todo/options.py:223
 msgid "Your generated submission export file is ready for download"
 msgstr ""
 
-#: hypha/apply/todo/options.py:219 hypha/apply/todo/options.py:227
+#: hypha/apply/todo/options.py:226 hypha/apply/todo/options.py:234
+#: hypha/apply/todo/options.py:241 hypha/apply/todo/options.py:249
 #, fuzzy
 #| msgid "Export"
 msgid "export"
 msgstr "Экспортировать"
 
-#: hypha/apply/todo/options.py:223
+#: hypha/apply/todo/options.py:230
 msgid ""
 "There was an issue generating your submission export file, please try again."
 msgstr ""
 
+#: hypha/apply/todo/options.py:238
+msgid "Your generated invoice export file is ready for download"
+msgstr ""
+
+#: hypha/apply/todo/options.py:245
+msgid ""
+"There was an issue generating your invoice export file, please try again."
+msgstr ""
+
 #: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
 #, fuzzy
 #| msgid "You don't have any backup codes yet."
@@ -9940,29 +10740,29 @@ msgstr "Логин"
 msgid "View users in this group"
 msgstr ""
 
-#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:63
+#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:67
 msgid "Remember me"
 msgstr ""
 
-#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:65
+#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:69
 msgid "On trusted devices only, keeps you logged in for a longer period."
 msgstr ""
 
-#: hypha/apply/users/forms.py:55
+#: hypha/apply/users/forms.py:57
 #, fuzzy
 #| msgid "email address"
 msgid "Email address"
 msgstr "адрес электронной почты"
 
-#: hypha/apply/users/forms.py:86
+#: hypha/apply/users/forms.py:90
 msgid "A user with that email already exists."
 msgstr "Пользователь с таким электронным адресом уже существует."
 
-#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/forms.py:91
 msgid "The two password fields didn't match."
 msgstr "Два поля для ввода пароля не совпадают."
 
-#: hypha/apply/users/forms.py:200
+#: hypha/apply/users/forms.py:208
 msgid ""
 "You are registered using OAuth, please contact an admin if you need to "
 "change your email address."
@@ -9970,137 +10770,174 @@ msgstr ""
 "Вы зарегистрированы с помощью OAuth, пожалуйста, свяжитесь с "
 "администратором, если вам нужно изменить адрес электронной почты."
 
-#: hypha/apply/users/forms.py:208
+#: hypha/apply/users/forms.py:216
 msgid "Slack names must not include spaces"
 msgstr ""
 
-#: hypha/apply/users/forms.py:251
+#: hypha/apply/users/forms.py:259
 msgid "Only includes active, non-superusers"
 msgstr "Включает только активных, не суперпользователей"
 
-#: hypha/apply/users/forms.py:261
-#: hypha/apply/users/templates/users/account.html:64
+#: hypha/apply/users/forms.py:269
+#: hypha/apply/users/templates/users/account.html:67
 #: hypha/apply/users/templates/users/activation/email.txt:13
 #: hypha/elevate/forms.py:20
 msgid "Password"
 msgstr "Пароль"
 
-#: hypha/apply/users/forms.py:262
+#: hypha/apply/users/forms.py:270
 msgid "Email change requires you to put password."
 msgstr "Для изменения электронной почты необходимо ввести пароль."
 
-#: hypha/apply/users/forms.py:275
+#: hypha/apply/users/forms.py:283
 msgid "Incorrect password. Please try again."
 msgstr "Неверный пароль. Пожалуйста, попробуйте еще раз."
 
-#: hypha/apply/users/forms.py:291
+#: hypha/apply/users/forms.py:299
 msgid "To proceed, type \"disable\" below and then click on \"confirm\":"
 msgstr ""
 
-#: hypha/apply/users/forms.py:301
+#: hypha/apply/users/forms.py:309
 msgid "Incorrect input."
 msgstr ""
 
-#: hypha/apply/users/middleware.py:52
+#: hypha/apply/users/middleware.py:56
 #, fuzzy
 #| msgid "Two-Factor Authentication"
 msgid "Two factor authentication required"
 msgstr "Двухфакторная аутентификация"
 
-#: hypha/apply/users/models.py:195
+#: hypha/apply/users/models.py:230
 msgid "email address"
 msgstr "адрес электронной почты"
 
-#: hypha/apply/users/models.py:197
+#: hypha/apply/users/models.py:232
 #, fuzzy
 #| msgid "Full name"
 msgid "full name"
 msgstr "Полное имя"
 
-#: hypha/apply/users/models.py:200
+#: hypha/apply/users/models.py:235
 #, fuzzy
 #| msgid "Slack name"
 msgid "slack name"
 msgstr "Имя в Slack"
 
-#: hypha/apply/users/models.py:202
+#: hypha/apply/users/models.py:237
 msgid "This is the name we should \"@mention\" when sending notifications"
 msgstr "Это имя, которое мы должны \"@mention\" при отправке уведомлений"
 
-#: hypha/apply/users/models.py:321
+#: hypha/apply/users/models.py:391
 msgid "user"
 msgstr ""
 
-#: hypha/apply/users/models.py:322
+#: hypha/apply/users/models.py:392
 #, fuzzy
 #| msgid "user groups"
 msgid "users"
 msgstr "пользовательские группы"
 
-#: hypha/apply/users/models.py:333
+#: hypha/apply/users/models.py:403
 #, fuzzy
 #| msgid "fund settings"
 msgid "Auth Settings"
 msgstr "настройки фонда"
 
-#: hypha/apply/users/models.py:335
+#: hypha/apply/users/models.py:405
 #, fuzzy
 #| msgid "Show consent checkbox?"
 msgid "show consent checkbox?"
 msgstr "Показывать флажок согласия?"
 
-#: hypha/apply/users/models.py:336
+#: hypha/apply/users/models.py:406
 #, fuzzy
 #| msgid "Login extra text"
 msgid "consent text"
 msgstr "Дополнительный текст для входа в систему"
 
-#: hypha/apply/users/models.py:337
+#: hypha/apply/users/models.py:407
 msgid "consent help"
 msgstr ""
 
-#: hypha/apply/users/models.py:339
+#: hypha/apply/users/models.py:409
 #, fuzzy
 #| msgid "Login extra text"
 msgid "login extra text"
 msgstr "Дополнительный текст для входа в систему"
 
-#: hypha/apply/users/models.py:341
+#: hypha/apply/users/models.py:411
 msgid "Displayed along side login form"
 msgstr "Отображается рядом с формой входа"
 
-#: hypha/apply/users/models.py:351
+#: hypha/apply/users/models.py:421
 msgid "User consent on login & register forms"
 msgstr "Согласие пользователя на формах входа и регистрации"
 
-#: hypha/apply/users/models.py:357
+#: hypha/apply/users/models.py:427
 msgid "Login form customizations"
 msgstr "Настройки формы входа в систему"
 
-#: hypha/apply/users/models.py:382
+#: hypha/apply/users/models.py:452
 #, fuzzy
 #| msgid "Pending "
 msgid "Pending signup"
 msgstr "Ожидание "
 
-#: hypha/apply/users/models.py:383
+#: hypha/apply/users/models.py:453
 #, fuzzy
 #| msgid "edited submission"
 msgid "Pending signups"
 msgstr "отредактированная заявка"
 
-#: hypha/apply/users/models.py:401
+#: hypha/apply/users/models.py:471
 #, fuzzy
 #| msgid "Confirm access"
 msgid "Confirm Access Token"
 msgstr "Подтвердить доступ"
 
-#: hypha/apply/users/models.py:402
+#: hypha/apply/users/models.py:472
 #, fuzzy
 #| msgid "Confirm access"
 msgid "Confirm Access Tokens"
 msgstr "Подтвердить доступ"
 
+#: hypha/apply/users/passkey_views.py:160
+#, python-brace-format
+msgid "Maximum of {max} passkeys allowed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:197
+#: hypha/apply/users/passkey_views.py:278
+msgid "Invalid JSON"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:202
+#: hypha/apply/users/passkey_views.py:283
+msgid "No active WebAuthn challenge"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:230
+#: hypha/apply/users/passkey_views.py:351
+#: hypha/apply/users/passkey_views.py:358
+#, fuzzy
+#| msgid "Verification code"
+msgid "Verification failed"
+msgstr "Код верификации"
+
+#: hypha/apply/users/passkey_views.py:248
+msgid "Could not save passkey"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:292
+#, fuzzy
+#| msgid "Invalid activation"
+msgid "Invalid credential"
+msgstr "Недействительная активация"
+
+#: hypha/apply/users/passkey_views.py:336
+msgid "Unknown credential"
+msgstr ""
+
 #: hypha/apply/users/roles.py:4
 msgid "Administrator"
 msgstr ""
@@ -10174,17 +11011,32 @@ msgid ""
 "contracting."
 msgstr ""
 
-#: hypha/apply/users/services.py:110
+#: hypha/apply/users/services.py:36
+#, python-format
+msgid "A passkey was added to your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:41
+#, python-format
+msgid "A passkey was removed from your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:152
 #, fuzzy, python-brace-format
 #| msgid "Log in with your %(ORG_SHORT_NAME)s email"
 msgid "Log in to {user} at {ORG_LONG_NAME}"
 msgstr "Войдите в систему, указав свою %(ORG_SHORT_NAME)s электронную почту"
 
-#: hypha/apply/users/services.py:134
+#: hypha/apply/users/services.py:176
 #, python-brace-format
 msgid "Welcome to {ORG_LONG_NAME}"
 msgstr ""
 
+#: hypha/apply/users/signals.py:31
+#, python-format
+msgid "Successful login to %(org)s"
+msgstr ""
+
 #: hypha/apply/users/templates/elevate/elevate.html:4
 #: hypha/apply/users/templates/elevate/elevate.html:10
 msgid "Confirm access"
@@ -10237,13 +11089,19 @@ msgstr ""
 "нескольких часов бездействия.\n"
 "            "
 
+#: hypha/apply/users/templates/includes/delete_user_submissions_form.html:20
+#, fuzzy
+#| msgid "Delete"
+msgid "Yes, delete"
+msgstr "Удалить"
+
 #: hypha/apply/users/templates/two_factor/_base.html:8
 #: hypha/apply/users/templates/users/change_password.html:9
 msgid "Back to account"
 msgstr "Назад к учетной записи"
 
 #: hypha/apply/users/templates/two_factor/_base.html:9
-#: hypha/apply/users/templates/users/account.html:85
+#: hypha/apply/users/templates/users/account.html:88
 msgid "Two-Factor Authentication (2FA)"
 msgstr "Двухфакторная аутентификация (2FA)"
 
@@ -10295,10 +11153,6 @@ msgstr ""
 msgid "Print"
 msgstr "Печать"
 
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
-msgid "Copied!"
-msgstr "Скопировано!"
-
 #: hypha/apply/users/templates/two_factor/core/backup_tokens.html:41
 msgid "Copy to Clipboard"
 msgstr "Скопировать в буфер обмена"
@@ -10585,34 +11439,44 @@ msgstr "Управлять данными и безопасностью свое
 msgid "Profile"
 msgstr "Профиль"
 
-#: hypha/apply/users/templates/users/account.html:60
+#: hypha/apply/users/templates/users/account.html:63
 msgid "Account Security"
 msgstr "Безопасность аккаунта"
 
-#: hypha/apply/users/templates/users/account.html:69
+#: hypha/apply/users/templates/users/account.html:72
 #: hypha/apply/users/templates/users/change_password.html:3
 msgid "Update password"
 msgstr "Обновить пароль"
 
-#: hypha/apply/users/templates/users/account.html:77
+#: hypha/apply/users/templates/users/account.html:80
 #, fuzzy
 #| msgid "Password"
 msgid "Set Password"
 msgstr "Пароль"
 
-#: hypha/apply/users/templates/users/account.html:89
+#: hypha/apply/users/templates/users/account.html:92
 msgid "Backup codes"
 msgstr "Резервные коды"
 
-#: hypha/apply/users/templates/users/account.html:90
+#: hypha/apply/users/templates/users/account.html:93
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:9
 msgid "Disable 2FA"
 msgstr "Отключить 2FA"
 
-#: hypha/apply/users/templates/users/account.html:92
+#: hypha/apply/users/templates/users/account.html:95
 msgid "Enable 2FA"
 msgstr "Включить двухфакторную аутентификацию (2FA)"
 
+#: hypha/apply/users/templates/users/account.html:100
+msgid "Passkeys"
+msgstr ""
+
+#: hypha/apply/users/templates/users/account.html:102
+msgid ""
+"With passkeys you can use your fingerprint, face, or screen lock to login "
+"securely without a password."
+msgstr ""
+
 #: hypha/apply/users/templates/users/activation/confirm.html:4
 #, fuzzy
 #| msgid "Confirmation email"
@@ -10748,7 +11612,7 @@ msgid "Select User:"
 msgstr "Выбранные"
 
 #: hypha/apply/users/templates/users/become.html:26
-#: hypha/templates/includes/user_menu.html:69
+#: hypha/apply/users/templates/users/includes/user_menu.html:69
 msgid "Switch User"
 msgstr ""
 
@@ -10786,7 +11650,7 @@ msgid "Email Change - Verify Email"
 msgstr "Подтвердите адрес электронной почты"
 
 #: hypha/apply/users/templates/users/email_change/done.html:4
-#: hypha/apply/users/views.py:230
+#: hypha/apply/users/views.py:235
 msgid "Verify Email"
 msgstr "Подтвердите адрес электронной почты"
 
@@ -10851,26 +11715,94 @@ msgstr ""
 "почту вашей учетной записи. Если это действие было совершено не вами, "
 "обратитесь к нам по адресу %(ORG_EMAIL)s "
 
-#: hypha/apply/users/templates/users/emails/confirm_access.md:4
+#: hypha/apply/users/templates/users/emails/confirm_access.md:4
+#, python-format
+msgid ""
+"To confirm access at %(ORG_LONG_NAME)s use the code below (valid for "
+"%(timeout_minutes)s minutes):"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/confirm_access.md:8
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:15
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:10
+msgid "If you did not request this email, please ignore it."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/confirm_access.md:11
+#: hypha/apply/users/templates/users/emails/login_notification.md:11
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:12
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:12
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
+#, fuzzy, python-format
+#| msgid "If you have any questions, please submit them here"
+msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
+msgstr "Если у вас есть вопросы, пожалуйста, задайте их здесь"
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that your account was successfully logged in to "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:6
+#, python-format
+msgid "Login time: %(login_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:8
+msgid ""
+"If you did not log in, please contact us immediately and consider changing "
+"your password."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a new passkey was added to your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:6
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:6
+#, python-format
+msgid "Passkey: %(passkey_name)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:7
 #, python-format
-msgid ""
-"To confirm access at %(ORG_LONG_NAME)s use the code below (valid for "
-"%(timeout_minutes)s minutes):"
+msgid "Added: %(event_time)s"
 msgstr ""
 
-#: hypha/apply/users/templates/users/emails/confirm_access.md:8
-#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:15
-#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:10
-msgid "If you did not request this email, please ignore it."
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:9
+msgid ""
+"If you did not add this passkey, please contact us immediately and consider "
+"removing it from your account."
 msgstr ""
 
-#: hypha/apply/users/templates/users/emails/confirm_access.md:11
-#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
-#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:4
 #, fuzzy, python-format
-#| msgid "If you have any questions, please submit them here"
-msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
-msgstr "Если у вас есть вопросы, пожалуйста, задайте их здесь"
+#| msgid ""
+#| "You're receiving this email because you requested a password reset for "
+#| "your user account at %(ORG_LONG_NAME)s."
+msgid ""
+"This is to notify you that a passkey was removed from your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+"Вы получили это письмо, потому что запросили сброс пароля для вашей учетной "
+"записи %(ORG_LONG_NAME)s."
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:7
+#, python-format
+msgid "Removed: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:9
+msgid ""
+"If you did not remove this passkey, please contact us immediately and "
+"consider changing your password if you have one."
+msgstr ""
 
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
 #, fuzzy, python-format
@@ -10937,6 +11869,97 @@ msgstr ""
 msgid "Set password for %(username)s at %(ORG_LONG_NAME)s"
 msgstr ""
 
+#: hypha/apply/users/templates/users/includes/okta_login_button.html:7
+#, fuzzy
+#| msgid "Forgot password?"
+msgid "Log in with Okta"
+msgstr "Забыли пароль?"
+
+#: hypha/apply/users/templates/users/includes/org_login_button.html:7
+#, python-format
+msgid "Log in with your %(ORG_SHORT_NAME)s email"
+msgstr "Войдите в систему, указав свою %(ORG_SHORT_NAME)s электронную почту"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:14
+#, fuzzy
+#| msgid "Forgot password?"
+msgid "Log in with passkey"
+msgstr "Забыли пароль?"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:18
+#, fuzzy
+#| msgid "Enable Two-Factor Authentication"
+msgid "Failed to begin authentication"
+msgstr "Включите двухфакторную аутентификацию"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:19
+#, fuzzy
+#| msgid "Application title"
+msgid "Authentication failed"
+msgstr "Название заявки"
+
+#: hypha/apply/users/templates/users/includes/password_login_button.html:7
+#, fuzzy
+#| msgid "Forgot password?"
+msgid "Log in with password"
+msgstr "Забыли пароль?"
+
+#: hypha/apply/users/templates/users/includes/passwordless_login_button.html:7
+#, fuzzy
+#| msgid "Forgot password?"
+msgid "Log in without password"
+msgstr "Забыли пароль?"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:27
+#, fuzzy
+#| msgid "your account"
+msgid "Goto your account"
+msgstr "ваша учетная запись"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:31
+#, fuzzy
+#| msgid "your account"
+msgid "My account"
+msgstr "ваша учетная запись"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:36
+#, fuzzy
+#| msgid "The slack #channel for notifications."
+msgid "Check latest notifications"
+msgstr "Канал Slack #channel для уведомлений."
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:40
+msgid "Activity feed"
+msgstr "Лента активности"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:44
+#, fuzzy
+#| msgid "Your flagged submissions"
+msgid "Goto your flagged submissions"
+msgstr "Ваши помеченные заявки"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:48
+msgid "My flagged"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:53
+msgid "Goto wagtail admin"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:84
+msgid "Release User"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:92
+msgid "Log out"
+msgstr "Выйти из системы"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
+#, fuzzy
+#| msgid "Sign up"
+msgid " or Sign up"
+msgstr "Зарегистрироваться"
+
 #: hypha/apply/users/templates/users/login.html:23
 #: hypha/apply/users/templates/users/login.html:31
 #, fuzzy
@@ -10987,35 +12010,35 @@ msgstr "Забыли ваш пароль?"
 msgid "OR"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:109
+#: hypha/apply/users/templates/users/login.html:115
 msgid "Or, alternatively, use one of your backup phones:"
 msgstr ""
 "Или, в качестве альтернативы, используйте один из ваших резервных номеров "
 "телефона:"
 
-#: hypha/apply/users/templates/users/login.html:125
+#: hypha/apply/users/templates/users/login.html:131
 #, fuzzy
 #| msgid "As a last resort, you can use a backup codes:"
 msgid "As a last resort, you can use a backup codes: "
 msgstr "В крайнем случае, вы можете использовать резервные коды:"
 
-#: hypha/apply/users/templates/users/login.html:130
+#: hypha/apply/users/templates/users/login.html:136
 #, fuzzy
 #| msgid "As a last resort, you can use a backup codes:"
 msgid "Click here to use a backup code"
 msgstr "В крайнем случае, вы можете использовать резервные коды:"
 
-#: hypha/apply/users/templates/users/login.html:133
+#: hypha/apply/users/templates/users/login.html:139
 #, fuzzy
 #| msgid "Use Backup Code"
 msgid "Use a Backup Code"
 msgstr "Использовать резервный код"
 
-#: hypha/apply/users/templates/users/login.html:149
+#: hypha/apply/users/templates/users/login.html:163
 msgid "Verification Code"
 msgstr "Код подтверждения"
 
-#: hypha/apply/users/templates/users/login.html:153
+#: hypha/apply/users/templates/users/login.html:167
 msgid "Backup Code"
 msgstr "Резервный код"
 
@@ -11059,6 +12082,70 @@ msgstr ""
 msgid "Use your password"
 msgstr "Забыли ваш пароль?"
 
+#: hypha/apply/users/templates/users/partials/passkey-list.html:22
+#: hypha/apply/users/templates/users/partials/passkey-list.html:70
+#, fuzzy
+#| msgid "Slack name"
+msgid "Passkey name"
+msgstr "Имя в Slack"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:23
+msgid "Click to edit name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:26
+#, fuzzy
+#| msgid "Save draft"
+msgid "Save name"
+msgstr "Сохранить черновик"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:32
+#, python-format
+msgid "Used %(when)s ago"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:34
+msgid "Never used"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:41
+msgid "Delete this passkey?"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:44
+#, fuzzy
+#| msgid "Delete user"
+msgid "Delete passkey"
+msgstr "Удалить пользователя"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:52
+msgid "No passkeys registered."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:59
+msgid "Server error"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:60
+#, fuzzy
+#| msgid "Revisions"
+msgid "Registration failed"
+msgstr "Корректировки"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:61
+msgid ""
+"This authenticator already has a passkey registered. Try a different "
+"authenticator or device."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:69
+msgid "e.g. MacBook Touch ID"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:75
+msgid "Add passkey"
+msgstr ""
+
 #: hypha/apply/users/templates/users/password_reset/complete.html:3
 #: hypha/apply/users/templates/users/password_reset/confirm.html:10
 #: hypha/apply/users/templates/users/password_reset/form.html:4
@@ -11228,6 +12315,46 @@ msgstr ""
 "был успешно создан! Мы отправили вам электронное письмо для активации "
 "учетной записи."
 
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:6
+#, fuzzy
+#| msgid "Are you sure you want to delete"
+msgid "Are you sure you want to delete these users?"
+msgstr "Вы уверены, что хотите удалить"
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:20
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:22
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:5
+#, fuzzy
+#| msgid "Are you sure you want to delete"
+msgid "Are you sure you want to delete this user?"
+msgstr "Вы уверены, что хотите удалить"
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:12
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:14
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted!"
+msgstr ""
+
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:12
 #, fuzzy
 #| msgid "This account do not have 2FA enabled."
@@ -11241,61 +12368,61 @@ msgstr ""
 msgid "2FA is disabled"
 msgstr "Двухфакторная аутентификация (2FA) уже отключена"
 
-#: hypha/apply/users/utils.py:40
+#: hypha/apply/users/utils.py:43
 msgid "Email is already in use."
 msgstr "Этот адрес электронной почты уже используется."
 
-#: hypha/apply/users/utils.py:130
+#: hypha/apply/users/utils.py:137
 #, fuzzy, python-brace-format
 #| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
 msgid "Confirmation email for {unverified_email} at {ORG_LONG_NAME}"
 msgstr "Ваша заявка в {ORG_LONG_NAME}: {source.title}"
 
-#: hypha/apply/users/views.py:117
+#: hypha/apply/users/views.py:120
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Profile updated."
 msgstr "Партнеры обновлены."
 
-#: hypha/apply/users/views.py:161 hypha/apply/users/views.py:236
+#: hypha/apply/users/views.py:164 hypha/apply/users/views.py:241
 msgid "Hijack feature is not enabled."
 msgstr "Функция перехвата не включена."
 
-#: hypha/apply/users/views.py:190
+#: hypha/apply/users/views.py:193
 msgid "Password Page timed out. Try changing the email again."
 msgstr ""
 "Истекло время для страницы с паролем. Попробуйте изменить адрес электронной "
 "почты еще раз."
 
-#: hypha/apply/users/views.py:211
+#: hypha/apply/users/views.py:216
 msgid "Alert! An attempt to update your email."
 msgstr ""
 
-#: hypha/apply/users/views.py:270
+#: hypha/apply/users/views.py:285
 #, python-brace-format
 msgid "Your email has been successfully updated to {email}!"
 msgstr "Ваш адрес электронной почты успешно обновлен на {email}!"
 
-#: hypha/apply/users/views.py:372
+#: hypha/apply/users/views.py:387
 #, fuzzy
 #| msgid "Your email has been successfully updated to {email}!"
 msgid "Your password was successfully updated!"
 msgstr "Ваш адрес электронной почты успешно обновлен на {email}!"
 
-#: hypha/apply/users/views.py:377
+#: hypha/apply/users/views.py:392
 #, fuzzy
 #| msgid "<li>Please correct the error below.</li>"
 #| msgid_plural "<li>Please correct the errors below.</li>"
 msgid "Please correct the errors below."
 msgstr "<li>Пожалуйста, исправьте ошибку, указанную ниже.</li>"
 
-#: hypha/apply/users/views.py:809
+#: hypha/apply/users/views.py:824
 #, fuzzy, python-brace-format
 #| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
 msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgstr "Ваша заявка в {ORG_LONG_NAME}: {source.title}"
 
-#: hypha/apply/users/views.py:870
+#: hypha/apply/users/views.py:885
 #, fuzzy
 #| msgid "Check your inbox for a password reset email!"
 msgid "✓ Check your email for password set link."
@@ -11556,7 +12683,7 @@ msgstr ""
 "Логотип мобильной версии сайта (если не установлен, будет использоваться "
 "логотип по умолчанию)"
 
-#: hypha/core/models/system_settings.py:60
+#: hypha/core/models/system_settings.py:61
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "Link for the site logo, e.g. \"https://www.example.org/\". If not set, "
@@ -11569,11 +12696,11 @@ msgstr ""
 "указано, будет использоваться страница с атрибутом slug, установленным как "
 "\"home\"."
 
-#: hypha/core/models/system_settings.py:64
+#: hypha/core/models/system_settings.py:66
 msgid "Front page navigation content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:66
+#: hypha/core/models/system_settings.py:68
 msgid ""
 "This will overwrite the default front page navigation bar, html tags is "
 "allowed."
@@ -11581,40 +12708,40 @@ msgstr ""
 "Это перезапишет стандартную панель навигации на главной странице, разрешено "
 "использование HTML-тегов."
 
-#: hypha/core/models/system_settings.py:72
+#: hypha/core/models/system_settings.py:74
 #, fuzzy
 #| msgid "Other comments"
 msgid "Footer content"
 msgstr "Другие комментарии"
 
-#: hypha/core/models/system_settings.py:74
+#: hypha/core/models/system_settings.py:76
 msgid "This will be added to the footer, html tags is allowed."
 msgstr "Это будет добавлено в нижний колонтитул, разрешены HTML-теги."
 
-#: hypha/core/models/system_settings.py:84
-#: hypha/core/models/system_settings.py:94
+#: hypha/core/models/system_settings.py:86
+#: hypha/core/models/system_settings.py:96
 msgid "Text"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:105
+#: hypha/core/models/system_settings.py:107
 #, fuzzy
 #| msgid "Per page"
 msgid "Homepage"
 msgstr "На странице"
 
-#: hypha/core/models/system_settings.py:113
+#: hypha/core/models/system_settings.py:115
 #, fuzzy
 #| msgid "Default site logo"
 msgid "Site logo"
 msgstr "Логотип сайта по умолчанию"
 
-#: hypha/core/models/system_settings.py:122
+#: hypha/core/models/system_settings.py:124
 #, fuzzy
 #| msgid "Per page"
 msgid "404 page"
 msgstr "На странице"
 
-#: hypha/core/models/system_settings.py:129
+#: hypha/core/models/system_settings.py:131
 #, fuzzy
 #| msgid "Per page"
 msgid "403 page"
@@ -11695,13 +12822,13 @@ msgstr "переход выполнен"
 msgid "renditions"
 msgstr "Варианты скрининга"
 
-#: hypha/settings/django.py:164 hypha/settings/local.py:105
+#: hypha/settings/django.py:163 hypha/settings/local.py:105
 msgid ""
 "This password has previously appeared in a data breach and should not be "
 "used. Please choose a different password."
 msgstr ""
 
-#: hypha/settings/django.py:167 hypha/settings/local.py:108
+#: hypha/settings/django.py:166 hypha/settings/local.py:108
 msgid "Your password must not have been detected in a major security breach."
 msgstr ""
 
@@ -11758,23 +12885,19 @@ msgstr ""
 msgid "current theme"
 msgstr "текущий"
 
-#: hypha/templates/base-apply.html:32
-msgid "Toggle Light / Dark / Auto color theme"
-msgstr ""
-
-#: hypha/templates/base-apply.html:54
+#: hypha/templates/base-apply.html:50
 msgid "Menu"
 msgstr ""
 
-#: hypha/templates/base-apply.html:76
+#: hypha/templates/base-apply.html:72
 msgid "Copyright"
 msgstr ""
 
-#: hypha/templates/base-apply.html:79
+#: hypha/templates/base-apply.html:75
 msgid "Built with"
 msgstr ""
 
-#: hypha/templates/base-apply.html:85
+#: hypha/templates/base-apply.html:81
 msgid "Manage cookies"
 msgstr ""
 
@@ -11789,6 +12912,27 @@ msgstr ""
 msgid "Page:"
 msgstr "Страница"
 
+#: hypha/templates/cotton/card_attachment.html:13
+#, python-format
+msgid "View file - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:21
+#, fuzzy
+#| msgid "Reupload"
+msgid "uploaded"
+msgstr "Загрузить повторно"
+
+#: hypha/templates/cotton/card_attachment.html:33
+#, fuzzy, python-format
+#| msgid "File not found on submission"
+msgid "File not found - %(filename)s"
+msgstr "Файл не найден при отправке"
+
+#: hypha/templates/cotton/card_attachment.html:40
+msgid "Missing file"
+msgstr ""
+
 #: hypha/templates/cotton/dropdown_menu.html:69
 #: hypha/templates/cotton/dropdown_menu.html:77
 #, fuzzy, python-format
@@ -11796,18 +12940,28 @@ msgstr "Страница"
 msgid "Filter %(title)s"
 msgstr "Корректировки для %(title)s"
 
-#. Translators: "delete" should match msgid "delete" (with context "confirm-delete")
-#: hypha/templates/cotton/modal/confirm.html:25
-msgid "Type <em>delete</em> below to confirm"
-msgstr ""
-
-#: hypha/templates/cotton/modal/confirm.html:41
+#: hypha/templates/cotton/modal/confirm.html:7
 #, fuzzy
 #| msgid "Delete"
-msgctxt "confirm-delete"
 msgid "delete"
 msgstr "Удалить"
 
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "anonymize"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:24
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">delete</pre> below to "
+"confirm"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:25
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">anonymize</pre> below to "
+"confirm"
+msgstr ""
+
 #: hypha/templates/cotton/modal/header.html:11
 #, fuzzy
 #| msgid "Closed"
@@ -11844,25 +12998,25 @@ msgstr "Вернуться в проект"
 msgid "* This must be a number"
 msgstr "Это должно быть числом"
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 #, fuzzy
 #| msgid "Update password"
 msgid "Hide password"
 msgstr "Обновить пароль"
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 #, fuzzy
 #| msgid "Password"
 msgid "Show password"
 msgstr "Пароль"
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently visible"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently hidden"
 msgstr ""
 
@@ -11916,81 +13070,52 @@ msgstr ""
 msgid "Your Tasks"
 msgstr ""
 
-#: hypha/templates/includes/org_login_button.html:7
-#, python-format
-msgid "Log in with your %(ORG_SHORT_NAME)s email"
-msgstr "Войдите в систему, указав свою %(ORG_SHORT_NAME)s электронную почту"
-
-#: hypha/templates/includes/password_login_button.html:7
-#, fuzzy
-#| msgid "Forgot password?"
-msgid "Log in with password"
-msgstr "Забыли пароль?"
+#: hypha/templates/password_required.html:4
+#: hypha/templates/password_required.html:9
+msgid "Password required"
+msgstr "Требуется пароль"
 
-#: hypha/templates/includes/passwordless_login_button.html:7
-#, fuzzy
-#| msgid "Forgot password?"
-msgid "Log in without password"
-msgstr "Забыли пароль?"
+#: hypha/templates/password_required.html:11
+msgid "Please enter the password to proceed."
+msgstr "Пожалуйста, введите пароль, чтобы продолжить."
 
-#: hypha/templates/includes/user_menu.html:27
-#, fuzzy
-#| msgid "your account"
-msgid "Goto your account"
-msgstr "ваша учетная запись"
+#~ msgid "View "
+#~ msgstr "Просмотреть "
 
-#: hypha/templates/includes/user_menu.html:31
-#, fuzzy
-#| msgid "your account"
-msgid "My account"
-msgstr "ваша учетная запись"
+#~ msgid "Are you sure you want to archive the selected submissions?"
+#~ msgstr "Вы уверены, что хотите архивировать выбранные заявки?"
 
-#: hypha/templates/includes/user_menu.html:36
-#, fuzzy
-#| msgid "The slack #channel for notifications."
-msgid "Check latest notifications"
-msgstr "Канал Slack #channel для уведомлений."
+#~ msgid "Ready For Preliminary Determination"
+#~ msgstr "Готово к предварительному решению"
 
-#: hypha/templates/includes/user_menu.html:40
-msgid "Activity feed"
-msgstr "Лента активности"
+#~ msgid "Ready For Discussion"
+#~ msgstr "Готово к обсуждению"
 
-#: hypha/templates/includes/user_menu.html:44
-#, fuzzy
-#| msgid "Your flagged submissions"
-msgid "Goto your flagged submissions"
-msgstr "Ваши помеченные заявки"
+#~ msgid "Ready For Final Determination"
+#~ msgstr "Готово к итоговому решению"
 
-#: hypha/templates/includes/user_menu.html:48
-msgid "My flagged"
-msgstr ""
+#~ msgid "Ready For Determination"
+#~ msgstr "Готово для заключения"
 
-#: hypha/templates/includes/user_menu.html:53
-msgid "Goto wagtail admin"
-msgstr ""
+#~ msgid "The"
+#~ msgstr "Это"
 
-#: hypha/templates/includes/user_menu.html:84
-msgid "Release User"
-msgstr ""
+#~ msgid "current"
+#~ msgstr "текущий"
 
-#: hypha/templates/includes/user_menu.html:91
-msgid "Log out"
-msgstr "Выйти из системы"
+#~ msgid "next"
+#~ msgstr "следующее"
 
-#: hypha/templates/includes/user_menu.html:101
-#, fuzzy
-#| msgid "Sign up"
-msgid " or Sign up"
-msgstr "Зарегистрироваться"
+#~ msgid "reporting period is"
+#~ msgstr "отчётный период составляет"
 
-#: hypha/templates/password_required.html:4
-#: hypha/templates/password_required.html:9
-msgid "Password required"
-msgstr "Требуется пароль"
+#~ msgid "A report is due for the period"
+#~ msgstr "Отчет должен быть представлен за период"
 
-#: hypha/templates/password_required.html:11
-msgid "Please enter the password to proceed."
-msgstr "Пожалуйста, введите пароль, чтобы продолжить."
+#, fuzzy
+#~| msgid "Show less..."
+#~ msgid "show less"
+#~ msgstr "Показать меньше..."
 
 #~ msgid "Partners updated."
 #~ msgstr "Партнеры обновлены."
@@ -12024,12 +13149,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Applicants & Partners"
 #~ msgstr "Обновить партнеров"
 
-#~ msgid "updated partners"
-#~ msgstr "партнеры обновлены"
-
-#~ msgid "You have been added as a partner the following submission."
-#~ msgstr "Вы были добавлены в качестве партнера следующей заявки."
-
 #~ msgid "Your active submissions"
 #~ msgstr "Ваши активные заявки"
 
@@ -12322,9 +13441,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Back to Account"
 #~ msgstr "Назад к учетной записи"
 
-#~ msgid "Invalid activation"
-#~ msgstr "Недействительная активация"
-
 #~ msgid "Invalid activation URL"
 #~ msgstr "Неверный URL активации"
 
@@ -12337,9 +13453,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Possible reason:"
 #~ msgstr "Возможная причина:"
 
-#~ msgid "Delete user"
-#~ msgstr "Удалить пользователя"
-
 #, fuzzy
 #~| msgid "First Name"
 #~ msgid "Display Name"
@@ -12380,9 +13493,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ "Отчетность была отключена, просто сохраните форму с соответствующей датой "
 #~ "и частотой отчета, чтобы включить ее снова."
 
-#~ msgid "made a comment"
-#~ msgstr "добавил комментарий"
-
 #, fuzzy
 #~| msgid "No Invoices available"
 #~ msgid "No notifications available."
@@ -12422,9 +13532,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Project #"
 #~ msgstr "Проект"
 
-#~ msgid "Contract number"
-#~ msgstr "Номер контракта"
-
 #~ msgid "Pay to"
 #~ msgstr "Оплатить"
 
@@ -12511,9 +13618,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Successfully unskipped a Report for {start_date} to {end_date}"
 #~ msgstr "Успешно отменен пропуск отчета с {start_date} по {end_date}"
 
-#~ msgid "updated contracting information"
-#~ msgstr "обновленная информация о контрактах"
-
 #~ msgid "approved paf"
 #~ msgstr "подтвержденная форма утверждения проекта"
 
@@ -12597,9 +13701,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Meta Terms"
 #~ msgstr "Мета-термины"
 
-#~ msgid "Archive Submissions"
-#~ msgstr "Архивировать заявки"
-
 #~ msgid ""
 #~ "All content related to these submissions will also be archived. This "
 #~ "includes reviews, determinations and comments"
@@ -12728,9 +13829,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Deliverables"
 #~ msgstr "Результаты работы"
 
-#~ msgid "Skip report"
-#~ msgstr "Пропустить отчет"
-
 #~ msgid "You're skipping the report for"
 #~ msgstr "Вы пропускаете отчет для"
 
@@ -12755,9 +13853,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Private Report"
 #~ msgstr "Частный отчет"
 
-#~ msgid "Save report"
-#~ msgstr "Сохранить отчет"
-
 #~ msgid "Submit report"
 #~ msgstr "Подать отчет"
 
@@ -12901,9 +13996,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ "Включите двухфакторную аутентификацию для повышения безопасности учетной "
 #~ "записи."
 
-#~ msgid "Enable Two-Factor Authentication"
-#~ msgstr "Включите двухфакторную аутентификацию"
-
 #~ msgid "Check your email"
 #~ msgstr "Проверьте вашу электронную почту"
 
@@ -13066,9 +14158,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
 #~ msgid "Other Contact Methods"
 #~ msgstr "Другие способы связи"
 
-#~ msgid "Contact information"
-#~ msgstr "Контактная информация"
-
 #~ msgid "Person types"
 #~ msgstr "Типы пользователей"
 
diff --git a/hypha/locale/zh_Hans/LC_MESSAGES/django.po b/hypha/locale/zh_Hans/LC_MESSAGES/django.po
index 8c43e9cfa8..36d197c6c6 100644
--- a/hypha/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/hypha/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-22 16:11+0000\n"
+"POT-Creation-Date: 2026-09-17 11:51+0000\n"
 "PO-Revision-Date: 2024-07-11 01:42+0000\n"
 "Last-Translator: 复予 <clonewith@qq.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -31,50 +31,50 @@ msgstr "发票"
 msgid "Please provide data for: {fields}"
 msgstr "请提供申请者的申请方式"
 
-#: hypha/apply/activity/adapters/activity_feed.py:28
+#: hypha/apply/activity/adapters/activity_feed.py:27
 #, fuzzy, python-brace-format
 #| msgid "Submitted {source.title} for {source.page.title}"
 msgid "Submitted {source.title_text_display} for {source.page.title}"
 msgstr "为 {source.page.title} 提交了 {source.title}"
 
+#: hypha/apply/activity/adapters/activity_feed.py:29
 #: hypha/apply/activity/adapters/activity_feed.py:30
-#: hypha/apply/activity/adapters/activity_feed.py:31
 #, fuzzy
 #| msgid "Related submissions"
 msgid "edited the submission"
 msgstr "相关提交"
 
-#: hypha/apply/activity/adapters/activity_feed.py:32
+#: hypha/apply/activity/adapters/activity_feed.py:31
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "updated Lead from {old_lead} to {source.lead}"
 msgstr "领导人已由 {old_lead} 变为 {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:33
+#: hypha/apply/activity/adapters/activity_feed.py:32
 #, fuzzy, python-brace-format
 #| msgid "Batch Lead changed to {new_lead}"
 msgid "batch updated Lead to {new_lead}"
 msgstr "批次领导人已更改为 {new_lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:35
+#: hypha/apply/activity/adapters/activity_feed.py:34
 #, fuzzy, python-brace-format
 #| msgid "Sent a determination. Outcome: {determination.clean_outcome}"
 msgid "sent a determination. Outcome: {determination.clean_outcome}"
 msgstr "发送了决策。结果：{determination.clean_outcome}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:38
+#: hypha/apply/activity/adapters/activity_feed.py:37
 msgid "Invited to submit a proposal"
 msgstr "邀请提交提案"
 
-#: hypha/apply/activity/adapters/activity_feed.py:41
+#: hypha/apply/activity/adapters/activity_feed.py:40
 msgid "Submitted a review"
 msgstr "提交了审核"
 
-#: hypha/apply/activity/adapters/activity_feed.py:42
+#: hypha/apply/activity/adapters/activity_feed.py:41
 msgid "Opened the submission while still sealed"
 msgstr "在提交被锁定时将其打开"
 
-#: hypha/apply/activity/adapters/activity_feed.py:45
+#: hypha/apply/activity/adapters/activity_feed.py:44
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} {opinion.opinion_display}s with {opinion.review.author}s review of "
@@ -85,295 +85,353 @@ msgstr ""
 "{user} 对 {opinion.review.author} 向 {source} 的审核持"
 "{opinion.opinion_display}意见"
 
-#: hypha/apply/activity/adapters/activity_feed.py:48
+#: hypha/apply/activity/adapters/activity_feed.py:47
 #, python-brace-format
 msgid "deleted the opinion for review: {review_opinion.review}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:51
+#: hypha/apply/activity/adapters/activity_feed.py:50
 #, python-brace-format
 msgid "Created project with initial status of \"{status}\""
 msgstr ""
 
+#: hypha/apply/activity/adapters/activity_feed.py:52
+#, python-brace-format
+msgid "Created SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:53
+#, python-brace-format
+msgid "Edited SOW for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:54
+#, python-brace-format
+msgid "Created project form for project \"{related.project}\""
+msgstr ""
+
 #: hypha/apply/activity/adapters/activity_feed.py:55
+#, python-brace-format
+msgid "Edited project form for project \"{related.project}\""
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:58
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "updated the project title from {old_title} to {source.title}"
 msgstr "领导人已由 {old_lead} 变为 {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:57
+#: hypha/apply/activity/adapters/activity_feed.py:61
+#, python-brace-format
+msgid "updated contract number to {source.contract_number}"
+msgstr ""
+
+#: hypha/apply/activity/adapters/activity_feed.py:63
 #, fuzzy, python-brace-format
 #| msgid "Lead changed from {old_lead} to {source.lead}"
 msgid "update Lead from {old_lead} to {source.lead}"
 msgstr "领导人已由 {old_lead} 变为 {source.lead}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:58
+#: hypha/apply/activity/adapters/activity_feed.py:64
 msgid "Requested approval"
 msgstr "请求了批准"
 
-#: hypha/apply/activity/adapters/activity_feed.py:60
+#: hypha/apply/activity/adapters/activity_feed.py:66
 #: hypha/apply/determinations/models.py:209
 #: hypha/apply/determinations/models.py:213
 #: hypha/apply/determinations/models.py:217
 #: hypha/apply/determinations/options.py:12
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
-#: hypha/apply/projects/utils.py:87
+#: hypha/apply/projects/utils.py:90
 msgid "Approved"
 msgstr "批准"
 
-#: hypha/apply/activity/adapters/activity_feed.py:61
+#: hypha/apply/activity/adapters/activity_feed.py:67
 #, fuzzy
 #| msgid "Requested changes for acceptance: \"{comment}\""
 msgid "requested changes for acceptance"
 msgstr "请求了待接受更改：“{comment}”"
 
-#: hypha/apply/activity/adapters/activity_feed.py:62
+#: hypha/apply/activity/adapters/activity_feed.py:68
 #, fuzzy
 #| msgid "Supporting Documents"
 msgid "Submitted Contract Documents"
 msgstr "支持文档"
 
-#: hypha/apply/activity/adapters/activity_feed.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:69
 #, python-brace-format
 msgid "Uploaded a {contract.state} contract"
 msgstr "上传了一个 {contract.state} 的合同"
 
-#: hypha/apply/activity/adapters/activity_feed.py:64
+#: hypha/apply/activity/adapters/activity_feed.py:70
 msgid "Approved contract"
 msgstr "批准了合同"
 
-#: hypha/apply/activity/adapters/activity_feed.py:66
-#: hypha/apply/projects/views/payment.py:275
+#: hypha/apply/activity/adapters/activity_feed.py:72
+#: hypha/apply/projects/views/invoice.py:280
 #, fuzzy
 #| msgid "Invoice File"
 msgid "Invoice added"
 msgstr "发票文件"
 
-#: hypha/apply/activity/adapters/activity_feed.py:67
+#: hypha/apply/activity/adapters/activity_feed.py:73
 msgid "Submitted a report"
 msgstr "提交了报告"
 
-#: hypha/apply/activity/adapters/activity_feed.py:70
-#: hypha/apply/activity/options.py:63
+#: hypha/apply/activity/adapters/activity_feed.py:74
+#, fuzzy
+#| msgid "Submitted a report"
+msgid "deleted a report"
+msgstr "提交了报告"
+
+#: hypha/apply/activity/adapters/activity_feed.py:77
+#: hypha/apply/activity/options.py:73
 #, fuzzy
 #| msgid "View report"
 msgid "disabled reporting"
 msgstr "查看报告"
 
-#: hypha/apply/activity/adapters/activity_feed.py:74
+#: hypha/apply/activity/adapters/activity_feed.py:81
 #, fuzzy
 #| msgid "No active submissions"
 msgid "archived this submission"
 msgstr "无活跃提交"
 
-#: hypha/apply/activity/adapters/activity_feed.py:75
+#: hypha/apply/activity/adapters/activity_feed.py:82
 #, fuzzy
 #| msgid "Your active submissions"
 msgid "un-archived this submission"
 msgstr "您的活动提交"
 
-#: hypha/apply/activity/adapters/activity_feed.py:76
+#: hypha/apply/activity/adapters/activity_feed.py:83
 #, fuzzy
 #| msgid "Delete Invoice"
 msgid "deleted an invoice"
 msgstr "删除发票"
 
-#: hypha/apply/activity/adapters/activity_feed.py:131
-#: hypha/apply/funds/views/submission_edit.py:630
+#: hypha/apply/activity/adapters/activity_feed.py:85
+#, fuzzy, python-brace-format
+#| msgid "Lead changed from {old_lead} to {source.lead}"
+msgid "updated author from {old_author} to {source.user}"
+msgstr "领导人已由 {old_lead} 变为 {source.lead}"
+
+#: hypha/apply/activity/adapters/activity_feed.py:145
+#: hypha/apply/funds/views/submission_edit.py:631
 msgid "Reviewers updated."
 msgstr "审核人已更新。"
 
-#: hypha/apply/activity/adapters/activity_feed.py:133
-#: hypha/apply/activity/adapters/slack.py:237
+#: hypha/apply/activity/adapters/activity_feed.py:147
+#: hypha/apply/activity/adapters/slack.py:257
 msgid "Added:"
 msgstr "添加了："
 
-#: hypha/apply/activity/adapters/activity_feed.py:137
-#: hypha/apply/activity/adapters/slack.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:151
+#: hypha/apply/activity/adapters/slack.py:261
 msgid "Removed:"
 msgstr "移除了："
 
-#: hypha/apply/activity/adapters/activity_feed.py:143
+#: hypha/apply/activity/adapters/activity_feed.py:157
 #, fuzzy
 #| msgid "Batch Reviewers Updated."
 msgid "Batch reviewers updated:"
 msgstr "批次审核人已更新。"
 
-#: hypha/apply/activity/adapters/activity_feed.py:146
+#: hypha/apply/activity/adapters/activity_feed.py:160
 #, python-brace-format
 msgid "{user} as {name}."
 msgstr "{user} 作为 {name}。"
 
-#: hypha/apply/activity/adapters/activity_feed.py:165
+#: hypha/apply/activity/adapters/activity_feed.py:179
 #, python-brace-format
 msgid "Successfully deleted submissions: {title}"
 msgstr "成功删除了提交：{title}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:174
+#: hypha/apply/activity/adapters/activity_feed.py:188
 #, fuzzy, python-brace-format
 #| msgid "Successfully deleted submissions: {title}"
 msgid "Successfully archived submissions: {title}"
 msgstr "成功删除了提交：{title}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:187
+#: hypha/apply/activity/adapters/activity_feed.py:201
 #, python-brace-format
 msgid ""
 "Successfully updated status to {invoice_status} for invoices: "
 "{invoice_numbers}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:204
+#: hypha/apply/activity/adapters/activity_feed.py:218
 #, fuzzy, python-brace-format
 #| msgid "Project Information"
 msgid "assigned Project form to {}"
 msgstr "项目信息"
 
-#: hypha/apply/activity/adapters/activity_feed.py:210
+#: hypha/apply/activity/adapters/activity_feed.py:224
 #, python-brace-format
 msgid "removed the task {task.code} for {source} from the task list"
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:215
+#: hypha/apply/activity/adapters/activity_feed.py:229
 #, python-brace-format
 msgid ""
 "removed the task {task.code} for {source} from whole team's{user_groups} "
 "task list."
 msgstr ""
 
-#: hypha/apply/activity/adapters/activity_feed.py:228
-#: hypha/apply/activity/adapters/activity_feed.py:260
+#: hypha/apply/activity/adapters/activity_feed.py:241
+#: hypha/apply/activity/adapters/activity_feed.py:273
 #, python-brace-format
 msgid "Progressed from {old_display} to {new_display}"
 msgstr "由 {old_display} 进展到 {new_display}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:291
+#: hypha/apply/activity/adapters/activity_feed.py:304
 #, python-brace-format
 msgid ""
 "Updated reporting frequency. New schedule is: {new_schedule} starting on "
 "{schedule_start}"
 msgstr "更新了报告频率。新计划：从 {schedule_start} 开始的 {new_schedule}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:296
+#: hypha/apply/activity/adapters/activity_feed.py:309
 #, fuzzy
 #| msgid "Skip report"
 msgid "Skipped a Report"
 msgstr "跳过报告"
 
-#: hypha/apply/activity/adapters/activity_feed.py:298
+#: hypha/apply/activity/adapters/activity_feed.py:311
 #, fuzzy
 #| msgid "More information required"
 msgid "Marked a Report as required"
 msgstr "需要更多信息"
 
-#: hypha/apply/activity/adapters/activity_feed.py:301
+#: hypha/apply/activity/adapters/activity_feed.py:314
 #, fuzzy, python-brace-format
 #| msgid "<p>Invoice status updated to: {status}.</p>"
 msgid "Updated Invoice status to: {invoice_status}."
 msgstr "<p>发票状态已更新至：{status}。</p>"
 
-#: hypha/apply/activity/adapters/activity_feed.py:350
+#: hypha/apply/activity/adapters/activity_feed.py:363
 #, fuzzy, python-brace-format
 #| msgid "Screening decision from {old_status} to {new_status}"
 msgid "Updated screening decision from \"{old_status}\" to \"{new_status}\""
 msgstr "审查决定由 {old_status} 变为 {new_status}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:353
+#: hypha/apply/activity/adapters/activity_feed.py:366
 #, fuzzy, python-brace-format
 #| msgid "Screening decision from {old_status} to {new_status}"
 msgid "Added screening decision to \"{new_status}\""
 msgstr "审查决定由 {old_status} 变为 {new_status}"
 
-#: hypha/apply/activity/adapters/activity_feed.py:357
+#: hypha/apply/activity/adapters/activity_feed.py:370
 #, python-brace-format
 msgid "Removed \"{old_status}\" screening decision."
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:196
+#: hypha/apply/activity/adapters/base.py:203
 #, python-brace-format
 msgid "{adapter} [to: {recipient}]: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/base.py:200
+#: hypha/apply/activity/adapters/base.py:207
 #, python-brace-format
 msgid "{adapter}: {message}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:90
+#: hypha/apply/activity/adapters/emails.py:92
 #, fuzzy, python-brace-format
 #| msgid "Application ready to review: {source.title}"
 msgid "Application ready to review: {source.title_text_display}"
 msgstr "申请已准备好审核：{source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:96
+#: hypha/apply/activity/adapters/emails.py:98
 msgid "Multiple applications are now ready for your review"
 msgstr "多个申请已准备好接受您的审核"
 
-#: hypha/apply/activity/adapters/emails.py:99
+#: hypha/apply/activity/adapters/emails.py:101
 #, fuzzy, python-brace-format
 #| msgid "Reminder: Application ready to review: {source.title}"
 msgid "Reminder: Application ready to review: {source.title_text_display}"
 msgstr "提醒：申请已准备好审核：{source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:102
+#: hypha/apply/activity/adapters/emails.py:104
 #, fuzzy
 #| msgid "View application"
 msgid "You are invited as a co-applicant"
 msgstr "查看申请"
 
-#: hypha/apply/activity/adapters/emails.py:107
+#: hypha/apply/activity/adapters/emails.py:109
 #, fuzzy, python-brace-format
 #| msgid "Projects awaiting approval"
 msgid "Project is waiting for approval: {source.title}"
 msgstr "等待批准的项目"
 
-#: hypha/apply/activity/adapters/emails.py:111
+#: hypha/apply/activity/adapters/emails.py:113
 #, fuzzy, python-brace-format
 #| msgid "Contract for {project} ({state})"
 msgid "Contract uploaded for the project: {source.title}"
 msgstr "{project}（{state}）的合同"
 
-#: hypha/apply/activity/adapters/emails.py:116
+#: hypha/apply/activity/adapters/emails.py:118
 #, fuzzy, python-brace-format
 #| msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgid "Contract Documents required approval for the project: {source.title}"
 msgstr "{user} 请求对项目 <{link}|{source.title}> 的批准"
 
-#: hypha/apply/activity/adapters/emails.py:126
+#: hypha/apply/activity/adapters/emails.py:128
 #, fuzzy, python-brace-format
 #| msgid "A Project is awaiting your review."
 msgid "Project is waiting for the contract: {source.title}"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/activity/adapters/emails.py:130
+#: hypha/apply/activity/adapters/emails.py:132
 #, fuzzy, python-brace-format
 #| msgid "Application ready to review: {source.title}"
 msgid "Project is ready for invoicing: {source.title}"
 msgstr "申请已准备好审核：{source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:134
+#: hypha/apply/activity/adapters/emails.py:136
 #, fuzzy, python-brace-format
 #| msgid "{user} has created a Project: <{link}|{source.title}>"
 msgid "Project status has changed to {project_status}: {source.title}"
 msgstr "{user} 创建了项目：<{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/emails.py:140
+#: hypha/apply/activity/adapters/emails.py:142
 msgid "Project has been rejected, please update and resubmit"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:143
+#: hypha/apply/activity/adapters/emails.py:145
 #, python-brace-format
 msgid "Project documents are ready to be assigned for approval: {source.title}"
 msgstr ""
 
-#: hypha/apply/activity/adapters/emails.py:150
+#: hypha/apply/activity/adapters/emails.py:151
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
+msgid "New comment on application to {ORG_LONG_NAME}: {source.title}"
+msgstr "您给 {ORG_LONG_NAME} 的项目：{source.title}"
+
+#: hypha/apply/activity/adapters/emails.py:158
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
+msgid ""
+"Your application to {ORG_LONG_NAME} has been reviewed: "
+"{source.title_text_display}"
+msgstr "您给 {ORG_LONG_NAME} 的项目：{source.title}"
+
+#: hypha/apply/activity/adapters/emails.py:162
+#, fuzzy, python-brace-format
+#| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
+msgid "Draft saved – application to {ORG_LONG_NAME}: {source.title}"
+msgstr "您给 {ORG_LONG_NAME} 的项目：{source.title}"
+
+#: hypha/apply/activity/adapters/emails.py:167
 #, fuzzy, python-brace-format
 #| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
 msgid "Your application to {ORG_LONG_NAME}: {source.title_text_display}"
 msgstr "您给 {ORG_LONG_NAME} 的项目：{source.title}"
 
-#: hypha/apply/activity/adapters/emails.py:153
-#, python-brace-format
-msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+#: hypha/apply/activity/adapters/emails.py:170
+#, fuzzy, python-brace-format
+#| msgid "Your {ORG_LONG_NAME} Project: {source.title}"
+msgid "Your {ORG_LONG_NAME} project: {source.title}"
 msgstr "您的 {ORG_LONG_NAME} 项目：{source.title}"
 
 #: hypha/apply/activity/adapters/slack.py:31
@@ -479,6 +537,12 @@ msgstr "{user} 删除了 {source.title}"
 
 #: hypha/apply/activity/adapters/slack.py:73
 #, fuzzy, python-brace-format
+#| msgid "{user} has deleted {source.title}"
+msgid "{user} has anonymized {source.title_text_display}"
+msgstr "{user} 删除了 {source.title}"
+
+#: hypha/apply/activity/adapters/slack.py:76
+#, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} has deleted {review.author} review for <{link}|{source.title}>"
 msgid ""
@@ -486,7 +550,7 @@ msgid ""
 "{source.title_text_display}>"
 msgstr "{user} 删除了 {review.author} 对 <{link}|{source.title}> 的审核"
 
-#: hypha/apply/activity/adapters/slack.py:76
+#: hypha/apply/activity/adapters/slack.py:79
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "{user} has deleted {review.author} review for <{link}|{source.title}>"
@@ -495,12 +559,12 @@ msgid ""
 "{source.title_text_display}>"
 msgstr "{user} 删除了 {review.author} 对 <{link}|{source.title}> 的审核"
 
-#: hypha/apply/activity/adapters/slack.py:79
+#: hypha/apply/activity/adapters/slack.py:82
 #, python-brace-format
 msgid "{user} has created a Project: <{link}|{source.title}>"
 msgstr "{user} 创建了项目：<{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:82
+#: hypha/apply/activity/adapters/slack.py:85
 #, python-brace-format
 msgid ""
 "The lead of project <{link}|{source.title}> has been updated from {old_lead} "
@@ -509,7 +573,7 @@ msgstr ""
 "{user} 更新了项目 <{link}|{source.title}> 的领导人：从 {old_lead} 到 "
 "{source.lead}"
 
-#: hypha/apply/activity/adapters/slack.py:85
+#: hypha/apply/activity/adapters/slack.py:88
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "The lead of project <{link}|{source.title}> has been updated from "
@@ -521,7 +585,19 @@ msgstr ""
 "{user} 更新了项目 <{link}|{source.title}> 的领导人：从 {old_lead} 到 "
 "{source.lead}"
 
-#: hypha/apply/activity/adapters/slack.py:88
+#: hypha/apply/activity/adapters/slack.py:91
+#, fuzzy, python-brace-format
+#| msgid ""
+#| "The lead of project <{link}|{source.title}> has been updated from "
+#| "{old_lead} to {source.lead} by {user}"
+msgid ""
+"The contract number of project <{link}|{source.title}> has been updated to "
+"{source.contract_number} by {user}"
+msgstr ""
+"{user} 更新了项目 <{link}|{source.title}> 的领导人：从 {old_lead} 到 "
+"{source.lead}"
+
+#: hypha/apply/activity/adapters/slack.py:94
 #, fuzzy, python-brace-format
 #| msgid "{user} has edited {review.author} review for <{link}|{source.title}>"
 msgid ""
@@ -529,29 +605,29 @@ msgid ""
 "{source.title_text_display}>"
 msgstr "{user} 编辑了 {review.author} 对 <{link}|{source.title}> 的审核"
 
-#: hypha/apply/activity/adapters/slack.py:91
+#: hypha/apply/activity/adapters/slack.py:97
 #, python-brace-format
 msgid "{user} has requested approval on project <{link}|{source.title}>"
 msgstr "{user} 请求对项目 <{link}|{source.title}> 的批准"
 
-#: hypha/apply/activity/adapters/slack.py:94
+#: hypha/apply/activity/adapters/slack.py:100
 #, python-brace-format
 msgid "{user} has approved project <{link}|{source.title}>"
 msgstr "{user} 批准了项目 <{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:97
+#: hypha/apply/activity/adapters/slack.py:103
 #, python-brace-format
 msgid ""
 "{user} has requested changes for project acceptance on <{link}|{source.title}"
 ">"
 msgstr "{user} 请求了 <{link}|{source.title}> 更改，以便项目被接受"
 
-#: hypha/apply/activity/adapters/slack.py:100
+#: hypha/apply/activity/adapters/slack.py:106
 #, python-brace-format
 msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgstr "{user} 为 <{link}|{source.title}> 上传了合同"
 
-#: hypha/apply/activity/adapters/slack.py:103
+#: hypha/apply/activity/adapters/slack.py:109
 #, fuzzy, python-brace-format
 #| msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgid ""
@@ -559,17 +635,17 @@ msgid ""
 "{source.title}>"
 msgstr "{user} 为 <{link}|{source.title}> 提交了报告"
 
-#: hypha/apply/activity/adapters/slack.py:106
+#: hypha/apply/activity/adapters/slack.py:112
 #, python-brace-format
 msgid "{user} has approved contract for <{link}|{source.title}>"
 msgstr "{user} 批准了 <{link}|{source.title}> 的合同"
 
-#: hypha/apply/activity/adapters/slack.py:109
+#: hypha/apply/activity/adapters/slack.py:115
 #, python-brace-format
 msgid "{user} has created invoice for <{link}|{source.title}>"
 msgstr "{user} 为 <{link}|{source.title}> 创建了发票"
 
-#: hypha/apply/activity/adapters/slack.py:112
+#: hypha/apply/activity/adapters/slack.py:118
 #, python-brace-format
 msgid ""
 "{user} has changed the status of <{link_related}|invoice> on <{link}|"
@@ -578,28 +654,34 @@ msgstr ""
 "{user} 更改了 <{link}|{source.title}> 的<{link_related}|发票>状态到 "
 "{invoice.status_display}"
 
-#: hypha/apply/activity/adapters/slack.py:115
+#: hypha/apply/activity/adapters/slack.py:121
 #, python-brace-format
 msgid "{user} has deleted invoice from <{link}|{source.title}>"
 msgstr "{user} 从 <{link}|{source.title}> 删除了发票"
 
-#: hypha/apply/activity/adapters/slack.py:118
+#: hypha/apply/activity/adapters/slack.py:124
 #, python-brace-format
 msgid "{user} has updated invoice for <{link}|{source.title}>"
 msgstr "{user} 更新了 <{link}|{source.title}> 的发票"
 
-#: hypha/apply/activity/adapters/slack.py:121
+#: hypha/apply/activity/adapters/slack.py:127
 #, python-brace-format
 msgid "{user} has submitted a report for <{link}|{source.title}>"
 msgstr "{user} 为 <{link}|{source.title}> 提交了报告"
 
-#: hypha/apply/activity/adapters/slack.py:125
+#: hypha/apply/activity/adapters/slack.py:130
+#, fuzzy, python-brace-format
+#| msgid "{user} has submitted a report for <{link}|{source.title}>"
+msgid "{user} has deleted a report for <{link}|{source.title}>"
+msgstr "{user} 为 <{link}|{source.title}> 提交了报告"
+
+#: hypha/apply/activity/adapters/slack.py:135
 #, fuzzy, python-brace-format
 #| msgid "{user} has created invoice for <{link}|{source.title}>"
 msgid "{user} has created a new account for <{link}|{source}>"
 msgstr "{user} 为 <{link}|{source.title}> 创建了发票"
 
-#: hypha/apply/activity/adapters/slack.py:128
+#: hypha/apply/activity/adapters/slack.py:138
 #, fuzzy, python-brace-format
 #| msgid "{user} has uploaded a contract for <{link}|{source.title}>"
 msgid ""
@@ -607,45 +689,59 @@ msgid ""
 "roles: {roles}"
 msgstr "{user} 为 <{link}|{source.title}> 上传了合同"
 
-#: hypha/apply/activity/adapters/slack.py:132
+#: hypha/apply/activity/adapters/slack.py:142
 #, fuzzy, python-brace-format
 #| msgid "{user} has opened the sealed submission: <{link}|{source.title}>"
 msgid "{user} has archived the submission: {source.title_text_display}"
 msgstr "{user} 打开了锁定的提交：<{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:135
+#: hypha/apply/activity/adapters/slack.py:145
 #, fuzzy, python-brace-format
 #| msgid "{user} has opened the sealed submission: <{link}|{source.title}>"
 msgid "{user} has unarchived the submission: {source.title_text_display}"
 msgstr "{user} 打开了锁定的提交：<{link}|{source.title}>"
 
-#: hypha/apply/activity/adapters/slack.py:231
+#: hypha/apply/activity/adapters/slack.py:148
+#, python-brace-format
+msgid ""
+"{user} has updated author from {old_author} to {source.user} for submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:151
+#, python-brace-format
+msgid ""
+"A new comment has been assigned to {assignee} by {user} on submission "
+"<{link}|{source}>"
+msgstr ""
+
+#: hypha/apply/activity/adapters/slack.py:251
 #, python-brace-format
 msgid "{user} has updated the reviewers on <{link}|{title}>"
 msgstr "{user} 更新了 <{link}|{title}> 的审核者"
 
-#: hypha/apply/activity/adapters/slack.py:250
+#: hypha/apply/activity/adapters/slack.py:270
 #, python-brace-format
 msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
 msgstr "{user} 将领导人批量更改为 {new_lead} 于：{submissions_text}"
 
-#: hypha/apply/activity/adapters/slack.py:262
+#: hypha/apply/activity/adapters/slack.py:282
 #, python-brace-format
 msgid "{user} as {name},"
 msgstr "{user} 作为 {name}，"
 
-#: hypha/apply/activity/adapters/slack.py:268
+#: hypha/apply/activity/adapters/slack.py:288
 #, python-brace-format
 msgid ""
 "{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
 msgstr "{user} 将 {reviewers_text} 批量添加为审核者于：{submissions_text}"
 
-#: hypha/apply/activity/adapters/slack.py:288
+#: hypha/apply/activity/adapters/slack.py:308
 #, python-brace-format
 msgid "{user} has transitioned the following submissions: {submissions_links}"
 msgstr "{user} 转换了以下提交：{submissions_links}"
 
-#: hypha/apply/activity/adapters/slack.py:298
+#: hypha/apply/activity/adapters/slack.py:318
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was sent by email. Outcome: "
@@ -654,7 +750,7 @@ msgstr ""
 "<{link}|{submission_title}> 的决策已通过电子邮件发送。结果："
 "{determination_outcome}"
 
-#: hypha/apply/activity/adapters/slack.py:305
+#: hypha/apply/activity/adapters/slack.py:325
 #, python-brace-format
 msgid ""
 "A determination for <{link}|{submission_title}> was saved without sending an "
@@ -663,23 +759,29 @@ msgstr ""
 "<{link}|{submission_title}> 的决策在未发送电子邮件时已保存。结果："
 "{determination_outcome}"
 
-#: hypha/apply/activity/adapters/slack.py:321
+#: hypha/apply/activity/adapters/slack.py:341
 #, python-brace-format
 msgid "Determinations of {outcome} was sent for: {submissions_links}"
 msgstr "已发送对于以下提交的 {outcome} 决策：{submissions_links}"
 
-#: hypha/apply/activity/adapters/slack.py:332
+#: hypha/apply/activity/adapters/slack.py:352
 #, python-brace-format
 msgid "{user} has deleted submissions: {title}"
 msgstr "{user} 删除了提交：{title}"
 
-#: hypha/apply/activity/adapters/slack.py:339
+#: hypha/apply/activity/adapters/slack.py:361
+#, fuzzy, python-brace-format
+#| msgid "{user} has deleted submissions: {title}"
+msgid "{user} has anonymized submissions: {title}"
+msgstr "{user} 删除了提交：{title}"
+
+#: hypha/apply/activity/adapters/slack.py:368
 #, fuzzy, python-brace-format
 #| msgid "{user} has deleted submissions: {title}"
 msgid "{user} has archived submissions: {title}"
 msgstr "{user} 删除了提交：{title}"
 
-#: hypha/apply/activity/adapters/slack.py:353
+#: hypha/apply/activity/adapters/slack.py:382
 #, python-brace-format
 msgid ""
 "<{link}|{title}> is ready for review. The following are assigned as "
@@ -713,40 +815,46 @@ msgstr "这个月"
 msgid "Last 3 months"
 msgstr "月"
 
-#: hypha/apply/activity/forms.py:16
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:70
+#: hypha/apply/activity/forms.py:17
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:47
 #, fuzzy
 #| msgid "Attachements"
 msgid "Attachments"
 msgstr "附件"
 
-#: hypha/apply/activity/forms.py:20 hypha/apply/funds/forms.py:102
-#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:371
+#: hypha/apply/activity/forms.py:21 hypha/apply/funds/forms.py:102
+#: hypha/apply/funds/forms.py:242 hypha/apply/funds/forms.py:389
 #, fuzzy
 #| msgid "Selected"
 msgid "Select..."
 msgstr "已选中"
 
-#: hypha/apply/activity/forms.py:21
+#: hypha/apply/activity/forms.py:22
 #, fuzzy
 #| msgid "Assign"
 msgid "Assign to"
 msgstr "分配"
 
-#: hypha/apply/activity/forms.py:33
+#: hypha/apply/activity/forms.py:39
 #, fuzzy
 #| msgid "Visibility"
 msgid "Visible to"
 msgstr "可见性"
 
-#: hypha/apply/activity/forms.py:34
+#: hypha/apply/activity/forms.py:40
 msgid "Message"
 msgstr "消息"
 
-#: hypha/apply/activity/forms.py:38
+#: hypha/apply/activity/forms.py:44
 msgid "Select a relevant user role. Staff can view every comment."
 msgstr ""
 
+#: hypha/apply/activity/forms.py:73
+#, fuzzy
+#| msgid "made a comment"
+msgid "Write a comment..."
+msgstr "留下了评论"
+
 #: hypha/apply/activity/management/commands/send_staff_email_digest.py:146
 msgid "Summary of all activities"
 msgstr ""
@@ -756,7 +864,8 @@ msgid "Activities Summary - "
 msgstr ""
 
 #: hypha/apply/activity/models.py:25
-#: hypha/apply/funds/models/co_applicants.py:9 hypha/apply/todo/options.py:69
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:12
+#: hypha/apply/funds/models/co_applicants.py:10 hypha/apply/todo/options.py:76
 #, fuzzy
 #| msgid "Comments"
 msgid "Comment"
@@ -768,7 +877,7 @@ msgstr "评论"
 msgid "Action"
 msgstr "活跃"
 
-#: hypha/apply/activity/models.py:36
+#: hypha/apply/activity/models.py:36 hypha/apply/funds/forms.py:336
 #, fuzzy
 #| msgid "Applicant"
 msgid "Applicants"
@@ -780,9 +889,9 @@ msgstr "申请者"
 msgid "Staff only"
 msgstr "员工标记"
 
-#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:231
-#: hypha/apply/funds/tables.py:469
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:81
+#: hypha/apply/activity/models.py:38 hypha/apply/funds/tables.py:245
+#: hypha/apply/funds/tables.py:533
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:86
 #: hypha/apply/funds/templates/submissions/all.html:437
 #: hypha/apply/funds/templates/submissions/all.html:478
 msgid "Reviewers"
@@ -804,7 +913,7 @@ msgstr "附件"
 msgid "activity attachments"
 msgstr "附件"
 
-#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:379
+#: hypha/apply/activity/models.py:205 hypha/apply/activity/models.py:384
 #, fuzzy
 #| msgid "Message"
 msgid "message"
@@ -828,19 +937,19 @@ msgstr "活动订阅"
 msgid "activities"
 msgstr "其他留言"
 
-#: hypha/apply/activity/models.py:329
+#: hypha/apply/activity/models.py:334
 msgid "verb"
 msgstr ""
 
-#: hypha/apply/activity/models.py:340
+#: hypha/apply/activity/models.py:345
 msgid "event"
 msgstr ""
 
-#: hypha/apply/activity/models.py:341
+#: hypha/apply/activity/models.py:346
 msgid "events"
 msgstr ""
 
-#: hypha/apply/activity/models.py:380
+#: hypha/apply/activity/models.py:385
 #, fuzzy
 #| msgid "Message"
 msgid "messages"
@@ -972,204 +1081,264 @@ msgstr "相关提交"
 
 #: hypha/apply/activity/options.py:35
 #, fuzzy
+#| msgid "No active submissions"
+msgid "anonymized submission"
+msgstr "无活跃提交"
+
+#: hypha/apply/activity/options.py:36
+#, fuzzy
 #| msgid "Add a review"
 msgid "deleted review"
 msgstr "添加审核"
 
-#: hypha/apply/activity/options.py:36
+#: hypha/apply/activity/options.py:37
 msgid "deleted review opinion"
 msgstr ""
 
-#: hypha/apply/activity/options.py:37
+#: hypha/apply/activity/options.py:38
 #, fuzzy
 #| msgid "Create Project"
 msgid "created project"
 msgstr "创建项目"
 
-#: hypha/apply/activity/options.py:38
+#: hypha/apply/activity/options.py:39
+#, fuzzy
+#| msgid "Create Project"
+msgid "created a project SOW"
+msgstr "创建项目"
+
+#: hypha/apply/activity/options.py:40
+#, fuzzy
+#| msgid "Project"
+msgid "edited a project SOW"
+msgstr "项目"
+
+#: hypha/apply/activity/options.py:41
+#, fuzzy
+#| msgid "Create Project"
+msgid "created a project form"
+msgstr "创建项目"
+
+#: hypha/apply/activity/options.py:42
+#, fuzzy
+#| msgid "Project Information"
+msgid "edited a project form"
+msgstr "项目信息"
+
+#: hypha/apply/activity/options.py:43
 #, fuzzy
 #| msgid "Update Project Status"
 msgid "updated project lead"
 msgstr "更新项目状态"
 
-#: hypha/apply/activity/options.py:39
+#: hypha/apply/activity/options.py:44
 #, fuzzy
 #| msgid "Update Project Status"
 msgid "updated project title"
 msgstr "更新项目状态"
 
-#: hypha/apply/activity/options.py:40
+#: hypha/apply/activity/options.py:47
+#, fuzzy
+#| msgid "Update Project Status"
+msgid "updated project contract number"
+msgstr "更新项目状态"
+
+#: hypha/apply/activity/options.py:49
 #, fuzzy
 #| msgid "Edit Review"
 msgid "edited review"
 msgstr "编辑审核"
 
-#: hypha/apply/activity/options.py:41
+#: hypha/apply/activity/options.py:50
 #, fuzzy
 #| msgid "Submit for Approval"
 msgid "sent for approval"
 msgstr "提交以批准"
 
-#: hypha/apply/activity/options.py:42
+#: hypha/apply/activity/options.py:51
 #, fuzzy
 #| msgid "Mentioned project"
 msgid "approved project"
 msgstr "提及的项目"
 
-#: hypha/apply/activity/options.py:43
+#: hypha/apply/activity/options.py:52
 msgid "assign project form approver"
 msgstr ""
 
-#: hypha/apply/activity/options.py:44
+#: hypha/apply/activity/options.py:53
 msgid "approved project form"
 msgstr ""
 
-#: hypha/apply/activity/options.py:45
+#: hypha/apply/activity/options.py:54
 #, fuzzy
 #| msgid "Mentioned project"
 msgid "transitioned project"
 msgstr "提及的项目"
 
-#: hypha/apply/activity/options.py:46
+#: hypha/apply/activity/options.py:55
 #, fuzzy
 #| msgid "Requested approval"
 msgid "requested project change"
 msgstr "请求了批准"
 
-#: hypha/apply/activity/options.py:49
+#: hypha/apply/activity/options.py:58
 msgid "submitted contract documents"
 msgstr ""
 
-#: hypha/apply/activity/options.py:51
+#: hypha/apply/activity/options.py:60
 msgid "uploaded document to project"
 msgstr ""
 
-#: hypha/apply/activity/options.py:52
+#: hypha/apply/activity/options.py:61
 #, fuzzy
 #| msgid "Uploaded a {contract.state} contract"
 msgid "uploaded contract to project"
 msgstr "上传了一个 {contract.state} 的合同"
 
-#: hypha/apply/activity/options.py:53
+#: hypha/apply/activity/options.py:62
 #, fuzzy
 #| msgid "Approved contract"
 msgid "approved contract"
 msgstr "批准了合同"
 
-#: hypha/apply/activity/options.py:54
+#: hypha/apply/activity/options.py:63
 #, fuzzy
 #| msgid "Invoice requested for {project}"
 msgid "created invoice for project"
 msgstr "已为 {project} 请求发票"
 
-#: hypha/apply/activity/options.py:55
+#: hypha/apply/activity/options.py:64
 #, fuzzy
 #| msgid "Update Invoice status"
 msgid "updated invoice status"
 msgstr "更新发票状态"
 
-#: hypha/apply/activity/options.py:56
+#: hypha/apply/activity/options.py:65
 #, fuzzy
 #| msgid "Project Invoices"
 msgid "approve invoice"
 msgstr "项目发票"
 
-#: hypha/apply/activity/options.py:57
+#: hypha/apply/activity/options.py:66
 #, fuzzy
 #| msgid "Delete Invoice"
 msgid "deleted invoice"
 msgstr "删除发票"
 
-#: hypha/apply/activity/options.py:58
+#: hypha/apply/activity/options.py:67
 msgid "sent project to compliance"
 msgstr ""
 
-#: hypha/apply/activity/options.py:59
+#: hypha/apply/activity/options.py:68
 #, fuzzy
 #| msgid "Add Invoice"
 msgid "updated invoice"
 msgstr "添加发票"
 
-#: hypha/apply/activity/options.py:60
+#: hypha/apply/activity/options.py:69
 #, fuzzy
 #| msgid "Submitted a report"
 msgid "submitted report"
 msgstr "提交了报告"
 
-#: hypha/apply/activity/options.py:61
+#: hypha/apply/activity/options.py:70
+#, fuzzy
+#| msgid "Add a review"
+msgid "deleted report"
+msgstr "添加审核"
+
+#: hypha/apply/activity/options.py:71
 #, fuzzy
 #| msgid "Skip report"
 msgid "skipped report"
 msgstr "跳过报告"
 
-#: hypha/apply/activity/options.py:62
+#: hypha/apply/activity/options.py:72
 #, fuzzy
 #| msgid "Change reporting frequency"
 msgid "changed report frequency"
 msgstr "更改报告频率"
 
-#: hypha/apply/activity/options.py:64
+#: hypha/apply/activity/options.py:74
 #, fuzzy
 #| msgid "View report"
 msgid "notified report"
 msgstr "查看报告"
 
-#: hypha/apply/activity/options.py:65
+#: hypha/apply/activity/options.py:75
 #, fuzzy
 #| msgid "Reminder created"
 msgid "reminder to review"
 msgstr "提醒已创建"
 
-#: hypha/apply/activity/options.py:66
+#: hypha/apply/activity/options.py:76
 #, fuzzy
 #| msgid "Related submissions"
 msgid "batch deleted submissions"
 msgstr "相关提交"
 
-#: hypha/apply/activity/options.py:69
+#: hypha/apply/activity/options.py:79
+#, fuzzy
+#| msgid "No active submissions"
+msgid "batch anonymized submissions"
+msgstr "无活跃提交"
+
+#: hypha/apply/activity/options.py:83
 #, fuzzy
 #| msgid "No active submissions"
 msgid "batch archive submissions"
 msgstr "无活跃提交"
 
-#: hypha/apply/activity/options.py:73
+#: hypha/apply/activity/options.py:87
 #, fuzzy
 #| msgid "Update Invoice status"
 msgid "batch update invoice status"
 msgstr "更新发票状态"
 
-#: hypha/apply/activity/options.py:75
+#: hypha/apply/activity/options.py:89
 msgid "created new account"
 msgstr ""
 
-#: hypha/apply/activity/options.py:76
+#: hypha/apply/activity/options.py:90
 #, fuzzy
 #| msgid "Requested amount"
 msgid "edited account"
 msgstr "请求数目"
 
-#: hypha/apply/activity/options.py:77
+#: hypha/apply/activity/options.py:91
 #, fuzzy
 #| msgid "No active submissions"
 msgid "archived submission"
 msgstr "无活跃提交"
 
-#: hypha/apply/activity/options.py:78
+#: hypha/apply/activity/options.py:92
 #, fuzzy
 #| msgid "Your active submissions"
 msgid "unarchived submission"
 msgstr "您的活动提交"
 
-#: hypha/apply/activity/options.py:79
+#: hypha/apply/activity/options.py:93
 msgid "remove task"
 msgstr ""
 
-#: hypha/apply/activity/options.py:80
+#: hypha/apply/activity/options.py:94
 #, fuzzy
 #| msgid "View application"
 msgid "invite co-applicant"
 msgstr "查看申请"
 
+#: hypha/apply/activity/options.py:95
+#, fuzzy
+#| msgid "Update Partners"
+msgid "updated author"
+msgstr "更新"
+
+#: hypha/apply/activity/options.py:96
+#, fuzzy
+#| msgid "Comments"
+msgid "comment assigned"
+msgstr "评论"
+
 #: hypha/apply/activity/templates/activity/include/action_list.html:6
 msgid "There are no actions."
 msgstr "没有操作。"
@@ -1205,13 +1374,13 @@ msgid "Filter"
 msgstr "筛选"
 
 #: hypha/apply/activity/templates/activity/notifications.html:79
-#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:44
+#: hypha/apply/activity/templates/activity/ui/activity-action-item.html:61
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:46
-#: hypha/apply/funds/models/co_applicants.py:8
+#: hypha/apply/funds/models/co_applicants.py:9
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:62
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:76
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:83
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:99
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:133
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:120
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:159
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:72
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:19
@@ -1239,102 +1408,136 @@ msgstr "编辑了"
 msgid "deleted"
 msgstr "删除"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:28
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:23
+#, fuzzy
+#| msgid "Add determination"
+msgid "Additional options"
+msgstr "添加决策"
+
+#: hypha/apply/activity/templates/activity/partials/comment_form.html:35
+#: hypha/apply/funds/templates/funds/comments.html:68
+#: hypha/apply/funds/templates/funds/comments.html:82
+#, fuzzy
+#| msgid "Comments"
+msgid "Add Comment"
+msgstr "评论"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:36
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:150
 #, python-format
 msgid "This user is a %(role)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:37
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:48
+#, fuzzy
+#| msgid "Ready for Determination"
+msgid "message from determination"
+msgstr "准备接受决策"
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:50
+#, python-format
+msgid "commented on %(related_name)s"
+msgstr ""
+
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:53
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:159
 #, fuzzy
 #| msgid "Comments"
 msgid "commented"
 msgstr "评论"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:52
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:69
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:173
 #, fuzzy
 #| msgid "Assign Lead"
 msgid "Assigned to you"
 msgstr "分配领导人"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:54
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:71
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:175
 #, python-format
 msgid "Assigned to %(assigned_to)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:61
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:78
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:182
 #, python-format
 msgid "This is visible to %(visibility_text)s"
 msgstr ""
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:72
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:193
 #, fuzzy
 #| msgid "made a comment"
 msgid "Edit comment"
 msgstr "留下了评论"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:76
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:93
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:197
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:40
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:36
-#: hypha/apply/funds/models/co_applicants.py:10
+#: hypha/apply/funds/models/co_applicants.py:11
 #: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:10
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:118
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:55
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:90
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:98
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:122
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:106
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:97
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:76
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:130
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:170
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:29
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:148
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:50
 #: hypha/apply/review/templates/review/review_detail.html:82
 msgid "Edit"
 msgstr "编辑"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:84
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:101
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:205
 #, fuzzy
 #| msgid "Are you sure you want to delete selected submissions?"
 msgid ""
 "Are you sure you want to delete this comment? This action cannot be undone."
 msgstr "您确定要删除所选提交吗？"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:85
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:102
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:206
 #, fuzzy
 #| msgid "Other comments"
 msgid "Delete comment"
 msgstr "其他留言"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:89
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:106
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:210
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:59
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:120
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:182
 #: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:21
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:26
 #: hypha/apply/funds/templates/funds/modals/edit_co_applicant_form.html:75
-#: hypha/apply/funds/templates/submissions/all.html:502
-#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:59
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
-#: hypha/apply/projects/views/payment.py:356
+#: hypha/apply/funds/templates/submissions/all.html:504
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:71
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:41
+#: hypha/apply/projects/views/invoice.py:361
 #: hypha/apply/review/templates/review/review_detail.html:92
-#: hypha/templates/cotton/modal/confirm.html:43
 #: hypha/templates/includes/dialog_form_base.html:28
 msgid "Delete"
 msgstr "删除"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:97
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:114
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:218
 msgid "updated"
 msgstr "更新于"
 
-#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:109
-#, fuzzy
-#| msgid "View"
-msgid "View "
-msgstr "查看"
+#: hypha/apply/activity/templates/activity/ui/activity-comment-item.html:125
+#, python-format
+msgid "View %(related_name)s"
+msgstr ""
 
 #: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:27
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:78
-#: hypha/apply/funds/views/submission_edit.py:131
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:130
+#: hypha/apply/funds/views/submission_edit.py:318
 #: hypha/apply/funds/workflows/definitions/double_stage.py:20
 #: hypha/apply/funds/workflows/definitions/double_stage.py:48
 #: hypha/apply/funds/workflows/definitions/double_stage.py:98
@@ -1349,6 +1552,10 @@ msgstr "查看"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:50
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:120
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:164
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:19
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:46
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:105
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:20
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:47
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:93
@@ -1358,18 +1565,18 @@ msgstr "查看"
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
 #: hypha/apply/projects/reports/templates/reports/report_form.html:60
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:30
-#: hypha/apply/projects/views/project.py:309
-#: hypha/apply/projects/views/project.py:345
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
-#: hypha/apply/projects/views/project.py:903
-#: hypha/apply/projects/views/project.py:942
-#: hypha/apply/projects/views/project.py:976
-#: hypha/apply/projects/views/project.py:1009
-#: hypha/apply/projects/views/project.py:1363
-#: hypha/apply/projects/views/project.py:1436
-#: hypha/apply/projects/views/project.py:1467
-#: hypha/apply/projects/views/project.py:1622
+#: hypha/apply/projects/views/project.py:313
+#: hypha/apply/projects/views/project.py:349
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
+#: hypha/apply/projects/views/project.py:954
+#: hypha/apply/projects/views/project.py:993
+#: hypha/apply/projects/views/project.py:1027
+#: hypha/apply/projects/views/project.py:1060
+#: hypha/apply/projects/views/project.py:1414
+#: hypha/apply/projects/views/project.py:1487
+#: hypha/apply/projects/views/project.py:1518
+#: hypha/apply/projects/views/project.py:1673
 #: hypha/apply/review/templates/review/review_edit_form.html:67
 #: hypha/apply/review/templates/review/review_form.html:84
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1384,6 +1591,8 @@ msgstr "提交"
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:58
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:59
 #: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:40
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:37
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:17
 #: hypha/apply/projects/templates/application_projects/project_form.html:33
 #: hypha/apply/users/templates/users/become.html:33
 #: hypha/templates/cotton/modal/confirm.html:48
@@ -1412,12 +1621,13 @@ msgid "Submissions"
 msgstr "提交"
 
 #: hypha/apply/activity/templates/messages/email/activity_summary.md:17
-#: hypha/apply/funds/tables.py:76
+#: hypha/apply/funds/tables.py:77
 #: hypha/apply/funds/templates/cotton/submission_list.html:38
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:41
-#: hypha/apply/funds/templates/funds/comments.html:37
-#: hypha/apply/projects/templates/application_projects/project_detail.html:31
-#: hypha/apply/review/views.py:432
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:29
+#: hypha/apply/funds/templates/funds/comments.html:25
+#: hypha/apply/projects/templates/application_projects/project_detail.html:26
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:24
+#: hypha/apply/review/views.py:441
 msgid "Comments"
 msgstr "评论"
 
@@ -1426,7 +1636,7 @@ msgstr "评论"
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
 #: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
 #: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:62
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:68
 #: hypha/apply/review/templates/review/review_list.html:4
 #: hypha/apply/review/templates/review/review_list.html:9
 #: hypha/core/navigation.py:80
@@ -1466,6 +1676,7 @@ msgid "View your submission here"
 msgstr "无提交"
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:16
+#: hypha/apply/activity/templates/messages/email/author_updated.html:11
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:29
 #: hypha/apply/activity/templates/messages/email/invited_to_proposal.html:11
 #: hypha/apply/activity/templates/messages/email/submission_confirmation.html:10
@@ -1473,6 +1684,7 @@ msgid "If you have any questions, please submit them here"
 msgstr "若您有任何问题，请在这里提交"
 
 #: hypha/apply/activity/templates/messages/email/applicant_base.html:18
+#: hypha/apply/activity/templates/messages/email/author_updated.html:13
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:31
 msgid "See our guide for more information"
 msgstr "阅读我们的指南以获得更多信息"
@@ -1501,8 +1713,8 @@ msgstr ""
 #: hypha/apply/funds/templates/funds/revisions_compare.html:42
 #: hypha/apply/funds/templates/funds/revisions_compare.html:43
 #: hypha/core/models/system_settings.py:21
-#: hypha/core/models/system_settings.py:79
-#: hypha/core/models/system_settings.py:89
+#: hypha/core/models/system_settings.py:81
+#: hypha/core/models/system_settings.py:91
 msgid "Title"
 msgstr "标题"
 
@@ -1525,11 +1737,38 @@ msgstr "链接"
 msgid "Please contact %(lead)s - %(email)s if you have any questions."
 msgstr "如有问题，请联系 %(lead)s - %(email)s。"
 
+#: hypha/apply/activity/templates/messages/email/author_updated.html:6
+#, fuzzy, python-format
+#| msgid "You have been added as a partner the following submission."
+msgid "You have been assigned as an Applicant to submission \"%(title)s\"."
+msgstr "您已作为合伙人被添加到如下提交。"
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:10
+#, fuzzy
+#| msgid "No submissions"
+msgid "Link to your submission"
+msgstr "无提交"
+
+#: hypha/apply/activity/templates/messages/email/author_updated.html:15
+#, fuzzy, python-format
+#| msgid ""
+#| "If you have any issues accessing the submission system or other general "
+#| "inquiries, please email us at %(ORG_EMAIL)s"
+msgid ""
+"If you have any issues accessing the submission or other general inquiries, "
+"please email us at %(ORG_EMAIL)s"
+msgstr ""
+"如果您在访问提交系统时有问题，或有其他一般问题，请用 %(ORG_EMAIL)s 向我们发送"
+"电子邮件"
+
 #: hypha/apply/activity/templates/messages/email/base.html:5
 #: hypha/apply/users/templates/users/activation/email.txt:2
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:2
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:2
 #: hypha/apply/users/templates/users/emails/confirm_access.md:2
+#: hypha/apply/users/templates/users/emails/login_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:2
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:2
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:2
 #: hypha/apply/users/templates/users/emails/set_password.txt:2
 #: hypha/apply/users/templates/users/password_reset/email.txt:2
@@ -1542,6 +1781,9 @@ msgstr "亲爱的 %(user)s，"
 #: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
 #: hypha/apply/users/templates/users/email_change/update_info_email.html:7
 #: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/login_notification.md:14
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:15
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:15
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
 #: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
 #: hypha/apply/users/templates/users/emails/set_password.txt:10
@@ -1570,12 +1812,28 @@ msgstr ""
 #: hypha/apply/activity/templates/messages/email/comment.html:10
 #, fuzzy, python-format
 #| msgid "There has been a new comment on \"%(title)s\" by %(user)s."
-msgid "There has been a new comment on \"%(title)s\" by %(display_user)s."
+msgid "There has been a new comment on \"%(title)s\" by %(display_user)s."
+msgstr "%(user)s 在“%(title)s”发布了新评论。"
+
+#: hypha/apply/activity/templates/messages/email/comment.html:12
+msgid "Read the full comment here"
+msgstr "在此查看完整评论"
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:5
+msgid "Hey there,"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:8
+#, fuzzy, python-format
+#| msgid "There has been a new comment on \"%(title)s\" by %(user)s."
+msgid "You have been assigned to a comment on \"%(title)s\"."
 msgstr "%(user)s 在“%(title)s”发布了新评论。"
 
-#: hypha/apply/activity/templates/messages/email/comment.html:12
-msgid "Read the full comment here"
-msgstr "在此查看完整评论"
+#: hypha/apply/activity/templates/messages/email/comment_assigned.html:12
+#, fuzzy
+#| msgid "Project name"
+msgid "View it here"
+msgstr "项目名称"
 
 #: hypha/apply/activity/templates/messages/email/contract_uploaded.html:13
 msgid "A new contract has been added to your Project"
@@ -1839,8 +2097,8 @@ msgid "no longer required"
 msgstr "不再需要"
 
 #: hypha/apply/activity/templates/messages/email/report_skipped.html:6
-#: hypha/apply/projects/models/project.py:818
-#: hypha/apply/projects/models/project.py:855
+#: hypha/apply/projects/models/project.py:847
+#: hypha/apply/projects/models/project.py:884
 msgid "required"
 msgstr "需要"
 
@@ -1956,7 +2214,7 @@ msgid "Please submit any questions related to your application here"
 msgstr "请在这里提交与您的申请有关的任何问题"
 
 #: hypha/apply/activity/templatetags/activity_tags.py:50
-#: hypha/apply/funds/tables.py:498
+#: hypha/apply/funds/tables.py:562
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:12
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:28
 #: hypha/apply/funds/templates/funds/includes/review_sidebar_item.html:44
@@ -1967,7 +2225,7 @@ msgstr "审核人"
 
 #: hypha/apply/activity/templatetags/activity_tags.py:61
 #: hypha/apply/funds/templates/cotton/submission_list.html:24
-#: hypha/apply/funds/templatetags/workflow_tags.py:72
+#: hypha/apply/funds/templatetags/workflow_tags.py:126
 #: hypha/apply/users/roles.py:5
 msgid "Applicant"
 msgstr "申请者"
@@ -1982,24 +2240,30 @@ msgstr ""
 msgid "You can begin submitting invoices and reports for your project."
 msgstr ""
 
-#: hypha/apply/activity/views.py:61
+#: hypha/apply/activity/views.py:99
 #, fuzzy
 #| msgid "You can only approve a signed contract"
 msgid "You can only edit your own comments"
 msgstr "您只能批准已签名的合同"
 
-#: hypha/apply/activity/views.py:64
+#: hypha/apply/activity/views.py:102
 msgid "You can not edit a deleted comment"
 msgstr ""
 
-#: hypha/apply/activity/views.py:92
+#: hypha/apply/activity/views.py:130
 msgid "You can only delete your own comments"
 msgstr ""
 
-#: hypha/apply/activity/views.py:95
+#: hypha/apply/activity/views.py:133
 msgid "You can not delete a deleted comment"
 msgstr ""
 
+#: hypha/apply/activity/views.py:183
+#, fuzzy
+#| msgid "Comments"
+msgid "Comment added!"
+msgstr "评论"
+
 #: hypha/apply/categories/admin.py:13
 #, fuzzy
 #| msgid "Category"
@@ -2021,27 +2285,27 @@ msgstr ""
 msgid "{title} {child_verbose_name} {verbose_name} for {parent}"
 msgstr ""
 
-#: hypha/apply/categories/blocks.py:31
+#: hypha/apply/categories/blocks.py:37
 msgid "Multi select"
 msgstr "多选"
 
-#: hypha/apply/categories/blocks.py:35 hypha/apply/funds/blocks.py:96
-#: hypha/apply/funds/blocks.py:153 hypha/apply/funds/blocks.py:199
+#: hypha/apply/categories/blocks.py:41 hypha/apply/funds/blocks.py:113
+#: hypha/apply/funds/blocks.py:170 hypha/apply/funds/blocks.py:216
 #: hypha/apply/stream_forms/blocks.py:36
 msgid "Label"
 msgstr "标签"
 
-#: hypha/apply/categories/blocks.py:37
+#: hypha/apply/categories/blocks.py:43
 msgid "Leave blank to use the default Category label"
 msgstr "留空以使用默认分类标签"
 
-#: hypha/apply/categories/blocks.py:40 hypha/apply/funds/blocks.py:100
-#: hypha/apply/funds/blocks.py:157 hypha/apply/funds/blocks.py:202
+#: hypha/apply/categories/blocks.py:46 hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:174 hypha/apply/funds/blocks.py:219
 #: hypha/apply/stream_forms/blocks.py:37
 msgid "Help text"
 msgstr "帮助文本"
 
-#: hypha/apply/categories/blocks.py:42
+#: hypha/apply/categories/blocks.py:48
 msgid "Leave blank to use the default Category help text"
 msgstr "留空以使用默认的“类别”帮助文本"
 
@@ -2066,7 +2330,8 @@ msgstr "使其可在仪表板上进行筛选"
 msgid "Options"
 msgstr "设置"
 
-#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:234
+#: hypha/apply/categories/models.py:53 hypha/apply/funds/tables.py:248
+#: hypha/apply/funds/tables.py:333
 #: hypha/apply/funds/templates/submissions/all.html:419
 #: hypha/apply/projects/templates/application_projects/modals/contracting_documents_upload.html:7
 #: hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html:7
@@ -2114,11 +2379,15 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
-#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:373
-#: hypha/apply/funds/tables.py:236
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:121
+#: hypha/apply/categories/models.py:146 hypha/apply/funds/forms.py:390
+#: hypha/apply/funds/tables.py:250
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:126
 #: hypha/apply/funds/templates/submissions/all.html:425
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:5
+#: hypha/apply/projects/forms/invoice.py:238 hypha/apply/projects/tables.py:115
+#: hypha/apply/projects/tables.py:152
+#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:58
+#: hypha/apply/projects/templates/application_projects/partials/invoice_tags.html:4
 msgid "Tags"
 msgstr ""
 
@@ -2200,12 +2469,12 @@ msgstr "无活跃发票。"
 
 #: hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html:91
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:24
-#: hypha/apply/funds/tables.py:68
+#: hypha/apply/funds/tables.py:69
 #: hypha/apply/funds/templates/submissions/all.html:328
-#: hypha/apply/projects/models/payment.py:26
-#: hypha/apply/projects/models/project.py:218
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:56
-#: hypha/apply/projects/tables.py:42
+#: hypha/apply/projects/models/invoice.py:37
+#: hypha/apply/projects/models/project.py:219
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:63
+#: hypha/apply/projects/tables.py:40
 msgid "Submitted"
 msgstr "已提交"
 
@@ -2249,7 +2518,7 @@ msgstr "您的既往审核"
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:13
 #: hypha/apply/dashboard/templates/dashboard/staff_dashboard.html:16
 #: hypha/apply/users/templates/users/account.html:35
-#: hypha/templates/includes/user_menu.html:57
+#: hypha/apply/users/templates/users/includes/user_menu.html:57
 #, fuzzy
 #| msgid "Add determination"
 msgid "Administration"
@@ -2270,7 +2539,7 @@ msgid "You don't have any PAFs for review right now"
 msgstr "您还没有备份代码。"
 
 #: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:27
-#: hypha/apply/funds/models/co_applicants.py:16
+#: hypha/apply/funds/models/co_applicants.py:17
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:6
 #: hypha/core/navigation.py:109
@@ -2372,11 +2641,12 @@ msgstr "无活跃发票。"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:27
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:25
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:26
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
 #: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:79
-#: hypha/apply/todo/options.py:87 hypha/apply/todo/options.py:95
+#: hypha/apply/projects/models/project.py:94 hypha/apply/todo/options.py:86
+#: hypha/apply/todo/options.py:94 hypha/apply/todo/options.py:102
 #: hypha/apply/todo/templates/todo/todolist_item.html:16
 msgid "Draft"
 msgstr "草稿"
@@ -2390,11 +2660,9 @@ msgstr "草稿"
 #: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:30
 #: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:11
 #: hypha/apply/determinations/templates/determinations/includes/determination_block.html:18
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:104
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:84
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:79
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:28
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:40
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "by"
 msgstr "由"
@@ -2510,30 +2778,38 @@ msgstr "发送通知"
 #: hypha/apply/determinations/blocks.py:77
 #: hypha/apply/determinations/blocks.py:78
 #: hypha/apply/determinations/blocks.py:79
-#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:276
-#: hypha/apply/review/blocks.py:172 hypha/apply/review/blocks.py:173
-#: hypha/apply/review/blocks.py:174 hypha/apply/review/blocks.py:175
-#: hypha/apply/review/blocks.py:176 hypha/apply/review/blocks.py:177
-#: hypha/apply/review/blocks.py:178 hypha/apply/stream_forms/blocks.py:475
-#: hypha/apply/stream_forms/blocks.py:476
-#: hypha/apply/stream_forms/blocks.py:477
-#: hypha/apply/stream_forms/blocks.py:478
-#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482
-#: hypha/apply/stream_forms/blocks.py:483
-#: hypha/apply/stream_forms/blocks.py:484
-#: hypha/apply/stream_forms/blocks.py:485
-#: hypha/apply/stream_forms/blocks.py:486
-#: hypha/apply/stream_forms/blocks.py:487
-#: hypha/apply/stream_forms/blocks.py:488 hypha/apply/utils/blocks.py:74
+#: hypha/apply/determinations/blocks.py:80 hypha/apply/funds/blocks.py:303
+#: hypha/apply/funds/blocks.py:304 hypha/apply/funds/blocks.py:305
+#: hypha/apply/funds/blocks.py:306 hypha/apply/funds/blocks.py:307
+#: hypha/apply/funds/blocks.py:308 hypha/apply/funds/blocks.py:309
+#: hypha/apply/funds/blocks.py:310 hypha/apply/funds/blocks.py:311
+#: hypha/apply/funds/blocks.py:312 hypha/apply/funds/blocks.py:313
+#: hypha/apply/funds/blocks.py:314 hypha/apply/funds/blocks.py:315
+#: hypha/apply/funds/blocks.py:316 hypha/apply/funds/blocks.py:317
+#: hypha/apply/funds/blocks.py:318 hypha/apply/review/blocks.py:172
+#: hypha/apply/review/blocks.py:173 hypha/apply/review/blocks.py:174
+#: hypha/apply/review/blocks.py:175 hypha/apply/review/blocks.py:176
+#: hypha/apply/review/blocks.py:177 hypha/apply/review/blocks.py:178
+#: hypha/apply/stream_forms/blocks.py:513
+#: hypha/apply/stream_forms/blocks.py:514
+#: hypha/apply/stream_forms/blocks.py:515
+#: hypha/apply/stream_forms/blocks.py:516
+#: hypha/apply/stream_forms/blocks.py:517
+#: hypha/apply/stream_forms/blocks.py:518
+#: hypha/apply/stream_forms/blocks.py:519
+#: hypha/apply/stream_forms/blocks.py:520
+#: hypha/apply/stream_forms/blocks.py:521
+#: hypha/apply/stream_forms/blocks.py:522
+#: hypha/apply/stream_forms/blocks.py:523
+#: hypha/apply/stream_forms/blocks.py:524
+#: hypha/apply/stream_forms/blocks.py:525
+#: hypha/apply/stream_forms/blocks.py:526 hypha/apply/utils/blocks.py:74
 #: hypha/apply/utils/blocks.py:75
 msgid "Fields"
 msgstr "领域"
 
 #: hypha/apply/determinations/blocks.py:78 hypha/apply/review/blocks.py:174
-#: hypha/apply/stream_forms/blocks.py:473
+#: hypha/apply/stream_forms/blocks.py:511
 msgid "Paragraph"
 msgstr "段落"
 
@@ -2555,7 +2831,7 @@ msgid "Do you recommend requesting a proposal based on this concept note?"
 msgstr ""
 
 #: hypha/apply/determinations/forms.py:305
-#: hypha/apply/determinations/views.py:99
+#: hypha/apply/determinations/views.py:100
 msgid "-- No determination selected -- "
 msgstr "-- 未选择决策 -- "
 
@@ -2636,24 +2912,24 @@ msgid "Rationale and appropriateness questions and comments"
 msgstr "原理与合理性问题与评论"
 
 #: hypha/apply/determinations/forms.py:592
-#: hypha/apply/determinations/views.py:389
+#: hypha/apply/determinations/views.py:394
 msgid "-- No proposal form selected -- "
 msgstr "-- 未选择提案表单 -- "
 
 #: hypha/apply/determinations/forms.py:595
-#: hypha/apply/determinations/views.py:392
+#: hypha/apply/determinations/views.py:397
 #, fuzzy
 #| msgid "Select the proposal form to use for proposal stage."
 msgid "Select the proposal form only for determination approval"
 msgstr "选择提案阶段使用的提案表单。"
 
 #: hypha/apply/determinations/forms.py:599
-#: hypha/apply/determinations/views.py:396
+#: hypha/apply/determinations/views.py:401
 msgid "Select the proposal form to use for proposal stage."
 msgstr "选择提案阶段使用的提案表单。"
 
 #: hypha/apply/determinations/forms.py:602
-#: hypha/apply/determinations/views.py:399
+#: hypha/apply/determinations/views.py:404
 msgid "Proposal Form"
 msgstr "提案表单"
 
@@ -2725,11 +3001,12 @@ msgstr "决策消息"
 #: hypha/apply/determinations/models.py:214
 #: hypha/apply/determinations/models.py:218
 #: hypha/apply/determinations/options.py:10
-#: hypha/apply/funds/workflows/constants.py:93
+#: hypha/apply/funds/workflows/constants.py:97
 #: hypha/apply/funds/workflows/definitions/double_stage.py:147
 #: hypha/apply/funds/workflows/definitions/double_stage.py:326
 #: hypha/apply/funds/workflows/definitions/single_stage.py:149
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:214
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:198
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:138
 msgid "Dismissed"
@@ -2744,7 +3021,7 @@ msgid "Needs more info"
 msgstr "0. 需要更多信息"
 
 #: hypha/apply/determinations/models.py:255
-#: hypha/apply/funds/workflows/registry.py:66
+#: hypha/apply/funds/workflows/registry.py:67
 msgid "Request"
 msgstr "请求"
 
@@ -2811,9 +3088,9 @@ msgstr "查看申请"
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:85
 #: hypha/apply/funds/templates/funds/application_base.html:125
 #: hypha/apply/funds/templates/funds/applicationsubmission_form.html:49
-#: hypha/apply/funds/views/submission_edit.py:129
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:320
+#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:319
 #: hypha/apply/projects/reports/templates/reports/report_form.html:69
 #: hypha/apply/projects/templates/application_projects/project_approval_form.html:52
 #: hypha/apply/projects/templates/application_projects/project_sow_form.html:48
@@ -2823,7 +3100,7 @@ msgid "Save draft"
 msgstr "保存草稿"
 
 #: hypha/apply/determinations/templates/determinations/base_determination_form.html:108
-#: hypha/apply/funds/templates/funds/comments.html:108
+#: hypha/apply/funds/templates/funds/comments.html:96
 #: hypha/apply/review/templates/review/review_form.html:107
 #: hypha/templates/cotton/dropdown_menu.html:99
 msgid "Loading…"
@@ -2882,8 +3159,8 @@ msgstr "成为"
 #: hypha/apply/determinations/templates/determinations/determination_detail.html:34
 #: hypha/apply/funds/templates/funds/application_preview.html:66
 #: hypha/apply/funds/templates/funds/submission-success.html:65
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:88
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:96
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:95
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:74
 #, fuzzy
 #| msgid "Continue Editing"
 msgid "Continue editing"
@@ -2914,46 +3191,46 @@ msgstr "更新草稿"
 msgid "Add determination"
 msgstr "添加决策"
 
-#: hypha/apply/determinations/views.py:120
+#: hypha/apply/determinations/views.py:121
 msgid "Improperly configured request, please try again."
 msgstr ""
 
-#: hypha/apply/determinations/views.py:213
+#: hypha/apply/determinations/views.py:214
 #, python-brace-format
 msgid "Successfully determined as {outcome}: "
 msgstr "成功决策为 {outcome}： "
 
-#: hypha/apply/determinations/views.py:234
+#: hypha/apply/determinations/views.py:235
 #, python-brace-format
 msgid "Unable to determine submission \"{title}\" as already determined"
 msgstr ""
 
-#: hypha/apply/determinations/views.py:286
+#: hypha/apply/determinations/views.py:291
 msgid "You do not have permission to create that determination."
 msgstr "您没有创建决策的权限。"
 
-#: hypha/apply/determinations/views.py:291
+#: hypha/apply/determinations/views.py:296
 msgid "A final determination has already been submitted."
 msgstr "已有最终决策提交。"
 
-#: hypha/apply/determinations/views.py:304
+#: hypha/apply/determinations/views.py:309
 msgid "There is a draft determination you do not have permission to edit."
 msgstr "存在草稿决策，且您无权编辑。"
 
-#: hypha/apply/determinations/views.py:460
+#: hypha/apply/determinations/views.py:469
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "A project was automatically created."
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/determinations/views.py:504
+#: hypha/apply/determinations/views.py:513
 #, python-brace-format
 msgid ""
 "A determination of \"{current}\" exists but you tried to progress as "
 "\"{target}\""
 msgstr "已存在“{current}”的决策，但您试图作为“{target}”进行"
 
-#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:554
+#: hypha/apply/flags/models.py:13 hypha/apply/funds/tables.py:626
 #: hypha/apply/users/roles.py:6
 msgid "Staff"
 msgstr "员工"
@@ -3028,10 +3305,11 @@ msgstr "员工标记"
 msgid "Sealed Rounds"
 msgstr "轮次与已锁定轮次"
 
-#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:40
-#: hypha/apply/funds/tables.py:223 hypha/apply/funds/tables.py:314
-#: hypha/apply/funds/tables.py:437 hypha/apply/funds/tables.py:474
-#: hypha/apply/projects/filters.py:35 hypha/apply/projects/filters.py:51
+#: hypha/apply/funds/admin.py:105 hypha/apply/funds/models/__init__.py:41
+#: hypha/apply/funds/tables.py:237 hypha/apply/funds/tables.py:325
+#: hypha/apply/funds/tables.py:372 hypha/apply/funds/tables.py:501
+#: hypha/apply/funds/tables.py:538 hypha/apply/projects/filters.py:39
+#: hypha/apply/projects/filters.py:55
 msgid "Funds"
 msgstr "基金"
 
@@ -3042,7 +3320,7 @@ msgid "Request For Partners"
 msgstr "请求更多信息"
 
 #: hypha/apply/funds/admin.py:118 hypha/apply/funds/admin_helpers.py:73
-#: hypha/apply/funds/models/__init__.py:74
+#: hypha/apply/funds/models/__init__.py:75
 msgid "Labs"
 msgstr "实验室"
 
@@ -3104,8 +3382,8 @@ msgstr "基金或 RFP"
 
 #: hypha/apply/funds/admin_helpers.py:47
 #: hypha/apply/funds/templates/funds/application_base.html:135
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:321
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:320
 #, fuzzy
 #| msgid "Review"
 msgid "Preview"
@@ -3135,7 +3413,7 @@ msgstr "轮次与已锁定轮次"
 msgid "state"
 msgstr ""
 
-#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:413
+#: hypha/apply/funds/admin_helpers.py:90 hypha/apply/funds/tables.py:477
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:22
 #: hypha/apply/funds/templates/funds/includes/round-block.html:12
 #: hypha/apply/funds/templates/funds/includes/round-block.html:20
@@ -3144,7 +3422,7 @@ msgstr ""
 msgid "Open"
 msgstr "开启中"
 
-#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:414
+#: hypha/apply/funds/admin_helpers.py:91 hypha/apply/funds/tables.py:478
 #: hypha/apply/funds/templates/funds/includes/round-block.html:30
 #: hypha/apply/funds/templates/funds/includes/round-block.html:37
 #: hypha/apply/funds/templates/funds/includes/round-block.html:39
@@ -3153,14 +3431,14 @@ msgid "Closed"
 msgstr "已关闭"
 
 #: hypha/apply/funds/admin_helpers.py:92
-#: hypha/apply/projects/models/project.py:220
-#: hypha/apply/projects/models/project.py:226
+#: hypha/apply/projects/models/project.py:221
+#: hypha/apply/projects/models/project.py:227
 #, fuzzy
 #| msgid "Proposed Start Date"
 msgid "Not started"
 msgstr "提议开始日期"
 
-#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:416
+#: hypha/apply/funds/admin_helpers.py:93 hypha/apply/funds/tables.py:480
 msgid "Unpublished"
 msgstr ""
 
@@ -3173,53 +3451,59 @@ msgstr ""
 msgid "Copy {form_name}"
 msgstr ""
 
-#: hypha/apply/funds/admin_views.py:79
+#: hypha/apply/funds/admin_views.py:68
+msgid ""
+"Please select the date in the copied page. Newly copied pages have NONE "
+"value for the start and end date"
+msgstr ""
+
+#: hypha/apply/funds/admin_views.py:77
 #, python-brace-format
 msgid "Page '{0}' and {1} subpages copied."
 msgstr "已复制页面“{0}”与 {1} 个子页面。"
 
-#: hypha/apply/funds/admin_views.py:85
+#: hypha/apply/funds/admin_views.py:83
 #, python-brace-format
 msgid "Page '{0}' copied."
 msgstr "已复制页面“{0}”。"
 
-#: hypha/apply/funds/blocks.py:94
+#: hypha/apply/funds/blocks.py:111
 #, fuzzy
 #| msgid "The title of the main news feed."
 msgid "The title of the project"
 msgstr "主新闻订阅源的标题。"
 
-#: hypha/apply/funds/blocks.py:96
+#: hypha/apply/funds/blocks.py:113
 msgid "What is the title of your application?"
 msgstr "您申请的标题是？"
 
-#: hypha/apply/funds/blocks.py:101
+#: hypha/apply/funds/blocks.py:118
 msgid "This project name can be changed if a full proposal is requested."
 msgstr "如果需要完整提案，则可更改项目名。"
 
-#: hypha/apply/funds/blocks.py:103
+#: hypha/apply/funds/blocks.py:120
 msgid "Max length"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:106
+#: hypha/apply/funds/blocks.py:123
 msgid "Application title"
 msgstr "申请标题"
 
-#: hypha/apply/funds/blocks.py:117
+#: hypha/apply/funds/blocks.py:134
 #, fuzzy
 #| msgid "Create Project"
 msgid "The value of the project"
 msgstr "创建项目"
 
-#: hypha/apply/funds/blocks.py:126
+#: hypha/apply/funds/blocks.py:143
 msgid "Requested amount"
 msgstr "请求数目"
 
-#: hypha/apply/funds/blocks.py:142
+#: hypha/apply/funds/blocks.py:159
 msgid "The name of the organization"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:146
+#: hypha/apply/funds/blocks.py:163
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:73
 #: hypha/apply/projects/reports/tables.py:24
 #, fuzzy
@@ -3227,93 +3511,93 @@ msgstr ""
 msgid "Organization name"
 msgstr "创建时间"
 
-#: hypha/apply/funds/blocks.py:151
+#: hypha/apply/funds/blocks.py:168
 #, fuzzy
 #| msgid "email address"
 msgid "The applicant email address"
 msgstr "电子邮箱地址"
 
-#: hypha/apply/funds/blocks.py:153
+#: hypha/apply/funds/blocks.py:170
 msgid "What email address should we use to contact you?"
 msgstr "我们应该用哪个电子邮箱地址联系您？"
 
-#: hypha/apply/funds/blocks.py:159
+#: hypha/apply/funds/blocks.py:176
 msgid ""
 "We will use this email address to communicate with you about your proposal."
 msgstr "我们会用此电子邮箱地址与您沟通提案相关事宜。"
 
-#: hypha/apply/funds/blocks.py:172
+#: hypha/apply/funds/blocks.py:189
 msgid "The postal address of the user"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:177
+#: hypha/apply/funds/blocks.py:194
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:66
 #: hypha/apply/funds/templates/funds/revisions_compare.html:57
 #: hypha/apply/funds/templates/funds/revisions_compare.html:58
 msgid "Address"
 msgstr "地址"
 
-#: hypha/apply/funds/blocks.py:198 hypha/apply/funds/blocks.py:215
+#: hypha/apply/funds/blocks.py:215 hypha/apply/funds/blocks.py:232
 msgid "Full name"
 msgstr "全名"
 
-#: hypha/apply/funds/blocks.py:199
+#: hypha/apply/funds/blocks.py:216
 msgid "What is your name?"
 msgstr "您的名字是？"
 
-#: hypha/apply/funds/blocks.py:204
+#: hypha/apply/funds/blocks.py:221
 msgid "We will use this name when we communicate with you about your proposal."
 msgstr "当与您沟通提案相关事宜时，我们会使用此名字。"
 
-#: hypha/apply/funds/blocks.py:221
+#: hypha/apply/funds/blocks.py:238
 #, fuzzy
 #| msgid "Project Duration"
 msgid "Duration"
 msgstr "项目时长"
 
-#: hypha/apply/funds/blocks.py:227
+#: hypha/apply/funds/blocks.py:244
 msgid "Days"
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:228 hypha/apply/projects/reports/models.py:244
+#: hypha/apply/funds/blocks.py:245 hypha/apply/projects/reports/models.py:249
 msgid "Weeks"
 msgstr "周"
 
-#: hypha/apply/funds/blocks.py:229 hypha/apply/projects/reports/models.py:245
+#: hypha/apply/funds/blocks.py:246 hypha/apply/projects/reports/models.py:250
 msgid "Months"
 msgstr "月"
 
-#: hypha/apply/funds/blocks.py:232
+#: hypha/apply/funds/blocks.py:249
 #, python-brace-format
 msgid "{} day"
 msgid_plural "{} days"
 msgstr[0] ""
 
-#: hypha/apply/funds/blocks.py:235
+#: hypha/apply/funds/blocks.py:252
 #, fuzzy, python-brace-format
 #| msgid "week"
 msgid "{} week"
 msgid_plural "{} weeks"
 msgstr[0] "周"
 
-#: hypha/apply/funds/blocks.py:238
+#: hypha/apply/funds/blocks.py:255
 #, fuzzy, python-brace-format
 #| msgid "month"
 msgid "{} month"
 msgid_plural "{} months"
 msgstr[0] "月"
 
-#: hypha/apply/funds/blocks.py:244
+#: hypha/apply/funds/blocks.py:261
 msgid ""
 "Duration type is used to display duration choices in Days, Weeks or Months "
 "in application forms. Be careful, changing the duration type in the active "
 "round can result in data inconsistency."
 msgstr ""
 
-#: hypha/apply/funds/blocks.py:275 hypha/apply/stream_forms/blocks.py:473
-#: hypha/apply/stream_forms/blocks.py:474
-#: hypha/apply/stream_forms/blocks.py:489
-#: hypha/apply/stream_forms/blocks.py:490 hypha/apply/utils/blocks.py:85
+#: hypha/apply/funds/blocks.py:319 hypha/apply/stream_forms/blocks.py:511
+#: hypha/apply/stream_forms/blocks.py:512
+#: hypha/apply/stream_forms/blocks.py:527
+#: hypha/apply/stream_forms/blocks.py:528 hypha/apply/utils/blocks.py:85
 msgid "Custom"
 msgstr "自定义"
 
@@ -3321,7 +3605,7 @@ msgstr "自定义"
 msgid "Take action"
 msgstr "进行操作"
 
-#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:448
+#: hypha/apply/funds/forms.py:88 hypha/apply/projects/forms/project.py:458
 #, python-brace-format
 msgid "Update lead from {lead} to"
 msgstr "将领导人由 {lead} 更新到"
@@ -3353,48 +3637,48 @@ msgstr ""
 msgid "{role_name} Reviewer"
 msgstr "{role_name} 审核人"
 
-#: hypha/apply/funds/forms.py:376
+#: hypha/apply/funds/forms.py:393
 #, fuzzy
 #| msgid "Meta terms are hierarchical in nature."
 msgid "Tags are hierarchical in nature."
 msgstr "元条款本身具有层次。"
 
-#: hypha/apply/funds/forms.py:425 hypha/apply/stream_forms/blocks.py:118
+#: hypha/apply/funds/forms.py:442 hypha/apply/stream_forms/blocks.py:156
 msgid "Email"
 msgstr "电子邮箱"
 
-#: hypha/apply/funds/forms.py:427 hypha/apply/funds/forms.py:460
+#: hypha/apply/funds/forms.py:444 hypha/apply/funds/forms.py:477
 msgid "Role"
 msgstr "角色"
 
-#: hypha/apply/funds/forms.py:433 hypha/apply/funds/forms.py:466
+#: hypha/apply/funds/forms.py:450 hypha/apply/funds/forms.py:483
 #, fuzzy
 #| msgid "Project Duration"
 msgid "Project permissions"
 msgstr "项目时长"
 
-#: hypha/apply/funds/forms.py:435 hypha/apply/funds/forms.py:468
+#: hypha/apply/funds/forms.py:452 hypha/apply/funds/forms.py:485
 msgid ""
 "Enable same access level to these sections. Example: View role + Contracting "
 "= read-only contracting access."
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:39 hypha/apply/funds/tables.py:75
+#: hypha/apply/funds/models/__init__.py:40 hypha/apply/funds/tables.py:76
 #: hypha/apply/funds/templates/submissions/all.html:410
-#: hypha/apply/projects/tables.py:185 hypha/apply/projects/tables.py:262
+#: hypha/apply/projects/tables.py:203 hypha/apply/projects/tables.py:284
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
 msgid "Fund"
 msgstr "基金"
 
-#: hypha/apply/funds/models/__init__.py:47
+#: hypha/apply/funds/models/__init__.py:48
 msgid "RFP"
 msgstr "RFP"
 
-#: hypha/apply/funds/models/__init__.py:48
+#: hypha/apply/funds/models/__init__.py:49
 msgid "RFPs"
 msgstr ""
 
-#: hypha/apply/funds/models/__init__.py:55
+#: hypha/apply/funds/models/__init__.py:56
 #: hypha/apply/funds/templates/cotton/submission_list.html:31
 #: hypha/apply/funds/templates/submissions/all.html:414
 #, fuzzy
@@ -3402,26 +3686,27 @@ msgstr ""
 msgid "Round"
 msgstr "轮次"
 
-#: hypha/apply/funds/models/__init__.py:56 hypha/apply/funds/tables.py:225
-#: hypha/apply/funds/tables.py:312 hypha/apply/funds/tables.py:479
+#: hypha/apply/funds/models/__init__.py:57 hypha/apply/funds/tables.py:239
+#: hypha/apply/funds/tables.py:327 hypha/apply/funds/tables.py:370
+#: hypha/apply/funds/tables.py:543
 #: hypha/apply/funds/templates/funds/rounds.html:5
 #: hypha/apply/funds/templates/funds/rounds.html:10
 msgid "Rounds"
 msgstr "轮次"
 
-#: hypha/apply/funds/models/__init__.py:63
+#: hypha/apply/funds/models/__init__.py:64
 #, fuzzy
 #| msgid "Sealed"
 msgid "Sealed round"
 msgstr "已锁定"
 
-#: hypha/apply/funds/models/__init__.py:64
+#: hypha/apply/funds/models/__init__.py:65
 #, fuzzy
 #| msgid "Rounds and Sealed Rounds"
 msgid "Sealed rounds"
 msgstr "轮次与已锁定轮次"
 
-#: hypha/apply/funds/models/__init__.py:73
+#: hypha/apply/funds/models/__init__.py:74
 msgid "Lab"
 msgstr "实验室"
 
@@ -3665,92 +3950,93 @@ msgstr "分配审核人"
 msgid "assigned reviewers"
 msgstr "分配审核人"
 
-#: hypha/apply/funds/models/co_applicants.py:14
+#: hypha/apply/funds/models/co_applicants.py:15
 #, fuzzy
 #| msgid "Project Invoices"
 msgid "Project Document"
 msgstr "项目发票"
 
-#: hypha/apply/funds/models/co_applicants.py:15
+#: hypha/apply/funds/models/co_applicants.py:16
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "Contracting Document"
 msgstr "支持文档"
 
-#: hypha/apply/funds/models/co_applicants.py:17
+#: hypha/apply/funds/models/co_applicants.py:18
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:10
 #: hypha/apply/projects/reports/templates/reports/report_list.html:6
 #: hypha/core/navigation.py:114
 msgid "Reports"
 msgstr "报告"
 
-#: hypha/apply/funds/models/co_applicants.py:21
+#: hypha/apply/funds/models/co_applicants.py:22
 #: hypha/apply/projects/templates/application_projects/paf_export.html:22
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:22
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:53
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
 msgid "Pending"
 msgstr "等待中"
 
-#: hypha/apply/funds/models/co_applicants.py:22
-#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/workflows/constants.py:93
 #: hypha/apply/funds/workflows/definitions/double_stage.py:311
 #: hypha/apply/funds/workflows/definitions/single_stage.py:134
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:197
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:182
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:123
 msgid "Accepted"
 msgstr "已通过"
 
-#: hypha/apply/funds/models/co_applicants.py:23
+#: hypha/apply/funds/models/co_applicants.py:24
 #, fuzzy
 #| msgid "Selected"
 msgid "Rejected"
 msgstr "已选中"
 
-#: hypha/apply/funds/models/co_applicants.py:24
+#: hypha/apply/funds/models/co_applicants.py:25
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:14
 msgid "Expired"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:33
+#: hypha/apply/funds/models/co_applicants.py:34
 #, fuzzy
 #| msgid "Send determination"
 msgid "invited user email"
 msgstr "发送决策"
 
-#: hypha/apply/funds/models/co_applicants.py:42
-#: hypha/apply/funds/models/submissions.py:487
-#: hypha/apply/projects/models/payment.py:137
-#: hypha/apply/projects/models/project.py:262
+#: hypha/apply/funds/models/co_applicants.py:43
+#: hypha/apply/funds/models/submissions.py:495
+#: hypha/apply/projects/models/invoice.py:160
+#: hypha/apply/projects/models/project.py:267
 #, fuzzy
 #| msgid "Status"
 msgid "status"
 msgstr "状态"
 
-#: hypha/apply/funds/models/co_applicants.py:48
-#: hypha/apply/funds/models/co_applicants.py:77
+#: hypha/apply/funds/models/co_applicants.py:49
+#: hypha/apply/funds/models/co_applicants.py:83
 msgid "role"
 msgstr ""
 
-#: hypha/apply/funds/models/co_applicants.py:57
+#: hypha/apply/funds/models/co_applicants.py:58
 #, fuzzy
 #| msgid "Application title"
 msgid "co-applicant invite"
 msgstr "申请标题"
 
-#: hypha/apply/funds/models/co_applicants.py:58
+#: hypha/apply/funds/models/co_applicants.py:59
 #, fuzzy
 #| msgid "Application title"
 msgid "co-applicant invites"
 msgstr "申请标题"
 
-#: hypha/apply/funds/models/co_applicants.py:84
+#: hypha/apply/funds/models/co_applicants.py:90
 #, fuzzy
 #| msgid "Applicant"
 msgid "co-applicant"
 msgstr "申请者"
 
-#: hypha/apply/funds/models/co_applicants.py:85
+#: hypha/apply/funds/models/co_applicants.py:91
 #, fuzzy
 #| msgid "Applicant"
 msgid "co-applicants"
@@ -4117,23 +4403,24 @@ msgstr "审核决定"
 msgid "screening decisions"
 msgstr "审核决定"
 
-#: hypha/apply/funds/models/submissions.py:439
+#: hypha/apply/funds/models/submissions.py:447
 #, fuzzy
 #| msgid "Summary"
 msgid "summary"
 msgstr "概要"
 
-#: hypha/apply/funds/models/submissions.py:502
+#: hypha/apply/funds/models/submissions.py:510
+#: hypha/apply/funds/models/submissions.py:1119
 msgid "submit time"
 msgstr "提交时间"
 
-#: hypha/apply/funds/models/submissions.py:531
+#: hypha/apply/funds/models/submissions.py:539
 #, fuzzy
 #| msgid "Related submissions"
 msgid "application submission"
 msgstr "相关提交"
 
-#: hypha/apply/funds/models/submissions.py:532
+#: hypha/apply/funds/models/submissions.py:540
 #, fuzzy
 #| msgid "Related submissions"
 msgid "application submissions"
@@ -4189,14 +4476,17 @@ msgid "Confirmation email"
 msgstr "确认邮件"
 
 #: hypha/apply/funds/models/utils.py:211
+#: hypha/apply/projects/models/invoice.py:21
 msgid "Failed"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:212
+#: hypha/apply/projects/models/invoice.py:22
 msgid "Success"
 msgstr ""
 
 #: hypha/apply/funds/models/utils.py:213
+#: hypha/apply/projects/models/invoice.py:23
 #, fuzzy
 #| msgid "Progress"
 msgid "In Progress"
@@ -4214,8 +4504,8 @@ msgstr "提交领导人"
 msgid "submission export managers"
 msgstr "提交领导人"
 
-#: hypha/apply/funds/permissions.py:24 hypha/apply/funds/permissions.py:34
-#: hypha/apply/funds/permissions.py:208 hypha/apply/projects/permissions.py:44
+#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
+#: hypha/apply/funds/permissions.py:212 hypha/apply/projects/permissions.py:44
 #: hypha/apply/projects/permissions.py:57
 #: hypha/apply/projects/permissions.py:124
 #: hypha/apply/projects/permissions.py:179
@@ -4223,13 +4513,15 @@ msgstr "提交领导人"
 #: hypha/apply/projects/permissions.py:261
 #: hypha/apply/projects/permissions.py:327
 #: hypha/apply/projects/permissions.py:346
+#: hypha/apply/projects/permissions.py:423
+#: hypha/apply/projects/permissions.py:441
 #, fuzzy
 #| msgid " Required"
 msgid "Login Required"
 msgstr " 必需"
 
-#: hypha/apply/funds/permissions.py:27 hypha/apply/funds/permissions.py:37
-#: hypha/apply/funds/permissions.py:211
+#: hypha/apply/funds/permissions.py:30 hypha/apply/funds/permissions.py:40
+#: hypha/apply/funds/permissions.py:215
 #: hypha/apply/funds/templates/funds/includes/submission-list-row.html:25
 #: hypha/apply/funds/templates/funds/includes/submission-table-row.html:26
 #, fuzzy
@@ -4237,30 +4529,30 @@ msgstr " 必需"
 msgid "Archived Submission"
 msgstr "您的活动提交"
 
-#: hypha/apply/funds/permissions.py:43
+#: hypha/apply/funds/permissions.py:46
 msgid "Co-applicant with edit role can edit submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:44
+#: hypha/apply/funds/permissions.py:47
 #, fuzzy
 #| msgid "Application Received"
 msgid "Co-applicant does not have edit role"
 msgstr "已收到申请"
 
-#: hypha/apply/funds/permissions.py:45
+#: hypha/apply/funds/permissions.py:48
 msgid "User can edit in current phase"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:155
+#: hypha/apply/funds/permissions.py:159
 msgid "Staff is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:157
+#: hypha/apply/funds/permissions.py:161
 msgid "Staff Admin is set to alter archive"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:158 hypha/apply/funds/permissions.py:255
-#: hypha/apply/funds/permissions.py:263 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:162 hypha/apply/funds/permissions.py:281
+#: hypha/apply/funds/permissions.py:289 hypha/apply/funds/permissions.py:305
 #: hypha/apply/projects/permissions.py:49
 #: hypha/apply/projects/permissions.py:77
 #: hypha/apply/projects/permissions.py:85
@@ -4281,192 +4573,198 @@ msgstr ""
 msgid "Forbidden Error"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:231
+#: hypha/apply/funds/permissions.py:259
 #, fuzzy
 #| msgid "No active submissions"
 msgid "No access to view submission"
 msgstr "无活跃提交"
 
-#: hypha/apply/funds/permissions.py:233
+#: hypha/apply/funds/permissions.py:261
 msgid "Applicant cannot view submission screening"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:239
+#: hypha/apply/funds/permissions.py:267
 #, fuzzy
 #| msgid "New partner(s) has been added to your submission."
 msgid "Co-applicant can't be added to archived submission"
 msgstr "新合伙人已添加到您的提交。"
 
-#: hypha/apply/funds/permissions.py:245
+#: hypha/apply/funds/permissions.py:271
 msgid "Co-applicants can't be invited to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:250
+#: hypha/apply/funds/permissions.py:276
 #, fuzzy
 #| msgid "No active submissions"
 msgid "Limit reached for this submission"
 msgstr "无活跃提交"
 
-#: hypha/apply/funds/permissions.py:252
+#: hypha/apply/funds/permissions.py:278
 msgid "Applicants can invite co-applicants to their application"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:254
+#: hypha/apply/funds/permissions.py:280
 msgid "Staff can invite co-applicant on behalf of applicant"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:260
+#: hypha/apply/funds/permissions.py:286
 msgid "Submission user can access their submission's co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:262
+#: hypha/apply/funds/permissions.py:288
 msgid "Staff can access each submissions' co-applicants"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:268
+#: hypha/apply/funds/permissions.py:294
 msgid "Co-applicant can't be updated to archived submission"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:274
+#: hypha/apply/funds/permissions.py:298
 msgid "Co-applicants can't be updated to completed projects"
 msgstr ""
 
-#: hypha/apply/funds/permissions.py:276
+#: hypha/apply/funds/permissions.py:300
 #, fuzzy
 #| msgid "Are you sure you want to delete"
 msgid "Same user who invited can delete the co-applicant"
 msgstr "您确定要删除"
 
-#: hypha/apply/funds/permissions.py:278
+#: hypha/apply/funds/permissions.py:302
 #, fuzzy
 #| msgid "Are you sure you want to delete"
 msgid "Submission owner can delete the co-applicant"
 msgstr "您确定要删除"
 
-#: hypha/apply/funds/permissions.py:280
+#: hypha/apply/funds/permissions.py:304
 msgid "Staff can delete any co-applicant of any submission"
 msgstr ""
 
-#: hypha/apply/funds/services.py:45
+#: hypha/apply/funds/services.py:47
 #, fuzzy, python-brace-format
 #| msgid "Number of submission"
 msgid "{count} submissions archived."
 msgstr "提交数"
 
-#: hypha/apply/funds/services.py:78
+#: hypha/apply/funds/services.py:80
 #, fuzzy, python-brace-format
 #| msgid "Number of submission"
 msgid "{count} submissions deleted."
 msgstr "提交数"
 
-#: hypha/apply/funds/services.py:108
+#: hypha/apply/funds/services.py:150
+#, fuzzy, python-brace-format
+#| msgid "Number of submission"
+msgid "{sub_number} submission anonymized"
+msgid_plural "{sub_number} submissions anonymized"
+msgstr[0] "提交数"
+
+#: hypha/apply/funds/services.py:175
 #, python-brace-format
 msgid "Lead set to {lead} on "
 msgstr ""
 
-#: hypha/apply/funds/services.py:158
+#: hypha/apply/funds/services.py:225
 #, fuzzy, python-brace-format
 #| msgid "{user} as {name}."
 msgid "{user} as {name}"
 msgstr "{user} 作为 {name}。"
 
-#: hypha/apply/funds/services.py:166
+#: hypha/apply/funds/services.py:233
 #, fuzzy, python-brace-format
 #| msgid "Batch reviewers added: {reviewers_text} to "
 msgid "Batch reviewers updated: {reviewers_text} on "
 msgstr "批次审核人添加了：{reviewers_text} 到 "
 
-#: hypha/apply/funds/tables.py:70
+#: hypha/apply/funds/tables.py:71
 #: hypha/apply/funds/templates/cotton/submission_list.html:22
 #: hypha/apply/funds/templates/submissions/all.html:344
 #: hypha/apply/funds/templates/submissions/all.html:470
-#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
-#: hypha/apply/projects/forms/payment.py:208
+#: hypha/apply/projects/filters.py:43 hypha/apply/projects/filters.py:64
+#: hypha/apply/projects/forms/invoice.py:210
 #: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:183
-#: hypha/apply/projects/tables.py:260
+#: hypha/apply/projects/reports/tables.py:27 hypha/apply/projects/tables.py:200
+#: hypha/apply/projects/tables.py:282
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:58
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:6
 #: hypha/apply/users/admin_views.py:55 hypha/apply/users/admin_views.py:128
 msgid "Status"
 msgstr "状态"
 
-#: hypha/apply/funds/tables.py:74
+#: hypha/apply/funds/tables.py:75
 msgid "Type"
 msgstr "类型"
 
-#: hypha/apply/funds/tables.py:78
+#: hypha/apply/funds/tables.py:79
 #: hypha/apply/review/templates/review/review_detail.html:11
 msgid "Last updated"
 msgstr "上次更新于"
 
-#: hypha/apply/funds/tables.py:100
+#: hypha/apply/funds/tables.py:101
 msgid "No submissions available"
 msgstr "无可用提交"
 
-#: hypha/apply/funds/tables.py:210
+#: hypha/apply/funds/tables.py:224
 msgid "Statuses"
 msgstr "状态"
 
-#: hypha/apply/funds/tables.py:226 hypha/apply/funds/tables.py:438
+#: hypha/apply/funds/tables.py:240 hypha/apply/funds/tables.py:502
 msgid "Leads"
 msgstr "领导人"
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 #: hypha/apply/funds/templates/submissions/all.html:382
 msgid "Screening"
 msgstr "审查"
 
-#: hypha/apply/funds/tables.py:228
+#: hypha/apply/funds/tables.py:242 hypha/apply/funds/tables.py:329
 msgid "No Status"
 msgstr "无状态"
 
-#: hypha/apply/funds/tables.py:345
+#: hypha/apply/funds/tables.py:403
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:46
 msgid "Determined"
 msgstr "已决策"
 
-#: hypha/apply/funds/tables.py:346
+#: hypha/apply/funds/tables.py:404
 #, fuzzy
 #| msgid "Start your"
 msgid "Start"
 msgstr "开始您的"
 
-#: hypha/apply/funds/tables.py:347
+#: hypha/apply/funds/tables.py:405
 msgid "End"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/funds/tables.py:439
+#: hypha/apply/funds/tables.py:456 hypha/apply/funds/tables.py:503
 #: hypha/apply/users/admin_views.py:125
 msgid "Active"
 msgstr "活跃"
 
-#: hypha/apply/funds/tables.py:392 hypha/apply/users/admin_views.py:125
+#: hypha/apply/funds/tables.py:456 hypha/apply/users/admin_views.py:125
 msgid "Inactive"
 msgstr ""
 
-#: hypha/apply/funds/tables.py:415
+#: hypha/apply/funds/tables.py:479
 #, fuzzy
 #| msgid "No Status"
 msgid "Not Started"
 msgstr "无状态"
 
-#: hypha/apply/funds/tables.py:440
+#: hypha/apply/funds/tables.py:504
 #, fuzzy
 #| msgid "Statuses"
 msgid "State"
 msgstr "状态"
 
-#: hypha/apply/funds/tables.py:516 hypha/apply/funds/tables.py:547
+#: hypha/apply/funds/tables.py:580 hypha/apply/funds/tables.py:619
 msgid "No reviews available"
 msgstr "无可用审核"
 
-#: hypha/apply/funds/tables.py:525
+#: hypha/apply/funds/tables.py:597
 msgid "Submission"
 msgstr "提交"
 
-#: hypha/apply/funds/tables.py:564
+#: hypha/apply/funds/tables.py:636
 msgid "No staff available"
 msgstr "无可用员工"
 
@@ -4477,13 +4775,13 @@ msgid "Organization"
 msgstr "创建时间"
 
 #: hypha/apply/funds/templates/cotton/submission_list.html:35
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:87
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
 #: hypha/apply/funds/templates/funds/submission_sealed.html:14
 #: hypha/apply/funds/templates/submissions/all.html:431
 #: hypha/apply/funds/templates/submissions/all.html:474
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:10
 #: hypha/apply/funds/templates/submissions/partials/submission-lead.html:14
-#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
+#: hypha/apply/projects/filters.py:45 hypha/apply/projects/filters.py:58
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:46
 #: hypha/apply/projects/templates/application_projects/project_sow_detail.html:10
 msgid "Lead"
@@ -4565,7 +4863,7 @@ msgid "(selected)"
 msgstr "已选中"
 
 #: hypha/apply/funds/templates/funds/application_base.html:105
-#: hypha/apply/funds/views/submission_edit.py:128
+#: hypha/apply/funds/views/submission_edit.py:127
 msgid "Preview and submit"
 msgstr ""
 
@@ -4630,7 +4928,6 @@ msgid "Reviews & assignees"
 msgstr "审核人 & 被分配者"
 
 #: hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html:50
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:66
 msgid "View all"
 msgstr "查看所有"
 
@@ -4644,6 +4941,19 @@ msgstr "提醒"
 msgid "Create new reminder"
 msgstr "创建提醒"
 
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:3
+#, fuzzy
+#| msgid "View application"
+msgid "Anonymize application"
+msgstr "查看申请"
+
+#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_anonymize.html:5
+msgid ""
+"Are you sure you want to anonymize this application? Personal data will be "
+"removed and the application will only be accessible via statistics in the "
+"Results view. This action cannot be undone."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:3
 #, fuzzy
 #| msgid "Screen application"
@@ -4657,92 +4967,83 @@ msgid ""
 "action cannot be undone."
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:22
-#: hypha/apply/funds/templates/funds/comments.html:18
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:18
+#: hypha/apply/funds/templates/funds/comments.html:14
 #: hypha/apply/projects/templates/application_projects/paf_export.html:76
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:107
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:109
 #: hypha/apply/projects/templates/application_projects/project_detail.html:17
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:15
 #, fuzzy
 #| msgid "application"
 msgid "Application"
 msgstr "申请"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:32
-#: hypha/apply/funds/templates/funds/comments.html:28
-#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
-#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
-#: hypha/apply/projects/templates/application_projects/project_detail.html:24
-msgid "Project"
-msgstr "项目"
-
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:50
-#: hypha/apply/funds/templates/funds/comments.html:46
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:38
+#: hypha/apply/funds/templates/funds/comments.html:34
 msgid "View message log"
 msgstr "查看消息日志"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:61
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:49
 msgid "Congratulations!"
 msgstr "恭喜！"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:63
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:51
 #, python-format
 msgid "Your %(stage)s application has been accepted."
 msgstr "您的 %(stage)s 申请已被通过。"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:68
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:56
 #, python-format
 msgid "Start your %(stage)s application."
 msgstr "开始您的 %(stage)s 申请。"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:77
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:65
 #, fuzzy
 #| msgid "Your application has been reviewed and the outcome is"
 msgid "This application has been archived. This is visible to accounts with "
 msgstr "您的申请已被审核，结果为"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:85
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:73
 #, fuzzy
 #| msgid "This submission is sealed"
 msgid "This application is sealed."
 msgstr "此提交已被锁定"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 #, fuzzy
 #| msgid "Draft"
 msgid "Drafted "
 msgstr "草稿"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:92
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:22
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:80
 #, fuzzy
 #| msgid "Submitted"
 msgid "Submitted "
 msgstr "已提交"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:100
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:88
 #: hypha/apply/funds/templates/submissions/all.html:336
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:34
 #, fuzzy
 #| msgid "Update"
 msgid "Updated"
 msgstr "更新"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:129
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:117
 #, fuzzy
 #| msgid "Delete Submissions"
 msgid "Delete Submission"
 msgstr "删除提交"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:195
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:183
 msgid "Related submissions"
 msgstr "相关提交"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:203
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:214
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:191
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:202
 msgid "View linked"
 msgstr "查看已链接"
 
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:223
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:211
 #, fuzzy
 #| msgid "Delete Submissions"
 msgid "Other Submissions"
@@ -4807,6 +5108,10 @@ msgstr "拒绝"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:154
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:187
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:204
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:94
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:140
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:171
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:189
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:127
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:160
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:177
@@ -4833,107 +5138,118 @@ msgstr ""
 msgid "Comments: %(title)s"
 msgstr "%(title)s 的修订"
 
-#: hypha/apply/funds/templates/funds/comments.html:57
+#: hypha/apply/funds/templates/funds/comments.html:45
 #, fuzzy
 #| msgid "Communications"
 msgid "Add communication"
 msgstr "交流"
 
-#: hypha/apply/funds/templates/funds/comments.html:80
-#: hypha/apply/funds/templates/funds/comments.html:94
-#, fuzzy
-#| msgid "Comments"
-msgid "Add Comment"
-msgstr "评论"
-
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:4
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:5
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:6
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:88
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:66
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:4
 #: hypha/apply/projects/templates/application_projects/project_admin_detail.html:10
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:128
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:35
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:131
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:41
 msgid "Actions to take"
 msgstr "待执行操作"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:15
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:16
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:12
 #, fuzzy
 #| msgid "No active submissions"
 msgid "Unarchive Submission"
 msgstr "无活跃提交"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:26
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:28
+#, fuzzy
+#| msgid "Create Project"
+msgid "Add another project"
+msgstr "创建项目"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:30
 #: hypha/apply/funds/templates/funds/modals/create_project_form.html:2
 #, fuzzy
 #| msgid "Create Project"
 msgid "Create project"
 msgstr "创建项目"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:32
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
 msgid "Complete draft determination"
 msgstr "完成草稿决策"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:37
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:42
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:9
 msgid "Complete draft review"
 msgstr "完成草稿审核"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:45
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:50
 msgid "Assign reviewers"
 msgstr "分配审核人"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:60
 #: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:19
 msgid "View determination"
 msgstr "查看决策"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:68
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
 #: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:34
-#: hypha/apply/projects/views/payment.py:138
+#: hypha/apply/projects/views/invoice.py:147
 msgid "Update status"
 msgstr "更新状态"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:73
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:78
 msgid "Assign"
 msgstr "分配"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:92
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:97
 msgid "More actions"
 msgstr "更多操作"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:101
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:106
 #: hypha/apply/funds/templates/funds/revisions_compare.html:88
 msgid "Revisions"
 msgstr "修订"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:111
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:116
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:69
 msgid "Translate"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:130
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:135
 #: hypha/apply/funds/views/reminders.py:69
 msgid "Create Reminder"
 msgstr "创建提醒"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:138
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:178
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:53
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:140
+#, fuzzy
+#| msgid "Approved"
+msgid "Change Author"
+msgstr "批准"
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:181
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:59
 #, fuzzy
 #| msgid "Download PDF"
 msgid "Download as PDF"
 msgstr "下载 PDF"
 
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:148
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:158
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:30
-#: hypha/apply/funds/templates/submissions/all.html:490
+#: hypha/apply/funds/templates/submissions/all.html:491
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:32
 #, fuzzy
 #| msgid "Archived"
 msgid "Archive"
 msgstr "已归档"
 
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:172
+#: hypha/apply/funds/templates/submissions/all.html:515
+msgid "Anonymize"
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:8
 #, fuzzy
 #| msgid "Applicant"
@@ -4955,8 +5271,8 @@ msgid "Not allowed"
 msgstr "未找到"
 
 #: hypha/apply/funds/templates/funds/includes/co-applicant-block.html:25
-#: hypha/apply/funds/views/co_applicants.py:58
-#: hypha/apply/funds/views/co_applicants.py:102
+#: hypha/apply/funds/views/co_applicants.py:57
+#: hypha/apply/funds/views/co_applicants.py:101
 msgid "Invite"
 msgstr ""
 
@@ -4986,7 +5302,8 @@ msgstr "您的活动提交"
 #: hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html:16
 msgid ""
 "Are you sure you want to archive submission? Archived submissions will be "
-"hidden from the main list of submissions and can not be edited."
+"hidden from the main list of submissions and can not be edited. Submissions "
+"can be unarchived at any time."
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html:16
@@ -5006,6 +5323,21 @@ msgstr "已归档"
 msgid "You have no %(type)s rounds or labs assigned to you."
 msgstr "没有分配给您的 %(type)s 轮次或实验室。"
 
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:18
+#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
+#: hypha/apply/funds/templates/funds/includes/submission-table-row.html:53
+msgid "Project"
+msgstr "项目"
+
+#: hypha/apply/funds/templates/funds/includes/projects_tab.html:30
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:18
+#, fuzzy, python-format
+#| msgid "Project"
+msgctxt "project tab"
+msgid "Project"
+msgid_plural "Projects (%(counter)s)"
+msgstr[0] "项目"
+
 #: hypha/apply/funds/templates/funds/includes/reminders_block.html:34
 msgid "No reminders yet."
 msgstr "还没有提醒。"
@@ -5042,6 +5374,12 @@ msgstr "项目时长"
 msgid "Legal Name"
 msgstr "法定名称"
 
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:54
+#, fuzzy
+#| msgid "Requested amount"
+msgid "Edit user account"
+msgstr "请求数目"
+
 #: hypha/apply/funds/templates/funds/includes/rendered_answers.html:61
 #: hypha/apply/funds/templates/funds/revisions_compare.html:52
 #: hypha/apply/funds/templates/funds/revisions_compare.html:53
@@ -5078,7 +5416,7 @@ msgid ""
 msgstr ""
 
 #: hypha/apply/funds/templates/funds/includes/round-block-listing.html:69
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:49
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:55
 #, fuzzy
 #| msgid "Report"
 msgid "Export"
@@ -5170,7 +5508,7 @@ msgid "selected"
 msgstr "已选中"
 
 #: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:43
-#: hypha/templates/base.html:159
+#: hypha/templates/base.html:160
 #, fuzzy
 #| msgid "Search"
 msgid "Search..."
@@ -5180,19 +5518,19 @@ msgstr "搜索"
 msgid "Search input"
 msgstr "搜索输入"
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:60
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:73
 #: hypha/apply/funds/templates/submissions/all.html:202
 msgid "Clear current filters & sorts"
 msgstr ""
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:108
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:121
 #: hypha/templates/cotton/pagination.html:12
 #, fuzzy
 #| msgid "previous"
 msgid "Previous"
 msgstr "上一页"
 
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:109
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:122
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:6
 #: hypha/apply/users/templates/two_factor/_wizard_actions.html:10
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:47
@@ -5207,9 +5545,8 @@ msgid "Translate application"
 msgstr "审核申请"
 
 #: hypha/apply/funds/templates/funds/includes/translate_application_form.html:38
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:10
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:26
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 #: hypha/apply/projects/templates/application_projects/filters/widgets/date_range_input_widget.html:5
 msgid "to"
@@ -5232,22 +5569,25 @@ msgstr "更新审核人"
 #: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:20
 #: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:51
-#: hypha/apply/funds/views/submission_edit.py:535
-#: hypha/apply/funds/views/submission_edit.py:566
-#: hypha/apply/funds/views/submission_edit.py:595
-#: hypha/apply/funds/views/submission_edit.py:639
-#: hypha/apply/funds/views/submission_edit.py:669
-#: hypha/apply/funds/views/submission_edit.py:695
-#: hypha/apply/funds/views/translate.py:60
-#: hypha/apply/funds/views/translate.py:95
+#: hypha/apply/funds/views/submission_edit.py:536
+#: hypha/apply/funds/views/submission_edit.py:567
+#: hypha/apply/funds/views/submission_edit.py:596
+#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:670
+#: hypha/apply/funds/views/submission_edit.py:696
+#: hypha/apply/funds/views/submission_edit.py:726
+#: hypha/apply/funds/views/submission_edit.py:752
+#: hypha/apply/funds/views/translate.py:58
+#: hypha/apply/funds/views/translate.py:93
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:28
-#: hypha/apply/projects/views/payment.py:354
-#: hypha/apply/projects/views/project.py:423
-#: hypha/apply/projects/views/project.py:462
-#: hypha/apply/projects/views/project.py:506
-#: hypha/apply/projects/views/project.py:542
-#: hypha/apply/projects/views/project.py:1289
-#: hypha/apply/projects/views/project.py:1328
+#: hypha/apply/projects/views/invoice.py:359
+#: hypha/apply/projects/views/project.py:427
+#: hypha/apply/projects/views/project.py:466
+#: hypha/apply/projects/views/project.py:510
+#: hypha/apply/projects/views/project.py:546
+#: hypha/apply/projects/views/project.py:588
+#: hypha/apply/projects/views/project.py:1340
+#: hypha/apply/projects/views/project.py:1379
 msgid "Update"
 msgstr "更新"
 
@@ -5331,10 +5671,10 @@ msgstr ""
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:15
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:20
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:25
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:46
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:137
-#: hypha/apply/projects/views/project.py:1043
-#: hypha/apply/projects/views/project.py:1260
+#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:47
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
+#: hypha/apply/projects/views/project.py:1094
+#: hypha/apply/projects/views/project.py:1311
 msgid "Update Status"
 msgstr "更新状态"
 
@@ -5344,6 +5684,18 @@ msgstr "更新状态"
 msgid "Current status"
 msgstr "当前状态"
 
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:2
+#, fuzzy
+#| msgid "Update status"
+msgid "Update Author"
+msgstr "更新状态"
+
+#: hypha/apply/funds/templates/funds/modals/update_author_form.html:6
+#, fuzzy
+#| msgid "current"
+msgid "Current Author"
+msgstr "当前"
+
 #: hypha/apply/funds/templates/funds/modals/update_lead_form.html:2
 #: hypha/apply/projects/templates/application_projects/modals/lead_update.html:2
 msgid "Update Lead"
@@ -5359,6 +5711,7 @@ msgstr "当前状态"
 #: hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html:2
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:12
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:13
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:2
 #, fuzzy
 #| msgid "Update status"
 msgid "Update tags"
@@ -5420,7 +5773,7 @@ msgid "Reviews by %(object)s"
 msgstr "%(object)s 的审核"
 
 #: hypha/apply/funds/templates/funds/revisions_compare.html:3
-#: hypha/apply/review/views.py:473
+#: hypha/apply/review/views.py:482
 msgid "Compare"
 msgstr "操作"
 
@@ -5526,11 +5879,11 @@ msgstr "无提交"
 
 #: hypha/apply/funds/templates/funds/submission-success.html:77
 #: hypha/apply/users/templates/users/activation/confirm.html:43
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
 #: hypha/apply/users/templates/users/login.html:4
 #: hypha/apply/users/templates/users/login.html:86
 #: hypha/apply/users/templates/users/password_reset/complete.html:14
 #: hypha/apply/users/templates/users/passwordless_login_signup.html:5
-#: hypha/templates/includes/user_menu.html:101
 msgid "Log in"
 msgstr "登录"
 
@@ -5596,6 +5949,13 @@ msgid ""
 "amount fields or data and are not included."
 msgstr "一些提交缺少数值，未包括在内。"
 
+#: hypha/apply/funds/templates/funds/submissions_result.html:53
+#, python-format
+msgid ""
+"%(count)s anonymized submission(s) are excluded because the active filter "
+"does not apply to anonymized data."
+msgstr ""
+
 #: hypha/apply/funds/templates/funds/tables/table.html:24
 #: hypha/apply/projects/templates/application_projects/tables/table.html:18
 msgid "Show"
@@ -5837,38 +6197,67 @@ msgstr "分配"
 msgid "Assign Reviewer(s)"
 msgstr "分配审核人"
 
-#: hypha/apply/funds/templates/submissions/all.html:486
-#, fuzzy
-#| msgid "Are you sure you want to delete selected submissions?"
-msgid "Are you sure you want to archive the selected submissions?"
-msgstr "您确定要删除所选提交吗？"
-
-#: hypha/apply/funds/templates/submissions/all.html:498
-#, fuzzy
-#| msgid "Are you sure you want to delete selected submissions?"
-msgid ""
-"Are you sure you want to delete the selected submissions? This action cannot "
-"be undone."
-msgstr "您确定要删除所选提交吗？"
-
-#: hypha/apply/funds/templates/submissions/all.html:524
+#: hypha/apply/funds/templates/submissions/all.html:538
 msgid "No results matched your search"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "Try"
 msgstr ""
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 #, fuzzy
 #| msgid "Clear"
 msgid "clearing"
 msgstr "清空"
 
-#: hypha/apply/funds/templates/submissions/all.html:525
+#: hypha/apply/funds/templates/submissions/all.html:539
 msgid "the current query and try again"
 msgstr ""
 
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:4
+#, fuzzy
+#| msgid "View application"
+msgid "Anonymize applications"
+msgstr "查看申请"
+
+#: hypha/apply/funds/templates/submissions/bulk_anonymize_confirm.html:9
+#, python-format
+msgid ""
+"Are you sure you want to anonymize %(count)s submission(s)? Personal data "
+"will be removed and applications will only be accessible via statistics in "
+"the Results view. All draft submissions will be deleted. This action cannot "
+"be undone."
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:11
+#, fuzzy
+#| msgid "Your active submissions"
+msgid "Archive submissions"
+msgstr "您的活动提交"
+
+#: hypha/apply/funds/templates/submissions/bulk_archive_confirm.html:14
+#, python-format
+msgid ""
+"Are you sure you want to archive %(count)s submission(s)? Archived "
+"submissions will be hidden from the main list and cannot be edited. "
+"Submissions can be unarchived at any time."
+msgstr ""
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:4
+#, fuzzy
+#| msgid "Screen application"
+msgid "Delete applications"
+msgstr "审核申请"
+
+#: hypha/apply/funds/templates/submissions/bulk_delete_confirm.html:8
+#, fuzzy, python-format
+#| msgid "Are you sure you want to delete selected submissions?"
+msgid ""
+"Are you sure you want to permanently delete %(count)s submission(s)? All "
+"data will be permanently removed. This action cannot be undone."
+msgstr "您确定要删除所选提交吗？"
+
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:9
 #, fuzzy
 #| msgid "Submission lead"
@@ -5876,6 +6265,7 @@ msgid "Submissions: Export as CSV"
 msgstr "提交领导人"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:11
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:11
 msgid "Export as CSV"
 msgstr ""
 
@@ -5894,6 +6284,8 @@ msgstr "提交领导人"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:23
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:24
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:23
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:24
 msgid "Generating downloadable CSV..."
 msgstr ""
 
@@ -5904,6 +6296,7 @@ msgid "Submissions: Download generated CSV"
 msgstr "提交领导人"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:42
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:42
 #, fuzzy
 #| msgid "Download PDF"
 msgid "Download generated CSV"
@@ -5916,10 +6309,12 @@ msgid "Submissions: Generate downloadable CSV"
 msgstr "提交领导人"
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:64
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:64
 msgid "Generation failed, click to retry generating downloadable CSV"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/export-submission-button.html:66
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:66
 #, fuzzy
 #| msgid "Generate Codes"
 msgid "Generate downloadable CSV"
@@ -5930,6 +6325,7 @@ msgid "Add tags"
 msgstr ""
 
 #: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:38
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:5
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 #, fuzzy
@@ -6116,14 +6512,14 @@ msgstr "无可用审核"
 msgid "Filter by {label}"
 msgstr "筛选条件"
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:123
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
 #, fuzzy
 #| msgid "application"
 msgid "Application #"
 msgstr "申请"
 
-#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:124
-#: hypha/apply/stream_forms/blocks.py:119
+#: hypha/apply/funds/utils.py:117 hypha/apply/funds/utils.py:125
+#: hypha/apply/stream_forms/blocks.py:157
 msgid "URL"
 msgstr "URL"
 
@@ -6138,99 +6534,101 @@ msgstr ""
 msgid "No screening"
 msgstr "无审查"
 
-#: hypha/apply/funds/views/all.py:251
+#: hypha/apply/funds/views/all.py:244
 msgid "Newest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:252
+#: hypha/apply/funds/views/all.py:245
 msgid "Oldest"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:253
+#: hypha/apply/funds/views/all.py:246
 #, fuzzy
 #| msgid "Amount Committed"
 msgid "Most Commented"
 msgstr "贡献数目"
 
-#: hypha/apply/funds/views/all.py:254
+#: hypha/apply/funds/views/all.py:247
 #, fuzzy
 #| msgid "Last edited"
 msgid "Least Commented"
 msgstr "上次编辑于"
 
-#: hypha/apply/funds/views/all.py:255
+#: hypha/apply/funds/views/all.py:248
 #, fuzzy
 #| msgid "Last Updated"
 msgid "Recently Updated"
 msgstr "上次更新于"
 
-#: hypha/apply/funds/views/all.py:256
+#: hypha/apply/funds/views/all.py:249
 #, fuzzy
 #| msgid "Last Updated"
 msgid "Least Recently Updated"
 msgstr "上次更新于"
 
-#: hypha/apply/funds/views/all.py:257
+#: hypha/apply/funds/views/all.py:250
 msgid "Best Match"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:304
+#: hypha/apply/funds/views/all.py:297 hypha/apply/projects/views/invoice.py:671
 msgid "Started CSV generation."
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:405
+#: hypha/apply/funds/views/all.py:469
 #, python-brace-format
 msgid ""
 "A determination already exists for the following submissions and they have "
 "been excluded: {submissions}"
 msgstr "以下提交拥有决策，已被排除：{submissions}"
 
-#: hypha/apply/funds/views/all.py:418
+#: hypha/apply/funds/views/all.py:482
 msgid "Submissions expect different forms - please contact admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:431
+#: hypha/apply/funds/views/all.py:495
 msgid "Inconsistent states provided - please talk to an admin"
 msgstr ""
 
-#: hypha/apply/funds/views/all.py:458
+#: hypha/apply/funds/views/all.py:522
 msgid "Failed to update: "
 msgstr "更新失败： "
 
-#: hypha/apply/funds/views/all.py:463
+#: hypha/apply/funds/views/all.py:527
 #, fuzzy, python-brace-format
 #| msgid "Successfully deleted submissions: {title}"
 msgid "Successfully updated status to {status}: "
 msgstr "成功删除了提交：{title}"
 
-#: hypha/apply/funds/views/co_applicants.py:94
+#: hypha/apply/funds/views/co_applicants.py:93
 #, fuzzy
 #| msgid "Application title"
 msgid "Co-applicant invited"
 msgstr "申请标题"
 
-#: hypha/apply/funds/views/co_applicants.py:234
+#: hypha/apply/funds/views/co_applicants.py:229
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:18
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:74
+#: hypha/apply/projects/templates/application_projects/modals/invoice_tag.html:14
 #: hypha/apply/projects/templates/application_projects/project_form.html:29
-#: hypha/apply/projects/views/payment.py:285
-#: hypha/apply/projects/views/project.py:2040
+#: hypha/apply/projects/views/invoice.py:290
+#: hypha/apply/projects/views/project.py:2131
 #: hypha/apply/users/templates/users/account.html:54
 msgid "Save"
 msgstr "保存"
 
-#: hypha/apply/funds/views/co_applicants.py:254
+#: hypha/apply/funds/views/co_applicants.py:249
 #, fuzzy
 #| msgid "Last updated"
 msgid "Co-applicant updated"
 msgstr "上次更新于"
 
-#: hypha/apply/funds/views/co_applicants.py:282
+#: hypha/apply/funds/views/co_applicants.py:277
 #, fuzzy
 #| msgid "Application Received"
 msgid "Co-applicant re-invited"
 msgstr "已收到申请"
 
-#: hypha/apply/funds/views/co_applicants.py:304
+#: hypha/apply/funds/views/co_applicants.py:299
 #, fuzzy
 #| msgid "Applicant"
 msgid "Co-applicant deleted"
@@ -6248,44 +6646,55 @@ msgstr "创建"
 msgid "Reminder deleted"
 msgstr "提醒已删除"
 
-#: hypha/apply/funds/views/submission_detail.py:311
+#: hypha/apply/funds/views/submission_delete.py:47
+#, fuzzy
+#| msgid "Submission lead"
+msgid "Submission anonymized."
+msgstr "提交领导人"
+
+#: hypha/apply/funds/views/submission_detail.py:301
 #, fuzzy
 #| msgid "Submission lead"
 msgid "Submission details"
 msgstr "提交领导人"
 
-#: hypha/apply/funds/views/submission_edit.py:97
-#: hypha/apply/funds/views/submission_edit.py:276
+#: hypha/apply/funds/views/submission_edit.py:96
+#: hypha/apply/funds/views/submission_edit.py:275
 #, fuzzy
 #| msgid "Draft"
 msgid "Draft saved"
 msgstr "草稿"
 
-#: hypha/apply/funds/views/submission_edit.py:366
-#: hypha/apply/funds/views/submission_edit.py:392
+#: hypha/apply/funds/views/submission_edit.py:365
+#: hypha/apply/funds/views/submission_edit.py:391
 #: hypha/apply/funds/workflows/definitions/double_stage.py:133
 msgid "Progress"
 msgstr "进度"
 
-#: hypha/apply/funds/views/submission_edit.py:419
-#: hypha/apply/funds/views/submission_edit.py:461
-#: hypha/apply/projects/views/project.py:605
-#: hypha/apply/projects/views/project.py:664
+#: hypha/apply/funds/views/submission_edit.py:410
+msgid "This submission already has a project."
+msgstr ""
+
+#: hypha/apply/funds/views/submission_edit.py:421
+#: hypha/apply/funds/views/submission_edit.py:463
+#: hypha/apply/projects/views/project.py:651
+#: hypha/apply/projects/views/project.py:710
 #: hypha/apply/review/templates/review/review_confirm_delete.html:23
 #: hypha/apply/users/templates/elevate/elevate.html:39
 #: hypha/apply/users/templates/two_factor/admin/disable.html:24
 #: hypha/apply/users/templates/two_factor/profile/disable.html:39
 #: hypha/apply/users/templates/users/partials/confirmation_code_sent.html:43
+#: hypha/templates/cotton/modal/confirm.html:43
 msgid "Confirm"
 msgstr "确定"
 
-#: hypha/apply/funds/views/submission_edit.py:558
+#: hypha/apply/funds/views/submission_edit.py:559
 #, fuzzy
 #| msgid "Submission lead"
 msgid "Submission Lead updated."
 msgstr "提交领导人"
 
-#: hypha/apply/funds/views/submission_edit.py:687
+#: hypha/apply/funds/views/submission_edit.py:744
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Tags updated successfully."
@@ -6295,56 +6704,86 @@ msgstr "合作者已更新。"
 msgid "User attempted to translate submission but is not org faculty"
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:154
+#: hypha/apply/funds/views/translate.py:152
 #, python-brace-format
 msgid "Submission translated from {fl} to {tl}."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:167
+#: hypha/apply/funds/views/translate.py:165
 msgid "Submission translation failed. Contact your Administrator."
 msgstr ""
 
-#: hypha/apply/funds/views/translate.py:174
+#: hypha/apply/funds/views/translate.py:172
 msgid "Translation cleared."
 msgstr ""
 
-#: hypha/apply/funds/workflows/constants.py:59
+#: hypha/apply/funds/workflows/constants.py:63
 msgid "Received"
 msgstr "已收到"
 
-#: hypha/apply/funds/workflows/constants.py:63
+#: hypha/apply/funds/workflows/constants.py:67
 #: hypha/apply/funds/workflows/definitions/double_stage.py:74
 #: hypha/apply/funds/workflows/definitions/double_stage.py:211
 #: hypha/apply/funds/workflows/definitions/single_stage.py:74
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:83
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:129
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:69
 msgid "Internal Review"
 msgstr "内部审核"
 
-#: hypha/apply/funds/workflows/constants.py:67
+#: hypha/apply/funds/workflows/constants.py:71
+#: hypha/apply/funds/workflows/definitions/double_stage.py:91
+#: hypha/apply/funds/workflows/definitions/double_stage.py:228
+#: hypha/apply/funds/workflows/definitions/double_stage.py:273
+#: hypha/apply/funds/workflows/definitions/single_stage.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:98
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
 msgid "Ready for Discussion"
 msgstr "准备接受讨论"
 
-#: hypha/apply/funds/workflows/constants.py:73
+#: hypha/apply/funds/workflows/constants.py:77
 msgid "More Information Requested"
 msgstr "需要更多信息"
 
-#: hypha/apply/funds/workflows/constants.py:77
+#: hypha/apply/funds/workflows/constants.py:81
 #: hypha/apply/funds/workflows/definitions/double_stage.py:165
 msgid "Invited for Proposal"
 msgstr "已被邀请提案"
 
-#: hypha/apply/funds/workflows/constants.py:81
+#: hypha/apply/funds/workflows/constants.py:85
 #: hypha/apply/funds/workflows/definitions/double_stage.py:258
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:115
 msgid "External Review"
 msgstr "外部审核"
 
-#: hypha/apply/funds/workflows/constants.py:85
+#: hypha/apply/funds/workflows/constants.py:89
+#: hypha/apply/funds/workflows/definitions/single_stage.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage.py:58
+#: hypha/apply/funds/workflows/definitions/single_stage.py:86
+#: hypha/apply/funds/workflows/definitions/single_stage.py:109
 #: hypha/apply/funds/workflows/definitions/single_stage.py:127
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:190
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:35
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:66
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:92
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:138
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:163
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:116
 msgid "Ready for Determination"
 msgstr "准备接受决策"
@@ -6359,6 +6798,9 @@ msgstr "准备接受决策"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:35
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:107
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:150
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:33
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:90
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:137
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:34
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:80
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:123
@@ -6379,7 +6821,8 @@ msgstr "开启审核"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:36
 #: hypha/apply/funds/workflows/definitions/double_stage.py:60
 #: hypha/apply/funds/workflows/definitions/double_stage.py:86
-msgid "Ready For Preliminary Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:122
+msgid "Ready for Preliminary Determination"
 msgstr "已准备好初步决策"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:37
@@ -6413,6 +6856,12 @@ msgstr "邀请到提案"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:155
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:188
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:36
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:67
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:96
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:142
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:173
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:190
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:37
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:84
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:128
@@ -6426,6 +6875,7 @@ msgstr "驳回"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:42
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:38
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:39
 msgid "Need screening"
@@ -6445,6 +6895,9 @@ msgstr "已收到概念备注"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:61
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:131
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:175
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:57
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:116
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:162
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:58
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:104
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:148
@@ -6460,6 +6913,8 @@ msgstr "需要更多信息"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:79
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:92
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:139
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:78
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:124
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:66
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:112
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:66
@@ -6470,6 +6925,7 @@ msgstr "关闭审核"
 #: hypha/apply/funds/workflows/definitions/single_stage.py:72
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:80
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:68
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:67
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:67
 msgid "Need screening (revert)"
@@ -6492,18 +6948,6 @@ msgstr "{ORG_SHORT_NAME} 审核"
 msgid "Open Review (revert)"
 msgstr "开启审核（回复）"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:91
-#: hypha/apply/funds/workflows/definitions/double_stage.py:228
-#: hypha/apply/funds/workflows/definitions/double_stage.py:273
-#: hypha/apply/funds/workflows/definitions/single_stage.py:92
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:113
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:157
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:130
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:85
-msgid "Ready For Discussion"
-msgstr "准备接受讨论"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:118
 #: hypha/apply/funds/workflows/definitions/double_stage.py:256
 #: hypha/apply/funds/workflows/definitions/double_stage.py:299
@@ -6513,18 +6957,18 @@ msgstr "准备接受讨论"
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:140
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:184
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:206
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:126
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:170
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:113
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:157
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:179
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:111
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:131
-msgid "Ready For Discussion (revert)"
+#, fuzzy
+#| msgid "Ready For Discussion (revert)"
+msgid "Ready for Discussion (revert)"
 msgstr "准备接受讨论（回复）"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:122
-msgid "Ready for Preliminary Determination"
-msgstr "已准备好初步决策"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:129
 msgid "Concept Accepted"
 msgstr "概念已批准"
@@ -6539,6 +6983,7 @@ msgstr "预备提案"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:223
 #: hypha/apply/funds/workflows/definitions/double_stage.py:245
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:108
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:65
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:81
 msgid "Open External Review"
 msgstr "开启外部审核"
@@ -6548,7 +6993,8 @@ msgstr "开启外部审核"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:197
 #: hypha/apply/funds/workflows/definitions/double_stage.py:224
 #: hypha/apply/funds/workflows/definitions/double_stage.py:267
-msgid "Ready For Final Determination"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:304
+msgid "Ready for Final Determination"
 msgstr "准备接受最终决策"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:179
@@ -6562,12 +7008,14 @@ msgstr "已收到提案（回复）"
 #: hypha/apply/funds/workflows/definitions/double_stage.py:225
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:110
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:139
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:83
 msgid "Open Internal Review (revert)"
 msgstr "开启内部审核（回复）"
 
 #: hypha/apply/funds/workflows/definitions/double_stage.py:268
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:152
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:93
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:125
 msgid "Open External Review (revert)"
 msgstr "开启外部审核（回复）"
@@ -6587,39 +7035,21 @@ msgstr "开启外部审核（回复）"
 msgid "Accept but additional info required"
 msgstr "已批准，但需要额外信息"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:304
-msgid "Ready for Final Determination"
-msgstr "准备接受最终决策"
-
 #: hypha/apply/funds/workflows/definitions/double_stage.py:312
 msgid "Final Determination"
 msgstr "最终决策"
 
-#: hypha/apply/funds/workflows/definitions/double_stage.py:321
-#: hypha/apply/funds/workflows/definitions/single_stage.py:144
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:209
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:182
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:133
-msgid "Accepted but additional info required"
-msgstr "已批准，但需要额外信息"
-
-#: hypha/apply/funds/workflows/definitions/single_stage.py:35
-#: hypha/apply/funds/workflows/definitions/single_stage.py:58
-#: hypha/apply/funds/workflows/definitions/single_stage.py:86
-#: hypha/apply/funds/workflows/definitions/single_stage.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:39
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:109
-#: hypha/apply/funds/workflows/definitions/single_stage_community.py:151
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:82
-#: hypha/apply/funds/workflows/definitions/single_stage_external.py:124
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:36
-#: hypha/apply/funds/workflows/definitions/single_stage_same.py:81
-msgid "Ready For Determination"
-msgstr "准备接受决策"
+#: hypha/apply/funds/workflows/definitions/double_stage.py:321
+#: hypha/apply/funds/workflows/definitions/single_stage.py:144
+#: hypha/apply/funds/workflows/definitions/single_stage_community.py:209
+#: hypha/apply/funds/workflows/definitions/single_stage_external.py:182
+#: hypha/apply/funds/workflows/definitions/single_stage_same.py:133
+msgid "Accepted but additional info required"
+msgstr "已批准，但需要额外信息"
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:41
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:43
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:39
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:40
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:40
 msgid "Application Received"
@@ -6627,6 +7057,7 @@ msgstr "已收到申请"
 
 #: hypha/apply/funds/workflows/definitions/single_stage.py:135
 #: hypha/apply/funds/workflows/definitions/single_stage_community.py:198
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:183
 #: hypha/apply/funds/workflows/definitions/single_stage_external.py:171
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:124
 msgid "Application Outcome"
@@ -6641,28 +7072,81 @@ msgstr "开启社区审核"
 msgid "Community Review"
 msgstr "社区审核"
 
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:34
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:70
+#, fuzzy
+#| msgid "Submit for review"
+msgid "Ready for Review"
+msgstr "提交供审核"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:79
+#, fuzzy
+#| msgid "Open Review (revert)"
+msgid "Ready for Review (revert)"
+msgstr "开启审核（回复）"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:82
+#, fuzzy
+#| msgid "Application Received"
+msgid "Application Review"
+msgstr "已收到申请"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:91
+#, fuzzy
+#| msgid "Open External Review"
+msgid "Open Internal Review"
+msgstr "开启外部审核"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:95
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:141
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:172
+msgid "Waitlist"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:191
+#, fuzzy
+#| msgid "Ready for Determination"
+msgid "Ready for Determination (revert)"
+msgstr "准备接受决策"
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:193
+msgid "Waitlisted"
+msgstr ""
+
+#: hypha/apply/funds/workflows/definitions/single_stage_ext_int.py:199
+#, fuzzy
+#| msgid "Accepted"
+msgid "Not Accepted"
+msgstr "已通过"
+
 #: hypha/apply/funds/workflows/definitions/single_stage_same.py:69
 #: hypha/apply/review/templates/review/review_detail.html:10
 msgid "Review"
 msgstr "审核"
 
-#: hypha/apply/funds/workflows/registry.py:69
+#: hypha/apply/funds/workflows/registry.py:70
 msgid "Request with same time review"
 msgstr ""
 
-#: hypha/apply/funds/workflows/registry.py:75
+#: hypha/apply/funds/workflows/registry.py:76
 #, fuzzy
 #| msgid "Open External Review"
 msgid "Request with external review"
 msgstr "开启外部审核"
 
-#: hypha/apply/funds/workflows/registry.py:81
+#: hypha/apply/funds/workflows/registry.py:82
 #, fuzzy
 #| msgid "Open Community Review"
 msgid "Request with community review"
 msgstr "开启社区审核"
 
-#: hypha/apply/funds/workflows/registry.py:87
+#: hypha/apply/funds/workflows/registry.py:88
+#, fuzzy
+#| msgid "Open External Review"
+msgid "Request external then internal review"
+msgstr "开启外部审核"
+
+#: hypha/apply/funds/workflows/registry.py:94
 #, fuzzy
 #| msgid "Invite to Proposal"
 msgid "Concept & Proposal"
@@ -6678,26 +7162,33 @@ msgid ""
 "usages and try again!"
 msgstr "您试图删除的对象正在别处被使用。请移除使用内容并重试。"
 
-#: hypha/apply/projects/admin.py:45
+#: hypha/apply/projects/admin.py:46
 #, fuzzy
 #| msgid "Project name"
 msgid "Project Forms"
 msgstr "项目名称"
 
-#: hypha/apply/projects/admin.py:62
+#: hypha/apply/projects/admin.py:63
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "SOW Forms"
 msgstr "项目批准表单"
 
-#: hypha/apply/projects/admin.py:79
+#: hypha/apply/projects/admin.py:80
 #, fuzzy
 #| msgid "Reports"
 msgid "Report Forms"
 msgstr "报告"
 
-#: hypha/apply/projects/admin.py:99
+#: hypha/apply/projects/admin.py:101
+#, fuzzy
+#| msgid "Invoices"
+msgid "Invoice Tags"
+msgstr "发票"
+
+#: hypha/apply/projects/admin.py:107
 #: hypha/apply/projects/templates/application_projects/project_list.html:6
+#: hypha/apply/projects/templates/application_projects/submission_projects.html:4
 #: hypha/core/navigation.py:98 hypha/core/navigation.py:133
 msgid "Projects"
 msgstr "项目"
@@ -6719,17 +7210,17 @@ msgid "Vendor pending"
 msgstr "供应商"
 
 #: hypha/apply/projects/constants.py:22
-#: hypha/apply/projects/models/payment.py:34 hypha/apply/projects/utils.py:91
+#: hypha/apply/projects/models/invoice.py:45 hypha/apply/projects/utils.py:94
 msgid "Declined"
 msgstr "已拒绝"
 
 #: hypha/apply/projects/constants.py:23
-#: hypha/apply/projects/models/payment.py:32 hypha/apply/projects/utils.py:93
+#: hypha/apply/projects/models/invoice.py:43 hypha/apply/projects/utils.py:96
 msgid "Paid"
 msgstr "已付款"
 
 #: hypha/apply/projects/constants.py:24
-#: hypha/apply/projects/models/payment.py:33 hypha/apply/projects/utils.py:95
+#: hypha/apply/projects/models/invoice.py:44 hypha/apply/projects/utils.py:98
 msgid "Payment failed"
 msgstr ""
 
@@ -6745,7 +7236,7 @@ msgstr "等待中"
 msgid "Request for change"
 msgstr "请求更多信息"
 
-#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/filters.py:24 hypha/apply/projects/tables.py:224
 #, fuzzy
 #| msgid "Update"
 msgid "Up to date"
@@ -6757,24 +7248,29 @@ msgstr "更新"
 msgid "Behind schedule"
 msgstr "新计划是"
 
-#: hypha/apply/projects/filters.py:66
+#: hypha/apply/projects/filters.py:61 hypha/apply/projects/tables.py:202
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
+msgid "Contractor"
+msgstr "合约"
+
+#: hypha/apply/projects/filters.py:73
 #: hypha/apply/projects/reports/templates/reports/reporting.html:6
 #: hypha/apply/projects/reports/templates/reports/reporting.html:11
-#: hypha/apply/projects/tables.py:186
+#: hypha/apply/projects/tables.py:205
 msgid "Reporting"
 msgstr "报告"
 
-#: hypha/apply/projects/forms/payment.py:108
+#: hypha/apply/projects/forms/invoice.py:110
 #, fuzzy
 #| msgid "Invoice File"
 msgid "Invoice file"
 msgstr "发票文件"
 
-#: hypha/apply/projects/forms/payment.py:110
+#: hypha/apply/projects/forms/invoice.py:112
 msgid "The invoice must be a PDF."
 msgstr "发票必须是 PDF 文件。"
 
-#: hypha/apply/projects/forms/payment.py:115
+#: hypha/apply/projects/forms/invoice.py:117
 msgid ""
 "Files that are related to the invoice. They could be xls, microsoft office "
 "documents, open office documents, pdfs, txt files."
@@ -6782,18 +7278,18 @@ msgstr ""
 "发票相关的文件。可以是 XLS 表格、Microsoft Office 文档、Open Office 文档、"
 "PDF 与 TXT 文件。"
 
-#: hypha/apply/projects/forms/payment.py:142
+#: hypha/apply/projects/forms/invoice.py:144
 msgid "Invoice File"
 msgstr "发票文件"
 
-#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:408
+#: hypha/apply/projects/forms/invoice.py:179
+#: hypha/apply/projects/forms/project.py:418
 #, fuzzy
 #| msgid "Comments"
 msgid "Document"
 msgstr "评论"
 
-#: hypha/apply/projects/forms/payment.py:200
+#: hypha/apply/projects/forms/invoice.py:202
 msgid "File not found on submission"
 msgstr "提交时未找到文件"
 
@@ -6810,136 +7306,168 @@ msgid "You can only approve a signed contract"
 msgstr "您只能批准已签名的合同"
 
 #: hypha/apply/projects/forms/project.py:93
+#: hypha/apply/projects/templates/application_projects/paf_export.html:6
+#: hypha/apply/projects/templates/application_projects/sow_export.html:6
+#, fuzzy
+#| msgid "Project file: {title}"
+msgid "Project title"
+msgstr "项目档案：{title}"
+
+#: hypha/apply/projects/forms/project.py:95
+msgid ""
+"A submission can have several projects. Give this one a name so it can be "
+"told apart from the others."
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:101
 #, fuzzy
 #| msgid "Related Projects"
 msgid "Select project lead"
 msgstr "相关项目"
 
-#: hypha/apply/projects/forms/project.py:98
+#: hypha/apply/projects/forms/project.py:106
 #, fuzzy
 #| msgid "Update Project Status"
 msgid "Initial project status"
 msgstr "更新项目状态"
 
-#: hypha/apply/projects/forms/project.py:104
+#: hypha/apply/projects/forms/project.py:112
 #, fuzzy
 #| msgid "Project name"
 msgid "Project end date"
 msgstr "项目名称"
 
-#: hypha/apply/projects/forms/project.py:123
+#: hypha/apply/projects/forms/project.py:132
 msgid "Project lead is a required field"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:222
+#: hypha/apply/projects/forms/project.py:232
 #, fuzzy
 #| msgid "Project's current status"
 msgid "Project form status"
 msgstr "项目当前状态"
 
-#: hypha/apply/projects/forms/project.py:307
+#: hypha/apply/projects/forms/project.py:317
 msgid "A Project can only be sent for Approval when Drafted."
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:385
-#: hypha/apply/projects/forms/project.py:400
+#: hypha/apply/projects/forms/project.py:395
+#: hypha/apply/projects/forms/project.py:410
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:78
 #, fuzzy
 #| msgid "Contractor"
 msgid "Contract"
 msgstr "合约"
 
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:397
 msgid "Signed and approved"
 msgstr ""
 
-#: hypha/apply/projects/forms/project.py:424
+#: hypha/apply/projects/forms/project.py:434
 #, fuzzy
 #| msgid "Contract number"
 msgid "Contract Document"
 msgstr "合同号"
 
-#: hypha/apply/projects/forms/project.py:482
+#: hypha/apply/projects/forms/project.py:492
 #, fuzzy
 #| msgid "Proposed End Date must be after Proposed Start Date"
 msgid "The end date must be after the start date."
 msgstr "提议的结束日期必须晚于开始日期"
 
-#: hypha/apply/projects/models/payment.py:27
+#: hypha/apply/projects/models/invoice.py:38
 msgid "Resubmitted"
 msgstr "已重新提交"
 
-#: hypha/apply/projects/models/payment.py:28
+#: hypha/apply/projects/models/invoice.py:39
 msgid "Changes requested by staff"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:29
+#: hypha/apply/projects/models/invoice.py:40
 msgid "Changes requested by finance"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:30
+#: hypha/apply/projects/models/invoice.py:41
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approved by staff"
 msgstr "批准了合同"
 
-#: hypha/apply/projects/models/payment.py:31
+#: hypha/apply/projects/models/invoice.py:42
 #, fuzzy
 #| msgid "Approved contract"
 msgid "Approved by finance"
 msgstr "批准了合同"
 
-#: hypha/apply/projects/models/payment.py:109
+#: hypha/apply/projects/models/invoice.py:82
+#, fuzzy
+#| msgid "Invoice File"
+msgid "invoice tag"
+msgstr "发票文件"
+
+#: hypha/apply/projects/models/invoice.py:83
+#, fuzzy
+#| msgid "invoices"
+msgid "invoice tags"
+msgstr "发票"
+
+#: hypha/apply/projects/models/invoice.py:132
 #, fuzzy
 #| msgid "Total value"
 msgid "paid value"
 msgstr "总数值"
 
-#: hypha/apply/projects/models/payment.py:116
-#: hypha/apply/projects/models/payment.py:289
-#: hypha/apply/projects/models/project.py:763
-#: hypha/apply/projects/models/project.py:795
+#: hypha/apply/projects/models/invoice.py:139
+#: hypha/apply/projects/models/invoice.py:319
+#: hypha/apply/projects/models/project.py:792
+#: hypha/apply/projects/models/project.py:824
 #, fuzzy
 #| msgid "Comments"
 msgid "document"
 msgstr "评论"
 
-#: hypha/apply/projects/models/payment.py:120
-#: hypha/apply/projects/models/payment.py:123
+#: hypha/apply/projects/models/invoice.py:143
+#: hypha/apply/projects/models/invoice.py:146
 #, fuzzy
 #| msgid "Comments"
 msgid "comment"
 msgstr "评论"
 
-#: hypha/apply/projects/models/payment.py:121
+#: hypha/apply/projects/models/invoice.py:144
 msgid "This will be displayed as a comment in the comments tab"
 msgstr ""
 
-#: hypha/apply/projects/models/payment.py:125
+#: hypha/apply/projects/models/invoice.py:148
 #, fuzzy
 #| msgid "Invoice Number"
 msgid "invoice number"
 msgstr "发票号"
 
-#: hypha/apply/projects/models/payment.py:132
+#: hypha/apply/projects/models/invoice.py:155
 #, fuzzy
 #| msgid "Invoice Link"
 msgid "invoice amount"
 msgstr "发票链接"
 
-#: hypha/apply/projects/models/payment.py:134
+#: hypha/apply/projects/models/invoice.py:157
 #, fuzzy
 #| msgid "Invoice File"
 msgid "invoice date"
 msgstr "发票文件"
 
-#: hypha/apply/projects/models/payment.py:135
+#: hypha/apply/projects/models/invoice.py:158
 #, fuzzy
 #| msgid "Paid"
 msgid "paid date"
 msgstr "已付款"
 
-#: hypha/apply/projects/models/payment.py:146
+#: hypha/apply/projects/models/invoice.py:168
+#, fuzzy
+#| msgid "All Projects"
+msgid "tags"
+msgstr "所有项目"
+
+#: hypha/apply/projects/models/invoice.py:175
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:6
 #: hypha/apply/projects/templates/application_projects/invoice_form.html:14
 #, fuzzy
@@ -6947,28 +7475,47 @@ msgstr "已付款"
 msgid "invoice"
 msgstr "发票"
 
-#: hypha/apply/projects/models/payment.py:147
+#: hypha/apply/projects/models/invoice.py:176
 #: hypha/apply/projects/templates/application_projects/invoice_list.html:20
 msgid "invoices"
 msgstr "发票"
 
-#: hypha/apply/projects/models/payment.py:150
-#, python-brace-format
-msgid "Invoice requested for {project}"
+#: hypha/apply/projects/models/invoice.py:180
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Invoice for {project}"
+msgstr "已为 {project} 请求发票"
+
+#: hypha/apply/projects/models/invoice.py:181
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Invoice {number} for {project}"
 msgstr "已为 {project} 请求发票"
 
-#: hypha/apply/projects/models/payment.py:298
+#: hypha/apply/projects/models/invoice.py:328
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "supporting document"
 msgstr "支持文档"
 
-#: hypha/apply/projects/models/payment.py:299
+#: hypha/apply/projects/models/invoice.py:329
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "supporting documents"
 msgstr "支持文档"
 
+#: hypha/apply/projects/models/invoice.py:359
+#, fuzzy
+#| msgid "Submission lead"
+msgid "invoice export manager"
+msgstr "提交领导人"
+
+#: hypha/apply/projects/models/invoice.py:360
+#, fuzzy
+#| msgid "Submission lead"
+msgid "invoice export managers"
+msgstr "提交领导人"
+
 #: hypha/apply/projects/models/project.py:75
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:41
 #, fuzzy
@@ -7014,386 +7561,418 @@ msgstr "完成"
 msgid "{} approval"
 msgstr "批准"
 
-#: hypha/apply/projects/models/project.py:215
+#: hypha/apply/projects/models/project.py:216
 #, fuzzy
 #| msgid "Progress"
 msgid "In progress"
 msgstr "进度"
 
-#: hypha/apply/projects/models/project.py:248
-#: hypha/apply/projects/models/project.py:761
-#: hypha/apply/projects/models/project.py:793
+#: hypha/apply/projects/models/project.py:251
+#: hypha/apply/projects/models/project.py:790
+#: hypha/apply/projects/models/project.py:822
 #, fuzzy
 #| msgid "Title"
 msgid "title"
 msgstr "标题"
 
-#: hypha/apply/projects/models/project.py:250
+#: hypha/apply/projects/models/project.py:253
 #, fuzzy
 #| msgid "Total value"
 msgid "value"
 msgstr "总数值"
 
-#: hypha/apply/projects/models/project.py:257
+#: hypha/apply/projects/models/project.py:260
 #, fuzzy
 #| msgid "Proposed Start Date"
 msgid "proposed start date"
 msgstr "提议开始日期"
 
-#: hypha/apply/projects/models/project.py:259
+#: hypha/apply/projects/models/project.py:262
 #, fuzzy
 #| msgid "Proposed End Date"
 msgid "proposed end date"
 msgstr "提议结束日期"
 
-#: hypha/apply/projects/models/project.py:269
+#: hypha/apply/projects/models/project.py:264
+#, fuzzy
+#| msgid "Contract number"
+msgid "contract number"
+msgstr "合同号"
+
+#: hypha/apply/projects/models/project.py:274
 msgid "locked"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:272
+#: hypha/apply/projects/models/project.py:277
 #, fuzzy
 #| msgid "Supporting documents"
 msgid "submit contracting documents"
 msgstr "支持文档"
 
-#: hypha/apply/projects/models/project.py:285
+#: hypha/apply/projects/models/project.py:290
 msgid "ID of this project at integrated payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:289
+#: hypha/apply/projects/models/project.py:294
 msgid "More details of the project integrated at payment service."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:294
+#: hypha/apply/projects/models/project.py:299
 msgid "Reviewers role and their actions/comments"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:302 hypha/apply/todo/options.py:105
-#: hypha/apply/todo/options.py:113 hypha/apply/todo/options.py:121
-#: hypha/apply/todo/options.py:129 hypha/apply/todo/options.py:138
-#: hypha/apply/todo/options.py:146 hypha/apply/todo/options.py:155
-#: hypha/apply/todo/options.py:163 hypha/apply/todo/options.py:171
-#: hypha/apply/todo/options.py:180 hypha/apply/todo/options.py:188
-#: hypha/apply/todo/options.py:196 hypha/apply/todo/options.py:204
-#: hypha/apply/todo/options.py:212
+#: hypha/apply/projects/models/project.py:307 hypha/apply/todo/options.py:112
+#: hypha/apply/todo/options.py:120 hypha/apply/todo/options.py:128
+#: hypha/apply/todo/options.py:136 hypha/apply/todo/options.py:145
+#: hypha/apply/todo/options.py:153 hypha/apply/todo/options.py:162
+#: hypha/apply/todo/options.py:170 hypha/apply/todo/options.py:178
+#: hypha/apply/todo/options.py:187 hypha/apply/todo/options.py:195
+#: hypha/apply/todo/options.py:203 hypha/apply/todo/options.py:211
+#: hypha/apply/todo/options.py:219
 #, fuzzy
 #| msgid "Project"
 msgid "project"
 msgstr "项目"
 
-#: hypha/apply/projects/models/project.py:303
+#: hypha/apply/projects/models/project.py:308
 #, fuzzy
 #| msgid "Project"
 msgid "projects"
 msgstr "项目"
 
-#: hypha/apply/projects/models/project.py:411
+#: hypha/apply/projects/models/project.py:418
 msgid "Proposed End Date must be after Proposed Start Date"
 msgstr "提议的结束日期必须晚于开始日期"
 
 #. Translators: SOW = Statement of Work
-#: hypha/apply/projects/models/project.py:518
+#: hypha/apply/projects/models/project.py:525
 #, fuzzy
 #| msgid "Project"
 msgctxt "singular"
 msgid "project SOW"
 msgstr "项目"
 
-#: hypha/apply/projects/models/project.py:519
+#: hypha/apply/projects/models/project.py:526
 #, fuzzy
 #| msgid "Project"
 msgctxt "plural"
 msgid "project SOW"
 msgstr "项目"
 
-#: hypha/apply/projects/models/project.py:541
+#: hypha/apply/projects/models/project.py:532
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Scope of Work for {project}"
+msgstr "已为 {project} 请求发票"
+
+#: hypha/apply/projects/models/project.py:543
+#, fuzzy
+#| msgid "Project Information"
+msgctxt "singular"
+msgid "project form"
+msgstr "项目信息"
+
+#: hypha/apply/projects/models/project.py:544
+#, fuzzy
+#| msgid "Project Information"
+msgctxt "plural"
+msgid "project forms"
+msgstr "项目信息"
+
+#: hypha/apply/projects/models/project.py:550
+#, fuzzy, python-brace-format
+#| msgid "A Project is awaiting your review."
+msgid "Project form for {project}"
+msgstr "有项目正等待您的审核。"
+
+#: hypha/apply/projects/models/project.py:572
 #, fuzzy
 #| msgid "Project Information"
 msgid "project form"
 msgstr "项目信息"
 
-#: hypha/apply/projects/models/project.py:542
+#: hypha/apply/projects/models/project.py:573
 #, fuzzy
 #| msgid "Project Information"
 msgid "project forms"
 msgstr "项目信息"
 
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:579
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "project SOW form"
 msgstr "项目批准表单"
 
-#: hypha/apply/projects/models/project.py:549
+#: hypha/apply/projects/models/project.py:580
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "project SOW forms"
 msgstr "项目批准表单"
 
-#: hypha/apply/projects/models/project.py:561
+#: hypha/apply/projects/models/project.py:592
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "project report form"
 msgstr "项目批准表单"
 
-#: hypha/apply/projects/models/project.py:562
+#: hypha/apply/projects/models/project.py:593
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "project report forms"
 msgstr "项目批准表单"
 
-#: hypha/apply/projects/models/project.py:569
+#: hypha/apply/projects/models/project.py:600
 msgid "user groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:602
 msgid ""
 "Only selected group's users will be listed for this ProjectFormReviewerRole"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:583
+#: hypha/apply/projects/models/project.py:614
 #, fuzzy
 #| msgid "All reviewers"
 msgid "PAF reviewers role"
 msgstr "所有审核人"
 
-#: hypha/apply/projects/models/project.py:584
+#: hypha/apply/projects/models/project.py:615
 #, fuzzy
 #| msgid "PAF Reviewers Roles"
 msgid "PAF reviewers roles"
 msgstr "PAF 审核人角色"
 
-#: hypha/apply/projects/models/project.py:595
+#: hypha/apply/projects/models/project.py:626
 msgid "Before"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:596
+#: hypha/apply/projects/models/project.py:627
 msgid "After"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:605
+#: hypha/apply/projects/models/project.py:636
 #, fuzzy
 #| msgid "Number field"
 msgid "Number of days"
 msgstr "数字字段"
 
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:637
 msgid "Relation to report due date"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:610
+#: hypha/apply/projects/models/project.py:641
 #, fuzzy
 #| msgid "Report frequency"
 msgid "project reminder frequency"
 msgstr "报告频率"
 
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:642
 #, fuzzy
 #| msgid "Report frequency"
 msgid "project reminder frequencies"
 msgstr "报告频率"
 
-#: hypha/apply/projects/models/project.py:617
+#: hypha/apply/projects/models/project.py:648
 #, fuzzy
 #| msgid "Contact email"
 msgid "contracting group email"
 msgstr "联系人电子邮箱"
 
-#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:650
 msgid "finance group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:620
+#: hypha/apply/projects/models/project.py:651
 msgid "staff group email"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:622
+#: hypha/apply/projects/models/project.py:653
 msgid "Uncheck it to approve project parallelly"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:632
+#: hypha/apply/projects/models/project.py:663
 #, fuzzy
 #| msgid "Mentioned project"
 msgid "Approve Project Sequentially"
 msgstr "提及的项目"
 
-#: hypha/apply/projects/models/project.py:635
+#: hypha/apply/projects/models/project.py:666
 #, fuzzy
 #| msgid "PAF Reviewers Roles"
 msgid "Project Form Reviewers Roles"
 msgstr "PAF 审核人角色"
 
-#: hypha/apply/projects/models/project.py:638
+#: hypha/apply/projects/models/project.py:669
 #, fuzzy
 #| msgid "PAF Reviewers Roles"
 msgid "Project Reviewers Roles"
 msgstr "PAF 审核人角色"
 
-#: hypha/apply/projects/models/project.py:640
+#: hypha/apply/projects/models/project.py:671
 msgid ""
 "Reviewer Roles are needed to move projects to 'Internal Approval' stage. "
 "Delete all roles to skip internal approval process and to move all internal "
 "approval projects back to the 'Draft' stage with all approvals removed."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:647
-#: hypha/apply/projects/models/project.py:648
+#: hypha/apply/projects/models/project.py:678
+#: hypha/apply/projects/models/project.py:679
 #, fuzzy
 #| msgid "Report frequency"
 msgid "Report reminder frequency"
 msgstr "报告频率"
 
-#: hypha/apply/projects/models/project.py:650
+#: hypha/apply/projects/models/project.py:681
 msgid ""
 "Set up a cron job to run `notify_report_due.py`. The script will use these "
 "reminder settings."
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:656
+#: hypha/apply/projects/models/project.py:687
 #: hypha/apply/projects/templates/application_projects/modals/send_for_approval.html:35
 #, fuzzy
 #| msgid "Project Link"
 msgid "project settings"
 msgstr "项目链接"
 
-#: hypha/apply/projects/models/project.py:681
+#: hypha/apply/projects/models/project.py:712
 #, fuzzy
 #| msgid "Approvals"
 msgid "PAF approval"
 msgstr "批准"
 
-#: hypha/apply/projects/models/project.py:682
+#: hypha/apply/projects/models/project.py:713
 #, fuzzy
 #| msgid "Approvals"
 msgid "PAF approvals"
 msgstr "批准"
 
-#: hypha/apply/projects/models/project.py:685
+#: hypha/apply/projects/models/project.py:716
 #, python-brace-format
 msgid "Approval of {project} by {user}"
 msgstr "{user} 批准了 {project}"
 
-#: hypha/apply/projects/models/project.py:713
+#: hypha/apply/projects/models/project.py:744
 #, fuzzy
 #| msgid "Profile"
 msgid "file"
 msgstr "个人资料"
 
-#: hypha/apply/projects/models/project.py:716
+#: hypha/apply/projects/models/project.py:747
 #, fuzzy
 #| msgid "Assign reviewers"
 msgid "signed and approved"
 msgstr "分配审核人"
 
-#: hypha/apply/projects/models/project.py:718
+#: hypha/apply/projects/models/project.py:749
 #, fuzzy
 #| msgid "Unsigned"
 msgid "counter signed?"
 msgstr "未签名"
 
-#: hypha/apply/projects/models/project.py:728
+#: hypha/apply/projects/models/project.py:759
 #, fuzzy
 #| msgid "Contractor"
 msgid "contract"
 msgstr "合约"
 
-#: hypha/apply/projects/models/project.py:729
+#: hypha/apply/projects/models/project.py:760
 #, fuzzy
 #| msgid "Contractor"
 msgid "contracts"
 msgstr "合约"
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Counter Signed"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:737
+#: hypha/apply/projects/models/project.py:768
 msgid "Unsigned"
 msgstr "未签名"
 
-#: hypha/apply/projects/models/project.py:740
+#: hypha/apply/projects/models/project.py:771
 #, python-brace-format
 msgid "Contract for {project} ({state})"
 msgstr "{project}（{state}）的合同"
 
-#: hypha/apply/projects/models/project.py:768
+#: hypha/apply/projects/models/project.py:797
 #, python-brace-format
 msgid "Project file: {title}"
 msgstr "项目档案：{title}"
 
-#: hypha/apply/projects/models/project.py:772
-#: hypha/apply/projects/models/project.py:773
+#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:802
 #, fuzzy
 #| msgid "Update Profile"
 msgid "packet files"
 msgstr "更新个人资料"
 
-#: hypha/apply/projects/models/project.py:800
+#: hypha/apply/projects/models/project.py:829
 #, fuzzy
 #| msgid "Contact Details"
 msgid "contract packet file"
 msgstr "联系人详情"
 
-#: hypha/apply/projects/models/project.py:801
+#: hypha/apply/projects/models/project.py:830
 #, fuzzy
 #| msgid "Contact Details"
 msgid "contract packet files"
 msgstr "联系人详情"
 
-#: hypha/apply/projects/models/project.py:804
+#: hypha/apply/projects/models/project.py:833
 #, fuzzy, python-brace-format
 #| msgid "Project file: {title}"
 msgid "Contract file: {title}"
 msgstr "项目档案：{title}"
 
-#: hypha/apply/projects/models/project.py:814
 #: hypha/apply/projects/models/project.py:843
+#: hypha/apply/projects/models/project.py:872
 #, fuzzy
 #| msgid "Username"
 msgid "name"
 msgstr "用户名"
 
-#: hypha/apply/projects/models/project.py:816
 #: hypha/apply/projects/models/project.py:845
+#: hypha/apply/projects/models/project.py:874
 #, fuzzy
 #| msgid "Recommendation"
 msgid "recommended minimum"
 msgstr "推荐"
 
-#: hypha/apply/projects/models/project.py:820
-#: hypha/apply/projects/models/project.py:857
+#: hypha/apply/projects/models/project.py:849
+#: hypha/apply/projects/models/project.py:886
 #, fuzzy
 #| msgid "View report"
 msgid "template"
 msgstr "查看报告"
 
-#: hypha/apply/projects/models/project.py:832
+#: hypha/apply/projects/models/project.py:861
 #, fuzzy
 #| msgid "Category"
 msgid "Document Category"
 msgstr "类别"
 
-#: hypha/apply/projects/models/project.py:833
+#: hypha/apply/projects/models/project.py:862
 #, fuzzy
 #| msgid "Project Invoices"
 msgid "Project Document Categories"
 msgstr "项目发票"
 
-#: hypha/apply/projects/models/project.py:850
+#: hypha/apply/projects/models/project.py:879
 msgid "allow document access for groups"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:851
+#: hypha/apply/projects/models/project.py:880
 msgid "Only selected group's users can access the document"
 msgstr ""
 
-#: hypha/apply/projects/models/project.py:869
+#: hypha/apply/projects/models/project.py:898
 #, fuzzy
 #| msgid "Contract number"
 msgid "Contrat Document Category"
 msgstr "合同号"
 
-#: hypha/apply/projects/models/project.py:870
+#: hypha/apply/projects/models/project.py:899
 #, fuzzy
 #| msgid "Contract number"
 msgid "Contract Document Categories"
@@ -7596,15 +8175,37 @@ msgstr ""
 msgid "Access allowed"
 msgstr "批准"
 
-#: hypha/apply/projects/permissions.py:424
+#: hypha/apply/projects/permissions.py:426
+#, fuzzy
+#| msgid "Project Information"
+msgid "Project is not in Draft state"
+msgstr "项目信息"
+
+#: hypha/apply/projects/permissions.py:429
+#, fuzzy
+#| msgid "You can only approve a signed contract"
+msgid "Only Staff can skip the PAF approval process"
+msgstr "您只能批准已签名的合同"
+
+#: hypha/apply/projects/permissions.py:433
+msgid "Staff can skip PAF approval when no reviewer roles are configured"
+msgstr ""
+
+#: hypha/apply/projects/permissions.py:436
+#, fuzzy
+#| msgid "Approval form not configured. Please add an approval form in the"
+msgid "PAF reviewer roles are configured, cannot skip approval process"
+msgstr "未配置好批准表单，请在如下位置添加"
+
+#: hypha/apply/projects/permissions.py:445
 msgid "Project form is editable for active projects if no reviewer roles"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:427
+#: hypha/apply/projects/permissions.py:448
 msgid "Project form is editable in Draft by this user"
 msgstr ""
 
-#: hypha/apply/projects/permissions.py:428
+#: hypha/apply/projects/permissions.py:449
 msgid "You are not allowed to edit the project at this time"
 msgstr "您无法在此时编辑项目"
 
@@ -7612,7 +8213,19 @@ msgstr "您无法在此时编辑项目"
 msgid "Reporting Period"
 msgstr "报告间隔"
 
-#: hypha/apply/projects/reports/forms.py:100
+#: hypha/apply/projects/reports/forms.py:101
+#: hypha/apply/projects/reports/forms.py:120
+#, fuzzy
+#| msgid "Report"
+msgid "Report due date"
+msgstr "报告"
+
+#: hypha/apply/projects/reports/forms.py:112
+#: hypha/apply/projects/reports/forms.py:131
+msgid "A report for this date already exists."
+msgstr ""
+
+#: hypha/apply/projects/reports/forms.py:136
 #, fuzzy
 #| msgid "Report"
 msgid "Report on:"
@@ -7632,108 +8245,114 @@ msgctxt "project report (noun)"
 msgid "reports"
 msgstr "报告"
 
-#: hypha/apply/projects/reports/models.py:204
+#: hypha/apply/projects/reports/models.py:131
+#, fuzzy, python-brace-format
+#| msgid "Invoice requested for {project}"
+msgid "Report due {due_date} for {project}"
+msgstr "已为 {project} 请求发票"
+
+#: hypha/apply/projects/reports/models.py:209
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report version"
 msgstr "报告间隔为"
 
-#: hypha/apply/projects/reports/models.py:205
+#: hypha/apply/projects/reports/models.py:210
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report versions"
 msgstr "报告间隔为"
 
-#: hypha/apply/projects/reports/models.py:220
+#: hypha/apply/projects/reports/models.py:225
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report private file"
 msgstr "报告间隔为"
 
-#: hypha/apply/projects/reports/models.py:221
+#: hypha/apply/projects/reports/models.py:226
 #, fuzzy
 #| msgid "reporting period is"
 msgid "report private files"
 msgstr "报告间隔为"
 
-#: hypha/apply/projects/reports/models.py:240
+#: hypha/apply/projects/reports/models.py:245
 msgid "week"
 msgstr "周"
 
-#: hypha/apply/projects/reports/models.py:241
+#: hypha/apply/projects/reports/models.py:246
 msgid "month"
 msgstr "月"
 
-#: hypha/apply/projects/reports/models.py:242
+#: hypha/apply/projects/reports/models.py:247
 msgid "year"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:246
+#: hypha/apply/projects/reports/models.py:251
 msgid "Years"
 msgstr "年数"
 
-#: hypha/apply/projects/reports/models.py:262
+#: hypha/apply/projects/reports/models.py:267
 #, fuzzy
 #| msgid "Reporting"
 msgid "report config"
 msgstr "报告"
 
-#: hypha/apply/projects/reports/models.py:263
+#: hypha/apply/projects/reports/models.py:268
 #, fuzzy
 #| msgid "Reporting"
 msgid "report configs"
 msgstr "报告"
 
-#: hypha/apply/projects/reports/models.py:267
+#: hypha/apply/projects/reports/models.py:272
 #, fuzzy
 #| msgid "Disable 2FA"
 msgid "Disabled"
 msgstr "禁用 2FA"
 
-#: hypha/apply/projects/reports/models.py:272
+#: hypha/apply/projects/reports/models.py:277
 #, python-brace-format
 msgid "One time, that already has reported on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:277
+#: hypha/apply/projects/reports/models.py:282
 #, python-brace-format
 msgid "One time on {date}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:285
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:316
 msgid "last day"
 msgstr "一天前"
 
-#: hypha/apply/projects/reports/models.py:291
+#: hypha/apply/projects/reports/models.py:307
 #, python-brace-format
 msgid "Once a year on {month} {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:294
+#: hypha/apply/projects/reports/models.py:310
 #, fuzzy, python-brace-format
 #| msgid "Every {occurrence} weeks on {weekday}"
 msgid "Every {occurrence} years on {month} {day}"
 msgstr "在每 {occurrence} 周的 {weekday}"
 
-#: hypha/apply/projects/reports/models.py:304
+#: hypha/apply/projects/reports/models.py:320
 #, python-brace-format
 msgid "Once a month on the {day}"
 msgstr ""
 
-#: hypha/apply/projects/reports/models.py:305
+#: hypha/apply/projects/reports/models.py:321
 #, fuzzy, python-brace-format
 #| msgid "Every {occurrence} weeks on {weekday}"
 msgid "Every {occurrence} months on the {day}"
 msgstr "在每 {occurrence} 周的 {weekday}"
 
-#: hypha/apply/projects/reports/models.py:312
+#: hypha/apply/projects/reports/models.py:328
 #, fuzzy, python-brace-format
 #| msgid "Every {occurrence} weeks on {weekday}"
 msgid "Once a week on {weekday}"
 msgstr "在每 {occurrence} 周的 {weekday}"
 
-#: hypha/apply/projects/reports/models.py:313
+#: hypha/apply/projects/reports/models.py:329
 #, python-brace-format
 msgid "Every {occurrence} weeks on {weekday}"
 msgstr "在每 {occurrence} 周的 {weekday}"
@@ -7756,35 +8375,35 @@ msgstr "日期"
 msgid "Last Notified"
 msgstr "上次编辑于"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "The"
-msgstr "此"
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "current"
-msgstr "当前"
-
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "next"
-msgstr "下一页"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:11
+#, fuzzy
+#| msgid "Edit Report"
+msgid "Edit this report date"
+msgstr "编辑报告"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:6
-msgid "reporting period is"
-msgstr "报告间隔为"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:12
+#, fuzzy
+#| msgid "Edited"
+msgid "edit"
+msgstr "编辑了"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:8
-msgid "A report is due for the period"
-msgstr "此阶段应提交报告"
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:16
+#, fuzzy
+#| msgid "Past 7 days"
+msgid "Past due"
+msgstr "过去 7 天"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
 msgid "Continue Editing"
 msgstr "继续编辑"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:23
-msgid "Add Report"
-msgstr "添加报告"
-
 #: hypha/apply/projects/reports/templates/reports/includes/report_line.html:28
+#, fuzzy
+#| msgid "Save report"
+msgid "Create report"
+msgstr "保存报告"
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:33
 #, fuzzy, python-format
 #| msgid ""
 #| "This will result in a gap in reporting for the project. You can undo this "
@@ -7794,41 +8413,77 @@ msgid ""
 "result in a gap in reporting for the project. You can undo this at any time. "
 msgstr "这将导致项目报告中的空白。您可随时撤销此操作。"
 
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:29
-#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:32
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:34
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:38
 msgid "Skip"
 msgstr "跳过"
 
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:36
+msgid "Skip this report date"
+msgstr ""
+
+#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:48
+#, fuzzy
+#| msgid "Other comments"
+msgid "Delete report requirement"
+msgstr "其他留言"
+
 #: hypha/apply/projects/reports/templates/reports/includes/reports.html:26
 #, fuzzy
 #| msgid "Enable 2FA"
 msgid "Enable"
 msgstr "启用双重验证"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:55
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:62
 msgid "Period End"
 msgstr "阶段结束"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:101
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:108
 msgid "Unskip"
 msgstr "取消跳过"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 #, fuzzy
 #| msgid "Show Codes"
 msgid "Show less"
 msgstr "显示代码"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:116
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
 msgid "Show more"
 msgstr "显示更多"
 
-#: hypha/apply/projects/reports/templates/reports/includes/reports.html:123
+#: hypha/apply/projects/reports/templates/reports/includes/reports.html:130
 #, fuzzy
 #| msgid "No reports submitted"
 msgid "No reports submitted yet."
 msgstr "没有已提交报告"
 
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:2
+#: hypha/apply/projects/reports/templates/reports/modals/add_report.html:18
+#, fuzzy
+#| msgid "Add Report"
+msgid "Add report date"
+msgstr "添加报告"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:2
+#, fuzzy
+#| msgid "Delete user"
+msgid "Delete report"
+msgstr "删除用户"
+
+#: hypha/apply/projects/reports/templates/reports/modals/confirm_delete.html:4
+#, fuzzy
+#| msgid "Are you sure you want to delete selected submissions?"
+msgid ""
+"Are you sure you want to delete this report? This action cannot be undone."
+msgstr "您确定要删除所选提交吗？"
+
+#: hypha/apply/projects/reports/templates/reports/modals/edit_report_due_date.html:2
+#, fuzzy
+#| msgid "Edit Report"
+msgid "Edit report due date"
+msgstr "编辑报告"
+
 #: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:2
 msgid "Change reporting frequency"
 msgstr "更改报告频率"
@@ -7899,24 +8554,24 @@ msgstr "报告"
 msgid "View project"
 msgstr "项目名称"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:50
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:23
 #: hypha/apply/projects/reports/templates/reports/report_form.html:24
 msgid "This report is for the period"
 msgstr "此报告针对阶段"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:56
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:32
 msgid "Report Skipped"
 msgstr "已跳过报告"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:58
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:37
 msgid "Public Report"
 msgstr "公开报告"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:107
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:85
 msgid "View previous report"
 msgstr "查看上一个报告"
 
-#: hypha/apply/projects/reports/templates/reports/report_detail.html:115
+#: hypha/apply/projects/reports/templates/reports/report_detail.html:93
 msgid "View next report"
 msgstr "查看下一个报告"
 
@@ -7994,38 +8649,60 @@ msgstr "提交了报告"
 msgid "No Projects Currently Reporting."
 msgstr "项目当前状态"
 
-#: hypha/apply/projects/reports/views.py:78
-#: hypha/apply/projects/reports/views.py:100
+#: hypha/apply/projects/reports/views.py:83
+#: hypha/apply/projects/reports/views.py:105
 #, fuzzy
 #| msgid "You do not have permission to create that determination."
 msgid "You do not have permission to access this report."
 msgstr "您没有创建决策的权限。"
 
-#: hypha/apply/projects/reports/views.py:125
+#: hypha/apply/projects/reports/views.py:130
 #, fuzzy
 #| msgid "You do not have permission to create that determination."
 msgid "You do not have permission to update this report."
 msgstr "您没有创建决策的权限。"
 
-#: hypha/apply/projects/reports/views.py:372
+#: hypha/apply/projects/reports/views.py:377
 #, fuzzy
 #| msgid "You do not have permission to create that determination."
 msgid "You do not have permission to update reporting configurations."
 msgstr "您没有创建决策的权限。"
 
-#: hypha/apply/projects/reports/views.py:491
+#: hypha/apply/projects/reports/views.py:496
 #, fuzzy
 #| msgid "Reporting Period"
 msgid "Reporting disabled"
 msgstr "报告间隔"
 
-#: hypha/apply/projects/tables.py:31
+#: hypha/apply/projects/reports/views.py:532
+#, fuzzy
+#| msgid "You do not have permission to create that determination."
+msgid "You do not have permission to add reports."
+msgstr "您没有创建决策的权限。"
+
+#: hypha/apply/projects/reports/views.py:572
+#, fuzzy
+#| msgid "You do not have permission to create that determination."
+msgid "You do not have permission to edit report due dates."
+msgstr "您没有创建决策的权限。"
+
+#: hypha/apply/projects/reports/views.py:583
+msgid "A submitted report's due date cannot be edited."
+msgstr ""
+
+#: hypha/apply/projects/reports/views.py:607
+#, fuzzy
+#| msgid "You do not have permission to create that determination."
+msgid "You do not have permission to delete reports."
+msgstr "您没有创建决策的权限。"
+
+#: hypha/apply/projects/tables.py:29
 #, fuzzy
 #| msgid "Invoice"
 msgid "Invoice #"
 msgstr "发票"
 
-#: hypha/apply/projects/tables.py:43
+#: hypha/apply/projects/tables.py:41
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
 #: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
@@ -8034,53 +8711,60 @@ msgstr "发票"
 msgid "Invoice date"
 msgstr "发票文件"
 
-#: hypha/apply/projects/tables.py:45
+#: hypha/apply/projects/tables.py:43
 #, fuzzy
 #| msgid "Project file: {title}"
 msgid "Project Title"
 msgstr "项目档案：{title}"
 
-#: hypha/apply/projects/tables.py:103
+#: hypha/apply/projects/tables.py:114
 #, fuzzy
 #| msgid "Vendor"
 msgid "Vendor Name"
 msgstr "供应商"
 
-#: hypha/apply/projects/tables.py:137
+#: hypha/apply/projects/tables.py:151
 msgid "Project Name"
 msgstr "项目名称"
 
-#: hypha/apply/projects/tables.py:188
+#: hypha/apply/projects/tables.py:204
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:66
+#, fuzzy
+#| msgid "Contractor"
+msgid "Contract #"
+msgstr "合约"
+
+#: hypha/apply/projects/tables.py:207
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:48
 #, fuzzy
 #| msgid "End Date"
 msgid "End date"
 msgstr "结束日期"
 
-#: hypha/apply/projects/tables.py:213
+#: hypha/apply/projects/tables.py:232
 #, python-brace-format
 msgid "{count} outstanding"
 msgstr ""
 
-#: hypha/apply/projects/tables.py:251
+#: hypha/apply/projects/tables.py:270
 #, fuzzy
 #| msgid "More information requested"
 msgid "Date requested"
 msgstr "需要更多信息"
 
-#: hypha/apply/projects/tables.py:266
+#: hypha/apply/projects/tables.py:288
 #, fuzzy
 #| msgid "Assign"
 msgid "Assignee"
 msgstr "分配"
 
-#: hypha/apply/projects/tables.py:286
+#: hypha/apply/projects/tables.py:308
 #, fuzzy
 #| msgid "Submit for Approval"
 msgid "Waiting for approval"
 msgstr "提交以批准"
 
-#: hypha/apply/projects/tables.py:288
+#: hypha/apply/projects/tables.py:310
 msgid "Waiting for assignee"
 msgstr ""
 
@@ -8135,8 +8819,8 @@ msgstr "签订合同中"
 #: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:170
 #: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:60
 #: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:56
-#: hypha/apply/projects/views/project.py:692
-#: hypha/apply/projects/views/project.py:815
+#: hypha/apply/projects/views/project.py:737
+#: hypha/apply/projects/views/project.py:860
 #: hypha/apply/templates/forms/includes/field.html:55
 msgid "Upload"
 msgstr "上传"
@@ -8231,12 +8915,12 @@ msgid "Update approvers"
 msgstr "更新"
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:55
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:156
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:159
 msgid "Change approver"
 msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:67
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:168
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:171
 #, fuzzy
 #| msgid "Assign reviewers"
 msgid "Assign approver"
@@ -8251,7 +8935,7 @@ msgstr "分配审核人"
 msgid "Project form"
 msgstr "项目信息"
 
-#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:124
+#: hypha/apply/projects/templates/application_projects/includes/project_documents.html:132
 #: hypha/apply/projects/templates/application_projects/includes/project_documents.html:172
 msgid "Fill in"
 msgstr "填写"
@@ -8274,7 +8958,7 @@ msgstr "查看申请"
 
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
 #: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:69
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:70
 msgid "Invoice"
 msgstr "发票"
 
@@ -8294,15 +8978,15 @@ msgstr "已付款"
 msgid "Vendor"
 msgstr "供应商"
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:74
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:76
 #, fuzzy
 #| msgid "Delete Invoice"
 msgid "Download invoice"
 msgstr "删除发票"
 
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:90
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:94
 #: hypha/apply/projects/templates/application_projects/paf_export.html:63
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:101
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:106
 msgid "Supporting Documents"
 msgstr "支持文档"
 
@@ -8395,6 +9079,12 @@ msgstr "更新发票状态"
 msgid "Project documents status"
 msgstr "项目发票"
 
+#: hypha/apply/projects/templates/application_projects/modals/project_contract_number_update.html:2
+#, fuzzy
+#| msgid "Contract number"
+msgid "Update contract number"
+msgstr "合同号"
+
 #: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
 #, fuzzy
 #| msgid "Update Project Status"
@@ -8545,13 +9235,6 @@ msgid ""
 "invoicing & reporting stage."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/paf_export.html:6
-#: hypha/apply/projects/templates/application_projects/sow_export.html:6
-#, fuzzy
-#| msgid "Project file: {title}"
-msgid "Project title"
-msgstr "项目档案：{title}"
-
 #: hypha/apply/projects/templates/application_projects/paf_export.html:7
 #: hypha/apply/projects/templates/application_projects/sow_export.html:7
 #, fuzzy
@@ -8560,29 +9243,29 @@ msgid "Project ID"
 msgstr "项目"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:18
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:44
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:49
 msgid "Approvals"
 msgstr "批准"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:32
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:66
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
 msgid "Submission lead"
 msgstr "提交领导人"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:34
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:69
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:72
 #, fuzzy
 #| msgid "No staff reviewers yet"
 msgid "Staff reviewers"
 msgstr "还没有员工审核人"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:41
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:75
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:78
 msgid "as"
 msgstr "作为"
 
 #: hypha/apply/projects/templates/application_projects/paf_export.html:51
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:89
 msgid "Advisory council"
 msgstr ""
 
@@ -8599,18 +9282,49 @@ msgstr "查看报告"
 msgid "Upload Contracting Documents"
 msgstr "支持文档"
 
-#: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:79
-#: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:76
+#: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:79
+#: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:76
+#, fuzzy
+#| msgid "Are you sure you want to submit your report?"
+msgid "Are you sure you want to remove this document?"
+msgstr "您确定要提交报告吗？"
+
+#: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:106
+#, fuzzy
+#| msgid "Supporting documents"
+msgid "Submit contract documents"
+msgstr "支持文档"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:9
+#, fuzzy
+#| msgid "Submission lead"
+msgid "Invoices: Export as CSV"
+msgstr "提交领导人"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:12
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:72
+msgid ""
+"Are you sure you want to export the invoices as a CSV file? This file may "
+"contain sensitive information, so please handle it carefully."
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:22
+#, fuzzy
+#| msgid "Submission lead"
+msgid "Invoices: Generating downloadable CSV"
+msgstr "提交领导人"
+
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:40
 #, fuzzy
-#| msgid "Are you sure you want to submit your report?"
-msgid "Are you sure you want to remove this document?"
-msgstr "您确定要提交报告吗？"
+#| msgid "Download PDF"
+msgid "Invoices: Download generated CSV"
+msgstr "下载 PDF"
 
-#: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:106
+#: hypha/apply/projects/templates/application_projects/partials/export-invoice-button.html:62
 #, fuzzy
-#| msgid "Supporting documents"
-msgid "Submit contract documents"
-msgstr "支持文档"
+#| msgid "Generate Codes"
+msgid "Invoices: Generate downloadable CSV"
+msgstr "生成代码"
 
 #: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:35
 #, fuzzy
@@ -8625,23 +9339,16 @@ msgstr "仅在“已提交”或您被请求更改时才可编辑"
 msgid "Edit Invoice"
 msgstr "添加发票"
 
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:29
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:52
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
-#, fuzzy
-#| msgid "made a comment"
-msgid "View comment"
-msgstr "留下了评论"
-
-#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:69
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:21
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:43
 #, fuzzy
-#| msgid "Show Codes"
-msgid "show less"
-msgstr "显示代码"
+#| msgid "Activity feed"
+msgid "Status & Activity"
+msgstr "活动订阅"
 
-#: hypha/apply/projects/templates/application_projects/partials/project_information.html:5
-msgid "Contractor"
-msgstr "合约"
+#: hypha/apply/projects/templates/application_projects/partials/object_status.html:48
+msgid "When you leave a comment or change the statuses, it'll show up here!"
+msgstr ""
 
 #: hypha/apply/projects/templates/application_projects/partials/project_information.html:22
 #, fuzzy
@@ -8662,6 +9369,29 @@ msgstr "项目档案：{title}"
 msgid "Awaiting contract finalization..."
 msgstr "等待决策"
 
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:75
+#, fuzzy
+#| msgid "Contract number"
+msgid "edit contract number"
+msgstr "合同号"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
+msgid "Copied!"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:87
+#, fuzzy
+#| msgid "Contract number"
+msgid "Copy contract number"
+msgstr "合同号"
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:91
+#, fuzzy
+#| msgid "Contract number"
+msgid "copy contract number"
+msgstr "合同号"
+
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:10
 #: hypha/apply/projects/templates/application_projects/partials/project_lead.html:14
 #, fuzzy
@@ -8711,24 +9441,24 @@ msgstr "当前状态"
 msgid "Update project status"
 msgstr "更新项目状态"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:23
-#: hypha/apply/projects/templates/application_projects/project_detail.html:54
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:49
 msgid "Project Information"
 msgstr "项目信息"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:83
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:94
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:86
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:97
 msgid "No reviews"
 msgstr "无审核"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:174
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:177
 #, fuzzy
 #| msgid "Download PDF"
 msgid "Download"
 msgstr "下载 PDF"
 
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:182
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:57
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:185
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:63
 #, fuzzy
 #| msgid "Download PDF"
 msgid "Download as DOCX"
@@ -8747,36 +9477,42 @@ msgstr "未配置好批准表单，请在如下位置添加"
 msgid "Proposal attachments"
 msgstr "附件"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:45
+#: hypha/apply/projects/templates/application_projects/project_detail.html:40
 #, python-format
 msgid "This project is in %(status)s state."
 msgstr ""
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:119
+#: hypha/apply/projects/templates/application_projects/project_detail.html:114
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "Project form approvals"
 msgstr "等待批准的项目"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#: hypha/apply/projects/templates/application_projects/project_detail.html:127
 #, fuzzy
 #| msgid "Request More Information"
 msgid "Request changes or more information by "
 msgstr "请求更多信息"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:149
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
+#, fuzzy
+#| msgid "made a comment"
+msgid "View comment"
+msgstr "留下了评论"
+
+#: hypha/apply/projects/templates/application_projects/project_detail.html:144
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "Pending approval from "
 msgstr "项目批准表单"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:153
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
 #, fuzzy
 #| msgid "Unsigned"
 msgid "nobody assigned yet"
 msgstr "未签名"
 
-#: hypha/apply/projects/templates/application_projects/project_detail.html:161
+#: hypha/apply/projects/templates/application_projects/project_detail.html:156
 #, fuzzy
 #| msgid "Approved"
 msgid "approved"
@@ -8795,7 +9531,7 @@ msgstr ""
 msgid "No Projects Available."
 msgstr "无可用项目。"
 
-#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
+#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:25
 #: hypha/apply/projects/templates/application_projects/sow_export.html:5
 msgid "Scope of Work"
 msgstr ""
@@ -8823,61 +9559,61 @@ msgstr "确定"
 msgid "{status} by {user_role}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:104
-#: hypha/apply/projects/templatetags/project_tags.py:109
-#: hypha/apply/projects/templatetags/project_tags.py:115
-#: hypha/apply/projects/templatetags/project_tags.py:119
-#: hypha/apply/projects/templatetags/project_tags.py:237
-#: hypha/apply/projects/templatetags/project_tags.py:249
-#: hypha/apply/projects/templatetags/project_tags.py:259
-#: hypha/apply/projects/templatetags/project_tags.py:278
-#: hypha/apply/projects/templatetags/project_tags.py:283
+#: hypha/apply/projects/templatetags/project_tags.py:117
+#: hypha/apply/projects/templatetags/project_tags.py:122
+#: hypha/apply/projects/templatetags/project_tags.py:128
+#: hypha/apply/projects/templatetags/project_tags.py:132
+#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:262
+#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:291
+#: hypha/apply/projects/templatetags/project_tags.py:296
 msgid "To do"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:105
+#: hypha/apply/projects/templatetags/project_tags.py:118
 msgid "Fill in the Project Form"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:110
+#: hypha/apply/projects/templatetags/project_tags.py:123
 msgid "Move project to next stage"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:116
+#: hypha/apply/projects/templatetags/project_tags.py:129
 msgid "Resubmit project documents for approval"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:120
+#: hypha/apply/projects/templatetags/project_tags.py:133
 #, fuzzy
 #| msgid "Submit for Approval"
 msgid "Submit project documents for approval"
 msgstr "提交以批准"
 
-#: hypha/apply/projects/templatetags/project_tags.py:124
-#: hypha/apply/projects/templatetags/project_tags.py:132
-#: hypha/apply/projects/templatetags/project_tags.py:136
-#: hypha/apply/projects/templatetags/project_tags.py:142
-#: hypha/apply/projects/templatetags/project_tags.py:158
-#: hypha/apply/projects/templatetags/project_tags.py:164
-#: hypha/apply/projects/templatetags/project_tags.py:179
-#: hypha/apply/projects/templatetags/project_tags.py:188
-#: hypha/apply/projects/templatetags/project_tags.py:194
-#: hypha/apply/projects/templatetags/project_tags.py:202
-#: hypha/apply/projects/templatetags/project_tags.py:211
-#: hypha/apply/projects/templatetags/project_tags.py:218
-#: hypha/apply/projects/templatetags/project_tags.py:225
-#: hypha/apply/projects/templatetags/project_tags.py:229
-#: hypha/apply/projects/templatetags/project_tags.py:243
-#: hypha/apply/projects/templatetags/project_tags.py:253
+#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:145
+#: hypha/apply/projects/templatetags/project_tags.py:149
+#: hypha/apply/projects/templatetags/project_tags.py:155
+#: hypha/apply/projects/templatetags/project_tags.py:171
+#: hypha/apply/projects/templatetags/project_tags.py:177
+#: hypha/apply/projects/templatetags/project_tags.py:192
+#: hypha/apply/projects/templatetags/project_tags.py:201
+#: hypha/apply/projects/templatetags/project_tags.py:207
+#: hypha/apply/projects/templatetags/project_tags.py:215
+#: hypha/apply/projects/templatetags/project_tags.py:224
+#: hypha/apply/projects/templatetags/project_tags.py:231
+#: hypha/apply/projects/templatetags/project_tags.py:238
+#: hypha/apply/projects/templatetags/project_tags.py:242
+#: hypha/apply/projects/templatetags/project_tags.py:256
 #: hypha/apply/projects/templatetags/project_tags.py:266
-#: hypha/apply/projects/templatetags/project_tags.py:272
+#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:285
 #, fuzzy
 #| msgid "Awaiting"
 msgid "Waiting for"
 msgstr "等待中"
 
-#: hypha/apply/projects/templatetags/project_tags.py:126
-#: hypha/apply/projects/templatetags/project_tags.py:144
+#: hypha/apply/projects/templatetags/project_tags.py:139
+#: hypha/apply/projects/templatetags/project_tags.py:157
 #, python-brace-format
 msgid ""
 "Awaiting project documents to be created and approved by {ORG_SHORT_NAME} "
@@ -8885,245 +9621,263 @@ msgid ""
 "stage."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:133
+#: hypha/apply/projects/templatetags/project_tags.py:146
 msgid "Changes requested. Awaiting documents to be resubmitted."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:137
+#: hypha/apply/projects/templatetags/project_tags.py:150
 msgid "Awaiting project form to be created."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:160
-#: hypha/apply/projects/templatetags/project_tags.py:196
+#: hypha/apply/projects/templatetags/project_tags.py:173
+#: hypha/apply/projects/templatetags/project_tags.py:209
 #, python-brace-format
 msgid "Awaiting approval. Assigned to {approver}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:166
-#: hypha/apply/projects/templatetags/project_tags.py:204
+#: hypha/apply/projects/templatetags/project_tags.py:179
+#: hypha/apply/projects/templatetags/project_tags.py:217
 #, python-brace-format
 msgid "Awaiting {reviewer_role} to assign an approver"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:180
+#: hypha/apply/projects/templatetags/project_tags.py:193
 msgid "Awaiting project form to be approved"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:189
+#: hypha/apply/projects/templatetags/project_tags.py:202
 msgid "Awaiting approval from other approvers teams"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:212
+#: hypha/apply/projects/templatetags/project_tags.py:225
 msgid "Awaiting project from assigned approvers"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:219
+#: hypha/apply/projects/templatetags/project_tags.py:232
 #, python-brace-format
 msgid "Awaiting signed contract from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:226
+#: hypha/apply/projects/templatetags/project_tags.py:239
 msgid "Awaiting signed contract from Staff/Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:230
+#: hypha/apply/projects/templatetags/project_tags.py:243
 msgid "Awaiting signed contract from Contracting team"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:239
+#: hypha/apply/projects/templatetags/project_tags.py:252
 msgid "Awaiting contract documents to be submitted by you."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:244
+#: hypha/apply/projects/templatetags/project_tags.py:257
 msgid "Awaiting countersigned contract from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:250
+#: hypha/apply/projects/templatetags/project_tags.py:263
 msgid "Awaiting contract documents submission by you"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:254
+#: hypha/apply/projects/templatetags/project_tags.py:267
 msgid "Awaiting contract documents submission from Vendor"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:261
+#: hypha/apply/projects/templatetags/project_tags.py:274
 msgid "Review the contract for all relevant details and approve."
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:268
+#: hypha/apply/projects/templatetags/project_tags.py:281
 #, python-brace-format
 msgid "Awaiting contract approval from {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:273
+#: hypha/apply/projects/templatetags/project_tags.py:286
 msgid "Awaiting contract approval from Staff"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:279
+#: hypha/apply/projects/templatetags/project_tags.py:292
 #, fuzzy
 #| msgid "Add Invoice"
 msgid "Add invoices"
 msgstr "添加发票"
 
-#: hypha/apply/projects/templatetags/project_tags.py:284
+#: hypha/apply/projects/templatetags/project_tags.py:297
 msgid "Review invoice and take action"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:303
+#: hypha/apply/projects/templatetags/project_tags.py:316
 #, python-brace-format
 msgid "Please download the signed contract uploaded by {ORG_SHORT_NAME}"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:305
+#: hypha/apply/projects/templatetags/project_tags.py:318
 msgid "Countersign"
 msgstr ""
 
-#: hypha/apply/projects/templatetags/project_tags.py:306
+#: hypha/apply/projects/templatetags/project_tags.py:319
 #, fuzzy
 #| msgid "Upload Signed Contract"
 msgid "Upload it back"
 msgstr "上传已签名合同"
 
-#: hypha/apply/projects/templatetags/project_tags.py:308
+#: hypha/apply/projects/templatetags/project_tags.py:321
 msgid "Please also make sure to upload other required contracting documents"
 msgstr ""
 
-#: hypha/apply/projects/utils.py:85
+#: hypha/apply/projects/utils.py:88
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "Pending approval"
 msgstr "等待批准的项目"
 
-#: hypha/apply/projects/utils.py:89
+#: hypha/apply/projects/utils.py:92
 #, fuzzy
 #| msgid "See our guide for more information"
 msgid "Request for change or more information"
 msgstr "阅读我们的指南以获得更多信息"
 
-#: hypha/apply/projects/views/payment.py:166
-#: hypha/apply/projects/views/payment.py:396
+#: hypha/apply/projects/views/invoice.py:175
+#: hypha/apply/projects/views/invoice.py:397
 #, python-brace-format
 msgid "<p>Invoice status updated to: {status}.</p>"
 msgstr "<p>发票状态已更新至：{status}。</p>"
 
-#: hypha/apply/projects/views/payment.py:209
+#: hypha/apply/projects/views/invoice.py:218
 #, fuzzy
 #| msgid "Reviewers updated."
 msgid "Invoice updated."
 msgstr "审核人已更新。"
 
-#: hypha/apply/projects/views/payment.py:299
+#: hypha/apply/projects/views/invoice.py:304
 #, fuzzy
 #| msgid "<p>Invoice status updated to: {status}.</p>"
 msgid "<p>Invoice added.</p>"
 msgstr "<p>发票状态已更新至：{status}。</p>"
 
-#: hypha/apply/projects/views/payment.py:575
+#: hypha/apply/projects/views/invoice.py:574
 msgid "Sorry something went wrong"
 msgstr "抱歉，出了些问题"
 
-#: hypha/apply/projects/views/project.py:265
+#: hypha/apply/projects/views/invoice.py:712
+#, fuzzy
+#| msgid "Reviewers updated."
+msgid "Invoice tags updated."
+msgstr "审核人已更新。"
+
+#: hypha/apply/projects/views/project.py:269
 #, fuzzy
 #| msgid "Submit for Approval"
 msgid "PAF has been submitted for approval"
 msgstr "提交以批准"
 
-#: hypha/apply/projects/views/project.py:337
+#: hypha/apply/projects/views/project.py:341
 msgid "Document has been uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:365
+#: hypha/apply/projects/views/project.py:369
 msgid "Document has been removed"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:396
+#: hypha/apply/projects/views/project.py:400
 #, fuzzy
 #| msgid "Contracting Information has been updated on %(title)s."
 msgid "Contracting document has been removed"
 msgstr "合同信息已于 %(title)s 更新。"
 
-#: hypha/apply/projects/views/project.py:443
+#: hypha/apply/projects/views/project.py:447
 #, fuzzy
 #| msgid "Unsigned"
 msgid "Unassigned"
 msgstr "未签名"
 
-#: hypha/apply/projects/views/project.py:452
+#: hypha/apply/projects/views/project.py:456
 #, fuzzy
 #| msgid "Last updated"
 msgid "Lead has been updated."
 msgstr "上次更新于"
 
-#: hypha/apply/projects/views/project.py:498
+#: hypha/apply/projects/views/project.py:502
 msgid "Title has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:534
+#: hypha/apply/projects/views/project.py:538
 #, fuzzy
 #| msgid "Last updated"
 msgid "Dates has been updated"
 msgstr "上次更新于"
 
-#: hypha/apply/projects/views/project.py:655
+#: hypha/apply/projects/views/project.py:580
+#, fuzzy
+#| msgid "Contracting Information has been updated on %(title)s."
+msgid "Contract number has been updated"
+msgstr "合同信息已于 %(title)s 更新。"
+
+#: hypha/apply/projects/views/project.py:701
 msgid ""
 "Contractor documents have been approved.  You can receive invoices from "
 "vendor now."
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:721
+#: hypha/apply/projects/views/project.py:766
 msgid "Countersigned contract uploaded"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:724
+#: hypha/apply/projects/views/project.py:769
 #, fuzzy
 #| msgid "Upload Signed Contract"
 msgid "Signed contract uploaded"
 msgstr "上传已签名合同"
 
-#: hypha/apply/projects/views/project.py:935
+#: hypha/apply/projects/views/project.py:986
 #, fuzzy
 #| msgid "No reports submitted"
 msgid "Contract documents submitted"
 msgstr "没有已提交报告"
 
-#: hypha/apply/projects/views/project.py:999
+#: hypha/apply/projects/views/project.py:1050
 #, fuzzy
 #| msgid "Contracting Information has been updated on %(title)s."
 msgid "Contracting document has been uploaded"
 msgstr "合同信息已于 %(title)s 更新。"
 
-#: hypha/apply/projects/views/project.py:1077
+#: hypha/apply/projects/views/project.py:1128
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "User don't have project form approver roles"
 msgstr "等待批准的项目"
 
-#: hypha/apply/projects/views/project.py:1083
+#: hypha/apply/projects/views/project.py:1134
 #, fuzzy, python-brace-format
 #| msgid "<p>{role} has updated PAF status to {paf_status}.</p>"
 msgid "Updated project form status to: {paf_status}"
 msgstr "<p>{role} 已将 PAF 状态更新至 {paf_status}。</p>"
 
-#: hypha/apply/projects/views/project.py:1173
+#: hypha/apply/projects/views/project.py:1224
 #, fuzzy
 #| msgid "Contracting Information has been updated on %(title)s."
 msgid "Project form status has been updated"
 msgstr "合同信息已于 %(title)s 更新。"
 
-#: hypha/apply/projects/views/project.py:1226
+#: hypha/apply/projects/views/project.py:1277
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "Project form has been approved"
 msgstr "等待批准的项目"
 
-#: hypha/apply/projects/views/project.py:1321
+#: hypha/apply/projects/views/project.py:1372
 msgid "Project status has been updated"
 msgstr ""
 
-#: hypha/apply/projects/views/project.py:1614
+#: hypha/apply/projects/views/project.py:1665
 msgid "Project form approvers have been updated"
 msgstr ""
 
+#: hypha/apply/projects/views/project.py:1799
+#, fuzzy
+#| msgid "No active submissions"
+msgid "No projects for this submission"
+msgstr "无活跃提交"
+
 #: hypha/apply/review/admin_helpers.py:11
 msgid "Clone"
 msgstr ""
@@ -9156,7 +9910,7 @@ msgstr "推荐"
 
 #: hypha/apply/review/blocks.py:149
 #: hypha/apply/review/templates/review/review_detail.html:48
-#: hypha/apply/review/views.py:431
+#: hypha/apply/review/views.py:440
 msgid "Visibility"
 msgstr "可见性"
 
@@ -9235,7 +9989,7 @@ msgstr "4. 好"
 msgid "5. Excellent"
 msgstr "5. 优秀"
 
-#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:245
+#: hypha/apply/review/options.py:23 hypha/apply/stream_forms/blocks.py:283
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:11
 msgid "No"
 msgstr "否"
@@ -9244,7 +9998,7 @@ msgstr "否"
 msgid "Maybe"
 msgstr "也许"
 
-#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:244
+#: hypha/apply/review/options.py:25 hypha/apply/stream_forms/blocks.py:282
 #: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:8
 msgid "Yes"
 msgstr "是"
@@ -9307,13 +10061,13 @@ msgid "View Changes"
 msgstr "更改"
 
 #: hypha/apply/review/templates/review/review_detail.html:40
-#: hypha/apply/review/views.py:429
+#: hypha/apply/review/views.py:438
 msgid "Recommendation"
 msgstr "推荐"
 
 #: hypha/apply/review/templates/review/review_detail.html:66
 #: hypha/apply/review/templates/review/review_list.html:30
-#: hypha/apply/review/views.py:427
+#: hypha/apply/review/views.py:436
 #, fuzzy
 #| msgid "Options"
 msgid "Opinions"
@@ -9386,167 +10140,181 @@ msgstr "推荐"
 msgid "Avg. score: {average}"
 msgstr ""
 
-#: hypha/apply/review/views.py:74
+#: hypha/apply/review/views.py:76
 msgid "Edit Review"
 msgstr "编辑审核"
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Update Review draft"
 msgstr "更新审核草稿"
 
-#: hypha/apply/review/views.py:152
+#: hypha/apply/review/views.py:154
 msgid "Create Review"
 msgstr "创建审核"
 
-#: hypha/apply/review/views.py:428
+#: hypha/apply/review/views.py:437
 #, fuzzy
 #| msgid "Total:"
 msgid "Overall Score"
 msgstr "总计："
 
-#: hypha/apply/review/views.py:430
+#: hypha/apply/review/views.py:439
 #, fuzzy
 #| msgid "Revisions"
 msgid "Revision"
 msgstr "修订"
 
-#: hypha/apply/review/views.py:470
+#: hypha/apply/review/views.py:479
 #, fuzzy
 #| msgid "current"
 msgid "Current"
 msgstr "当前"
 
-#: hypha/apply/stream_forms/blocks.py:114
-#: hypha/apply/stream_forms/blocks.py:217
+#: hypha/apply/stream_forms/blocks.py:123
+#: hypha/apply/stream_forms/blocks.py:255
 msgid "Required"
 msgstr "必需"
 
-#: hypha/apply/stream_forms/blocks.py:124
+#: hypha/apply/stream_forms/blocks.py:142
+#, fuzzy
+#| msgid "Proposal Information"
+msgid "Personal information"
+msgstr "提案信息"
+
+#: hypha/apply/stream_forms/blocks.py:146
+msgid ""
+"Tick this if the answer will contain personally identifiable information, "
+"such as a name, address, phone number or date of birth. Only the applicant, "
+"their co-applicants and staff will be able to see the answer. Reviewers and "
+"other users will see that the question was asked, but not the answer."
+msgstr ""
+
+#: hypha/apply/stream_forms/blocks.py:162
 msgid "Format"
 msgstr "格式"
 
-#: hypha/apply/stream_forms/blocks.py:125
-#: hypha/apply/stream_forms/blocks.py:156
-#: hypha/apply/stream_forms/blocks.py:171
+#: hypha/apply/stream_forms/blocks.py:163
+#: hypha/apply/stream_forms/blocks.py:194
+#: hypha/apply/stream_forms/blocks.py:209
 msgid "Default value"
 msgstr "默认值"
 
-#: hypha/apply/stream_forms/blocks.py:128
+#: hypha/apply/stream_forms/blocks.py:166
 msgid "Text field (single line)"
 msgstr "文本字段（单行）"
 
-#: hypha/apply/stream_forms/blocks.py:147
+#: hypha/apply/stream_forms/blocks.py:185
 msgid "Max number of inputs"
 msgstr "最大输入数"
 
-#: hypha/apply/stream_forms/blocks.py:148
+#: hypha/apply/stream_forms/blocks.py:186
 msgid "Add new item"
 msgstr "添加新项目"
 
-#: hypha/apply/stream_forms/blocks.py:151
+#: hypha/apply/stream_forms/blocks.py:189
 msgid "Text field (single line) (multiple inputs)"
 msgstr "文本字段（单行）（多个输入）"
 
-#: hypha/apply/stream_forms/blocks.py:157
+#: hypha/apply/stream_forms/blocks.py:195
 msgid "Word limit"
 msgstr "字数限制"
 
-#: hypha/apply/stream_forms/blocks.py:162
+#: hypha/apply/stream_forms/blocks.py:200
 msgid "Text field (multi line)"
 msgstr "文本字段（多行）"
 
-#: hypha/apply/stream_forms/blocks.py:176
+#: hypha/apply/stream_forms/blocks.py:214
 msgid "Number field"
 msgstr "数字字段"
 
-#: hypha/apply/stream_forms/blocks.py:189
+#: hypha/apply/stream_forms/blocks.py:227
 msgid "Checkbox field"
 msgstr "复选框字段"
 
-#: hypha/apply/stream_forms/blocks.py:201
-#: hypha/apply/stream_forms/blocks.py:219
+#: hypha/apply/stream_forms/blocks.py:239
+#: hypha/apply/stream_forms/blocks.py:257
 msgid "Choice"
 msgstr "选择"
 
-#: hypha/apply/stream_forms/blocks.py:207
+#: hypha/apply/stream_forms/blocks.py:245
 msgid "Radio buttons"
 msgstr "单选按钮"
 
-#: hypha/apply/stream_forms/blocks.py:221
+#: hypha/apply/stream_forms/blocks.py:259
 msgid ""
 "Please create only two choices for toggle. First choice will revel the group "
 "and the second hide it. Additional choices will be ignored."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:231
+#: hypha/apply/stream_forms/blocks.py:269
 msgid "Group fields"
 msgstr "组合字段"
 
-#: hypha/apply/stream_forms/blocks.py:233
+#: hypha/apply/stream_forms/blocks.py:271
 msgid "Remember to end group using Group fields end block."
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:253
+#: hypha/apply/stream_forms/blocks.py:291
 #, fuzzy
 #| msgid "Group fields"
 msgid "Group fields end"
 msgstr "组合字段"
 
-#: hypha/apply/stream_forms/blocks.py:255
+#: hypha/apply/stream_forms/blocks.py:293
 #, fuzzy
 #| msgid "Group fields"
 msgid "End of Group fields Block"
 msgstr "组合字段"
 
-#: hypha/apply/stream_forms/blocks.py:262
+#: hypha/apply/stream_forms/blocks.py:300
 msgid "Dropdown field"
 msgstr "下拉框字段"
 
-#: hypha/apply/stream_forms/blocks.py:272
+#: hypha/apply/stream_forms/blocks.py:310
 msgid "Checkbox"
 msgstr "复选框"
 
-#: hypha/apply/stream_forms/blocks.py:278
+#: hypha/apply/stream_forms/blocks.py:316
 msgid "Multiple checkboxes field"
 msgstr "多复选框字段"
 
-#: hypha/apply/stream_forms/blocks.py:319
+#: hypha/apply/stream_forms/blocks.py:357
 msgid "Date field"
 msgstr "日期字段"
 
-#: hypha/apply/stream_forms/blocks.py:341
+#: hypha/apply/stream_forms/blocks.py:379
 msgid "Time field"
 msgstr "时间字段"
 
-#: hypha/apply/stream_forms/blocks.py:373
+#: hypha/apply/stream_forms/blocks.py:411
 msgid "Date+time field"
 msgstr "日期+时间字段"
 
-#: hypha/apply/stream_forms/blocks.py:405
+#: hypha/apply/stream_forms/blocks.py:443
 msgid "Image field"
 msgstr "图像字段"
 
-#: hypha/apply/stream_forms/blocks.py:418
+#: hypha/apply/stream_forms/blocks.py:456
 #, fuzzy
 #| msgid "Multiple File field"
 msgid "Single File field"
 msgstr "多文件字段"
 
-#: hypha/apply/stream_forms/blocks.py:424
-#: hypha/apply/stream_forms/blocks.py:443
+#: hypha/apply/stream_forms/blocks.py:462
+#: hypha/apply/stream_forms/blocks.py:481
 #, python-brace-format
 msgid "{help_text} Accepted file types are {file_types}"
 msgstr ""
 
-#: hypha/apply/stream_forms/blocks.py:437
+#: hypha/apply/stream_forms/blocks.py:475
 msgid "Multiple File field"
 msgstr "多文件字段"
 
-#: hypha/apply/stream_forms/blocks.py:474
+#: hypha/apply/stream_forms/blocks.py:512
 msgid "Section header"
 msgstr "页眉"
 
-#: hypha/apply/stream_forms/blocks.py:493
+#: hypha/apply/stream_forms/blocks.py:531
 msgid "Form fields"
 msgstr "表单字段"
 
@@ -9588,32 +10356,25 @@ msgid ""
 "update your user account with the name you provide here."
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:8
-#, python-format
-msgid "View file - %(filename)s"
-msgstr ""
-
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:14
+#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
 #, fuzzy
-#| msgid "Upload"
-msgid "uploaded"
-msgstr "上传"
+#| msgid "No Screening"
+msgid "No selection"
+msgstr "无审查"
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:25
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
 #, fuzzy
-#| msgid "File not found on submission"
-msgid "File not found"
-msgstr "提交时未找到文件"
+#| msgid "Contact information"
+msgid "Contains personal information."
+msgstr "联系人信息"
 
-#: hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html:32
-msgid "Missing file"
+#: hypha/apply/stream_forms/templates/stream_forms/render_field.html:7
+msgid "(PII)"
 msgstr ""
 
-#: hypha/apply/stream_forms/templates/stream_forms/render_checkbox_field.html:13
-#, fuzzy
-#| msgid "No Screening"
-msgid "No selection"
-msgstr "无审查"
+#: hypha/apply/stream_forms/templates/stream_forms/render_redacted_field.html:12
+msgid "Hidden — contains personal information."
+msgstr ""
 
 #: hypha/apply/templates/forms/includes/field.html:11
 msgid "This field is required."
@@ -9649,131 +10410,143 @@ msgstr ""
 msgid "tasks"
 msgstr ""
 
-#: hypha/apply/todo/options.py:30
+#: hypha/apply/todo/options.py:32
 #, fuzzy
 #| msgid "Comments"
 msgid "Comment Task"
 msgstr "评论"
 
-#: hypha/apply/todo/options.py:31
+#: hypha/apply/todo/options.py:33
 #, fuzzy
 #| msgid "Submission"
 msgid "Submission Draft"
 msgstr "提交"
 
-#: hypha/apply/todo/options.py:32
+#: hypha/apply/todo/options.py:34
 #, fuzzy
 #| msgid "Update Determination draft"
 msgid "Determination draft"
 msgstr "更新决策"
 
-#: hypha/apply/todo/options.py:33
+#: hypha/apply/todo/options.py:35
 #, fuzzy
 #| msgid "Review for"
 msgid "Review Draft"
 msgstr "审核对"
 
-#: hypha/apply/todo/options.py:34
+#: hypha/apply/todo/options.py:36
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project waiting project form"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/todo/options.py:35
+#: hypha/apply/todo/options.py:37
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project waiting scope of work"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/todo/options.py:36
+#: hypha/apply/todo/options.py:38
 #, fuzzy
 #| msgid "Project Approval Form"
 msgid "Project submit project form(s)"
 msgstr "项目批准表单"
 
-#: hypha/apply/todo/options.py:37
+#: hypha/apply/todo/options.py:39
 msgid "Project submit scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:38
+#: hypha/apply/todo/options.py:40
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project form required changes"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/todo/options.py:39
+#: hypha/apply/todo/options.py:41
 #, fuzzy
 #| msgid "Project's current status"
 msgid "Project form waiting assignee"
 msgstr "项目当前状态"
 
-#: hypha/apply/todo/options.py:40
+#: hypha/apply/todo/options.py:42
 #, fuzzy
 #| msgid "Projects awaiting approval"
 msgid "Project form waiting approval"
 msgstr "等待批准的项目"
 
-#: hypha/apply/todo/options.py:41
+#: hypha/apply/todo/options.py:43
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project waiting contract"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/todo/options.py:44
+#: hypha/apply/todo/options.py:46
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project waiting contract document"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/todo/options.py:46
+#: hypha/apply/todo/options.py:48
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project waiting contract review"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/todo/options.py:47
+#: hypha/apply/todo/options.py:49
 #, fuzzy
 #| msgid "A Project is awaiting your review."
 msgid "Project waiting invoice"
 msgstr "有项目正等待您的审核。"
 
-#: hypha/apply/todo/options.py:48
+#: hypha/apply/todo/options.py:50
 #, fuzzy
 #| msgid "Invoice File"
 msgid "Invoice required changes"
 msgstr "发票文件"
 
-#: hypha/apply/todo/options.py:49
+#: hypha/apply/todo/options.py:51
 #, fuzzy
 #| msgid "Submit for Approval"
 msgid "Invoice waiting approval"
 msgstr "提交以批准"
 
-#: hypha/apply/todo/options.py:50
+#: hypha/apply/todo/options.py:52
 #, fuzzy
 #| msgid "Invoice File"
 msgid "Invoice waiting paid"
 msgstr "发票文件"
 
-#: hypha/apply/todo/options.py:51
+#: hypha/apply/todo/options.py:53
 #, fuzzy
 #| msgid "Report"
 msgid "Report due"
 msgstr "报告"
 
-#: hypha/apply/todo/options.py:52
+#: hypha/apply/todo/options.py:54
 #, fuzzy
 #| msgid "Related submissions"
 msgid "Download exported submissions"
 msgstr "相关提交"
 
-#: hypha/apply/todo/options.py:55
+#: hypha/apply/todo/options.py:57
 #, fuzzy
 #| msgid "Filter submissions to calculate values"
 msgid "Failed to generate submissions export file"
 msgstr "筛选要计算数值的提交"
 
-#: hypha/apply/todo/options.py:65
+#: hypha/apply/todo/options.py:59
+#, fuzzy
+#| msgid "Related submissions"
+msgid "Download exported invoices"
+msgstr "相关提交"
+
+#: hypha/apply/todo/options.py:62
+#, fuzzy
+#| msgid "Filter submissions to calculate values"
+msgid "Failed to generate invoices export file"
+msgstr "筛选要计算数值的提交"
+
+#: hypha/apply/todo/options.py:72
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.source.fund_name} "
@@ -9781,7 +10554,7 @@ msgid ""
 "comment: <q class=\"text-fg-muted italic align-bottom\">{msg}</q>"
 msgstr ""
 
-#: hypha/apply/todo/options.py:75
+#: hypha/apply/todo/options.py:82
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9789,7 +10562,7 @@ msgid ""
 "align-bottom \">\"{related.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:83
+#: hypha/apply/todo/options.py:90
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -9798,7 +10571,7 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:91
+#: hypha/apply/todo/options.py:98
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.submission.fund_name} "
@@ -9807,70 +10580,70 @@ msgid ""
 "bottom\">\"{related.submission.title}\"</span> is waiting to be submitted"
 msgstr ""
 
-#: hypha/apply/todo/options.py:101
+#: hypha/apply/todo/options.py:108
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form"
 msgstr ""
 
-#: hypha/apply/todo/options.py:109
+#: hypha/apply/todo/options.py:116
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for scope of work"
 msgstr ""
 
-#: hypha/apply/todo/options.py:117
+#: hypha/apply/todo/options.py:124
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for project form(s) submission"
 msgstr ""
 
-#: hypha/apply/todo/options.py:125
+#: hypha/apply/todo/options.py:132
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form requires changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:134
+#: hypha/apply/todo/options.py:141
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project form is waiting for assignee"
 msgstr ""
 
-#: hypha/apply/todo/options.py:142
+#: hypha/apply/todo/options.py:149
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br> Project form is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:151
+#: hypha/apply/todo/options.py:158
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contract"
 msgstr ""
 
-#: hypha/apply/todo/options.py:159
+#: hypha/apply/todo/options.py:166
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Project is waiting for contracting documents"
 msgstr ""
 
-#: hypha/apply/todo/options.py:167
+#: hypha/apply/todo/options.py:174
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
 "span><br>Contract for project is waiting for review"
 msgstr ""
 
-#: hypha/apply/todo/options.py:176
+#: hypha/apply/todo/options.py:183
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.fund_name} #{related.application_id}</"
@@ -9878,7 +10651,7 @@ msgid ""
 "bottom\">\"{related.title}\"</span> is waiting for invoice"
 msgstr ""
 
-#: hypha/apply/todo/options.py:184
+#: hypha/apply/todo/options.py:191
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9886,7 +10659,7 @@ msgid ""
 "{related.invoice_number} required changes or more information"
 msgstr ""
 
-#: hypha/apply/todo/options.py:192
+#: hypha/apply/todo/options.py:199
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9894,7 +10667,7 @@ msgid ""
 "{related.invoice_number} is waiting for your approval"
 msgstr ""
 
-#: hypha/apply/todo/options.py:200
+#: hypha/apply/todo/options.py:207
 #, python-brace-format
 msgid ""
 "<span class='text-xs'>{related.project.fund_name} "
@@ -9902,7 +10675,7 @@ msgid ""
 "{related.invoice_number} is waiting to be paid"
 msgstr ""
 
-#: hypha/apply/todo/options.py:208
+#: hypha/apply/todo/options.py:215
 #, python-brace-format
 msgid ""
 "<span class=\"text-xs\">{related.project.fund_name} "
@@ -9911,21 +10684,31 @@ msgid ""
 "\">\"{related.project.title}\"</span> is due"
 msgstr ""
 
-#: hypha/apply/todo/options.py:216
+#: hypha/apply/todo/options.py:223
 msgid "Your generated submission export file is ready for download"
 msgstr ""
 
-#: hypha/apply/todo/options.py:219 hypha/apply/todo/options.py:227
+#: hypha/apply/todo/options.py:226 hypha/apply/todo/options.py:234
+#: hypha/apply/todo/options.py:241 hypha/apply/todo/options.py:249
 #, fuzzy
 #| msgid "Report"
 msgid "export"
 msgstr "报告"
 
-#: hypha/apply/todo/options.py:223
+#: hypha/apply/todo/options.py:230
 msgid ""
 "There was an issue generating your submission export file, please try again."
 msgstr ""
 
+#: hypha/apply/todo/options.py:238
+msgid "Your generated invoice export file is ready for download"
+msgstr ""
+
+#: hypha/apply/todo/options.py:245
+msgid ""
+"There was an issue generating your invoice export file, please try again."
+msgstr ""
+
 #: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
 #, fuzzy
 #| msgid "You don't have any backup codes yet."
@@ -9999,157 +10782,194 @@ msgstr "月"
 msgid "View users in this group"
 msgstr ""
 
-#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:63
+#: hypha/apply/users/forms.py:27 hypha/apply/users/forms.py:67
 msgid "Remember me"
 msgstr ""
 
-#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:65
+#: hypha/apply/users/forms.py:29 hypha/apply/users/forms.py:69
 msgid "On trusted devices only, keeps you logged in for a longer period."
 msgstr ""
 
-#: hypha/apply/users/forms.py:55
+#: hypha/apply/users/forms.py:57
 #, fuzzy
 #| msgid "email address"
 msgid "Email address"
 msgstr "电子邮箱地址"
 
-#: hypha/apply/users/forms.py:86
+#: hypha/apply/users/forms.py:90
 msgid "A user with that email already exists."
 msgstr ""
 
-#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/forms.py:91
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: hypha/apply/users/forms.py:200
+#: hypha/apply/users/forms.py:208
 msgid ""
 "You are registered using OAuth, please contact an admin if you need to "
 "change your email address."
 msgstr "您是使用 OAuth 注册的，若要更改电子邮件地址，请联系管理员。"
 
-#: hypha/apply/users/forms.py:208
+#: hypha/apply/users/forms.py:216
 msgid "Slack names must not include spaces"
 msgstr ""
 
-#: hypha/apply/users/forms.py:251
+#: hypha/apply/users/forms.py:259
 msgid "Only includes active, non-superusers"
 msgstr "只包括活跃、非超级用户的用户"
 
-#: hypha/apply/users/forms.py:261
-#: hypha/apply/users/templates/users/account.html:64
+#: hypha/apply/users/forms.py:269
+#: hypha/apply/users/templates/users/account.html:67
 #: hypha/apply/users/templates/users/activation/email.txt:13
 #: hypha/elevate/forms.py:20
 msgid "Password"
 msgstr "密码"
 
-#: hypha/apply/users/forms.py:262
+#: hypha/apply/users/forms.py:270
 msgid "Email change requires you to put password."
 msgstr "更改电子邮箱需要您输入密码。"
 
-#: hypha/apply/users/forms.py:275
+#: hypha/apply/users/forms.py:283
 msgid "Incorrect password. Please try again."
 msgstr "密码不正确。请重试。"
 
-#: hypha/apply/users/forms.py:291
+#: hypha/apply/users/forms.py:299
 msgid "To proceed, type \"disable\" below and then click on \"confirm\":"
 msgstr ""
 
-#: hypha/apply/users/forms.py:301
+#: hypha/apply/users/forms.py:309
 msgid "Incorrect input."
 msgstr ""
 
-#: hypha/apply/users/middleware.py:52
+#: hypha/apply/users/middleware.py:56
 #, fuzzy
 #| msgid "Two-Factor Authentication"
 msgid "Two factor authentication required"
 msgstr "双重认证"
 
-#: hypha/apply/users/models.py:195
+#: hypha/apply/users/models.py:230
 msgid "email address"
 msgstr "电子邮箱地址"
 
-#: hypha/apply/users/models.py:197
+#: hypha/apply/users/models.py:232
 #, fuzzy
 #| msgid "Full name"
 msgid "full name"
 msgstr "全名"
 
-#: hypha/apply/users/models.py:200
+#: hypha/apply/users/models.py:235
 #, fuzzy
 #| msgid "Slack name"
 msgid "slack name"
 msgstr "Slack 名称"
 
-#: hypha/apply/users/models.py:202
+#: hypha/apply/users/models.py:237
 msgid "This is the name we should \"@mention\" when sending notifications"
 msgstr "这是我们在发送通知时，应当“@提及”的名称"
 
-#: hypha/apply/users/models.py:321
+#: hypha/apply/users/models.py:391
 msgid "user"
 msgstr ""
 
-#: hypha/apply/users/models.py:322
+#: hypha/apply/users/models.py:392
 msgid "users"
 msgstr ""
 
-#: hypha/apply/users/models.py:333
+#: hypha/apply/users/models.py:403
 #, fuzzy
 #| msgid "fund settings"
 msgid "Auth Settings"
 msgstr "基金设置"
 
-#: hypha/apply/users/models.py:335
+#: hypha/apply/users/models.py:405
 msgid "show consent checkbox?"
 msgstr ""
 
-#: hypha/apply/users/models.py:336
+#: hypha/apply/users/models.py:406
 msgid "consent text"
 msgstr ""
 
-#: hypha/apply/users/models.py:337
+#: hypha/apply/users/models.py:407
 msgid "consent help"
 msgstr ""
 
-#: hypha/apply/users/models.py:339
+#: hypha/apply/users/models.py:409
 msgid "login extra text"
 msgstr ""
 
-#: hypha/apply/users/models.py:341
+#: hypha/apply/users/models.py:411
 msgid "Displayed along side login form"
 msgstr ""
 
-#: hypha/apply/users/models.py:351
+#: hypha/apply/users/models.py:421
 msgid "User consent on login & register forms"
 msgstr ""
 
-#: hypha/apply/users/models.py:357
+#: hypha/apply/users/models.py:427
 msgid "Login form customizations"
 msgstr ""
 
-#: hypha/apply/users/models.py:382
+#: hypha/apply/users/models.py:452
 #, fuzzy
 #| msgid "Pending"
 msgid "Pending signup"
 msgstr "等待中"
 
-#: hypha/apply/users/models.py:383
+#: hypha/apply/users/models.py:453
 #, fuzzy
 #| msgid "Related submissions"
 msgid "Pending signups"
 msgstr "相关提交"
 
-#: hypha/apply/users/models.py:401
+#: hypha/apply/users/models.py:471
 #, fuzzy
 #| msgid "Confirm"
 msgid "Confirm Access Token"
 msgstr "确定"
 
-#: hypha/apply/users/models.py:402
+#: hypha/apply/users/models.py:472
 #, fuzzy
 #| msgid "Confirm"
 msgid "Confirm Access Tokens"
 msgstr "确定"
 
+#: hypha/apply/users/passkey_views.py:160
+#, python-brace-format
+msgid "Maximum of {max} passkeys allowed"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:197
+#: hypha/apply/users/passkey_views.py:278
+msgid "Invalid JSON"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:202
+#: hypha/apply/users/passkey_views.py:283
+msgid "No active WebAuthn challenge"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:230
+#: hypha/apply/users/passkey_views.py:351
+#: hypha/apply/users/passkey_views.py:358
+#, fuzzy
+#| msgid "Application Outcome"
+msgid "Verification failed"
+msgstr "申请结果"
+
+#: hypha/apply/users/passkey_views.py:248
+msgid "Could not save passkey"
+msgstr ""
+
+#: hypha/apply/users/passkey_views.py:292
+#, fuzzy
+#| msgid "Invalid activation"
+msgid "Invalid credential"
+msgstr "激活无效"
+
+#: hypha/apply/users/passkey_views.py:336
+msgid "Unknown credential"
+msgstr ""
+
 #: hypha/apply/users/roles.py:4
 msgid "Administrator"
 msgstr ""
@@ -10221,17 +11041,32 @@ msgid ""
 "contracting."
 msgstr ""
 
-#: hypha/apply/users/services.py:110
+#: hypha/apply/users/services.py:36
+#, python-format
+msgid "A passkey was added to your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:41
+#, python-format
+msgid "A passkey was removed from your %(org)s account"
+msgstr ""
+
+#: hypha/apply/users/services.py:152
 #, fuzzy, python-brace-format
 #| msgid "Log in with your %(ORG_SHORT_NAME)s email"
 msgid "Log in to {user} at {ORG_LONG_NAME}"
 msgstr "用您的 %(ORG_SHORT_NAME)s 电子邮箱登录"
 
-#: hypha/apply/users/services.py:134
+#: hypha/apply/users/services.py:176
 #, python-brace-format
 msgid "Welcome to {ORG_LONG_NAME}"
 msgstr ""
 
+#: hypha/apply/users/signals.py:31
+#, python-format
+msgid "Successful login to %(org)s"
+msgstr ""
+
 #: hypha/apply/users/templates/elevate/elevate.html:4
 #: hypha/apply/users/templates/elevate/elevate.html:10
 #, fuzzy
@@ -10272,13 +11107,19 @@ msgid ""
 "inactivity."
 msgstr ""
 
+#: hypha/apply/users/templates/includes/delete_user_submissions_form.html:20
+#, fuzzy
+#| msgid "Delete"
+msgid "Yes, delete"
+msgstr "删除"
+
 #: hypha/apply/users/templates/two_factor/_base.html:8
 #: hypha/apply/users/templates/users/change_password.html:9
 msgid "Back to account"
 msgstr "返回账户"
 
 #: hypha/apply/users/templates/two_factor/_base.html:9
-#: hypha/apply/users/templates/users/account.html:85
+#: hypha/apply/users/templates/users/account.html:88
 msgid "Two-Factor Authentication (2FA)"
 msgstr "双重认证 (2FA)"
 
@@ -10324,10 +11165,6 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:37
-msgid "Copied!"
-msgstr ""
-
 #: hypha/apply/users/templates/two_factor/core/backup_tokens.html:41
 msgid "Copy to Clipboard"
 msgstr ""
@@ -10556,36 +11393,46 @@ msgstr ""
 msgid "Profile"
 msgstr "个人资料"
 
-#: hypha/apply/users/templates/users/account.html:60
+#: hypha/apply/users/templates/users/account.html:63
 msgid "Account Security"
 msgstr "账户安全"
 
-#: hypha/apply/users/templates/users/account.html:69
+#: hypha/apply/users/templates/users/account.html:72
 #: hypha/apply/users/templates/users/change_password.html:3
 msgid "Update password"
 msgstr "更新密码"
 
-#: hypha/apply/users/templates/users/account.html:77
+#: hypha/apply/users/templates/users/account.html:80
 #, fuzzy
 #| msgid "Password"
 msgid "Set Password"
 msgstr "密码"
 
-#: hypha/apply/users/templates/users/account.html:89
+#: hypha/apply/users/templates/users/account.html:92
 #, fuzzy
 #| msgid "Backup Codes"
 msgid "Backup codes"
 msgstr "备份代码"
 
-#: hypha/apply/users/templates/users/account.html:90
+#: hypha/apply/users/templates/users/account.html:93
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:9
 msgid "Disable 2FA"
 msgstr "禁用 2FA"
 
-#: hypha/apply/users/templates/users/account.html:92
+#: hypha/apply/users/templates/users/account.html:95
 msgid "Enable 2FA"
 msgstr "启用双重验证"
 
+#: hypha/apply/users/templates/users/account.html:100
+msgid "Passkeys"
+msgstr ""
+
+#: hypha/apply/users/templates/users/account.html:102
+msgid ""
+"With passkeys you can use your fingerprint, face, or screen lock to login "
+"securely without a password."
+msgstr ""
+
 #: hypha/apply/users/templates/users/activation/confirm.html:4
 #, fuzzy
 #| msgid "Confirmation email"
@@ -10719,7 +11566,7 @@ msgid "Select User:"
 msgstr "已选中"
 
 #: hypha/apply/users/templates/users/become.html:26
-#: hypha/templates/includes/user_menu.html:69
+#: hypha/apply/users/templates/users/includes/user_menu.html:69
 msgid "Switch User"
 msgstr ""
 
@@ -10756,7 +11603,7 @@ msgid "Email Change - Verify Email"
 msgstr "验证邮箱"
 
 #: hypha/apply/users/templates/users/email_change/done.html:4
-#: hypha/apply/users/views.py:230
+#: hypha/apply/users/views.py:235
 msgid "Verify Email"
 msgstr "验证邮箱"
 
@@ -10805,37 +11652,100 @@ msgid ""
 "Try again to change email from accounts page. If that fails please contact "
 "%(ORG_SHORT_NAME)s at <a href=\"mailto:%(ORG_EMAIL)s\">%(ORG_EMAIL)s</a>."
 msgstr ""
-"请从账户页面再次尝试更改电子邮箱。如果依然失败，请用以下地址联系 "
-"%(ORG_SHORT_NAME)s"
+"请从账户页面再次尝试更改电子邮箱。如果依然失败，请用以下地址联系 "
+"%(ORG_SHORT_NAME)s"
+
+#: hypha/apply/users/templates/users/email_change/update_info_email.html:4
+#, python-format
+msgid ""
+"There has been an attempt to change email of your account on the "
+"%(ORG_LONG_NAME)s web site. If this action wasn't made by you, please "
+"contact support at %(ORG_EMAIL)s "
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/confirm_access.md:4
+#, python-format
+msgid ""
+"To confirm access at %(ORG_LONG_NAME)s use the code below (valid for "
+"%(timeout_minutes)s minutes):"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/confirm_access.md:8
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:15
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:10
+msgid "If you did not request this email, please ignore it."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/confirm_access.md:11
+#: hypha/apply/users/templates/users/emails/login_notification.md:11
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:12
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:12
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
+#, fuzzy, python-format
+#| msgid "If you have any questions, please submit them here"
+msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
+msgstr "若您有任何问题，请在这里提交"
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that your account was successfully logged in to "
+"%(ORG_LONG_NAME)s."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:6
+#, python-format
+msgid "Login time: %(login_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/login_notification.md:8
+msgid ""
+"If you did not log in, please contact us immediately and consider changing "
+"your password."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:4
+#, python-format
+msgid ""
+"This is to notify you that a new passkey was added to your account at "
+"%(ORG_LONG_NAME)s."
+msgstr ""
 
-#: hypha/apply/users/templates/users/email_change/update_info_email.html:4
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:6
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:6
 #, python-format
+msgid "Passkey: %(passkey_name)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:7
+#, python-format
+msgid "Added: %(event_time)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passkey_added_notification.md:9
 msgid ""
-"There has been an attempt to change email of your account on the "
-"%(ORG_LONG_NAME)s web site. If this action wasn't made by you, please "
-"contact support at %(ORG_EMAIL)s "
+"If you did not add this passkey, please contact us immediately and consider "
+"removing it from your account."
 msgstr ""
 
-#: hypha/apply/users/templates/users/emails/confirm_access.md:4
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:4
 #, python-format
 msgid ""
-"To confirm access at %(ORG_LONG_NAME)s use the code below (valid for "
-"%(timeout_minutes)s minutes):"
+"This is to notify you that a passkey was removed from your account at "
+"%(ORG_LONG_NAME)s."
 msgstr ""
 
-#: hypha/apply/users/templates/users/emails/confirm_access.md:8
-#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:15
-#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:10
-msgid "If you did not request this email, please ignore it."
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:7
+#, python-format
+msgid "Removed: %(event_time)s"
 msgstr ""
 
-#: hypha/apply/users/templates/users/emails/confirm_access.md:11
-#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:18
-#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:13
-#, fuzzy, python-format
-#| msgid "If you have any questions, please submit them here"
-msgid "If you have any questions, please contact us at %(ORG_EMAIL)s."
-msgstr "若您有任何问题，请在这里提交"
+#: hypha/apply/users/templates/users/emails/passkey_removed_notification.md:9
+msgid ""
+"If you did not remove this passkey, please contact us immediately and "
+"consider changing your password if you have one."
+msgstr ""
 
 #: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
 #, fuzzy, python-format
@@ -10902,6 +11812,97 @@ msgstr ""
 msgid "Set password for %(username)s at %(ORG_LONG_NAME)s"
 msgstr ""
 
+#: hypha/apply/users/templates/users/includes/okta_login_button.html:7
+#, fuzzy
+#| msgid "Your chosen password"
+msgid "Log in with Okta"
+msgstr "您选用的密码"
+
+#: hypha/apply/users/templates/users/includes/org_login_button.html:7
+#, python-format
+msgid "Log in with your %(ORG_SHORT_NAME)s email"
+msgstr "用您的 %(ORG_SHORT_NAME)s 电子邮箱登录"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:14
+#, fuzzy
+#| msgid "Your chosen password"
+msgid "Log in with passkey"
+msgstr "您选用的密码"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:18
+#, fuzzy
+#| msgid "Enable Two-Factor Authentication"
+msgid "Failed to begin authentication"
+msgstr "启用双重认证"
+
+#: hypha/apply/users/templates/users/includes/passkey_login_button.html:19
+#, fuzzy
+#| msgid "Application title"
+msgid "Authentication failed"
+msgstr "申请标题"
+
+#: hypha/apply/users/templates/users/includes/password_login_button.html:7
+#, fuzzy
+#| msgid "Your chosen password"
+msgid "Log in with password"
+msgstr "您选用的密码"
+
+#: hypha/apply/users/templates/users/includes/passwordless_login_button.html:7
+#, fuzzy
+#| msgid "Forgot your password?"
+msgid "Log in without password"
+msgstr "忘记密码？"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:27
+#, fuzzy
+#| msgid "Back to account"
+msgid "Goto your account"
+msgstr "返回账户"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:31
+#, fuzzy
+#| msgid "Account"
+msgid "My account"
+msgstr "账户"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:36
+#, fuzzy
+#| msgid "The slack #channel for notifications."
+msgid "Check latest notifications"
+msgstr "接收通知的 Slack #频道。"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:40
+msgid "Activity feed"
+msgstr "活动订阅"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:44
+#, fuzzy
+#| msgid "Your Flagged Submissions"
+msgid "Goto your flagged submissions"
+msgstr "您的已标记提交"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:48
+msgid "My flagged"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:53
+msgid "Goto wagtail admin"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:84
+msgid "Release User"
+msgstr ""
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:92
+msgid "Log out"
+msgstr "注销"
+
+#: hypha/apply/users/templates/users/includes/user_menu.html:102
+#, fuzzy
+#| msgid "Sign up"
+msgid " or Sign up"
+msgstr "注册"
+
 #: hypha/apply/users/templates/users/login.html:23
 #: hypha/apply/users/templates/users/login.html:31
 #, fuzzy
@@ -10942,31 +11943,31 @@ msgstr "忘记密码？"
 msgid "OR"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:109
+#: hypha/apply/users/templates/users/login.html:115
 msgid "Or, alternatively, use one of your backup phones:"
 msgstr "或者也可以使用您的备用手机号码："
 
-#: hypha/apply/users/templates/users/login.html:125
+#: hypha/apply/users/templates/users/login.html:131
 msgid "As a last resort, you can use a backup codes: "
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:130
+#: hypha/apply/users/templates/users/login.html:136
 msgid "Click here to use a backup code"
 msgstr ""
 
-#: hypha/apply/users/templates/users/login.html:133
+#: hypha/apply/users/templates/users/login.html:139
 #, fuzzy
 #| msgid "Backup Codes"
 msgid "Use a Backup Code"
 msgstr "备份代码"
 
-#: hypha/apply/users/templates/users/login.html:149
+#: hypha/apply/users/templates/users/login.html:163
 #, fuzzy
 #| msgid "Notifications"
 msgid "Verification Code"
 msgstr "通知"
 
-#: hypha/apply/users/templates/users/login.html:153
+#: hypha/apply/users/templates/users/login.html:167
 #, fuzzy
 #| msgid "Backup Codes"
 msgid "Backup Code"
@@ -11012,6 +12013,70 @@ msgstr ""
 msgid "Use your password"
 msgstr "忘记密码？"
 
+#: hypha/apply/users/templates/users/partials/passkey-list.html:22
+#: hypha/apply/users/templates/users/partials/passkey-list.html:70
+#, fuzzy
+#| msgid "Slack name"
+msgid "Passkey name"
+msgstr "Slack 名称"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:23
+msgid "Click to edit name"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:26
+#, fuzzy
+#| msgid "Save draft"
+msgid "Save name"
+msgstr "保存草稿"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:32
+#, python-format
+msgid "Used %(when)s ago"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:34
+msgid "Never used"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:41
+msgid "Delete this passkey?"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:44
+#, fuzzy
+#| msgid "Delete user"
+msgid "Delete passkey"
+msgstr "删除用户"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:52
+msgid "No passkeys registered."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:59
+msgid "Server error"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:60
+#, fuzzy
+#| msgid "Revisions"
+msgid "Registration failed"
+msgstr "修订"
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:61
+msgid ""
+"This authenticator already has a passkey registered. Try a different "
+"authenticator or device."
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:69
+msgid "e.g. MacBook Touch ID"
+msgstr ""
+
+#: hypha/apply/users/templates/users/partials/passkey-list.html:75
+msgid "Add passkey"
+msgstr ""
+
 #: hypha/apply/users/templates/users/password_reset/complete.html:3
 #: hypha/apply/users/templates/users/password_reset/confirm.html:10
 #: hypha/apply/users/templates/users/password_reset/form.html:4
@@ -11165,6 +12230,46 @@ msgid ""
 "email."
 msgstr ""
 
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:6
+#, fuzzy
+#| msgid "Are you sure you want to delete"
+msgid "Are you sure you want to delete these users?"
+msgstr "您确定要删除"
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:20
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html:22
+#, python-format
+msgid ""
+"This will result in %(submission_count)s associated submissions being "
+"deleted!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:5
+#, fuzzy
+#| msgid "Are you sure you want to delete"
+msgid "Are you sure you want to delete this user?"
+msgstr "您确定要删除"
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:12
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted or anonymized!"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/confirm_delete.html:14
+#, python-format
+msgid ""
+"This will result in the user's %(submission_count)s associated submissions "
+"being deleted!"
+msgstr ""
+
 #: hypha/apply/users/templates/wagtailusers/users/edit.html:12
 #, fuzzy
 #| msgid "This account do not have 2FA enabled."
@@ -11177,59 +12282,59 @@ msgstr "此账户未启用双重认证。"
 msgid "2FA is disabled"
 msgstr "禁用 2FA"
 
-#: hypha/apply/users/utils.py:40
+#: hypha/apply/users/utils.py:43
 msgid "Email is already in use."
 msgstr ""
 
-#: hypha/apply/users/utils.py:130
+#: hypha/apply/users/utils.py:137
 #, fuzzy, python-brace-format
 #| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
 msgid "Confirmation email for {unverified_email} at {ORG_LONG_NAME}"
 msgstr "您给 {ORG_LONG_NAME} 的项目：{source.title}"
 
-#: hypha/apply/users/views.py:117
+#: hypha/apply/users/views.py:120
 #, fuzzy
 #| msgid "Partners updated."
 msgid "Profile updated."
 msgstr "合作者已更新。"
 
-#: hypha/apply/users/views.py:161 hypha/apply/users/views.py:236
+#: hypha/apply/users/views.py:164 hypha/apply/users/views.py:241
 msgid "Hijack feature is not enabled."
 msgstr "未启用劫持功能。"
 
-#: hypha/apply/users/views.py:190
+#: hypha/apply/users/views.py:193
 msgid "Password Page timed out. Try changing the email again."
 msgstr "密码页面超时。请试试重新修改电子邮箱。"
 
-#: hypha/apply/users/views.py:211
+#: hypha/apply/users/views.py:216
 msgid "Alert! An attempt to update your email."
 msgstr ""
 
-#: hypha/apply/users/views.py:270
+#: hypha/apply/users/views.py:285
 #, python-brace-format
 msgid "Your email has been successfully updated to {email}!"
 msgstr "您的电子邮箱已成功更新为 {email}！"
 
-#: hypha/apply/users/views.py:372
+#: hypha/apply/users/views.py:387
 #, fuzzy
 #| msgid "Your email has been successfully updated to {email}!"
 msgid "Your password was successfully updated!"
 msgstr "您的电子邮箱已成功更新为 {email}！"
 
-#: hypha/apply/users/views.py:377
+#: hypha/apply/users/views.py:392
 #, fuzzy
 #| msgid "<li>Please correct the error below.</li>"
 #| msgid_plural "<li>Please correct the errors below.</li>"
 msgid "Please correct the errors below."
 msgstr "<li>请修正以下错误。</li>"
 
-#: hypha/apply/users/views.py:809
+#: hypha/apply/users/views.py:824
 #, fuzzy, python-brace-format
 #| msgid "Your application to {ORG_LONG_NAME}: {source.title}"
 msgid "Confirmation code for {ORG_LONG_NAME}: {token}"
 msgstr "您给 {ORG_LONG_NAME} 的项目：{source.title}"
 
-#: hypha/apply/users/views.py:870
+#: hypha/apply/users/views.py:885
 msgid "✓ Check your email for password set link."
 msgstr ""
 
@@ -11478,7 +12583,7 @@ msgstr "默认网站标识"
 msgid "Mobile site logo (if not set default will be used)"
 msgstr "移动网站标识（若未设置，则会使用默认）"
 
-#: hypha/core/models/system_settings.py:60
+#: hypha/core/models/system_settings.py:61
 #, fuzzy, python-brace-format
 #| msgid ""
 #| "Link for the site logo, e.g. \"https://www.example.org/\". If not set, "
@@ -11490,11 +12595,11 @@ msgstr ""
 "网站标识（logo）的链接，例如“https://www.example.org/”。如果没有设置，则默认"
 "是 Slug 为“home”的页面。"
 
-#: hypha/core/models/system_settings.py:64
+#: hypha/core/models/system_settings.py:66
 msgid "Front page navigation content"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:66
+#: hypha/core/models/system_settings.py:68
 #, fuzzy
 #| msgid "This will be added to the footer, html tags is allowed."
 msgid ""
@@ -11502,40 +12607,40 @@ msgid ""
 "allowed."
 msgstr "会将此添加到页脚，允许使用 HTML 标签。"
 
-#: hypha/core/models/system_settings.py:72
+#: hypha/core/models/system_settings.py:74
 #, fuzzy
 #| msgid "Other comments"
 msgid "Footer content"
 msgstr "其他留言"
 
-#: hypha/core/models/system_settings.py:74
+#: hypha/core/models/system_settings.py:76
 msgid "This will be added to the footer, html tags is allowed."
 msgstr "会将此添加到页脚，允许使用 HTML 标签。"
 
-#: hypha/core/models/system_settings.py:84
-#: hypha/core/models/system_settings.py:94
+#: hypha/core/models/system_settings.py:86
+#: hypha/core/models/system_settings.py:96
 msgid "Text"
 msgstr ""
 
-#: hypha/core/models/system_settings.py:105
+#: hypha/core/models/system_settings.py:107
 #, fuzzy
 #| msgid "Per page"
 msgid "Homepage"
 msgstr "每页"
 
-#: hypha/core/models/system_settings.py:113
+#: hypha/core/models/system_settings.py:115
 #, fuzzy
 #| msgid "Default site logo"
 msgid "Site logo"
 msgstr "默认网站标识"
 
-#: hypha/core/models/system_settings.py:122
+#: hypha/core/models/system_settings.py:124
 #, fuzzy
 #| msgid "Per page"
 msgid "404 page"
 msgstr "每页"
 
-#: hypha/core/models/system_settings.py:129
+#: hypha/core/models/system_settings.py:131
 #, fuzzy
 #| msgid "Per page"
 msgid "403 page"
@@ -11616,13 +12721,13 @@ msgstr "等待中"
 msgid "renditions"
 msgstr "审核设置"
 
-#: hypha/settings/django.py:164 hypha/settings/local.py:105
+#: hypha/settings/django.py:163 hypha/settings/local.py:105
 msgid ""
 "This password has previously appeared in a data breach and should not be "
 "used. Please choose a different password."
 msgstr ""
 
-#: hypha/settings/django.py:167 hypha/settings/local.py:108
+#: hypha/settings/django.py:166 hypha/settings/local.py:108
 msgid "Your password must not have been detected in a major security breach."
 msgstr ""
 
@@ -11679,23 +12784,19 @@ msgstr ""
 msgid "current theme"
 msgstr "当前"
 
-#: hypha/templates/base-apply.html:32
-msgid "Toggle Light / Dark / Auto color theme"
-msgstr ""
-
-#: hypha/templates/base-apply.html:54
+#: hypha/templates/base-apply.html:50
 msgid "Menu"
 msgstr ""
 
-#: hypha/templates/base-apply.html:76
+#: hypha/templates/base-apply.html:72
 msgid "Copyright"
 msgstr ""
 
-#: hypha/templates/base-apply.html:79
+#: hypha/templates/base-apply.html:75
 msgid "Built with"
 msgstr ""
 
-#: hypha/templates/base-apply.html:85
+#: hypha/templates/base-apply.html:81
 msgid "Manage cookies"
 msgstr ""
 
@@ -11710,6 +12811,27 @@ msgstr ""
 msgid "Page:"
 msgstr "页面"
 
+#: hypha/templates/cotton/card_attachment.html:13
+#, python-format
+msgid "View file - %(filename)s"
+msgstr ""
+
+#: hypha/templates/cotton/card_attachment.html:21
+#, fuzzy
+#| msgid "Upload"
+msgid "uploaded"
+msgstr "上传"
+
+#: hypha/templates/cotton/card_attachment.html:33
+#, fuzzy, python-format
+#| msgid "File not found on submission"
+msgid "File not found - %(filename)s"
+msgstr "提交时未找到文件"
+
+#: hypha/templates/cotton/card_attachment.html:40
+msgid "Missing file"
+msgstr ""
+
 #: hypha/templates/cotton/dropdown_menu.html:69
 #: hypha/templates/cotton/dropdown_menu.html:77
 #, fuzzy, python-format
@@ -11717,18 +12839,28 @@ msgstr "页面"
 msgid "Filter %(title)s"
 msgstr "%(title)s 的修订"
 
-#. Translators: "delete" should match msgid "delete" (with context "confirm-delete")
-#: hypha/templates/cotton/modal/confirm.html:25
-msgid "Type <em>delete</em> below to confirm"
-msgstr ""
-
-#: hypha/templates/cotton/modal/confirm.html:41
+#: hypha/templates/cotton/modal/confirm.html:7
 #, fuzzy
 #| msgid "Delete"
-msgctxt "confirm-delete"
 msgid "delete"
 msgstr "删除"
 
+#: hypha/templates/cotton/modal/confirm.html:7
+msgid "anonymize"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:24
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">delete</pre> below to "
+"confirm"
+msgstr ""
+
+#: hypha/templates/cotton/modal/confirm.html:25
+msgid ""
+"Type <pre class=\"badge badge-soft badge-neutral\">anonymize</pre> below to "
+"confirm"
+msgstr ""
+
 #: hypha/templates/cotton/modal/header.html:11
 #, fuzzy
 #| msgid "Closed"
@@ -11763,25 +12895,25 @@ msgstr "返回账户"
 msgid "* This must be a number"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 #, fuzzy
 #| msgid "Update password"
 msgid "Hide password"
 msgstr "更新密码"
 
-#: hypha/templates/django/forms/widgets/password.html:17
-#: hypha/templates/django/forms/widgets/password.html:18
+#: hypha/templates/django/forms/widgets/password.html:20
+#: hypha/templates/django/forms/widgets/password.html:21
 #, fuzzy
 #| msgid "Password"
 msgid "Show password"
 msgstr "密码"
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently visible"
 msgstr ""
 
-#: hypha/templates/django/forms/widgets/password.html:36
+#: hypha/templates/django/forms/widgets/password.html:41
 msgid "Password is currently hidden"
 msgstr ""
 
@@ -11835,81 +12967,56 @@ msgstr ""
 msgid "Your Tasks"
 msgstr ""
 
-#: hypha/templates/includes/org_login_button.html:7
-#, python-format
-msgid "Log in with your %(ORG_SHORT_NAME)s email"
-msgstr "用您的 %(ORG_SHORT_NAME)s 电子邮箱登录"
-
-#: hypha/templates/includes/password_login_button.html:7
-#, fuzzy
-#| msgid "Your chosen password"
-msgid "Log in with password"
-msgstr "您选用的密码"
+#: hypha/templates/password_required.html:4
+#: hypha/templates/password_required.html:9
+msgid "Password required"
+msgstr "需要密码"
 
-#: hypha/templates/includes/passwordless_login_button.html:7
-#, fuzzy
-#| msgid "Forgot your password?"
-msgid "Log in without password"
-msgstr "忘记密码？"
+#: hypha/templates/password_required.html:11
+msgid "Please enter the password to proceed."
+msgstr "请输入密码以继续。"
 
-#: hypha/templates/includes/user_menu.html:27
 #, fuzzy
-#| msgid "Back to account"
-msgid "Goto your account"
-msgstr "返回账户"
+#~| msgid "View"
+#~ msgid "View "
+#~ msgstr "查看"
 
-#: hypha/templates/includes/user_menu.html:31
 #, fuzzy
-#| msgid "Account"
-msgid "My account"
-msgstr "账户"
+#~| msgid "Are you sure you want to delete selected submissions?"
+#~ msgid "Are you sure you want to archive the selected submissions?"
+#~ msgstr "您确定要删除所选提交吗？"
 
-#: hypha/templates/includes/user_menu.html:36
-#, fuzzy
-#| msgid "The slack #channel for notifications."
-msgid "Check latest notifications"
-msgstr "接收通知的 Slack #频道。"
+#~ msgid "Ready For Preliminary Determination"
+#~ msgstr "已准备好初步决策"
 
-#: hypha/templates/includes/user_menu.html:40
-msgid "Activity feed"
-msgstr "活动订阅"
+#~ msgid "Ready For Discussion"
+#~ msgstr "准备接受讨论"
 
-#: hypha/templates/includes/user_menu.html:44
-#, fuzzy
-#| msgid "Your Flagged Submissions"
-msgid "Goto your flagged submissions"
-msgstr "您的已标记提交"
+#~ msgid "Ready For Final Determination"
+#~ msgstr "准备接受最终决策"
 
-#: hypha/templates/includes/user_menu.html:48
-msgid "My flagged"
-msgstr ""
+#~ msgid "Ready For Determination"
+#~ msgstr "准备接受决策"
 
-#: hypha/templates/includes/user_menu.html:53
-msgid "Goto wagtail admin"
-msgstr ""
+#~ msgid "The"
+#~ msgstr "此"
 
-#: hypha/templates/includes/user_menu.html:84
-msgid "Release User"
-msgstr ""
+#~ msgid "current"
+#~ msgstr "当前"
 
-#: hypha/templates/includes/user_menu.html:91
-msgid "Log out"
-msgstr "注销"
+#~ msgid "next"
+#~ msgstr "下一页"
 
-#: hypha/templates/includes/user_menu.html:101
-#, fuzzy
-#| msgid "Sign up"
-msgid " or Sign up"
-msgstr "注册"
+#~ msgid "reporting period is"
+#~ msgstr "报告间隔为"
 
-#: hypha/templates/password_required.html:4
-#: hypha/templates/password_required.html:9
-msgid "Password required"
-msgstr "需要密码"
+#~ msgid "A report is due for the period"
+#~ msgstr "此阶段应提交报告"
 
-#: hypha/templates/password_required.html:11
-msgid "Please enter the password to proceed."
-msgstr "请输入密码以继续。"
+#, fuzzy
+#~| msgid "Show Codes"
+#~ msgid "show less"
+#~ msgstr "显示代码"
 
 #~ msgid "Partners updated."
 #~ msgstr "合作者已更新。"
@@ -11943,14 +13050,6 @@ msgstr "请输入密码以继续。"
 #~ msgid "Applicants & Partners"
 #~ msgstr "更新"
 
-#, fuzzy
-#~| msgid "Update Partners"
-#~ msgid "updated partners"
-#~ msgstr "更新"
-
-#~ msgid "You have been added as a partner the following submission."
-#~ msgstr "您已作为合伙人被添加到如下提交。"
-
 #~ msgid "Your active submissions"
 #~ msgstr "您的活动提交"
 
@@ -12225,9 +13324,6 @@ msgstr "请输入密码以继续。"
 #~ msgid "Back to Account"
 #~ msgstr "返回账户"
 
-#~ msgid "Invalid activation"
-#~ msgstr "激活无效"
-
 #~ msgid "Invalid activation URL"
 #~ msgstr "激活 URL 无效"
 
@@ -12240,9 +13336,6 @@ msgstr "请输入密码以继续。"
 #~ msgid "Possible reason:"
 #~ msgstr "可能原因："
 
-#~ msgid "Delete user"
-#~ msgstr "删除用户"
-
 #, fuzzy
 #~| msgid "First Name"
 #~ msgid "Display Name"
@@ -12268,9 +13361,6 @@ msgstr "请输入密码以继续。"
 #~ "没有已配置的用户。为何不<a href=\"%(wagtailusers_add_url)s\">添加一些</"
 #~ "a>？"
 
-#~ msgid "made a comment"
-#~ msgstr "留下了评论"
-
 #, fuzzy
 #~| msgid "No Invoices available"
 #~ msgid "No notifications available."
@@ -12312,9 +13402,6 @@ msgstr "请输入密码以继续。"
 #~ msgid "Project #"
 #~ msgstr "项目"
 
-#~ msgid "Contract number"
-#~ msgstr "合同号"
-
 #~ msgid "Pay to"
 #~ msgstr "付款到"
 
@@ -12504,9 +13591,6 @@ msgstr "请输入密码以继续。"
 #~ msgid "Private Report"
 #~ msgstr "私密报告"
 
-#~ msgid "Save report"
-#~ msgstr "保存报告"
-
 #~ msgid "Submit report"
 #~ msgstr "提交报告"
 
@@ -12574,9 +13658,6 @@ msgstr "请输入密码以继续。"
 #~ msgid "Login"
 #~ msgstr "登录"
 
-#~ msgid "Enable Two-Factor Authentication"
-#~ msgstr "启用双重认证"
-
 #~ msgid "Two-Factor Authentication(2FA)"
 #~ msgstr "双重认证 (2FA)"
 
@@ -12764,9 +13845,6 @@ msgstr "请输入密码以继续。"
 #~ msgid "Other Contact Methods"
 #~ msgstr "其他联系方式"
 
-#~ msgid "Contact information"
-#~ msgstr "联系人信息"
-
 #~ msgid "Person types"
 #~ msgstr "个人类型"