diff --git a/hypha/locale/cs/LC_MESSAGES/django.po b/hypha/locale/cs/LC_MESSAGES/django.po
index 0061c4f5eb..708b5137ef 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: 2025-04-21 08:43+0000\n"
+"POT-Creation-Date: 2025-05-07 08:27+0000\n"
"PO-Revision-Date: 2025-04-22 15:03+0000\n"
"Last-Translator: Jiří Podhorecký \n"
"Language-Team: Czech Invoice status updated to: {status}.
"
msgstr "Stav faktury aktualizován na: {status}.
"
-#: hypha/apply/projects/views/payment.py:186
+#: hypha/apply/projects/views/payment.py:189
msgid "Invoice updated."
msgstr "Faktura aktualizována."
-#: hypha/apply/projects/views/payment.py:274
+#: hypha/apply/projects/views/payment.py:277
msgid "Invoice added.
"
msgstr "Faktura byla přidána.
"
-#: hypha/apply/projects/views/payment.py:532
+#: hypha/apply/projects/views/payment.py:537
msgid "Sorry something went wrong"
msgstr "Omlouváme se, ale něco se pokazilo"
-#: hypha/apply/projects/views/project.py:263
+#: hypha/apply/projects/views/project.py:264
msgid "PAF has been submitted for approval"
msgstr "PAF byl předložen ke schválení"
-#: hypha/apply/projects/views/project.py:335
+#: hypha/apply/projects/views/project.py:336
msgid "Document has been uploaded"
msgstr "Dokument byl nahrán"
-#: hypha/apply/projects/views/project.py:363
+#: hypha/apply/projects/views/project.py:364
msgid "Document has been removed"
msgstr "Dokument byl odebrán"
-#: hypha/apply/projects/views/project.py:390
+#: hypha/apply/projects/views/project.py:391
msgid "Contracting document has been removed"
msgstr "Zadávací dokument byl odstraněn"
-#: hypha/apply/projects/views/project.py:437
+#: hypha/apply/projects/views/project.py:438
msgid "Unassigned"
msgstr "Nepřiřazeno"
-#: hypha/apply/projects/views/project.py:446
+#: hypha/apply/projects/views/project.py:447
msgid "Lead has been updated."
msgstr "Vedení bylo aktualizováno."
-#: hypha/apply/projects/views/project.py:492
+#: hypha/apply/projects/views/project.py:493
msgid "Title has been updated"
msgstr "Název byl aktualizován"
-#: hypha/apply/projects/views/project.py:613
+#: hypha/apply/projects/views/project.py:529
+#, fuzzy
+#| msgid "Title has been updated"
+msgid "Dates has been updated"
+msgstr "Název byl aktualizován"
+
+#: hypha/apply/projects/views/project.py:650
msgid ""
"Contractor documents have been approved. You can receive invoices from "
"vendor now."
@@ -5962,40 +6060,40 @@ msgstr ""
"Dokumenty dodavatele byly schváleny. Nyní můžete od dodavatele přijímat "
"faktury."
-#: hypha/apply/projects/views/project.py:679
+#: hypha/apply/projects/views/project.py:716
msgid "Countersigned contract uploaded"
msgstr "Kontrasignovaná smlouva nahrána"
-#: hypha/apply/projects/views/project.py:682
+#: hypha/apply/projects/views/project.py:719
msgid "Signed contract uploaded"
msgstr "Podepsaná smlouva nahrána"
-#: hypha/apply/projects/views/project.py:889
+#: hypha/apply/projects/views/project.py:930
msgid "Contract documents submitted"
msgstr "Smluvní dokumentace předložena"
-#: hypha/apply/projects/views/project.py:950
+#: hypha/apply/projects/views/project.py:991
msgid "Contracting document has been uploaded"
msgstr "Zadávací dokument byl nahrán"
-#: hypha/apply/projects/views/project.py:1034
+#: hypha/apply/projects/views/project.py:1075
#, python-brace-format
msgid "updated project form status to {paf_status}."
msgstr "aktualizován stav formuláře projektu na {paf_status}."
-#: hypha/apply/projects/views/project.py:1108
+#: hypha/apply/projects/views/project.py:1149
msgid "Project form status has been updated"
msgstr "Stav projektového formuláře byl aktualizován"
-#: hypha/apply/projects/views/project.py:1161
+#: hypha/apply/projects/views/project.py:1202
msgid "Project form has been approved"
msgstr "Projektový formulář byl schválen"
-#: hypha/apply/projects/views/project.py:1270
+#: hypha/apply/projects/views/project.py:1311
msgid "Project status has been updated"
msgstr "Stav projektu byl aktualizován"
-#: hypha/apply/projects/views/project.py:1563
+#: hypha/apply/projects/views/project.py:1604
msgid "Project form approvers have been updated"
msgstr "Schvalovatelé projektových formulářů byli aktualizováni"
@@ -6300,9 +6398,8 @@ msgid ""
"align-bottom \">\"{related.title}\" is waiting to be submitted"
msgstr ""
"{related.fund_name} #{related.application_id}"
-"span>
Koncept žádosti \"{related.title}\" "
-"čeká na odeslání"
+"span>
Koncept žádosti \"{related.title}\" čeká na odeslání"
#: hypha/apply/todo/options.py:73
#, python-brace-format
@@ -6314,8 +6411,8 @@ msgid ""
msgstr ""
"{related.submission.fund_name} "
"#{related.submission.application_id}
Koncept rozhodnutí k odeslání "
-""
-"\"{related.submission.title}\" čeká na odeslání"
+"\"{related.submission.title}\" čeká na odeslání"
#: hypha/apply/todo/options.py:81
#, python-brace-format
@@ -6327,8 +6424,8 @@ msgid ""
msgstr ""
"{related.submission.fund_name} "
"#{related.submission.application_id}
Koncept recenze pro odeslání "
-""
-"\"{related.submission.title}\" čeká na odeslání"
+"\"{related.submission.title}\" čeká na odeslání"
#: hypha/apply/todo/options.py:91
#, python-brace-format
@@ -6429,8 +6526,8 @@ msgid ""
"bottom\">\"{related.title}\" is waiting for invoice"
msgstr ""
"{related.fund_name} #{related.application_id}"
-"span>
Projekt "
-"\"{related.title}\" čeká na fakturu"
+"span>
Projekt \"{related.title}\" čeká na fakturu"
#: hypha/apply/todo/options.py:174
#, python-brace-format
@@ -6474,9 +6571,9 @@ msgid ""
"\">\"{related.project.title}\" is due"
msgstr ""
"{related.project.fund_name} "
-"#{related.project.application_id}
Zpráva pro projekt \"{related.project.title}\""
-" je po termínu"
+"#{related.project.application_id}
Zpráva pro projekt \"{related.project.title}\" je po termínu"
#: hypha/apply/todo/templates/todo/todolist_dropdown.html:7
msgid "No pending task."
@@ -7085,6 +7182,10 @@ msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:17
#: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
+#: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:11
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
#: hypha/apply/users/templates/users/emails/set_password.txt:10
#: hypha/apply/users/templates/users/password_reset/email.txt:10
#, python-format
@@ -7244,6 +7345,86 @@ msgstr ""
"S laskavým pozdravem,\n"
" Tým %(org_short_name)s"
+#: 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/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:8
+#: 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 "Pokud máte nějaké dotazy, napište je sem"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:5
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Login to your account on the %(org_long_name)s web site by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+"Aktivujte si účet na webových stránkách %(org_long_name)s kliknutím na tento "
+"odkaz nebo jeho zkopírováním a vložením do prohlížeče:"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:9
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:8
+#, python-format
+msgid ""
+"This link will valid for %(timeout_minutes)s minutes and can be used only "
+"once."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:12
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Your account on the %(org_long_name)s web site is deactivated. Please "
+"contact site administrators."
+msgstr ""
+"Aktivujte si účet na webových stránkách %(org_long_name)s kliknutím na tento "
+"odkaz nebo jeho zkopírováním a vložením do prohlížeče:"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:3
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:2
+#, fuzzy
+#| msgid "Dear"
+msgid "Dear,"
+msgstr "Vážený"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:5
+#, python-format
+msgid ""
+"It looks like you are trying to login on %(org_long_name)s web site, but we "
+"could not find any account with the email provided."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Welcome to %(org_long_name)s web site. Create your account by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+"Aktivujte si účet na webových stránkách %(org_long_name)s kliknutím na tento "
+"odkaz nebo jeho zkopírováním a vložením do prohlížeče:"
+
#: hypha/apply/users/templates/users/emails/set_password.txt:4
#, python-format
msgid ""
@@ -7765,7 +7946,7 @@ msgstr "Zpět na začátek"
msgid "Menu Item"
msgstr "Položka nabídky"
-#: hypha/settings/django.py:162 hypha/settings/local.py:95
+#: hypha/settings/django.py:164 hypha/settings/local.py:95
msgid ""
"This password has previously appeared in a data breach and should not be "
"used. Please choose a different password."
@@ -7773,11 +7954,11 @@ 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:165 hypha/settings/local.py:98
+#: hypha/settings/django.py:167 hypha/settings/local.py:98
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."
-#: hypha/templates/base-apply.html:40
+#: hypha/templates/base-apply.html:39
msgid "Menu"
msgstr "Nabídka"
@@ -7877,6 +8058,16 @@ msgstr "Vyžadováno heslo"
msgid "Please enter the password to proceed."
msgstr "Pro pokračování zadejte heslo."
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid ""
+#~ "Reporting has been disabled, just save the form with appropriate report "
+#~ "date and frequency to enable it again."
+#~ msgstr ""
+#~ "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 "Project form assigned to {}"
#~ msgstr "Formulář projektu přiřazený k {}"
@@ -7917,9 +8108,6 @@ msgstr "Pro pokračování zadejte heslo."
#~ msgid ">Are you sure you want to delete \"%(object)s\"?"
#~ msgstr ">Opravdu chcete odstranit \"%(object)s\"?"
-#~ msgid "End Date"
-#~ msgstr "Datum ukončení"
-
#~ msgid "Project #"
#~ msgstr "Projekt č"
@@ -8102,9 +8290,6 @@ msgstr "Pro pokračování zadejte heslo."
#~ msgstr ""
#~ "Opravdu jste připraveni předložit projektovou dokumentaci ke schválení v"
-#~ msgid "Edited"
-#~ msgstr "Upraveno"
-
#~ msgid "Created"
#~ msgstr "Vytvořeno"
diff --git a/hypha/locale/django.pot b/hypha/locale/django.pot
index 7e3c8f2b57..e1c4e90eeb 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: 2025-04-21 08:45+0000\n"
+"POT-Creation-Date: 2025-05-07 08:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -111,7 +111,7 @@ msgid "Approved contract"
msgstr ""
#: hypha/apply/activity/adapters/activity_feed.py:69
-#: hypha/apply/projects/views/payment.py:251
+#: hypha/apply/projects/views/payment.py:254
msgid "Invoice added"
msgstr ""
@@ -137,7 +137,7 @@ msgid "deleted an invoice"
msgstr ""
#: hypha/apply/activity/adapters/activity_feed.py:135
-#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:631
msgid "Reviewers updated."
msgstr ""
@@ -990,8 +990,8 @@ msgstr ""
#: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:25
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:59
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:317
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:308
#: 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
@@ -1014,18 +1014,18 @@ msgstr ""
#: hypha/apply/funds/workflows/definitions/single_stage_same.py:47
#: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
#: hypha/apply/projects/reports/templates/reports/report_form.html:57
-#: hypha/apply/projects/views/project.py:307
-#: hypha/apply/projects/views/project.py:343
-#: hypha/apply/projects/views/project.py:650
-#: hypha/apply/projects/views/project.py:769
-#: hypha/apply/projects/views/project.py:857
-#: hypha/apply/projects/views/project.py:896
-#: hypha/apply/projects/views/project.py:927
-#: hypha/apply/projects/views/project.py:960
-#: hypha/apply/projects/views/project.py:1312
-#: hypha/apply/projects/views/project.py:1385
-#: hypha/apply/projects/views/project.py:1416
-#: hypha/apply/projects/views/project.py:1571
+#: hypha/apply/projects/views/project.py:308
+#: hypha/apply/projects/views/project.py:344
+#: hypha/apply/projects/views/project.py:687
+#: hypha/apply/projects/views/project.py:810
+#: hypha/apply/projects/views/project.py:898
+#: hypha/apply/projects/views/project.py:937
+#: hypha/apply/projects/views/project.py:968
+#: hypha/apply/projects/views/project.py:1001
+#: hypha/apply/projects/views/project.py:1353
+#: hypha/apply/projects/views/project.py:1426
+#: hypha/apply/projects/views/project.py:1457
+#: hypha/apply/projects/views/project.py:1612
#: hypha/apply/review/templates/review/review_edit_form.html:64
#: hypha/apply/review/templates/review/review_form.html:75
#: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1046,6 +1046,49 @@ msgstr ""
msgid "Cancel"
msgstr ""
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:4
+msgid "Activities Summary"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:7
+#, python-format
+msgid ""
+"\n"
+"There is %(total_count_apnumber)s new activity:\n"
+msgid_plural ""
+"\n"
+"There are %(total_count_apnumber)s new activities:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:13
+#: hypha/apply/funds/templates/funds/submissions_result.html:41
+#: hypha/apply/funds/templates/submissions/all.html:7
+#: hypha/core/navigation.py:38
+msgid "Submissions"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:17
+#: hypha/apply/funds/tables.py:92
+msgid "Comments"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:21
+#: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
+#: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
+#: hypha/apply/funds/templates/funds/submissions_result.html:59
+#: hypha/apply/projects/templates/application_projects/paf_export.html:31
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
+#: hypha/apply/review/templates/review/review_list.html:4
+#: hypha/apply/review/templates/review/review_list.html:10
+#: hypha/core/navigation.py:59
+msgid "Reviews"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:25
+msgid "Other activities"
+msgstr ""
+
#: hypha/apply/activity/templates/messages/email/applicant_base.html:4
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:7
#, python-format
@@ -1086,36 +1129,37 @@ msgid "Project documents are ready to be assigned for approval."
msgstr ""
#: hypha/apply/activity/templates/messages/email/assign_paf_approvers.html:9
-#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:10
+#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:9
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:15
#: hypha/apply/activity/templates/messages/email/invoice_approved.html:9
#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:18
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:10
#: hypha/apply/activity/templates/messages/email/paf_for_approval.html:9
-#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:10
-#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:10
+#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:9
+#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:9
#: hypha/apply/activity/templates/messages/email/project_final_approval.html:9
#: hypha/apply/activity/templates/messages/email/project_request_change.html:9
#: hypha/apply/activity/templates/messages/email/ready_for_contracting.html:9
#: hypha/apply/activity/templates/messages/email/ready_to_review.html:8
#: hypha/apply/activity/templates/messages/email/report_frequency.html:12
#: hypha/apply/activity/templates/messages/email/report_skipped.html:12
+#: hypha/apply/activity/templates/messages/email/report_submitted.html:10
#: hypha/apply/activity/templates/messages/email/sent_to_compliance.html:9
#: hypha/apply/activity/templates/messages/email/submit_contract_documents.html:11
-#: hypha/apply/funds/templates/funds/revisions_compare.html:39
-#: hypha/apply/funds/templates/funds/revisions_compare.html:40
+#: hypha/apply/funds/templates/funds/revisions_compare.html:49
+#: hypha/apply/funds/templates/funds/revisions_compare.html:50
#: hypha/core/models/system_settings.py:21
msgid "Title"
msgstr ""
#: hypha/apply/activity/templates/messages/email/assign_paf_approvers.html:10
-#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:11
+#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:10
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:16
#: hypha/apply/activity/templates/messages/email/invoice_approved.html:10
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:11
#: hypha/apply/activity/templates/messages/email/paf_for_approval.html:10
-#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:11
-#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:11
+#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:10
+#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:10
#: hypha/apply/activity/templates/messages/email/project_created.html:11
#: hypha/apply/activity/templates/messages/email/project_final_approval.html:10
#: hypha/apply/activity/templates/messages/email/project_request_change.html:10
@@ -1144,6 +1188,8 @@ msgstr ""
#: 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/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
#, python-format
@@ -1166,12 +1212,6 @@ msgstr ""
msgid "New applications have been added to your review list."
msgstr ""
-#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:9
-#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:9
-#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:9
-msgid "ID"
-msgstr ""
-
#: hypha/apply/activity/templates/messages/email/comment.html:4
#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:4
msgid "Dear"
@@ -1245,7 +1285,6 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/invoice_approved.html:11
#: hypha/apply/activity/templates/messages/email/project_created.html:10
-#: hypha/apply/activity/templates/messages/email/report_submitted.html:10
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:33
#: hypha/apply/funds/templates/funds/comments.html:28
#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
@@ -1361,7 +1400,7 @@ msgstr ""
#, python-format
msgid ""
"An %(ORG_SHORT_NAME)s staff member has changed the reporting frequency of "
-"%(title)s."
+"\"%(title)s\"."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_frequency.html:8
@@ -1374,7 +1413,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/report_notify.html:6
#, python-format
-msgid "A report is due for %(title)s on %(end_date)s."
+msgid "A report is due for \"%(title)s\" on %(end_date)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_notify.html:8
@@ -1396,7 +1435,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/report_skipped.html:6
#, python-format
-msgid " for %(title)s for period %(start_date)s to %(end_date)s."
+msgid " for \"%(title)s\" for period %(start_date)s to %(end_date)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_skipped.html:9
@@ -1408,8 +1447,8 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/report_submitted.html:6
#, python-format
msgid ""
-"An %(ORG_SHORT_NAME)s staff member has submitted a report for %(title)s for "
-"period %(start_date)s to %(end_date)s."
+"An %(ORG_SHORT_NAME)s staff member has submitted a report for \"%(title)s\" "
+"for period %(start_date)s to %(end_date)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_submitted.html:8
@@ -1419,7 +1458,8 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:6
#, python-format
msgid ""
-"We appreciate your %(title)s application submission to the %(ORG_LONG_NAME)s."
+"We appreciate your \"%(title)s\" application submission to the "
+"%(ORG_LONG_NAME)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:8
@@ -1450,20 +1490,14 @@ msgid ""
msgstr ""
#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:18
-#: 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/activity/templates/messages/email/submission_confirmation.html:19
msgid "Project name"
msgstr ""
-#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:20
+#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:19
msgid "Contact name"
msgstr ""
-#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:21
+#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:20
msgid "Contact email"
msgstr ""
@@ -1673,8 +1707,8 @@ msgstr ""
#: hypha/apply/dashboard/templates/dashboard/partner_dashboard.html:37
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:59
#: hypha/apply/funds/tables.py:84
-#: hypha/apply/funds/templates/funds/revisions_compare.html:28
-#: hypha/apply/funds/templates/funds/revisions_compare.html:32
+#: hypha/apply/funds/templates/funds/revisions_compare.html:29
+#: hypha/apply/funds/templates/funds/revisions_compare.html:38
#: hypha/apply/projects/models/payment.py:26
#: hypha/apply/projects/reports/templates/reports/includes/reports.html:54
#: hypha/apply/projects/reports/templates/reports/includes/reports.html:65
@@ -1686,9 +1720,8 @@ msgstr ""
#: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:20
#: hypha/apply/dashboard/templates/dashboard/partner_dashboard.html:37
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:59
-#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:10
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:9
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:25
+#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:15
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:16
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:105
#: hypha/apply/funds/templates/funds/tables/table.html:30
@@ -1741,7 +1774,7 @@ msgstr ""
#: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:30
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:5
#: hypha/apply/projects/templates/application_projects/invoice_list.html:6
-#: hypha/apply/projects/views/project_partials.py:149
+#: hypha/apply/projects/views/project_partials.py:159
#: hypha/core/navigation.py:88
msgid "Invoices"
msgstr ""
@@ -1853,7 +1886,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/reminders_block.html:25
#: hypha/apply/funds/templates/submissions/all.html:533
#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:34
-#: hypha/apply/projects/views/payment.py:331
+#: hypha/apply/projects/views/payment.py:334
#: hypha/apply/review/templates/review/review_detail.html:50
#: hypha/templates/includes/dialog_form_base.html:28
msgid "Delete"
@@ -2042,14 +2075,14 @@ msgid "Proposal Form"
msgstr ""
#: hypha/apply/determinations/models.py:117
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:7
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:11
#: 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_external.py:26
#: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
-#: hypha/apply/projects/models/project.py:83
-#: hypha/apply/projects/models/project.py:91 hypha/apply/review/models.py:172
+#: hypha/apply/projects/models/project.py:85
+#: hypha/apply/projects/models/project.py:93 hypha/apply/review/models.py:172
#: hypha/apply/todo/options.py:69 hypha/apply/todo/options.py:77
#: hypha/apply/todo/options.py:85
msgid "Draft"
@@ -2108,7 +2141,7 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:3
#: hypha/apply/determinations/templates/determinations/determination_form.html:6
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:31
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:35
msgid "draft"
msgstr ""
@@ -2152,9 +2185,9 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:57
#: hypha/apply/funds/templates/funds/application_base.html:117
#: hypha/apply/funds/templates/funds/applicationsubmission_form.html:37
-#: hypha/apply/funds/views/submission_edit.py:130
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:318
+#: hypha/apply/funds/views/submission_edit.py:129
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:309
#: hypha/apply/projects/reports/templates/reports/report_form.html:56
#: hypha/apply/projects/templates/application_projects/project_approval_form.html:41
#: hypha/apply/projects/templates/application_projects/project_sow_form.html:39
@@ -2224,12 +2257,12 @@ msgid "Edit determination"
msgstr ""
#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:3
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:3
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:4
msgid "Determinations"
msgstr ""
-#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:13
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:12
+#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:18
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:19
msgid "Awaiting determination"
msgstr ""
@@ -2369,8 +2402,8 @@ msgstr ""
#: hypha/apply/funds/blocks.py:97
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:49
-#: hypha/apply/funds/templates/funds/revisions_compare.html:54
-#: hypha/apply/funds/templates/funds/revisions_compare.html:55
+#: hypha/apply/funds/templates/funds/revisions_compare.html:64
+#: hypha/apply/funds/templates/funds/revisions_compare.html:65
msgid "Address"
msgstr ""
@@ -2397,7 +2430,7 @@ msgstr ""
msgid "Take action"
msgstr ""
-#: hypha/apply/funds/forms.py:86 hypha/apply/projects/forms/project.py:427
+#: hypha/apply/funds/forms.py:86 hypha/apply/projects/forms/project.py:452
#, python-brace-format
msgid "Update lead from {lead} to"
msgstr ""
@@ -2434,7 +2467,7 @@ msgid "Tags are hierarchical in nature."
msgstr ""
#: hypha/apply/funds/models/__init__.py:36 hypha/apply/funds/tables.py:91
-#: hypha/apply/projects/tables.py:141 hypha/apply/projects/tables.py:216
+#: hypha/apply/projects/tables.py:141 hypha/apply/projects/tables.py:217
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:32
msgid "Fund"
msgstr ""
@@ -2588,7 +2621,7 @@ msgstr ""
msgid "Only one Yes and No screening decision can be set as default."
msgstr ""
-#: hypha/apply/funds/models/submissions.py:481
+#: hypha/apply/funds/models/submissions.py:482
msgid "submit time"
msgstr ""
@@ -2650,7 +2683,7 @@ msgstr ""
#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
#: hypha/apply/projects/forms/payment.py:208
#: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/tables.py:139 hypha/apply/projects/tables.py:214
+#: hypha/apply/projects/tables.py:139 hypha/apply/projects/tables.py:215
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:24
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:22
@@ -2664,10 +2697,6 @@ msgstr ""
msgid "Type"
msgstr ""
-#: hypha/apply/funds/tables.py:92
-msgid "Comments"
-msgstr ""
-
#: hypha/apply/funds/tables.py:94
#: hypha/apply/funds/templates/funds/tables/table.html:22
#: hypha/apply/review/templates/review/review_detail.html:20
@@ -2774,7 +2803,7 @@ msgid "Application guide"
msgstr ""
#: hypha/apply/funds/templates/funds/application_base.html:98
-#: hypha/apply/funds/views/submission_edit.py:129
+#: hypha/apply/funds/views/submission_edit.py:128
msgid "Preview and submit"
msgstr ""
@@ -2784,8 +2813,8 @@ msgid "Submit for review"
msgstr ""
#: hypha/apply/funds/templates/funds/application_base.html:127
-#: hypha/apply/funds/views/submission_edit.py:134
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:133
+#: hypha/apply/funds/views/submission_edit.py:310
msgid "Preview"
msgstr ""
@@ -2809,12 +2838,16 @@ msgstr ""
msgid "Revisions"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:27
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:24
+msgid "Edited by"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:31
#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:5
msgid "current"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:41
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:45
#: hypha/apply/funds/templates/funds/revisions_compare.html:3
#: hypha/apply/review/templates/review/review_detail.html:70
msgid "Compare"
@@ -2974,7 +3007,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:61
#: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:20
-#: hypha/apply/projects/views/payment.py:119
+#: hypha/apply/projects/views/payment.py:122
msgid "Update status"
msgstr ""
@@ -2988,8 +3021,8 @@ msgstr ""
#: hypha/apply/funds/templates/submissions/partials/submission-lead.html:12
#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
-#: hypha/apply/projects/templates/application_projects/partials/project-lead.html:9
-#: hypha/apply/projects/templates/application_projects/partials/project-lead.html:13
+#: hypha/apply/projects/templates/application_projects/partials/project_lead.html:9
+#: hypha/apply/projects/templates/application_projects/partials/project_lead.html:13
#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:21
#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
msgid "Lead"
@@ -3079,27 +3112,27 @@ msgid "Proposal Information"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:25
-#: hypha/apply/funds/templates/funds/revisions_compare.html:64
-#: hypha/apply/funds/templates/funds/revisions_compare.html:65
+#: hypha/apply/funds/templates/funds/revisions_compare.html:74
+#: hypha/apply/funds/templates/funds/revisions_compare.html:75
msgid "Requested Funding"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:32
-#: hypha/apply/funds/templates/funds/revisions_compare.html:59
-#: hypha/apply/funds/templates/funds/revisions_compare.html:60
+#: hypha/apply/funds/templates/funds/revisions_compare.html:69
+#: hypha/apply/funds/templates/funds/revisions_compare.html:70
msgid "Project Duration"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:40
-#: hypha/apply/funds/templates/funds/revisions_compare.html:44
-#: hypha/apply/funds/templates/funds/revisions_compare.html:45
+#: hypha/apply/funds/templates/funds/revisions_compare.html:54
+#: hypha/apply/funds/templates/funds/revisions_compare.html:55
msgid "Legal Name"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:44
-#: hypha/apply/funds/templates/funds/revisions_compare.html:49
-#: hypha/apply/funds/templates/funds/revisions_compare.html:50
-#: hypha/apply/projects/templates/application_projects/project_detail.html:66
+#: hypha/apply/funds/templates/funds/revisions_compare.html:59
+#: hypha/apply/funds/templates/funds/revisions_compare.html:60
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:9
msgid "E-mail"
msgstr ""
@@ -3198,22 +3231,23 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
#: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:19
#: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:50
-#: hypha/apply/funds/views/submission_edit.py:545
-#: hypha/apply/funds/views/submission_edit.py:576
-#: hypha/apply/funds/views/submission_edit.py:605
-#: hypha/apply/funds/views/submission_edit.py:649
-#: hypha/apply/funds/views/submission_edit.py:682
-#: hypha/apply/funds/views/submission_edit.py:731
-#: hypha/apply/funds/views/submission_edit.py:762
-#: hypha/apply/funds/views/submission_edit.py:788
+#: 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:673
+#: hypha/apply/funds/views/submission_edit.py:722
+#: hypha/apply/funds/views/submission_edit.py:753
+#: hypha/apply/funds/views/submission_edit.py:779
#: hypha/apply/funds/views/translate.py:62
#: hypha/apply/funds/views/translate.py:97
#: hypha/apply/projects/reports/templates/reports/includes/reports.html:27
-#: hypha/apply/projects/views/project.py:417
-#: hypha/apply/projects/views/project.py:456
-#: hypha/apply/projects/views/project.py:500
-#: hypha/apply/projects/views/project.py:1238
-#: hypha/apply/projects/views/project.py:1277
+#: hypha/apply/projects/views/project.py:418
+#: hypha/apply/projects/views/project.py:457
+#: hypha/apply/projects/views/project.py:501
+#: hypha/apply/projects/views/project.py:537
+#: hypha/apply/projects/views/project.py:1279
+#: hypha/apply/projects/views/project.py:1318
msgid "Update"
msgstr ""
@@ -3234,8 +3268,8 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:43
#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
-#: hypha/apply/projects/views/project.py:994
-#: hypha/apply/projects/views/project.py:1209
+#: hypha/apply/projects/views/project.py:1035
+#: hypha/apply/projects/views/project.py:1250
msgid "Update Status"
msgstr ""
@@ -3270,11 +3304,11 @@ msgid "Are you sure you want to delete \"%(object)s\"?"
msgstr ""
#: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:25
-#: hypha/apply/funds/views/submission_edit.py:429
-#: hypha/apply/funds/views/submission_edit.py:471
+#: hypha/apply/funds/views/submission_edit.py:420
+#: hypha/apply/funds/views/submission_edit.py:462
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:30
-#: hypha/apply/projects/views/project.py:563
-#: hypha/apply/projects/views/project.py:622
+#: hypha/apply/projects/views/project.py:600
+#: hypha/apply/projects/views/project.py:659
#: hypha/apply/review/templates/review/review_confirm_delete.html:17
#: hypha/apply/review/templates/review/reviewopinion_confirm_delete.html:17
#: hypha/apply/users/templates/elevate/elevate.html:32
@@ -3284,17 +3318,6 @@ msgstr ""
msgid "Confirm"
msgstr ""
-#: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
-#: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
-#: hypha/apply/funds/templates/funds/submissions_result.html:59
-#: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
-#: hypha/apply/review/templates/review/review_list.html:4
-#: hypha/apply/review/templates/review/review_list.html:10
-#: hypha/core/navigation.py:59
-msgid "Reviews"
-msgstr ""
-
#: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:10
msgid "Reviewer leaderboard"
msgstr ""
@@ -3325,7 +3348,7 @@ msgstr ""
msgid "Proposal Information (Old)"
msgstr ""
-#: hypha/apply/funds/templates/funds/revisions_compare.html:31
+#: hypha/apply/funds/templates/funds/revisions_compare.html:36
msgid "Proposal Information (New)"
msgstr ""
@@ -3468,12 +3491,6 @@ msgstr ""
msgid "Accepted"
msgstr ""
-#: hypha/apply/funds/templates/funds/submissions_result.html:41
-#: hypha/apply/funds/templates/submissions/all.html:7
-#: hypha/core/navigation.py:38
-msgid "Submissions"
-msgstr ""
-
#: hypha/apply/funds/templates/funds/submissions_result.html:43
msgid "Applied submissions"
msgstr ""
@@ -4002,26 +4019,26 @@ msgstr ""
msgid "Reminder deleted"
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:99
-#: hypha/apply/funds/views/submission_edit.py:266
+#: hypha/apply/funds/views/submission_edit.py:98
+#: hypha/apply/funds/views/submission_edit.py:265
msgid "Draft saved"
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:376
-#: hypha/apply/funds/views/submission_edit.py:402
+#: hypha/apply/funds/views/submission_edit.py:367
+#: hypha/apply/funds/views/submission_edit.py:393
#: hypha/apply/funds/workflows/definitions/double_stage.py:133
msgid "Progress"
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:568
+#: hypha/apply/funds/views/submission_edit.py:559
msgid "Submission Lead updated."
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:722
+#: hypha/apply/funds/views/submission_edit.py:713
msgid "Partners updated successfully."
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:780
+#: hypha/apply/funds/views/submission_edit.py:771
msgid "Meta terms updated successfully."
msgstr ""
@@ -4456,7 +4473,7 @@ msgid "Invoice File"
msgstr ""
#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:412
msgid "Document"
msgstr ""
@@ -4464,52 +4481,60 @@ msgstr ""
msgid "File not found on submission"
msgstr ""
-#: hypha/apply/projects/forms/project.py:63
+#: hypha/apply/projects/forms/project.py:67
msgid "Something changed before your approval please re-review"
msgstr ""
-#: hypha/apply/projects/forms/project.py:69
+#: hypha/apply/projects/forms/project.py:73
msgid "The contract you were trying to approve has already been approved"
msgstr ""
-#: hypha/apply/projects/forms/project.py:73
+#: hypha/apply/projects/forms/project.py:77
msgid "You can only approve a signed contract"
msgstr ""
-#: hypha/apply/projects/forms/project.py:89
-msgid "Select Project Lead"
+#: hypha/apply/projects/forms/project.py:93
+msgid "Select project lead"
msgstr ""
-#: hypha/apply/projects/forms/project.py:94
-msgid "Initial Project Status"
+#: hypha/apply/projects/forms/project.py:98
+msgid "Initial project status"
msgstr ""
-#: hypha/apply/projects/forms/project.py:115
+#: hypha/apply/projects/forms/project.py:104
+msgid "Project end date"
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:123
msgid "Project lead is a required field"
msgstr ""
-#: hypha/apply/projects/forms/project.py:197
+#: hypha/apply/projects/forms/project.py:222
msgid "Project form status"
msgstr ""
-#: hypha/apply/projects/forms/project.py:286
+#: hypha/apply/projects/forms/project.py:311
msgid "A Project can only be sent for Approval when Drafted."
msgstr ""
-#: hypha/apply/projects/forms/project.py:364
-#: hypha/apply/projects/forms/project.py:379
+#: hypha/apply/projects/forms/project.py:389
+#: hypha/apply/projects/forms/project.py:404
#: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:57
msgid "Contract"
msgstr ""
-#: hypha/apply/projects/forms/project.py:366
+#: hypha/apply/projects/forms/project.py:391
msgid "Signed and approved"
msgstr ""
-#: hypha/apply/projects/forms/project.py:403
+#: hypha/apply/projects/forms/project.py:428
msgid "Contract Document"
msgstr ""
+#: hypha/apply/projects/forms/project.py:486
+msgid "The end date must be after the start date."
+msgstr ""
+
#: hypha/apply/projects/models/payment.py:27
msgid "Resubmitted"
msgstr ""
@@ -4561,130 +4586,130 @@ msgstr ""
msgid "Invoice requested for {project}"
msgstr ""
-#: hypha/apply/projects/models/project.py:84
+#: hypha/apply/projects/models/project.py:86
msgid "Internal approval"
msgstr ""
-#: hypha/apply/projects/models/project.py:85
-#: hypha/apply/projects/models/project.py:93 hypha/apply/users/roles.py:13
+#: hypha/apply/projects/models/project.py:87
+#: hypha/apply/projects/models/project.py:95 hypha/apply/users/roles.py:13
msgid "Contracting"
msgstr ""
-#: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94
+#: hypha/apply/projects/models/project.py:88
+#: hypha/apply/projects/models/project.py:96
msgid "Invoicing and reporting"
msgstr ""
-#: hypha/apply/projects/models/project.py:87
-#: hypha/apply/projects/models/project.py:95
+#: hypha/apply/projects/models/project.py:89
+#: hypha/apply/projects/models/project.py:97
msgid "Closing"
msgstr ""
-#: hypha/apply/projects/models/project.py:88
-#: hypha/apply/projects/models/project.py:96
+#: hypha/apply/projects/models/project.py:90
+#: hypha/apply/projects/models/project.py:98
msgid "Complete"
msgstr ""
-#: hypha/apply/projects/models/project.py:92
+#: hypha/apply/projects/models/project.py:94
msgid "{} approval"
msgstr ""
-#: hypha/apply/projects/models/project.py:262
-msgid "Proposed Start Date"
+#: hypha/apply/projects/models/project.py:250
+msgid "Proposed start date"
msgstr ""
-#: hypha/apply/projects/models/project.py:263
-msgid "Proposed End Date"
+#: hypha/apply/projects/models/project.py:252
+msgid "Proposed end date"
msgstr ""
-#: hypha/apply/projects/models/project.py:399
+#: hypha/apply/projects/models/project.py:400
msgid "Proposed End Date must be after Proposed Start Date"
msgstr ""
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:549
msgid "user groups"
msgstr ""
-#: hypha/apply/projects/models/project.py:550
+#: hypha/apply/projects/models/project.py:551
msgid ""
"Only selected group's users will be listed for this ProjectFormReviewerRole"
msgstr ""
-#: hypha/apply/projects/models/project.py:570
+#: hypha/apply/projects/models/project.py:571
msgid "Before"
msgstr ""
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:572
msgid "After"
msgstr ""
-#: hypha/apply/projects/models/project.py:580
+#: hypha/apply/projects/models/project.py:581
msgid "Number of days"
msgstr ""
-#: hypha/apply/projects/models/project.py:581
+#: hypha/apply/projects/models/project.py:582
msgid "Relation to report due date"
msgstr ""
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:607
msgid "Project Form Reviewers Roles"
msgstr ""
-#: hypha/apply/projects/models/project.py:609
+#: hypha/apply/projects/models/project.py:610
msgid "Project Reviewers Roles"
msgstr ""
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:612
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:618
#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:620
msgid "Report reminder frequency"
msgstr ""
-#: hypha/apply/projects/models/project.py:621
+#: hypha/apply/projects/models/project.py:622
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:651
+#: hypha/apply/projects/models/project.py:652
#, python-brace-format
msgid "Approval of {project} by {user}"
msgstr ""
-#: hypha/apply/projects/models/project.py:697
+#: hypha/apply/projects/models/project.py:698
msgid "Counter Signed"
msgstr ""
-#: hypha/apply/projects/models/project.py:697
+#: hypha/apply/projects/models/project.py:698
msgid "Unsigned"
msgstr ""
-#: hypha/apply/projects/models/project.py:700
+#: hypha/apply/projects/models/project.py:701
#, python-brace-format
msgid "Contract for {project} ({state})"
msgstr ""
-#: hypha/apply/projects/models/project.py:726
+#: hypha/apply/projects/models/project.py:727
#, python-brace-format
msgid "Project file: {title}"
msgstr ""
-#: hypha/apply/projects/models/project.py:756
+#: hypha/apply/projects/models/project.py:757
#, python-brace-format
msgid "Contract file: {title}"
msgstr ""
-#: hypha/apply/projects/models/project.py:796
+#: hypha/apply/projects/models/project.py:797
msgid "Allow document access for groups"
msgstr ""
-#: hypha/apply/projects/models/project.py:797
+#: hypha/apply/projects/models/project.py:798
msgid "Only selected group's users can access the document"
msgstr ""
@@ -4692,75 +4717,75 @@ msgstr ""
msgid "Reporting Period"
msgstr ""
-#: hypha/apply/projects/reports/models.py:230
+#: hypha/apply/projects/reports/models.py:228
msgid "week"
msgstr ""
-#: hypha/apply/projects/reports/models.py:231
+#: hypha/apply/projects/reports/models.py:229
msgid "month"
msgstr ""
-#: hypha/apply/projects/reports/models.py:232
+#: hypha/apply/projects/reports/models.py:230
msgid "year"
msgstr ""
-#: hypha/apply/projects/reports/models.py:234
+#: hypha/apply/projects/reports/models.py:232
msgid "Weeks"
msgstr ""
-#: hypha/apply/projects/reports/models.py:235
+#: hypha/apply/projects/reports/models.py:233
msgid "Months"
msgstr ""
-#: hypha/apply/projects/reports/models.py:236
+#: hypha/apply/projects/reports/models.py:234
msgid "Years"
msgstr ""
-#: hypha/apply/projects/reports/models.py:255
+#: hypha/apply/projects/reports/models.py:253
msgid "Reporting Disabled"
msgstr ""
-#: hypha/apply/projects/reports/models.py:260
+#: hypha/apply/projects/reports/models.py:258
#, python-brace-format
msgid "One time, that already has reported on {date}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:265
+#: hypha/apply/projects/reports/models.py:263
#, python-brace-format
msgid "One time on {date}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:273
-#: hypha/apply/projects/reports/models.py:288
+#: hypha/apply/projects/reports/models.py:271
+#: hypha/apply/projects/reports/models.py:286
msgid "last day"
msgstr ""
-#: hypha/apply/projects/reports/models.py:279
+#: hypha/apply/projects/reports/models.py:277
#, python-brace-format
msgid "Once a year on {month} {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:282
+#: hypha/apply/projects/reports/models.py:280
#, python-brace-format
msgid "Every {occurrence} years on {month} {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:292
+#: hypha/apply/projects/reports/models.py:290
#, python-brace-format
msgid "Once a month on the {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:293
+#: hypha/apply/projects/reports/models.py:291
#, python-brace-format
msgid "Every {occurrence} months on the {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:298
#, python-brace-format
msgid "Once a week on {weekday}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:299
#, python-brace-format
msgid "Every {occurrence} weeks on {weekday}"
msgstr ""
@@ -4838,8 +4863,8 @@ msgstr ""
#: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:10
msgid ""
-"Reporting has been disabled, just save the form with appropriate report date "
-"and frequency to enable it again."
+"You'll need to configure reporting before you can use it. Please set the "
+"report date and frequency, then save the form."
msgstr ""
#: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:13
@@ -4876,9 +4901,9 @@ msgstr ""
#: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:68
#: hypha/apply/projects/templates/application_projects/project_form.html:32
-#: hypha/apply/projects/views/payment.py:260
-#: hypha/apply/projects/views/payment.py:329
-#: hypha/apply/projects/views/project.py:1962
+#: hypha/apply/projects/views/payment.py:263
+#: hypha/apply/projects/views/payment.py:332
+#: hypha/apply/projects/views/project.py:2003
#: hypha/apply/users/templates/wagtailusers/users/edit.html:70
#: hypha/apply/users/templates/wagtailusers/users/edit.html:98
msgid "Save"
@@ -5009,19 +5034,24 @@ msgstr ""
msgid "Vendor Name"
msgstr ""
-#: hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/tables.py:144
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:43
+msgid "End date"
+msgstr ""
+
+#: hypha/apply/projects/tables.py:206
msgid "Date requested"
msgstr ""
-#: hypha/apply/projects/tables.py:220
+#: hypha/apply/projects/tables.py:221
msgid "Assignee"
msgstr ""
-#: hypha/apply/projects/tables.py:240
+#: hypha/apply/projects/tables.py:241
msgid "Waiting for approval"
msgstr ""
-#: hypha/apply/projects/tables.py:242
+#: hypha/apply/projects/tables.py:243
msgid "Waiting for assignee"
msgstr ""
@@ -5065,8 +5095,8 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:132
#: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:49
#: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:51
-#: hypha/apply/projects/views/project.py:650
-#: hypha/apply/projects/views/project.py:769
+#: hypha/apply/projects/views/project.py:687
+#: hypha/apply/projects/views/project.py:810
#: hypha/apply/templates/forms/includes/field.html:32
msgid "Upload"
msgstr ""
@@ -5259,6 +5289,10 @@ msgstr ""
msgid "Update Project Form Status"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
+msgid "Update project dates"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/modals/project_status_update.html:2
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:31
msgid "Update Project Status"
@@ -5376,6 +5410,11 @@ msgstr ""
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:45
msgid "Approvals"
@@ -5426,7 +5465,7 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:17
#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:30
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
msgid "View comment"
msgstr ""
@@ -5434,6 +5473,23 @@ msgstr ""
msgid "Hide"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:4
+msgid "Contractor"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:20
+msgid "Start date"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:28
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:51
+msgid "edit dates"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:36
+msgid "Awaiting contract finalization..."
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/partials/project_title.html:13
msgid "edit title"
msgstr ""
@@ -5497,32 +5553,28 @@ msgstr ""
msgid " This project is in %(status)s state. "
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:61
-msgid "Contractor"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:121
+#: hypha/apply/projects/templates/application_projects/project_detail.html:116
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:147
+#: hypha/apply/projects/templates/application_projects/project_detail.html:142
msgid "Pending approval from "
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:151
+#: hypha/apply/projects/templates/application_projects/project_detail.html:146
msgid "nobody assigned yet"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:159
+#: hypha/apply/projects/templates/application_projects/project_detail.html:154
msgid "approved"
msgstr ""
#: hypha/apply/projects/templates/application_projects/project_list.html:6
-#: hypha/apply/projects/views/project_partials.py:110
+#: hypha/apply/projects/views/project_partials.py:120
#: hypha/core/navigation.py:77
msgid "Projects"
msgstr ""
@@ -5723,92 +5775,96 @@ msgstr ""
msgid "Request for change or more information"
msgstr ""
-#: hypha/apply/projects/views/payment.py:146
-#: hypha/apply/projects/views/payment.py:370
+#: hypha/apply/projects/views/payment.py:149
+#: hypha/apply/projects/views/payment.py:373
#, python-brace-format
msgid "Invoice status updated to: {status}.
"
msgstr ""
-#: hypha/apply/projects/views/payment.py:186
+#: hypha/apply/projects/views/payment.py:189
msgid "Invoice updated."
msgstr ""
-#: hypha/apply/projects/views/payment.py:274
+#: hypha/apply/projects/views/payment.py:277
msgid "Invoice added.
"
msgstr ""
-#: hypha/apply/projects/views/payment.py:532
+#: hypha/apply/projects/views/payment.py:537
msgid "Sorry something went wrong"
msgstr ""
-#: hypha/apply/projects/views/project.py:263
+#: hypha/apply/projects/views/project.py:264
msgid "PAF has been submitted for approval"
msgstr ""
-#: hypha/apply/projects/views/project.py:335
+#: hypha/apply/projects/views/project.py:336
msgid "Document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:363
+#: hypha/apply/projects/views/project.py:364
msgid "Document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:390
+#: hypha/apply/projects/views/project.py:391
msgid "Contracting document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:437
+#: hypha/apply/projects/views/project.py:438
msgid "Unassigned"
msgstr ""
-#: hypha/apply/projects/views/project.py:446
+#: hypha/apply/projects/views/project.py:447
msgid "Lead has been updated."
msgstr ""
-#: hypha/apply/projects/views/project.py:492
+#: hypha/apply/projects/views/project.py:493
msgid "Title has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:613
+#: hypha/apply/projects/views/project.py:529
+msgid "Dates has been updated"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:650
msgid ""
"Contractor documents have been approved. You can receive invoices from "
"vendor now."
msgstr ""
-#: hypha/apply/projects/views/project.py:679
+#: hypha/apply/projects/views/project.py:716
msgid "Countersigned contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:682
+#: hypha/apply/projects/views/project.py:719
msgid "Signed contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:889
+#: hypha/apply/projects/views/project.py:930
msgid "Contract documents submitted"
msgstr ""
-#: hypha/apply/projects/views/project.py:950
+#: hypha/apply/projects/views/project.py:991
msgid "Contracting document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:1034
+#: hypha/apply/projects/views/project.py:1075
#, python-brace-format
msgid "updated project form status to {paf_status}."
msgstr ""
-#: hypha/apply/projects/views/project.py:1108
+#: hypha/apply/projects/views/project.py:1149
msgid "Project form status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1161
+#: hypha/apply/projects/views/project.py:1202
msgid "Project form has been approved"
msgstr ""
-#: hypha/apply/projects/views/project.py:1270
+#: hypha/apply/projects/views/project.py:1311
msgid "Project status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1563
+#: hypha/apply/projects/views/project.py:1604
msgid "Project form approvers have been updated"
msgstr ""
@@ -6760,6 +6816,10 @@ msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:17
#: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
+#: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:11
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
#: hypha/apply/users/templates/users/emails/set_password.txt:10
#: hypha/apply/users/templates/users/password_reset/email.txt:10
#, python-format
@@ -6901,6 +6961,68 @@ msgid ""
" The %(org_short_name)s Team"
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/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:8
+#: 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/passwordless_login_email.md:5
+#, python-format
+msgid ""
+"Login to your account on the %(org_long_name)s web site by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:9
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:8
+#, python-format
+msgid ""
+"This link will valid for %(timeout_minutes)s minutes and can be used only "
+"once."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:12
+#, python-format
+msgid ""
+"Your account on the %(org_long_name)s web site is deactivated. Please "
+"contact site administrators."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:3
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:2
+msgid "Dear,"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:5
+#, python-format
+msgid ""
+"It looks like you are trying to login on %(org_long_name)s web site, but we "
+"could not find any account with the email provided."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:4
+#, python-format
+msgid ""
+"Welcome to %(org_long_name)s web site. Create your account by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
#: hypha/apply/users/templates/users/emails/set_password.txt:4
#, python-format
msgid ""
@@ -7386,17 +7508,17 @@ msgstr ""
msgid "Menu Item"
msgstr ""
-#: hypha/settings/django.py:162 hypha/settings/local.py:95
+#: hypha/settings/django.py:164 hypha/settings/local.py:95
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:165 hypha/settings/local.py:98
+#: hypha/settings/django.py:167 hypha/settings/local.py:98
msgid "Your password must not have been detected in a major security breach."
msgstr ""
-#: hypha/templates/base-apply.html:40
+#: hypha/templates/base-apply.html:39
msgid "Menu"
msgstr ""
diff --git a/hypha/locale/en/LC_MESSAGES/django.po b/hypha/locale/en/LC_MESSAGES/django.po
index 4b73d5c9ff..057dcb84ff 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: 2025-04-21 08:41+0000\n"
+"POT-Creation-Date: 2025-05-07 08:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -111,7 +111,7 @@ msgid "Approved contract"
msgstr ""
#: hypha/apply/activity/adapters/activity_feed.py:69
-#: hypha/apply/projects/views/payment.py:251
+#: hypha/apply/projects/views/payment.py:254
msgid "Invoice added"
msgstr ""
@@ -137,7 +137,7 @@ msgid "deleted an invoice"
msgstr ""
#: hypha/apply/activity/adapters/activity_feed.py:135
-#: hypha/apply/funds/views/submission_edit.py:640
+#: hypha/apply/funds/views/submission_edit.py:631
msgid "Reviewers updated."
msgstr ""
@@ -990,8 +990,8 @@ msgstr ""
#: hypha/apply/activity/templates/activity/ui/edit_comment_form.html:25
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:59
-#: hypha/apply/funds/views/submission_edit.py:132
-#: hypha/apply/funds/views/submission_edit.py:317
+#: hypha/apply/funds/views/submission_edit.py:131
+#: hypha/apply/funds/views/submission_edit.py:308
#: 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
@@ -1014,18 +1014,18 @@ msgstr ""
#: hypha/apply/funds/workflows/definitions/single_stage_same.py:47
#: hypha/apply/funds/workflows/definitions/single_stage_same.py:92
#: hypha/apply/projects/reports/templates/reports/report_form.html:57
-#: hypha/apply/projects/views/project.py:307
-#: hypha/apply/projects/views/project.py:343
-#: hypha/apply/projects/views/project.py:650
-#: hypha/apply/projects/views/project.py:769
-#: hypha/apply/projects/views/project.py:857
-#: hypha/apply/projects/views/project.py:896
-#: hypha/apply/projects/views/project.py:927
-#: hypha/apply/projects/views/project.py:960
-#: hypha/apply/projects/views/project.py:1312
-#: hypha/apply/projects/views/project.py:1385
-#: hypha/apply/projects/views/project.py:1416
-#: hypha/apply/projects/views/project.py:1571
+#: hypha/apply/projects/views/project.py:308
+#: hypha/apply/projects/views/project.py:344
+#: hypha/apply/projects/views/project.py:687
+#: hypha/apply/projects/views/project.py:810
+#: hypha/apply/projects/views/project.py:898
+#: hypha/apply/projects/views/project.py:937
+#: hypha/apply/projects/views/project.py:968
+#: hypha/apply/projects/views/project.py:1001
+#: hypha/apply/projects/views/project.py:1353
+#: hypha/apply/projects/views/project.py:1426
+#: hypha/apply/projects/views/project.py:1457
+#: hypha/apply/projects/views/project.py:1612
#: hypha/apply/review/templates/review/review_edit_form.html:64
#: hypha/apply/review/templates/review/review_form.html:75
#: hypha/apply/users/templates/two_factor/_wizard_actions.html:4
@@ -1046,6 +1046,49 @@ msgstr ""
msgid "Cancel"
msgstr ""
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:4
+msgid "Activities Summary"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:7
+#, python-format
+msgid ""
+"\n"
+"There is %(total_count_apnumber)s new activity:\n"
+msgid_plural ""
+"\n"
+"There are %(total_count_apnumber)s new activities:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:13
+#: hypha/apply/funds/templates/funds/submissions_result.html:41
+#: hypha/apply/funds/templates/submissions/all.html:7
+#: hypha/core/navigation.py:38
+msgid "Submissions"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:17
+#: hypha/apply/funds/tables.py:92
+msgid "Comments"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:21
+#: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
+#: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
+#: hypha/apply/funds/templates/funds/submissions_result.html:59
+#: hypha/apply/projects/templates/application_projects/paf_export.html:31
+#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
+#: hypha/apply/review/templates/review/review_list.html:4
+#: hypha/apply/review/templates/review/review_list.html:10
+#: hypha/core/navigation.py:59
+msgid "Reviews"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/activity_summary.md:25
+msgid "Other activities"
+msgstr ""
+
#: hypha/apply/activity/templates/messages/email/applicant_base.html:4
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:7
#, python-format
@@ -1086,36 +1129,37 @@ msgid "Project documents are ready to be assigned for approval."
msgstr ""
#: hypha/apply/activity/templates/messages/email/assign_paf_approvers.html:9
-#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:10
+#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:9
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:15
#: hypha/apply/activity/templates/messages/email/invoice_approved.html:9
#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:18
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:10
#: hypha/apply/activity/templates/messages/email/paf_for_approval.html:9
-#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:10
-#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:10
+#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:9
+#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:9
#: hypha/apply/activity/templates/messages/email/project_final_approval.html:9
#: hypha/apply/activity/templates/messages/email/project_request_change.html:9
#: hypha/apply/activity/templates/messages/email/ready_for_contracting.html:9
#: hypha/apply/activity/templates/messages/email/ready_to_review.html:8
#: hypha/apply/activity/templates/messages/email/report_frequency.html:12
#: hypha/apply/activity/templates/messages/email/report_skipped.html:12
+#: hypha/apply/activity/templates/messages/email/report_submitted.html:10
#: hypha/apply/activity/templates/messages/email/sent_to_compliance.html:9
#: hypha/apply/activity/templates/messages/email/submit_contract_documents.html:11
-#: hypha/apply/funds/templates/funds/revisions_compare.html:39
-#: hypha/apply/funds/templates/funds/revisions_compare.html:40
+#: hypha/apply/funds/templates/funds/revisions_compare.html:49
+#: hypha/apply/funds/templates/funds/revisions_compare.html:50
#: hypha/core/models/system_settings.py:21
msgid "Title"
msgstr ""
#: hypha/apply/activity/templates/messages/email/assign_paf_approvers.html:10
-#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:11
+#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:10
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:16
#: hypha/apply/activity/templates/messages/email/invoice_approved.html:10
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:11
#: hypha/apply/activity/templates/messages/email/paf_for_approval.html:10
-#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:11
-#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:11
+#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:10
+#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:10
#: hypha/apply/activity/templates/messages/email/project_created.html:11
#: hypha/apply/activity/templates/messages/email/project_final_approval.html:10
#: hypha/apply/activity/templates/messages/email/project_request_change.html:10
@@ -1144,6 +1188,8 @@ msgstr ""
#: 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/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
#, python-format
@@ -1166,12 +1212,6 @@ msgstr ""
msgid "New applications have been added to your review list."
msgstr ""
-#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:9
-#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:9
-#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:9
-msgid "ID"
-msgstr ""
-
#: hypha/apply/activity/templates/messages/email/comment.html:4
#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:4
msgid "Dear"
@@ -1245,7 +1285,6 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/invoice_approved.html:11
#: hypha/apply/activity/templates/messages/email/project_created.html:10
-#: hypha/apply/activity/templates/messages/email/report_submitted.html:10
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:33
#: hypha/apply/funds/templates/funds/comments.html:28
#: hypha/apply/funds/templates/funds/includes/submission-list-row.html:128
@@ -1361,7 +1400,7 @@ msgstr ""
#, python-format
msgid ""
"An %(ORG_SHORT_NAME)s staff member has changed the reporting frequency of "
-"%(title)s."
+"\"%(title)s\"."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_frequency.html:8
@@ -1374,7 +1413,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/report_notify.html:6
#, python-format
-msgid "A report is due for %(title)s on %(end_date)s."
+msgid "A report is due for \"%(title)s\" on %(end_date)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_notify.html:8
@@ -1396,7 +1435,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/report_skipped.html:6
#, python-format
-msgid " for %(title)s for period %(start_date)s to %(end_date)s."
+msgid " for \"%(title)s\" for period %(start_date)s to %(end_date)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_skipped.html:9
@@ -1408,8 +1447,8 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/report_submitted.html:6
#, python-format
msgid ""
-"An %(ORG_SHORT_NAME)s staff member has submitted a report for %(title)s for "
-"period %(start_date)s to %(end_date)s."
+"An %(ORG_SHORT_NAME)s staff member has submitted a report for \"%(title)s\" "
+"for period %(start_date)s to %(end_date)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/report_submitted.html:8
@@ -1419,7 +1458,8 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:6
#, python-format
msgid ""
-"We appreciate your %(title)s application submission to the %(ORG_LONG_NAME)s."
+"We appreciate your \"%(title)s\" application submission to the "
+"%(ORG_LONG_NAME)s."
msgstr ""
#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:8
@@ -1450,20 +1490,14 @@ msgid ""
msgstr ""
#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:18
-#: 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/activity/templates/messages/email/submission_confirmation.html:19
msgid "Project name"
msgstr ""
-#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:20
+#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:19
msgid "Contact name"
msgstr ""
-#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:21
+#: hypha/apply/activity/templates/messages/email/submission_confirmation.html:20
msgid "Contact email"
msgstr ""
@@ -1673,8 +1707,8 @@ msgstr ""
#: hypha/apply/dashboard/templates/dashboard/partner_dashboard.html:37
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:59
#: hypha/apply/funds/tables.py:84
-#: hypha/apply/funds/templates/funds/revisions_compare.html:28
-#: hypha/apply/funds/templates/funds/revisions_compare.html:32
+#: hypha/apply/funds/templates/funds/revisions_compare.html:29
+#: hypha/apply/funds/templates/funds/revisions_compare.html:38
#: hypha/apply/projects/models/payment.py:26
#: hypha/apply/projects/reports/templates/reports/includes/reports.html:54
#: hypha/apply/projects/reports/templates/reports/includes/reports.html:65
@@ -1686,9 +1720,8 @@ msgstr ""
#: hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html:20
#: hypha/apply/dashboard/templates/dashboard/partner_dashboard.html:37
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:59
-#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:10
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:9
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:25
+#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:15
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:16
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:96
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:105
#: hypha/apply/funds/templates/funds/tables/table.html:30
@@ -1741,7 +1774,7 @@ msgstr ""
#: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:30
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:5
#: hypha/apply/projects/templates/application_projects/invoice_list.html:6
-#: hypha/apply/projects/views/project_partials.py:149
+#: hypha/apply/projects/views/project_partials.py:159
#: hypha/core/navigation.py:88
msgid "Invoices"
msgstr ""
@@ -1853,7 +1886,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/reminders_block.html:25
#: hypha/apply/funds/templates/submissions/all.html:533
#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:34
-#: hypha/apply/projects/views/payment.py:331
+#: hypha/apply/projects/views/payment.py:334
#: hypha/apply/review/templates/review/review_detail.html:50
#: hypha/templates/includes/dialog_form_base.html:28
msgid "Delete"
@@ -2042,14 +2075,14 @@ msgid "Proposal Form"
msgstr ""
#: hypha/apply/determinations/models.py:117
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:7
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:11
#: 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_external.py:26
#: hypha/apply/funds/workflows/definitions/single_stage_same.py:26
-#: hypha/apply/projects/models/project.py:83
-#: hypha/apply/projects/models/project.py:91 hypha/apply/review/models.py:172
+#: hypha/apply/projects/models/project.py:85
+#: hypha/apply/projects/models/project.py:93 hypha/apply/review/models.py:172
#: hypha/apply/todo/options.py:69 hypha/apply/todo/options.py:77
#: hypha/apply/todo/options.py:85
msgid "Draft"
@@ -2108,7 +2141,7 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:3
#: hypha/apply/determinations/templates/determinations/determination_form.html:6
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:31
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:35
msgid "draft"
msgstr ""
@@ -2152,9 +2185,9 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:57
#: hypha/apply/funds/templates/funds/application_base.html:117
#: hypha/apply/funds/templates/funds/applicationsubmission_form.html:37
-#: hypha/apply/funds/views/submission_edit.py:130
-#: hypha/apply/funds/views/submission_edit.py:133
-#: hypha/apply/funds/views/submission_edit.py:318
+#: hypha/apply/funds/views/submission_edit.py:129
+#: hypha/apply/funds/views/submission_edit.py:132
+#: hypha/apply/funds/views/submission_edit.py:309
#: hypha/apply/projects/reports/templates/reports/report_form.html:56
#: hypha/apply/projects/templates/application_projects/project_approval_form.html:41
#: hypha/apply/projects/templates/application_projects/project_sow_form.html:39
@@ -2224,12 +2257,12 @@ msgid "Edit determination"
msgstr ""
#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:3
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:3
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:4
msgid "Determinations"
msgstr ""
-#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:13
-#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:12
+#: hypha/apply/determinations/templates/determinations/includes/applicant_determination_block.html:18
+#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:19
msgid "Awaiting determination"
msgstr ""
@@ -2369,8 +2402,8 @@ msgstr ""
#: hypha/apply/funds/blocks.py:97
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:49
-#: hypha/apply/funds/templates/funds/revisions_compare.html:54
-#: hypha/apply/funds/templates/funds/revisions_compare.html:55
+#: hypha/apply/funds/templates/funds/revisions_compare.html:64
+#: hypha/apply/funds/templates/funds/revisions_compare.html:65
msgid "Address"
msgstr ""
@@ -2397,7 +2430,7 @@ msgstr ""
msgid "Take action"
msgstr ""
-#: hypha/apply/funds/forms.py:86 hypha/apply/projects/forms/project.py:427
+#: hypha/apply/funds/forms.py:86 hypha/apply/projects/forms/project.py:452
#, python-brace-format
msgid "Update lead from {lead} to"
msgstr ""
@@ -2434,7 +2467,7 @@ msgid "Tags are hierarchical in nature."
msgstr ""
#: hypha/apply/funds/models/__init__.py:36 hypha/apply/funds/tables.py:91
-#: hypha/apply/projects/tables.py:141 hypha/apply/projects/tables.py:216
+#: hypha/apply/projects/tables.py:141 hypha/apply/projects/tables.py:217
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:32
msgid "Fund"
msgstr ""
@@ -2588,7 +2621,7 @@ msgstr ""
msgid "Only one Yes and No screening decision can be set as default."
msgstr ""
-#: hypha/apply/funds/models/submissions.py:481
+#: hypha/apply/funds/models/submissions.py:482
msgid "submit time"
msgstr ""
@@ -2650,7 +2683,7 @@ msgstr ""
#: hypha/apply/projects/filters.py:39 hypha/apply/projects/filters.py:57
#: hypha/apply/projects/forms/payment.py:208
#: hypha/apply/projects/reports/filters.py:28
-#: hypha/apply/projects/tables.py:139 hypha/apply/projects/tables.py:214
+#: hypha/apply/projects/tables.py:139 hypha/apply/projects/tables.py:215
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:24
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:22
@@ -2664,10 +2697,6 @@ msgstr ""
msgid "Type"
msgstr ""
-#: hypha/apply/funds/tables.py:92
-msgid "Comments"
-msgstr ""
-
#: hypha/apply/funds/tables.py:94
#: hypha/apply/funds/templates/funds/tables/table.html:22
#: hypha/apply/review/templates/review/review_detail.html:20
@@ -2774,7 +2803,7 @@ msgid "Application guide"
msgstr ""
#: hypha/apply/funds/templates/funds/application_base.html:98
-#: hypha/apply/funds/views/submission_edit.py:129
+#: hypha/apply/funds/views/submission_edit.py:128
msgid "Preview and submit"
msgstr ""
@@ -2784,8 +2813,8 @@ msgid "Submit for review"
msgstr ""
#: hypha/apply/funds/templates/funds/application_base.html:127
-#: hypha/apply/funds/views/submission_edit.py:134
-#: hypha/apply/funds/views/submission_edit.py:319
+#: hypha/apply/funds/views/submission_edit.py:133
+#: hypha/apply/funds/views/submission_edit.py:310
msgid "Preview"
msgstr ""
@@ -2809,12 +2838,16 @@ msgstr ""
msgid "Revisions"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:27
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:24
+msgid "Edited by"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:31
#: hypha/apply/projects/reports/templates/reports/includes/report_line.html:5
msgid "current"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationrevision_list.html:41
+#: hypha/apply/funds/templates/funds/applicationrevision_list.html:45
#: hypha/apply/funds/templates/funds/revisions_compare.html:3
#: hypha/apply/review/templates/review/review_detail.html:70
msgid "Compare"
@@ -2974,7 +3007,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:61
#: hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html:20
-#: hypha/apply/projects/views/payment.py:119
+#: hypha/apply/projects/views/payment.py:122
msgid "Update status"
msgstr ""
@@ -2988,8 +3021,8 @@ msgstr ""
#: hypha/apply/funds/templates/submissions/partials/submission-lead.html:12
#: hypha/apply/projects/filters.py:41 hypha/apply/projects/filters.py:54
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:30
-#: hypha/apply/projects/templates/application_projects/partials/project-lead.html:9
-#: hypha/apply/projects/templates/application_projects/partials/project-lead.html:13
+#: hypha/apply/projects/templates/application_projects/partials/project_lead.html:9
+#: hypha/apply/projects/templates/application_projects/partials/project_lead.html:13
#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:21
#: hypha/apply/projects/templates/application_projects/project_sow_detail.html:19
msgid "Lead"
@@ -3079,27 +3112,27 @@ msgid "Proposal Information"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:25
-#: hypha/apply/funds/templates/funds/revisions_compare.html:64
-#: hypha/apply/funds/templates/funds/revisions_compare.html:65
+#: hypha/apply/funds/templates/funds/revisions_compare.html:74
+#: hypha/apply/funds/templates/funds/revisions_compare.html:75
msgid "Requested Funding"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:32
-#: hypha/apply/funds/templates/funds/revisions_compare.html:59
-#: hypha/apply/funds/templates/funds/revisions_compare.html:60
+#: hypha/apply/funds/templates/funds/revisions_compare.html:69
+#: hypha/apply/funds/templates/funds/revisions_compare.html:70
msgid "Project Duration"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:40
-#: hypha/apply/funds/templates/funds/revisions_compare.html:44
-#: hypha/apply/funds/templates/funds/revisions_compare.html:45
+#: hypha/apply/funds/templates/funds/revisions_compare.html:54
+#: hypha/apply/funds/templates/funds/revisions_compare.html:55
msgid "Legal Name"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:44
-#: hypha/apply/funds/templates/funds/revisions_compare.html:49
-#: hypha/apply/funds/templates/funds/revisions_compare.html:50
-#: hypha/apply/projects/templates/application_projects/project_detail.html:66
+#: hypha/apply/funds/templates/funds/revisions_compare.html:59
+#: hypha/apply/funds/templates/funds/revisions_compare.html:60
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:9
msgid "E-mail"
msgstr ""
@@ -3198,22 +3231,23 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:52
#: hypha/apply/funds/templates/submissions/partials/meta-terms-card.html:19
#: hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html:50
-#: hypha/apply/funds/views/submission_edit.py:545
-#: hypha/apply/funds/views/submission_edit.py:576
-#: hypha/apply/funds/views/submission_edit.py:605
-#: hypha/apply/funds/views/submission_edit.py:649
-#: hypha/apply/funds/views/submission_edit.py:682
-#: hypha/apply/funds/views/submission_edit.py:731
-#: hypha/apply/funds/views/submission_edit.py:762
-#: hypha/apply/funds/views/submission_edit.py:788
+#: 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:673
+#: hypha/apply/funds/views/submission_edit.py:722
+#: hypha/apply/funds/views/submission_edit.py:753
+#: hypha/apply/funds/views/submission_edit.py:779
#: hypha/apply/funds/views/translate.py:62
#: hypha/apply/funds/views/translate.py:97
#: hypha/apply/projects/reports/templates/reports/includes/reports.html:27
-#: hypha/apply/projects/views/project.py:417
-#: hypha/apply/projects/views/project.py:456
-#: hypha/apply/projects/views/project.py:500
-#: hypha/apply/projects/views/project.py:1238
-#: hypha/apply/projects/views/project.py:1277
+#: hypha/apply/projects/views/project.py:418
+#: hypha/apply/projects/views/project.py:457
+#: hypha/apply/projects/views/project.py:501
+#: hypha/apply/projects/views/project.py:537
+#: hypha/apply/projects/views/project.py:1279
+#: hypha/apply/projects/views/project.py:1318
msgid "Update"
msgstr ""
@@ -3234,8 +3268,8 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/partials/invoice_detail_actions.html:43
#: hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html:40
#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:140
-#: hypha/apply/projects/views/project.py:994
-#: hypha/apply/projects/views/project.py:1209
+#: hypha/apply/projects/views/project.py:1035
+#: hypha/apply/projects/views/project.py:1250
msgid "Update Status"
msgstr ""
@@ -3270,11 +3304,11 @@ msgid "Are you sure you want to delete \"%(object)s\"?"
msgstr ""
#: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:25
-#: hypha/apply/funds/views/submission_edit.py:429
-#: hypha/apply/funds/views/submission_edit.py:471
+#: hypha/apply/funds/views/submission_edit.py:420
+#: hypha/apply/funds/views/submission_edit.py:462
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:30
-#: hypha/apply/projects/views/project.py:563
-#: hypha/apply/projects/views/project.py:622
+#: hypha/apply/projects/views/project.py:600
+#: hypha/apply/projects/views/project.py:659
#: hypha/apply/review/templates/review/review_confirm_delete.html:17
#: hypha/apply/review/templates/review/reviewopinion_confirm_delete.html:17
#: hypha/apply/users/templates/elevate/elevate.html:32
@@ -3284,17 +3318,6 @@ msgstr ""
msgid "Confirm"
msgstr ""
-#: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:5
-#: hypha/apply/funds/templates/funds/reviewer_leaderboard_detail.html:5
-#: hypha/apply/funds/templates/funds/submissions_result.html:59
-#: hypha/apply/projects/templates/application_projects/paf_export.html:31
-#: hypha/apply/projects/templates/application_projects/project_approval_detail.html:56
-#: hypha/apply/review/templates/review/review_list.html:4
-#: hypha/apply/review/templates/review/review_list.html:10
-#: hypha/core/navigation.py:59
-msgid "Reviews"
-msgstr ""
-
#: hypha/apply/funds/templates/funds/reviewer_leaderboard.html:10
msgid "Reviewer leaderboard"
msgstr ""
@@ -3325,7 +3348,7 @@ msgstr ""
msgid "Proposal Information (Old)"
msgstr ""
-#: hypha/apply/funds/templates/funds/revisions_compare.html:31
+#: hypha/apply/funds/templates/funds/revisions_compare.html:36
msgid "Proposal Information (New)"
msgstr ""
@@ -3468,12 +3491,6 @@ msgstr ""
msgid "Accepted"
msgstr ""
-#: hypha/apply/funds/templates/funds/submissions_result.html:41
-#: hypha/apply/funds/templates/submissions/all.html:7
-#: hypha/core/navigation.py:38
-msgid "Submissions"
-msgstr ""
-
#: hypha/apply/funds/templates/funds/submissions_result.html:43
msgid "Applied submissions"
msgstr ""
@@ -4002,26 +4019,26 @@ msgstr ""
msgid "Reminder deleted"
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:99
-#: hypha/apply/funds/views/submission_edit.py:266
+#: hypha/apply/funds/views/submission_edit.py:98
+#: hypha/apply/funds/views/submission_edit.py:265
msgid "Draft saved"
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:376
-#: hypha/apply/funds/views/submission_edit.py:402
+#: hypha/apply/funds/views/submission_edit.py:367
+#: hypha/apply/funds/views/submission_edit.py:393
#: hypha/apply/funds/workflows/definitions/double_stage.py:133
msgid "Progress"
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:568
+#: hypha/apply/funds/views/submission_edit.py:559
msgid "Submission Lead updated."
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:722
+#: hypha/apply/funds/views/submission_edit.py:713
msgid "Partners updated successfully."
msgstr ""
-#: hypha/apply/funds/views/submission_edit.py:780
+#: hypha/apply/funds/views/submission_edit.py:771
msgid "Meta terms updated successfully."
msgstr ""
@@ -4456,7 +4473,7 @@ msgid "Invoice File"
msgstr ""
#: hypha/apply/projects/forms/payment.py:177
-#: hypha/apply/projects/forms/project.py:387
+#: hypha/apply/projects/forms/project.py:412
msgid "Document"
msgstr ""
@@ -4464,52 +4481,60 @@ msgstr ""
msgid "File not found on submission"
msgstr ""
-#: hypha/apply/projects/forms/project.py:63
+#: hypha/apply/projects/forms/project.py:67
msgid "Something changed before your approval please re-review"
msgstr ""
-#: hypha/apply/projects/forms/project.py:69
+#: hypha/apply/projects/forms/project.py:73
msgid "The contract you were trying to approve has already been approved"
msgstr ""
-#: hypha/apply/projects/forms/project.py:73
+#: hypha/apply/projects/forms/project.py:77
msgid "You can only approve a signed contract"
msgstr ""
-#: hypha/apply/projects/forms/project.py:89
-msgid "Select Project Lead"
+#: hypha/apply/projects/forms/project.py:93
+msgid "Select project lead"
msgstr ""
-#: hypha/apply/projects/forms/project.py:94
-msgid "Initial Project Status"
+#: hypha/apply/projects/forms/project.py:98
+msgid "Initial project status"
msgstr ""
-#: hypha/apply/projects/forms/project.py:115
+#: hypha/apply/projects/forms/project.py:104
+msgid "Project end date"
+msgstr ""
+
+#: hypha/apply/projects/forms/project.py:123
msgid "Project lead is a required field"
msgstr ""
-#: hypha/apply/projects/forms/project.py:197
+#: hypha/apply/projects/forms/project.py:222
msgid "Project form status"
msgstr ""
-#: hypha/apply/projects/forms/project.py:286
+#: hypha/apply/projects/forms/project.py:311
msgid "A Project can only be sent for Approval when Drafted."
msgstr ""
-#: hypha/apply/projects/forms/project.py:364
-#: hypha/apply/projects/forms/project.py:379
+#: hypha/apply/projects/forms/project.py:389
+#: hypha/apply/projects/forms/project.py:404
#: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:57
msgid "Contract"
msgstr ""
-#: hypha/apply/projects/forms/project.py:366
+#: hypha/apply/projects/forms/project.py:391
msgid "Signed and approved"
msgstr ""
-#: hypha/apply/projects/forms/project.py:403
+#: hypha/apply/projects/forms/project.py:428
msgid "Contract Document"
msgstr ""
+#: hypha/apply/projects/forms/project.py:486
+msgid "The end date must be after the start date."
+msgstr ""
+
#: hypha/apply/projects/models/payment.py:27
msgid "Resubmitted"
msgstr ""
@@ -4561,130 +4586,130 @@ msgstr ""
msgid "Invoice requested for {project}"
msgstr ""
-#: hypha/apply/projects/models/project.py:84
+#: hypha/apply/projects/models/project.py:86
msgid "Internal approval"
msgstr ""
-#: hypha/apply/projects/models/project.py:85
-#: hypha/apply/projects/models/project.py:93 hypha/apply/users/roles.py:13
+#: hypha/apply/projects/models/project.py:87
+#: hypha/apply/projects/models/project.py:95 hypha/apply/users/roles.py:13
msgid "Contracting"
msgstr ""
-#: hypha/apply/projects/models/project.py:86
-#: hypha/apply/projects/models/project.py:94
+#: hypha/apply/projects/models/project.py:88
+#: hypha/apply/projects/models/project.py:96
msgid "Invoicing and reporting"
msgstr ""
-#: hypha/apply/projects/models/project.py:87
-#: hypha/apply/projects/models/project.py:95
+#: hypha/apply/projects/models/project.py:89
+#: hypha/apply/projects/models/project.py:97
msgid "Closing"
msgstr ""
-#: hypha/apply/projects/models/project.py:88
-#: hypha/apply/projects/models/project.py:96
+#: hypha/apply/projects/models/project.py:90
+#: hypha/apply/projects/models/project.py:98
msgid "Complete"
msgstr ""
-#: hypha/apply/projects/models/project.py:92
+#: hypha/apply/projects/models/project.py:94
msgid "{} approval"
msgstr ""
-#: hypha/apply/projects/models/project.py:262
-msgid "Proposed Start Date"
+#: hypha/apply/projects/models/project.py:250
+msgid "Proposed start date"
msgstr ""
-#: hypha/apply/projects/models/project.py:263
-msgid "Proposed End Date"
+#: hypha/apply/projects/models/project.py:252
+msgid "Proposed end date"
msgstr ""
-#: hypha/apply/projects/models/project.py:399
+#: hypha/apply/projects/models/project.py:400
msgid "Proposed End Date must be after Proposed Start Date"
msgstr ""
-#: hypha/apply/projects/models/project.py:548
+#: hypha/apply/projects/models/project.py:549
msgid "user groups"
msgstr ""
-#: hypha/apply/projects/models/project.py:550
+#: hypha/apply/projects/models/project.py:551
msgid ""
"Only selected group's users will be listed for this ProjectFormReviewerRole"
msgstr ""
-#: hypha/apply/projects/models/project.py:570
+#: hypha/apply/projects/models/project.py:571
msgid "Before"
msgstr ""
-#: hypha/apply/projects/models/project.py:571
+#: hypha/apply/projects/models/project.py:572
msgid "After"
msgstr ""
-#: hypha/apply/projects/models/project.py:580
+#: hypha/apply/projects/models/project.py:581
msgid "Number of days"
msgstr ""
-#: hypha/apply/projects/models/project.py:581
+#: hypha/apply/projects/models/project.py:582
msgid "Relation to report due date"
msgstr ""
-#: hypha/apply/projects/models/project.py:606
+#: hypha/apply/projects/models/project.py:607
msgid "Project Form Reviewers Roles"
msgstr ""
-#: hypha/apply/projects/models/project.py:609
+#: hypha/apply/projects/models/project.py:610
msgid "Project Reviewers Roles"
msgstr ""
-#: hypha/apply/projects/models/project.py:611
+#: hypha/apply/projects/models/project.py:612
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:618
#: hypha/apply/projects/models/project.py:619
+#: hypha/apply/projects/models/project.py:620
msgid "Report reminder frequency"
msgstr ""
-#: hypha/apply/projects/models/project.py:621
+#: hypha/apply/projects/models/project.py:622
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:651
+#: hypha/apply/projects/models/project.py:652
#, python-brace-format
msgid "Approval of {project} by {user}"
msgstr ""
-#: hypha/apply/projects/models/project.py:697
+#: hypha/apply/projects/models/project.py:698
msgid "Counter Signed"
msgstr ""
-#: hypha/apply/projects/models/project.py:697
+#: hypha/apply/projects/models/project.py:698
msgid "Unsigned"
msgstr ""
-#: hypha/apply/projects/models/project.py:700
+#: hypha/apply/projects/models/project.py:701
#, python-brace-format
msgid "Contract for {project} ({state})"
msgstr ""
-#: hypha/apply/projects/models/project.py:726
+#: hypha/apply/projects/models/project.py:727
#, python-brace-format
msgid "Project file: {title}"
msgstr ""
-#: hypha/apply/projects/models/project.py:756
+#: hypha/apply/projects/models/project.py:757
#, python-brace-format
msgid "Contract file: {title}"
msgstr ""
-#: hypha/apply/projects/models/project.py:796
+#: hypha/apply/projects/models/project.py:797
msgid "Allow document access for groups"
msgstr ""
-#: hypha/apply/projects/models/project.py:797
+#: hypha/apply/projects/models/project.py:798
msgid "Only selected group's users can access the document"
msgstr ""
@@ -4692,75 +4717,75 @@ msgstr ""
msgid "Reporting Period"
msgstr ""
-#: hypha/apply/projects/reports/models.py:230
+#: hypha/apply/projects/reports/models.py:228
msgid "week"
msgstr ""
-#: hypha/apply/projects/reports/models.py:231
+#: hypha/apply/projects/reports/models.py:229
msgid "month"
msgstr ""
-#: hypha/apply/projects/reports/models.py:232
+#: hypha/apply/projects/reports/models.py:230
msgid "year"
msgstr ""
-#: hypha/apply/projects/reports/models.py:234
+#: hypha/apply/projects/reports/models.py:232
msgid "Weeks"
msgstr ""
-#: hypha/apply/projects/reports/models.py:235
+#: hypha/apply/projects/reports/models.py:233
msgid "Months"
msgstr ""
-#: hypha/apply/projects/reports/models.py:236
+#: hypha/apply/projects/reports/models.py:234
msgid "Years"
msgstr ""
-#: hypha/apply/projects/reports/models.py:255
+#: hypha/apply/projects/reports/models.py:253
msgid "Reporting Disabled"
msgstr ""
-#: hypha/apply/projects/reports/models.py:260
+#: hypha/apply/projects/reports/models.py:258
#, python-brace-format
msgid "One time, that already has reported on {date}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:265
+#: hypha/apply/projects/reports/models.py:263
#, python-brace-format
msgid "One time on {date}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:273
-#: hypha/apply/projects/reports/models.py:288
+#: hypha/apply/projects/reports/models.py:271
+#: hypha/apply/projects/reports/models.py:286
msgid "last day"
msgstr ""
-#: hypha/apply/projects/reports/models.py:279
+#: hypha/apply/projects/reports/models.py:277
#, python-brace-format
msgid "Once a year on {month} {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:282
+#: hypha/apply/projects/reports/models.py:280
#, python-brace-format
msgid "Every {occurrence} years on {month} {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:292
+#: hypha/apply/projects/reports/models.py:290
#, python-brace-format
msgid "Once a month on the {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:293
+#: hypha/apply/projects/reports/models.py:291
#, python-brace-format
msgid "Every {occurrence} months on the {day}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:300
+#: hypha/apply/projects/reports/models.py:298
#, python-brace-format
msgid "Once a week on {weekday}"
msgstr ""
-#: hypha/apply/projects/reports/models.py:301
+#: hypha/apply/projects/reports/models.py:299
#, python-brace-format
msgid "Every {occurrence} weeks on {weekday}"
msgstr ""
@@ -4838,8 +4863,8 @@ msgstr ""
#: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:10
msgid ""
-"Reporting has been disabled, just save the form with appropriate report date "
-"and frequency to enable it again."
+"You'll need to configure reporting before you can use it. Please set the "
+"report date and frequency, then save the form."
msgstr ""
#: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:13
@@ -4876,9 +4901,9 @@ msgstr ""
#: hypha/apply/projects/reports/templates/reports/modals/report_frequency_config.html:68
#: hypha/apply/projects/templates/application_projects/project_form.html:32
-#: hypha/apply/projects/views/payment.py:260
-#: hypha/apply/projects/views/payment.py:329
-#: hypha/apply/projects/views/project.py:1962
+#: hypha/apply/projects/views/payment.py:263
+#: hypha/apply/projects/views/payment.py:332
+#: hypha/apply/projects/views/project.py:2003
#: hypha/apply/users/templates/wagtailusers/users/edit.html:70
#: hypha/apply/users/templates/wagtailusers/users/edit.html:98
msgid "Save"
@@ -5009,19 +5034,24 @@ msgstr ""
msgid "Vendor Name"
msgstr ""
-#: hypha/apply/projects/tables.py:205
+#: hypha/apply/projects/tables.py:144
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:43
+msgid "End date"
+msgstr ""
+
+#: hypha/apply/projects/tables.py:206
msgid "Date requested"
msgstr ""
-#: hypha/apply/projects/tables.py:220
+#: hypha/apply/projects/tables.py:221
msgid "Assignee"
msgstr ""
-#: hypha/apply/projects/tables.py:240
+#: hypha/apply/projects/tables.py:241
msgid "Waiting for approval"
msgstr ""
-#: hypha/apply/projects/tables.py:242
+#: hypha/apply/projects/tables.py:243
msgid "Waiting for assignee"
msgstr ""
@@ -5065,8 +5095,8 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/contracting_documents.html:132
#: hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html:49
#: hypha/apply/projects/templates/application_projects/partials/supporting_documents.html:51
-#: hypha/apply/projects/views/project.py:650
-#: hypha/apply/projects/views/project.py:769
+#: hypha/apply/projects/views/project.py:687
+#: hypha/apply/projects/views/project.py:810
#: hypha/apply/templates/forms/includes/field.html:32
msgid "Upload"
msgstr ""
@@ -5259,6 +5289,10 @@ msgstr ""
msgid "Update Project Form Status"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/modals/project_dates_update.html:2
+msgid "Update project dates"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/modals/project_status_update.html:2
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:31
msgid "Update Project Status"
@@ -5376,6 +5410,11 @@ msgstr ""
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:45
msgid "Approvals"
@@ -5426,7 +5465,7 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:17
#: hypha/apply/projects/templates/application_projects/partials/invoice_status.html:30
-#: hypha/apply/projects/templates/application_projects/project_detail.html:137
+#: hypha/apply/projects/templates/application_projects/project_detail.html:132
msgid "View comment"
msgstr ""
@@ -5434,6 +5473,23 @@ msgstr ""
msgid "Hide"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:4
+msgid "Contractor"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:20
+msgid "Start date"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:28
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:51
+msgid "edit dates"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/partials/project_information.html:36
+msgid "Awaiting contract finalization..."
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/partials/project_title.html:13
msgid "edit title"
msgstr ""
@@ -5497,32 +5553,28 @@ msgstr ""
msgid " This project is in %(status)s state. "
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:61
-msgid "Contractor"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:121
+#: hypha/apply/projects/templates/application_projects/project_detail.html:116
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:147
+#: hypha/apply/projects/templates/application_projects/project_detail.html:142
msgid "Pending approval from "
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:151
+#: hypha/apply/projects/templates/application_projects/project_detail.html:146
msgid "nobody assigned yet"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:159
+#: hypha/apply/projects/templates/application_projects/project_detail.html:154
msgid "approved"
msgstr ""
#: hypha/apply/projects/templates/application_projects/project_list.html:6
-#: hypha/apply/projects/views/project_partials.py:110
+#: hypha/apply/projects/views/project_partials.py:120
#: hypha/core/navigation.py:77
msgid "Projects"
msgstr ""
@@ -5723,92 +5775,96 @@ msgstr ""
msgid "Request for change or more information"
msgstr ""
-#: hypha/apply/projects/views/payment.py:146
-#: hypha/apply/projects/views/payment.py:370
+#: hypha/apply/projects/views/payment.py:149
+#: hypha/apply/projects/views/payment.py:373
#, python-brace-format
msgid "Invoice status updated to: {status}.
"
msgstr ""
-#: hypha/apply/projects/views/payment.py:186
+#: hypha/apply/projects/views/payment.py:189
msgid "Invoice updated."
msgstr ""
-#: hypha/apply/projects/views/payment.py:274
+#: hypha/apply/projects/views/payment.py:277
msgid "Invoice added.
"
msgstr ""
-#: hypha/apply/projects/views/payment.py:532
+#: hypha/apply/projects/views/payment.py:537
msgid "Sorry something went wrong"
msgstr ""
-#: hypha/apply/projects/views/project.py:263
+#: hypha/apply/projects/views/project.py:264
msgid "PAF has been submitted for approval"
msgstr ""
-#: hypha/apply/projects/views/project.py:335
+#: hypha/apply/projects/views/project.py:336
msgid "Document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:363
+#: hypha/apply/projects/views/project.py:364
msgid "Document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:390
+#: hypha/apply/projects/views/project.py:391
msgid "Contracting document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:437
+#: hypha/apply/projects/views/project.py:438
msgid "Unassigned"
msgstr ""
-#: hypha/apply/projects/views/project.py:446
+#: hypha/apply/projects/views/project.py:447
msgid "Lead has been updated."
msgstr ""
-#: hypha/apply/projects/views/project.py:492
+#: hypha/apply/projects/views/project.py:493
msgid "Title has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:613
+#: hypha/apply/projects/views/project.py:529
+msgid "Dates has been updated"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:650
msgid ""
"Contractor documents have been approved. You can receive invoices from "
"vendor now."
msgstr ""
-#: hypha/apply/projects/views/project.py:679
+#: hypha/apply/projects/views/project.py:716
msgid "Countersigned contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:682
+#: hypha/apply/projects/views/project.py:719
msgid "Signed contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:889
+#: hypha/apply/projects/views/project.py:930
msgid "Contract documents submitted"
msgstr ""
-#: hypha/apply/projects/views/project.py:950
+#: hypha/apply/projects/views/project.py:991
msgid "Contracting document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:1034
+#: hypha/apply/projects/views/project.py:1075
#, python-brace-format
msgid "updated project form status to {paf_status}."
msgstr ""
-#: hypha/apply/projects/views/project.py:1108
+#: hypha/apply/projects/views/project.py:1149
msgid "Project form status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1161
+#: hypha/apply/projects/views/project.py:1202
msgid "Project form has been approved"
msgstr ""
-#: hypha/apply/projects/views/project.py:1270
+#: hypha/apply/projects/views/project.py:1311
msgid "Project status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1563
+#: hypha/apply/projects/views/project.py:1604
msgid "Project form approvers have been updated"
msgstr ""
@@ -6760,6 +6816,10 @@ msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:17
#: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
+#: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:11
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
#: hypha/apply/users/templates/users/emails/set_password.txt:10
#: hypha/apply/users/templates/users/password_reset/email.txt:10
#, python-format
@@ -6901,6 +6961,68 @@ msgid ""
" The %(org_short_name)s Team"
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/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:8
+#: 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/passwordless_login_email.md:5
+#, python-format
+msgid ""
+"Login to your account on the %(org_long_name)s web site by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:9
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:8
+#, python-format
+msgid ""
+"This link will valid for %(timeout_minutes)s minutes and can be used only "
+"once."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:12
+#, python-format
+msgid ""
+"Your account on the %(org_long_name)s web site is deactivated. Please "
+"contact site administrators."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:3
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:2
+msgid "Dear,"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:5
+#, python-format
+msgid ""
+"It looks like you are trying to login on %(org_long_name)s web site, but we "
+"could not find any account with the email provided."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:4
+#, python-format
+msgid ""
+"Welcome to %(org_long_name)s web site. Create your account by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
#: hypha/apply/users/templates/users/emails/set_password.txt:4
#, python-format
msgid ""
@@ -7386,17 +7508,17 @@ msgstr ""
msgid "Menu Item"
msgstr ""
-#: hypha/settings/django.py:162 hypha/settings/local.py:95
+#: hypha/settings/django.py:164 hypha/settings/local.py:95
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:165 hypha/settings/local.py:98
+#: hypha/settings/django.py:167 hypha/settings/local.py:98
msgid "Your password must not have been detected in a major security breach."
msgstr ""
-#: hypha/templates/base-apply.html:40
+#: hypha/templates/base-apply.html:39
msgid "Menu"
msgstr ""
diff --git a/hypha/locale/es/LC_MESSAGES/django.po b/hypha/locale/es/LC_MESSAGES/django.po
index ccdedb0ce7..f280b9e96c 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: 2025-04-21 08:43+0000\n"
+"POT-Creation-Date: 2025-05-07 08:27+0000\n"
"PO-Revision-Date: 2024-02-22 07:43+0000\n"
"Last-Translator: gallegonovato \n"
"Language-Team: Spanish Invoice status updated to: {status}."
msgstr ""
-#: hypha/apply/projects/views/payment.py:186
+#: hypha/apply/projects/views/payment.py:189
#, fuzzy
#| msgid "Invoice created"
msgid "Invoice updated."
msgstr "Factura emitida"
-#: hypha/apply/projects/views/payment.py:274
+#: hypha/apply/projects/views/payment.py:277
#, fuzzy
#| msgid "Invoice created"
msgid "Invoice added.
"
msgstr "Factura emitida"
-#: hypha/apply/projects/views/payment.py:532
+#: hypha/apply/projects/views/payment.py:537
msgid "Sorry something went wrong"
msgstr ""
-#: hypha/apply/projects/views/project.py:263
+#: hypha/apply/projects/views/project.py:264
msgid "PAF has been submitted for approval"
msgstr ""
-#: hypha/apply/projects/views/project.py:335
+#: hypha/apply/projects/views/project.py:336
msgid "Document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:363
+#: hypha/apply/projects/views/project.py:364
msgid "Document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:390
+#: hypha/apply/projects/views/project.py:391
msgid "Contracting document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:437
+#: hypha/apply/projects/views/project.py:438
msgid "Unassigned"
msgstr ""
-#: hypha/apply/projects/views/project.py:446
+#: hypha/apply/projects/views/project.py:447
msgid "Lead has been updated."
msgstr ""
-#: hypha/apply/projects/views/project.py:492
+#: hypha/apply/projects/views/project.py:493
msgid "Title has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:613
+#: hypha/apply/projects/views/project.py:529
+msgid "Dates has been updated"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:650
msgid ""
"Contractor documents have been approved. You can receive invoices from "
"vendor now."
msgstr ""
-#: hypha/apply/projects/views/project.py:679
+#: hypha/apply/projects/views/project.py:716
msgid "Countersigned contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:682
+#: hypha/apply/projects/views/project.py:719
msgid "Signed contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:889
+#: hypha/apply/projects/views/project.py:930
msgid "Contract documents submitted"
msgstr ""
-#: hypha/apply/projects/views/project.py:950
+#: hypha/apply/projects/views/project.py:991
msgid "Contracting document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:1034
+#: hypha/apply/projects/views/project.py:1075
#, python-brace-format
msgid "updated project form status to {paf_status}."
msgstr ""
-#: hypha/apply/projects/views/project.py:1108
+#: hypha/apply/projects/views/project.py:1149
msgid "Project form status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1161
+#: hypha/apply/projects/views/project.py:1202
msgid "Project form has been approved"
msgstr ""
-#: hypha/apply/projects/views/project.py:1270
+#: hypha/apply/projects/views/project.py:1311
msgid "Project status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1563
+#: hypha/apply/projects/views/project.py:1604
msgid "Project form approvers have been updated"
msgstr ""
@@ -6915,6 +6983,10 @@ msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:17
#: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
+#: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:11
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
#: hypha/apply/users/templates/users/emails/set_password.txt:10
#: hypha/apply/users/templates/users/password_reset/email.txt:10
#, python-format
@@ -7056,6 +7128,68 @@ msgid ""
" The %(org_short_name)s Team"
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/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:8
+#: 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/passwordless_login_email.md:5
+#, python-format
+msgid ""
+"Login to your account on the %(org_long_name)s web site by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:9
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:8
+#, python-format
+msgid ""
+"This link will valid for %(timeout_minutes)s minutes and can be used only "
+"once."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:12
+#, python-format
+msgid ""
+"Your account on the %(org_long_name)s web site is deactivated. Please "
+"contact site administrators."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:3
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:2
+msgid "Dear,"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:5
+#, python-format
+msgid ""
+"It looks like you are trying to login on %(org_long_name)s web site, but we "
+"could not find any account with the email provided."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:4
+#, python-format
+msgid ""
+"Welcome to %(org_long_name)s web site. Create your account by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
#: hypha/apply/users/templates/users/emails/set_password.txt:4
#, python-format
msgid ""
@@ -7541,17 +7675,17 @@ msgstr ""
msgid "Menu Item"
msgstr ""
-#: hypha/settings/django.py:162 hypha/settings/local.py:95
+#: hypha/settings/django.py:164 hypha/settings/local.py:95
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:165 hypha/settings/local.py:98
+#: hypha/settings/django.py:167 hypha/settings/local.py:98
msgid "Your password must not have been detected in a major security breach."
msgstr ""
-#: hypha/templates/base-apply.html:40
+#: hypha/templates/base-apply.html:39
msgid "Menu"
msgstr ""
diff --git a/hypha/locale/fr/LC_MESSAGES/django.po b/hypha/locale/fr/LC_MESSAGES/django.po
index 1b80169a15..735c3528c5 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: 2025-04-21 08:44+0000\n"
+"POT-Creation-Date: 2025-05-07 08:26+0000\n"
"PO-Revision-Date: 2024-02-22 07:43+0000\n"
"Last-Translator: Nathan \n"
"Language-Team: French Invoice status updated to: {status}."
msgstr ""
-#: hypha/apply/projects/views/payment.py:186
+#: hypha/apply/projects/views/payment.py:189
#, fuzzy
#| msgid "Invoice created"
msgid "Invoice updated."
msgstr "Facture créée"
-#: hypha/apply/projects/views/payment.py:274
+#: hypha/apply/projects/views/payment.py:277
#, fuzzy
#| msgid "Invoice created"
msgid "Invoice added.
"
msgstr "Facture créée"
-#: hypha/apply/projects/views/payment.py:532
+#: hypha/apply/projects/views/payment.py:537
msgid "Sorry something went wrong"
msgstr ""
-#: hypha/apply/projects/views/project.py:263
+#: hypha/apply/projects/views/project.py:264
msgid "PAF has been submitted for approval"
msgstr ""
-#: hypha/apply/projects/views/project.py:335
+#: hypha/apply/projects/views/project.py:336
msgid "Document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:363
+#: hypha/apply/projects/views/project.py:364
msgid "Document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:390
+#: hypha/apply/projects/views/project.py:391
msgid "Contracting document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:437
+#: hypha/apply/projects/views/project.py:438
msgid "Unassigned"
msgstr ""
-#: hypha/apply/projects/views/project.py:446
+#: hypha/apply/projects/views/project.py:447
msgid "Lead has been updated."
msgstr ""
-#: hypha/apply/projects/views/project.py:492
+#: hypha/apply/projects/views/project.py:493
msgid "Title has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:613
+#: hypha/apply/projects/views/project.py:529
+#, fuzzy
+#| msgid "Partners updated."
+msgid "Dates has been updated"
+msgstr "Partenaires mis à jour."
+
+#: hypha/apply/projects/views/project.py:650
msgid ""
"Contractor documents have been approved. You can receive invoices from "
"vendor now."
msgstr ""
-#: hypha/apply/projects/views/project.py:679
+#: hypha/apply/projects/views/project.py:716
msgid "Countersigned contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:682
+#: hypha/apply/projects/views/project.py:719
msgid "Signed contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:889
+#: hypha/apply/projects/views/project.py:930
msgid "Contract documents submitted"
msgstr ""
-#: hypha/apply/projects/views/project.py:950
+#: hypha/apply/projects/views/project.py:991
msgid "Contracting document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:1034
+#: hypha/apply/projects/views/project.py:1075
#, 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:1108
+#: hypha/apply/projects/views/project.py:1149
msgid "Project form status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1161
+#: hypha/apply/projects/views/project.py:1202
msgid "Project form has been approved"
msgstr ""
-#: hypha/apply/projects/views/project.py:1270
+#: hypha/apply/projects/views/project.py:1311
msgid "Project status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1563
+#: hypha/apply/projects/views/project.py:1604
msgid "Project form approvers have been updated"
msgstr ""
@@ -6893,6 +6963,10 @@ msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:17
#: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
+#: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:11
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
#: hypha/apply/users/templates/users/emails/set_password.txt:10
#: hypha/apply/users/templates/users/password_reset/email.txt:10
#, python-format
@@ -7034,6 +7108,68 @@ msgid ""
" The %(org_short_name)s Team"
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/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:8
+#: 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/passwordless_login_email.md:5
+#, python-format
+msgid ""
+"Login to your account on the %(org_long_name)s web site by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:9
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:8
+#, python-format
+msgid ""
+"This link will valid for %(timeout_minutes)s minutes and can be used only "
+"once."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:12
+#, python-format
+msgid ""
+"Your account on the %(org_long_name)s web site is deactivated. Please "
+"contact site administrators."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:3
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:2
+msgid "Dear,"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:5
+#, python-format
+msgid ""
+"It looks like you are trying to login on %(org_long_name)s web site, but we "
+"could not find any account with the email provided."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:4
+#, python-format
+msgid ""
+"Welcome to %(org_long_name)s web site. Create your account by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+
#: hypha/apply/users/templates/users/emails/set_password.txt:4
#, python-format
msgid ""
@@ -7521,17 +7657,17 @@ msgstr ""
msgid "Menu Item"
msgstr ""
-#: hypha/settings/django.py:162 hypha/settings/local.py:95
+#: hypha/settings/django.py:164 hypha/settings/local.py:95
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:165 hypha/settings/local.py:98
+#: hypha/settings/django.py:167 hypha/settings/local.py:98
msgid "Your password must not have been detected in a major security breach."
msgstr ""
-#: hypha/templates/base-apply.html:40
+#: hypha/templates/base-apply.html:39
msgid "Menu"
msgstr ""
@@ -7635,6 +7771,3 @@ msgstr ""
#~| msgid "Approved"
#~ msgid "Approved by "
#~ msgstr "Approuvé"
-
-#~ msgid "Edited"
-#~ msgstr "Modifié"
diff --git a/hypha/locale/ru/LC_MESSAGES/django.po b/hypha/locale/ru/LC_MESSAGES/django.po
index 937724d62d..2543118596 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: 2025-04-21 08:44+0000\n"
+"POT-Creation-Date: 2025-05-07 08:26+0000\n"
"PO-Revision-Date: 2024-04-23 14:50+0000\n"
"Last-Translator: arctic_garden \n"
"Language-Team: Russian Invoice status updated to: {status}."
msgstr "Статус инвойса обновлен до: {status}.
"
-#: hypha/apply/projects/views/payment.py:186
+#: hypha/apply/projects/views/payment.py:189
#, fuzzy
#| msgid "Invoice added"
msgid "Invoice updated."
msgstr "Добавлен инвойс"
-#: hypha/apply/projects/views/payment.py:274
+#: hypha/apply/projects/views/payment.py:277
msgid "Invoice added.
"
msgstr "Инвойс добавлен.
"
-#: hypha/apply/projects/views/payment.py:532
+#: hypha/apply/projects/views/payment.py:537
msgid "Sorry something went wrong"
msgstr "Извините, что-то пошло не так"
-#: hypha/apply/projects/views/project.py:263
+#: hypha/apply/projects/views/project.py:264
msgid "PAF has been submitted for approval"
msgstr "Форма утверждения проекта была подана на подтверждение"
-#: hypha/apply/projects/views/project.py:335
+#: hypha/apply/projects/views/project.py:336
msgid "Document has been uploaded"
msgstr "Документ был загружен"
-#: hypha/apply/projects/views/project.py:363
+#: hypha/apply/projects/views/project.py:364
msgid "Document has been removed"
msgstr "Документ был удален"
-#: hypha/apply/projects/views/project.py:390
+#: hypha/apply/projects/views/project.py:391
msgid "Contracting document has been removed"
msgstr "Контрактный документ был удален"
-#: hypha/apply/projects/views/project.py:437
+#: hypha/apply/projects/views/project.py:438
#, fuzzy
#| msgid "Unsigned"
msgid "Unassigned"
msgstr "Не подписанный"
-#: hypha/apply/projects/views/project.py:446
+#: hypha/apply/projects/views/project.py:447
#, fuzzy
#| msgid "Lead has been updated"
msgid "Lead has been updated."
msgstr "Руководитель был обновлен"
-#: hypha/apply/projects/views/project.py:492
+#: hypha/apply/projects/views/project.py:493
#, fuzzy
#| msgid "Lead has been updated"
msgid "Title has been updated"
msgstr "Руководитель был обновлен"
-#: hypha/apply/projects/views/project.py:613
+#: hypha/apply/projects/views/project.py:529
+#, fuzzy
+#| msgid "Lead has been updated"
+msgid "Dates has been updated"
+msgstr "Руководитель был обновлен"
+
+#: hypha/apply/projects/views/project.py:650
#, fuzzy
#| msgid ""
#| "Contractor documents have been approved. You can receive invoices from "
@@ -6424,46 +6520,46 @@ msgstr ""
"Контрактные документы утверждены. Теперь вы можете получать инвойсы от "
"поставщика."
-#: hypha/apply/projects/views/project.py:679
+#: hypha/apply/projects/views/project.py:716
msgid "Countersigned contract uploaded"
msgstr "Контракт, подписанный всеми сторонами, загружен"
-#: hypha/apply/projects/views/project.py:682
+#: hypha/apply/projects/views/project.py:719
msgid "Signed contract uploaded"
msgstr "Подписанный контракт загружен"
-#: hypha/apply/projects/views/project.py:889
+#: hypha/apply/projects/views/project.py:930
msgid "Contract documents submitted"
msgstr "Контрактные документы представлены"
-#: hypha/apply/projects/views/project.py:950
+#: hypha/apply/projects/views/project.py:991
msgid "Contracting document has been uploaded"
msgstr "Контрактный документ загружен"
-#: hypha/apply/projects/views/project.py:1034
+#: hypha/apply/projects/views/project.py:1075
#, fuzzy, python-brace-format
#| msgid "{role} has updated PAF status to {paf_status}.
"
msgid "updated project form status to {paf_status}."
msgstr ""
"{role} обновил статус формы утверждения проекта на {paf_status}.
"
-#: hypha/apply/projects/views/project.py:1108
+#: hypha/apply/projects/views/project.py:1149
#, fuzzy
#| msgid "Project status has been updated"
msgid "Project form status has been updated"
msgstr "Статус проекта был обновлен"
-#: hypha/apply/projects/views/project.py:1161
+#: hypha/apply/projects/views/project.py:1202
#, fuzzy
#| msgid "PAF has been approved"
msgid "Project form has been approved"
msgstr "Форма утверждения проекта была подтверждена"
-#: hypha/apply/projects/views/project.py:1270
+#: hypha/apply/projects/views/project.py:1311
msgid "Project status has been updated"
msgstr "Статус проекта был обновлен"
-#: hypha/apply/projects/views/project.py:1563
+#: hypha/apply/projects/views/project.py:1604
#, fuzzy
#| msgid "PAF approvers have been updated"
msgid "Project form approvers have been updated"
@@ -7542,6 +7638,10 @@ msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:17
#: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
+#: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:11
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
#: hypha/apply/users/templates/users/emails/set_password.txt:10
#: hypha/apply/users/templates/users/password_reset/email.txt:10
#, python-format
@@ -7709,6 +7809,84 @@ msgstr ""
"С наилучшими пожеланиями, \n"
" Команда %(org_short_name)s"
+#: 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/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:8
+#: 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/passwordless_login_email.md:5
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Login to your account on the %(org_long_name)s web site by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+"Активируйте свою учетную запись на сайте %(org_long_name)s, нажав на эту "
+"ссылку или скопировав и вставив ее в свой браузер:"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:9
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:8
+#, python-format
+msgid ""
+"This link will valid for %(timeout_minutes)s minutes and can be used only "
+"once."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:12
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Your account on the %(org_long_name)s web site is deactivated. Please "
+"contact site administrators."
+msgstr ""
+"Активируйте свою учетную запись на сайте %(org_long_name)s, нажав на эту "
+"ссылку или скопировав и вставив ее в свой браузер:"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:3
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:2
+msgid "Dear,"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:5
+#, python-format
+msgid ""
+"It looks like you are trying to login on %(org_long_name)s web site, but we "
+"could not find any account with the email provided."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Welcome to %(org_long_name)s web site. Create your account by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+"Активируйте свою учетную запись на сайте %(org_long_name)s, нажав на эту "
+"ссылку или скопировав и вставив ее в свой браузер:"
+
#: hypha/apply/users/templates/users/emails/set_password.txt:4
#, fuzzy, python-format
#| msgid ""
@@ -8310,17 +8488,17 @@ msgstr "Вернуться в проект"
msgid "Menu Item"
msgstr ""
-#: hypha/settings/django.py:162 hypha/settings/local.py:95
+#: hypha/settings/django.py:164 hypha/settings/local.py:95
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:165 hypha/settings/local.py:98
+#: hypha/settings/django.py:167 hypha/settings/local.py:98
msgid "Your password must not have been detected in a major security breach."
msgstr ""
-#: hypha/templates/base-apply.html:40
+#: hypha/templates/base-apply.html:39
msgid "Menu"
msgstr ""
@@ -8428,6 +8606,13 @@ msgstr "Требуется пароль"
msgid "Please enter the password to proceed."
msgstr "Пожалуйста, введите пароль, чтобы продолжить."
+#~ msgid ""
+#~ "Reporting has been disabled, just save the form with appropriate report "
+#~ "date and frequency to enable it again."
+#~ msgstr ""
+#~ "Отчетность была отключена, просто сохраните форму с соответствующей датой "
+#~ "и частотой отчета, чтобы включить ее снова."
+
#, fuzzy
#~| msgid "PAF assigned to {}"
#~ msgid "Project form assigned to {}"
@@ -8476,9 +8661,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
#~ msgid ">Are you sure you want to delete \"%(object)s\"?"
#~ msgstr ">Вы уверены, что хотите удалить \"%(object)s\"?"
-#~ msgid "End Date"
-#~ msgstr "Дата окончания"
-
#, fuzzy
#~| msgid "Project"
#~ msgid "Project #"
@@ -8580,9 +8762,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
#~ "параллельном порядке утверждающие лица могут утвердить проекты в любое "
#~ "время."
-#~ msgid "Edited"
-#~ msgstr "Отредактировано"
-
#~ msgid "Successfully removed document"
#~ msgstr "Документ успешно удален"
@@ -8640,9 +8819,6 @@ msgstr "Пожалуйста, введите пароль, чтобы продо
#~ msgid "Contracting Information has been updated on %(title)s."
#~ msgstr "Информация о контракте была обновлена на %(title)s."
-#~ msgid "Submit date"
-#~ msgstr "Дата подачи"
-
#~ msgid "fund"
#~ msgstr "фонд"
diff --git a/hypha/locale/zh_Hans/LC_MESSAGES/django.po b/hypha/locale/zh_Hans/LC_MESSAGES/django.po
index 7cf14fc475..089243a42e 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: 2025-04-21 08:45+0000\n"
+"POT-Creation-Date: 2025-05-07 08:26+0000\n"
"PO-Revision-Date: 2024-07-11 01:42+0000\n"
"Last-Translator: 复予 \n"
"Language-Team: Chinese (Simplified) Invoice status updated to: {status}."
msgstr "发票状态已更新至:{status}。
"
-#: hypha/apply/projects/views/payment.py:186
+#: hypha/apply/projects/views/payment.py:189
#, fuzzy
#| msgid "Reviewers updated."
msgid "Invoice updated."
msgstr "审核人已更新。"
-#: hypha/apply/projects/views/payment.py:274
+#: hypha/apply/projects/views/payment.py:277
#, fuzzy
#| msgid "Invoice status updated to: {status}.
"
msgid "Invoice added.
"
msgstr "发票状态已更新至:{status}。
"
-#: hypha/apply/projects/views/payment.py:532
+#: hypha/apply/projects/views/payment.py:537
msgid "Sorry something went wrong"
msgstr "抱歉,出了些问题"
-#: hypha/apply/projects/views/project.py:263
+#: hypha/apply/projects/views/project.py:264
#, fuzzy
#| msgid "Submit for Approval"
msgid "PAF has been submitted for approval"
msgstr "提交以批准"
-#: hypha/apply/projects/views/project.py:335
+#: hypha/apply/projects/views/project.py:336
msgid "Document has been uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:363
+#: hypha/apply/projects/views/project.py:364
msgid "Document has been removed"
msgstr ""
-#: hypha/apply/projects/views/project.py:390
+#: hypha/apply/projects/views/project.py:391
#, 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:437
+#: hypha/apply/projects/views/project.py:438
#, fuzzy
#| msgid "Unsigned"
msgid "Unassigned"
msgstr "未签名"
-#: hypha/apply/projects/views/project.py:446
+#: hypha/apply/projects/views/project.py:447
#, fuzzy
#| msgid "Last updated"
msgid "Lead has been updated."
msgstr "上次更新于"
-#: hypha/apply/projects/views/project.py:492
+#: hypha/apply/projects/views/project.py:493
msgid "Title has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:613
+#: hypha/apply/projects/views/project.py:529
+#, fuzzy
+#| msgid "Last updated"
+msgid "Dates has been updated"
+msgstr "上次更新于"
+
+#: hypha/apply/projects/views/project.py:650
msgid ""
"Contractor documents have been approved. You can receive invoices from "
"vendor now."
msgstr ""
-#: hypha/apply/projects/views/project.py:679
+#: hypha/apply/projects/views/project.py:716
msgid "Countersigned contract uploaded"
msgstr ""
-#: hypha/apply/projects/views/project.py:682
+#: hypha/apply/projects/views/project.py:719
#, fuzzy
#| msgid "Upload Signed Contract"
msgid "Signed contract uploaded"
msgstr "上传已签名合同"
-#: hypha/apply/projects/views/project.py:889
+#: hypha/apply/projects/views/project.py:930
#, fuzzy
#| msgid "No reports submitted"
msgid "Contract documents submitted"
msgstr "没有已提交报告"
-#: hypha/apply/projects/views/project.py:950
+#: hypha/apply/projects/views/project.py:991
#, 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:1034
+#: hypha/apply/projects/views/project.py:1075
#, fuzzy, python-brace-format
#| msgid "{role} has updated PAF status to {paf_status}.
"
msgid "updated project form status to {paf_status}."
msgstr "{role} 已将 PAF 状态更新至 {paf_status}。
"
-#: hypha/apply/projects/views/project.py:1108
+#: hypha/apply/projects/views/project.py:1149
#, 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:1161
+#: hypha/apply/projects/views/project.py:1202
#, fuzzy
#| msgid "Projects awaiting approval"
msgid "Project form has been approved"
msgstr "等待批准的项目"
-#: hypha/apply/projects/views/project.py:1270
+#: hypha/apply/projects/views/project.py:1311
msgid "Project status has been updated"
msgstr ""
-#: hypha/apply/projects/views/project.py:1563
+#: hypha/apply/projects/views/project.py:1604
msgid "Project form approvers have been updated"
msgstr ""
@@ -7642,6 +7732,10 @@ msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:17
#: hypha/apply/users/templates/users/email_change/confirm_email.txt:10
+#: hypha/apply/users/templates/users/emails/confirm_access.md:14
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:21
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:11
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:16
#: hypha/apply/users/templates/users/emails/set_password.txt:10
#: hypha/apply/users/templates/users/password_reset/email.txt:10
#, python-format
@@ -7806,6 +7900,84 @@ msgstr ""
"谨致问候,\n"
"%(org_short_name)s 团队"
+#: 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/passwordless_login_email.md:18
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:8
+#: 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/passwordless_login_email.md:5
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Login to your account on the %(org_long_name)s web site by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+"点击此链接或将其复制并粘贴到浏览器中,以激活您在 %(org_long_name)s 网站的账"
+"户:"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:9
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:8
+#, python-format
+msgid ""
+"This link will valid for %(timeout_minutes)s minutes and can be used only "
+"once."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_email.md:12
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Your account on the %(org_long_name)s web site is deactivated. Please "
+"contact site administrators."
+msgstr ""
+"点击此链接或将其复制并粘贴到浏览器中,以激活您在 %(org_long_name)s 网站的账"
+"户:"
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:3
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:2
+msgid "Dear,"
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_login_no_account_found.md:5
+#, python-format
+msgid ""
+"It looks like you are trying to login on %(org_long_name)s web site, but we "
+"could not find any account with the email provided."
+msgstr ""
+
+#: hypha/apply/users/templates/users/emails/passwordless_new_account_login.md:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Activate your account on the %(org_long_name)s web site by clicking this "
+#| "link or copying and pasting it to your browser:"
+msgid ""
+"Welcome to %(org_long_name)s web site. Create your account by clicking this "
+"link or copying and pasting it to your browser:"
+msgstr ""
+"点击此链接或将其复制并粘贴到浏览器中,以激活您在 %(org_long_name)s 网站的账"
+"户:"
+
#: hypha/apply/users/templates/users/emails/set_password.txt:4
#, fuzzy, python-format
#| msgid ""
@@ -8363,17 +8535,17 @@ msgstr "返回账户"
msgid "Menu Item"
msgstr ""
-#: hypha/settings/django.py:162 hypha/settings/local.py:95
+#: hypha/settings/django.py:164 hypha/settings/local.py:95
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:165 hypha/settings/local.py:98
+#: hypha/settings/django.py:167 hypha/settings/local.py:98
msgid "Your password must not have been detected in a major security breach."
msgstr ""
-#: hypha/templates/base-apply.html:40
+#: hypha/templates/base-apply.html:39
msgid "Menu"
msgstr ""
@@ -8528,9 +8700,6 @@ msgstr "请输入密码以继续。"
#~ msgid ">Are you sure you want to delete \"%(object)s\"?"
#~ msgstr ">您确定要删除“%(object)s”吗?"
-#~ msgid "End Date"
-#~ msgstr "结束日期"
-
#, fuzzy
#~| msgid "Project"
#~ msgid "Project #"
@@ -8593,9 +8762,6 @@ msgstr "请输入密码以继续。"
#~ msgid "Submit for Approval"
#~ msgstr "提交以批准"
-#~ msgid "Edited"
-#~ msgstr "编辑了"
-
#~ msgid "Successfully removed document"
#~ msgstr "文档删除成功"
@@ -8629,9 +8795,6 @@ msgstr "请输入密码以继续。"
#~ "detail page."
#~ msgstr "下一步是登陆项目详情页面,完善合同信息。"
-#~ msgid "Submit date"
-#~ msgstr "提交日期"
-
#~ msgid "fund"
#~ msgstr "基金"