diff --git a/hypha/locale/django.pot b/hypha/locale/django.pot
index 01dd00ea562bf27881ef15fbca64051af40171f2..cdfd16abba1cae348bae741b71d6f3a0111cd7e8 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: 2021-11-09 10:44+0000\n"
+"POT-Creation-Date: 2022-04-29 14:22+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,418 +18,418 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: hypha/apply/activity/messaging.py:39
+#: hypha/apply/activity/messaging.py:53
#, python-brace-format
msgid " as {role}"
msgstr ""
-#: hypha/apply/activity/messaging.py:228
+#: hypha/apply/activity/messaging.py:242
#, python-brace-format
msgid "Submitted {source.title} for {source.page.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:229 hypha/apply/activity/messaging.py:230
+#: hypha/apply/activity/messaging.py:243 hypha/apply/activity/messaging.py:244
msgid "Edited"
msgstr ""
-#: hypha/apply/activity/messaging.py:231 hypha/apply/activity/messaging.py:245
+#: hypha/apply/activity/messaging.py:245 hypha/apply/activity/messaging.py:259
#, python-brace-format
msgid "Lead changed from {old_lead} to {source.lead}"
msgstr ""
-#: hypha/apply/activity/messaging.py:232
+#: hypha/apply/activity/messaging.py:246
#, python-brace-format
msgid "Batch Lead changed to {new_lead}"
msgstr ""
-#: hypha/apply/activity/messaging.py:233
+#: hypha/apply/activity/messaging.py:247
#, python-brace-format
msgid "Sent a determination. Outcome: {determination.clean_outcome}"
msgstr ""
-#: hypha/apply/activity/messaging.py:235
+#: hypha/apply/activity/messaging.py:249
msgid "Invited to submit a proposal"
msgstr ""
-#: hypha/apply/activity/messaging.py:239
+#: hypha/apply/activity/messaging.py:253
msgid "Submitted a review"
msgstr ""
-#: hypha/apply/activity/messaging.py:240
+#: hypha/apply/activity/messaging.py:254
msgid "Opened the submission while still sealed"
msgstr ""
-#: hypha/apply/activity/messaging.py:242
+#: hypha/apply/activity/messaging.py:256
#, python-brace-format
msgid ""
"{user} {opinion.opinion_display}s with {opinion.review.author}s review of "
"{source}"
msgstr ""
-#: hypha/apply/activity/messaging.py:243
+#: hypha/apply/activity/messaging.py:257
msgid "Created"
msgstr ""
-#: hypha/apply/activity/messaging.py:244
+#: hypha/apply/activity/messaging.py:258
#, python-brace-format
msgid "Progressed from {old_stage} to {source.status_display}"
msgstr ""
-#: hypha/apply/activity/messaging.py:246
+#: hypha/apply/activity/messaging.py:260
msgid "Requested approval"
msgstr ""
-#: hypha/apply/activity/messaging.py:247
+#: hypha/apply/activity/messaging.py:261
#: hypha/apply/determinations/options.py:12
msgid "Approved"
msgstr ""
-#: hypha/apply/activity/messaging.py:248
+#: hypha/apply/activity/messaging.py:262
#, python-brace-format
msgid "Requested changes for acceptance: \"{comment}\""
msgstr ""
-#: hypha/apply/activity/messaging.py:249
+#: hypha/apply/activity/messaging.py:263
#, python-brace-format
msgid "Uploaded a {contract.state} contract"
msgstr ""
-#: hypha/apply/activity/messaging.py:250
+#: hypha/apply/activity/messaging.py:264
msgid "Approved contract"
msgstr ""
-#: hypha/apply/activity/messaging.py:251
-#, python-brace-format
-msgid "Updated Invoice status to: {invoice.status_display}"
-msgstr ""
-
-#: hypha/apply/activity/messaging.py:252
+#: hypha/apply/activity/messaging.py:266
msgid "Invoice created"
msgstr ""
-#: hypha/apply/activity/messaging.py:253
+#: hypha/apply/activity/messaging.py:267
msgid "Submitted a report"
msgstr ""
-#: hypha/apply/activity/messaging.py:284
+#: hypha/apply/activity/messaging.py:298
msgid "Reviewers updated."
msgstr ""
-#: hypha/apply/activity/messaging.py:286 hypha/apply/activity/messaging.py:356
-#: hypha/apply/activity/messaging.py:513
+#: hypha/apply/activity/messaging.py:300 hypha/apply/activity/messaging.py:370
+#: hypha/apply/activity/messaging.py:552
msgid "Added:"
msgstr ""
-#: hypha/apply/activity/messaging.py:290 hypha/apply/activity/messaging.py:360
-#: hypha/apply/activity/messaging.py:517
+#: hypha/apply/activity/messaging.py:304 hypha/apply/activity/messaging.py:374
+#: hypha/apply/activity/messaging.py:556
msgid "Removed:"
msgstr ""
-#: hypha/apply/activity/messaging.py:296
+#: hypha/apply/activity/messaging.py:310
msgid "Batch Reviewers Updated."
msgstr ""
-#: hypha/apply/activity/messaging.py:298
+#: hypha/apply/activity/messaging.py:312
#, python-brace-format
msgid "{user} as {name}."
msgstr ""
-#: hypha/apply/activity/messaging.py:316
+#: hypha/apply/activity/messaging.py:330
#, python-brace-format
msgid "Successfully deleted submissions: {title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:320
+#: hypha/apply/activity/messaging.py:334
#, python-brace-format
msgid "Progressed from {old_display} to {new_display}"
msgstr ""
-#: hypha/apply/activity/messaging.py:354
+#: hypha/apply/activity/messaging.py:368
msgid "Partners updated."
msgstr ""
-#: hypha/apply/activity/messaging.py:367
+#: hypha/apply/activity/messaging.py:381
#, python-brace-format
msgid ""
"Updated reporting frequency. New schedule is: {new_schedule} starting on "
"{schedule_start}"
msgstr ""
-#: hypha/apply/activity/messaging.py:405
+#: hypha/apply/activity/messaging.py:390
+#, python-brace-format
+msgid "Updated Invoice status to: {status}."
+msgstr ""
+
+#: hypha/apply/activity/messaging.py:423
#, python-brace-format
msgid "Screening status from {old_status} to {new_status}"
msgstr ""
-#: hypha/apply/activity/messaging.py:412
+#: hypha/apply/activity/messaging.py:430
#, python-brace-format
msgid ""
"A new submission has been submitted for {source.page.title}: <{link}|{source."
"title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:413
+#: hypha/apply/activity/messaging.py:431
#, python-brace-format
msgid ""
"The lead of <{link}|{source.title}> has been updated from {old_lead} to "
"{source.lead} by {user}"
msgstr ""
-#: hypha/apply/activity/messaging.py:415
+#: hypha/apply/activity/messaging.py:433
#, python-brace-format
msgid ""
"A new {comment.visibility} comment has been posted on <{link}|{source.title}"
"> by {user}"
msgstr ""
-#: hypha/apply/activity/messaging.py:416 hypha/apply/activity/messaging.py:417
+#: hypha/apply/activity/messaging.py:434 hypha/apply/activity/messaging.py:435
#, python-brace-format
msgid "{user} has edited <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:420
+#: hypha/apply/activity/messaging.py:438
#, python-brace-format
msgid "{user} has updated the partners on <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:421
+#: hypha/apply/activity/messaging.py:439
#, python-brace-format
msgid ""
"{user} has updated the status of <{link}|{source.title}>: {old_phase."
"display_name} → {source.phase}"
msgstr ""
-#: hypha/apply/activity/messaging.py:425
+#: hypha/apply/activity/messaging.py:443
#, python-brace-format
msgid "A proposal has been submitted for review: <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:426
+#: hypha/apply/activity/messaging.py:444
#, python-brace-format
msgid ""
"<{link}|{source.title}> by {source.user} has been invited to submit a "
"proposal"
msgstr ""
-#: hypha/apply/activity/messaging.py:427
+#: hypha/apply/activity/messaging.py:445
#, python-brace-format
msgid ""
"{user} has submitted a review for <{link}|{source.title}>. Outcome: {review."
"outcome}, Score: {review.get_score_display}"
msgstr ""
-#: hypha/apply/activity/messaging.py:429
+#: hypha/apply/activity/messaging.py:447
#, python-brace-format
msgid "{user} has opened the sealed submission: <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:430
+#: hypha/apply/activity/messaging.py:448
#, python-brace-format
msgid ""
"{user} {opinion.opinion_display}s with {opinion.review.author}s review of "
"{source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:432
+#: hypha/apply/activity/messaging.py:450
#, python-brace-format
msgid "{user} has deleted {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:433
+#: hypha/apply/activity/messaging.py:451
#, python-brace-format
msgid "{user} has deleted {review.author} review for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:434
+#: hypha/apply/activity/messaging.py:452
#, python-brace-format
msgid "{user} has created a Project: <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:435
+#: hypha/apply/activity/messaging.py:453
#, python-brace-format
msgid ""
"The lead of project <{link}|{source.title}> has been updated from {old_lead} "
"to {source.lead} by {user}"
msgstr ""
-#: hypha/apply/activity/messaging.py:436
+#: hypha/apply/activity/messaging.py:454
#, python-brace-format
msgid "{user} has edited {review.author} review for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:437
+#: hypha/apply/activity/messaging.py:455
#, python-brace-format
msgid "{user} has requested approval on project <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:438
+#: hypha/apply/activity/messaging.py:456
#, python-brace-format
msgid "{user} has approved project <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:439
+#: hypha/apply/activity/messaging.py:457
#, python-brace-format
msgid ""
"{user} has requested changes for project acceptance on <{link}|{source.title}"
">."
msgstr ""
-#: hypha/apply/activity/messaging.py:440
+#: hypha/apply/activity/messaging.py:458
#, python-brace-format
msgid "{user} has uploaded a contract for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:441
+#: hypha/apply/activity/messaging.py:459
#, python-brace-format
msgid "{user} has approved contract for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:442
+#: hypha/apply/activity/messaging.py:460
#, python-brace-format
msgid "{user} has created invoice for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:443
+#: hypha/apply/activity/messaging.py:461
#, python-brace-format
msgid ""
"{user} has changed the status of <{link_related}|invoice> on <{link}|{source."
"title}> to {invoice.status_display}."
msgstr ""
-#: hypha/apply/activity/messaging.py:444
+#: hypha/apply/activity/messaging.py:462
#, python-brace-format
msgid "{user} has deleted invoice from <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:445
+#: hypha/apply/activity/messaging.py:463
#, python-brace-format
msgid "{user} has updated invoice for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:446
+#: hypha/apply/activity/messaging.py:464
#, python-brace-format
msgid "{user} has submitted a report for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:510
+#: hypha/apply/activity/messaging.py:549
#, python-brace-format
msgid "{user} has updated the reviewers on <{link}|{title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:526
+#: hypha/apply/activity/messaging.py:565
#, python-brace-format
msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
msgstr ""
-#: hypha/apply/activity/messaging.py:537 hypha/apply/activity/messaging.py:973
+#: hypha/apply/activity/messaging.py:576 hypha/apply/activity/messaging.py:1018
#, python-brace-format
msgid "{user} as {name},"
msgstr ""
-#: hypha/apply/activity/messaging.py:542
+#: hypha/apply/activity/messaging.py:581
#, python-brace-format
msgid ""
"{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
msgstr ""
-#: hypha/apply/activity/messaging.py:560
+#: hypha/apply/activity/messaging.py:599
#, python-brace-format
msgid "{user} has transitioned the following submissions: {submissions_links}"
msgstr ""
-#: hypha/apply/activity/messaging.py:570
+#: hypha/apply/activity/messaging.py:609
#, python-brace-format
msgid ""
"A determination for <{link}|{submission_title}> was sent by email. Outcome: "
"{determination_outcome}"
msgstr ""
-#: hypha/apply/activity/messaging.py:577
+#: hypha/apply/activity/messaging.py:616
#, python-brace-format
msgid ""
"A determination for <{link}|{submission_title}> was saved without sending an "
"email. Outcome: {determination_outcome}"
msgstr ""
-#: hypha/apply/activity/messaging.py:594
+#: hypha/apply/activity/messaging.py:633
#, python-brace-format
msgid "Determinations of {outcome} was sent for: {submissions_links}"
msgstr ""
-#: hypha/apply/activity/messaging.py:603
+#: hypha/apply/activity/messaging.py:642
#, python-brace-format
msgid "{user} has deleted submissions: {title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:617
+#: hypha/apply/activity/messaging.py:656
#, python-brace-format
msgid ""
"<{link}|{title}> is ready for review. The following are assigned as "
"reviewers: {reviewers}"
msgstr ""
-#: hypha/apply/activity/messaging.py:732
+#: hypha/apply/activity/messaging.py:771
#, python-brace-format
msgid "Application ready to review: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:734
+#: hypha/apply/activity/messaging.py:773
msgid "Multiple applications are now ready for your review"
msgstr ""
-#: hypha/apply/activity/messaging.py:736
+#: hypha/apply/activity/messaging.py:775
#, python-brace-format
msgid "Reminder: Application ready to review: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:739
+#: hypha/apply/activity/messaging.py:778
#, python-brace-format
msgid "Your application to {org_long_name}: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:741
+#: hypha/apply/activity/messaging.py:780
#, python-brace-format
msgid "Your {org_long_name} Project: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:963
+#: hypha/apply/activity/messaging.py:1008
msgid "Successfully uploaded document"
msgstr ""
-#: hypha/apply/activity/messaging.py:964
+#: hypha/apply/activity/messaging.py:1009
msgid "Successfully removed document"
msgstr ""
-#: hypha/apply/activity/messaging.py:967
+#: hypha/apply/activity/messaging.py:1012
msgid "Reminder created"
msgstr ""
-#: hypha/apply/activity/messaging.py:968
+#: hypha/apply/activity/messaging.py:1013
msgid "Reminder deleted"
msgstr ""
-#: hypha/apply/activity/messaging.py:979
+#: hypha/apply/activity/messaging.py:1024
#, python-brace-format
msgid "Batch reviewers added: {reviewers_text} to "
msgstr ""
-#: hypha/apply/activity/messaging.py:984
+#: hypha/apply/activity/messaging.py:1029
#, python-brace-format
msgid ""
"Successfully updated reporting frequency. They will now report "
"{new_schedule} starting on {schedule_start}"
msgstr ""
-#: hypha/apply/activity/messaging.py:988
+#: hypha/apply/activity/messaging.py:1033
#, python-brace-format
msgid "Successfully skipped a Report for {start_date} to {end_date}"
msgstr ""
-#: hypha/apply/activity/messaging.py:990
+#: hypha/apply/activity/messaging.py:1035
#, python-brace-format
msgid "Successfully unskipped a Report for {start_date} to {end_date}"
msgstr ""
-#: hypha/apply/activity/messaging.py:1009
+#: hypha/apply/activity/messaging.py:1054
#, python-brace-format
msgid "Successfully determined as {outcome}: "
msgstr ""
@@ -478,6 +478,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/base.html:2
#: hypha/apply/users/templates/users/activation/email.txt:5
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:5
#, python-format
msgid "Dear %(user)s,"
msgstr ""
@@ -504,7 +505,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:10
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:7
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:14
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:16
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:9
#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:9
#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:9
@@ -518,7 +519,6 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:11
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:8
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:15
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:10
#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:10
#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:10
@@ -598,16 +598,24 @@ msgid ""
"for period %(date_from)s to %(date_to)s."
msgstr ""
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:6
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:7
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:7
#, python-format
msgid "It is now %(status)s."
msgstr ""
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:9
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:10
msgid "The staff member left this comment"
msgstr ""
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:15
+msgid "Invoice Link"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:17
+msgid "Project Link"
+msgstr ""
+
#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:5
msgid "New partner(s) has been added to your submission."
msgstr ""
@@ -740,13 +748,13 @@ msgid "Contracting Information has been updated on %(title)s."
msgstr ""
#: hypha/apply/api/v1/determination/utils.py:25
-#: hypha/apply/determinations/forms.py:106
+#: hypha/apply/determinations/forms.py:108
#: hypha/apply/determinations/views.py:93
msgid "-- No determination selected -- "
msgstr ""
#: hypha/apply/api/v1/filters.py:23 hypha/apply/funds/tables.py:416
-#: hypha/apply/users/templates/wagtailusers/users/list.html:46
+#: hypha/apply/users/templates/wagtailusers/users/list.html:48
msgid "Active"
msgstr ""
@@ -770,19 +778,21 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: hypha/apply/api/v1/projects/views.py:39
+#: hypha/apply/api/v1/projects/views.py:50
msgid "Not Found"
msgstr ""
-#: hypha/apply/api/v1/projects/views.py:45
+#: hypha/apply/api/v1/projects/views.py:56
msgid "Invoice Already has this deliverable"
msgstr ""
-#: hypha/apply/api/v1/projects/views.py:48
+#: hypha/apply/api/v1/projects/views.py:59
msgid "Required quantity is more than available"
msgstr ""
-#: hypha/apply/categories/blocks.py:34 hypha/apply/stream_forms/blocks.py:36
+#: hypha/apply/categories/blocks.py:34 hypha/apply/funds/blocks.py:30
+#: hypha/apply/funds/blocks.py:53 hypha/apply/funds/blocks.py:102
+#: hypha/apply/stream_forms/blocks.py:36
msgid "Label"
msgstr ""
@@ -790,11 +800,17 @@ msgstr ""
msgid "Leave blank to use the default Category label"
msgstr ""
-#: hypha/apply/categories/blocks.py:40
+#: hypha/apply/categories/blocks.py:39 hypha/apply/funds/blocks.py:31
+#: hypha/apply/funds/blocks.py:54 hypha/apply/funds/blocks.py:103
+#: hypha/apply/stream_forms/blocks.py:37
+msgid "Help text"
+msgstr ""
+
+#: hypha/apply/categories/blocks.py:41
msgid "Leave blank to use the default Category help text"
msgstr ""
-#: hypha/apply/categories/blocks.py:43
+#: hypha/apply/categories/blocks.py:44
msgid "Multi select"
msgstr ""
@@ -877,7 +893,11 @@ msgstr ""
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:70
#: hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html:33
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:4
-#: hypha/apply/projects/models/payment.py:21 hypha/apply/projects/tables.py:21
+#: hypha/apply/projects/models/payment.py:31 hypha/apply/projects/tables.py:23
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:15
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:24
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:60
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:69
#: hypha/apply/projects/templates/application_projects/includes/reports.html:63
#: hypha/apply/projects/templates/application_projects/includes/reports.html:74
msgid "Submitted"
@@ -919,11 +939,10 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/determination_detail.html:25
#: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:2
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:81
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:86
#: hypha/apply/projects/templates/application_projects/includes/reports.html:81
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:32
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:56
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:57
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:34
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:58
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:59
#: hypha/apply/projects/templates/application_projects/invoice_form.html:4
#: hypha/apply/projects/templates/application_projects/report_detail.html:59
#: hypha/apply/projects/templates/application_projects/vendor_detail.html:23
@@ -966,53 +985,54 @@ msgid "No submissions"
msgstr ""
#: hypha/apply/dashboard/templates/dashboard/community_dashboard.html:38
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:106
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:108
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:35
msgid "Your previous reviews"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:18
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:19
#: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:14
msgid "Apply admin"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:30
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:32
msgid "Submissions waiting for your review"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:32
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:39
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:47
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:55
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:34
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:41
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:49
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:57
#: hypha/apply/funds/templates/funds/includes/round-block-listing.html:23
#: hypha/apply/funds/templates/funds/includes/status-block.html:10
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:72
#: hypha/apply/projects/templates/application_projects/includes/reports.html:78
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:16
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:39
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:64
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:17
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:19
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:41
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:66
msgid "View"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:37
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:39
msgid "Live projects under your management"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:45
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:92
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:47
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:94
msgid "Projects awaiting approval"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:53
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:55
msgid "Requests for invoices requiring your attention"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:77
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:79
msgid "Your projects"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:83
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:112
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:85
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:114
#: hypha/apply/dashboard/templates/dashboard/includes/flagged.html:12
#: hypha/apply/dashboard/templates/dashboard/includes/waiting-for-review.html:13
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:41
@@ -1025,7 +1045,7 @@ msgstr ""
msgid "Show all"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:99
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:101
#: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:21
msgid "Active Invoices"
msgstr ""
@@ -1064,12 +1084,11 @@ msgstr ""
#: hypha/apply/determinations/blocks.py:65
#: hypha/apply/determinations/blocks.py:66
#: hypha/apply/determinations/blocks.py:67
-#: hypha/apply/determinations/blocks.py:68 hypha/apply/funds/blocks.py:184
+#: hypha/apply/determinations/blocks.py:68 hypha/apply/funds/blocks.py:193
#: hypha/apply/review/blocks.py:160 hypha/apply/review/blocks.py:161
#: hypha/apply/review/blocks.py:162 hypha/apply/review/blocks.py:163
#: hypha/apply/review/blocks.py:164 hypha/apply/review/blocks.py:165
-#: hypha/apply/review/blocks.py:166 hypha/apply/stream_forms/blocks.py:467
-#: hypha/apply/stream_forms/blocks.py:468
+#: hypha/apply/review/blocks.py:166 hypha/apply/stream_forms/blocks.py:468
#: hypha/apply/stream_forms/blocks.py:469
#: hypha/apply/stream_forms/blocks.py:470
#: hypha/apply/stream_forms/blocks.py:471
@@ -1081,8 +1100,9 @@ msgstr ""
#: hypha/apply/stream_forms/blocks.py:477
#: hypha/apply/stream_forms/blocks.py:478
#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480 hypha/apply/utils/blocks.py:66
-#: hypha/apply/utils/blocks.py:67
+#: hypha/apply/stream_forms/blocks.py:480
+#: hypha/apply/stream_forms/blocks.py:481 hypha/apply/utils/blocks.py:76
+#: hypha/apply/utils/blocks.py:77
msgid "Fields"
msgstr ""
@@ -1090,161 +1110,161 @@ msgstr ""
msgid "Section text/header"
msgstr ""
-#: hypha/apply/determinations/forms.py:170
-#: hypha/apply/determinations/forms.py:251
-#: hypha/apply/determinations/forms.py:507
-#: hypha/apply/determinations/models.py:102
+#: hypha/apply/determinations/forms.py:172
+#: hypha/apply/determinations/forms.py:253
+#: hypha/apply/determinations/forms.py:515
+#: hypha/apply/determinations/models.py:101
#: hypha/apply/determinations/templates/determinations/determination_detail.html:12
#: hypha/apply/determinations/templates/determinations/determination_detail.html:20
msgid "Determination"
msgstr ""
-#: hypha/apply/determinations/forms.py:176
-#: hypha/apply/determinations/forms.py:257
-#: hypha/apply/determinations/models.py:103
+#: hypha/apply/determinations/forms.py:178
+#: hypha/apply/determinations/forms.py:259
+#: hypha/apply/determinations/models.py:102
msgid "Determination message"
msgstr ""
-#: hypha/apply/determinations/forms.py:183
+#: hypha/apply/determinations/forms.py:185
msgid "Goals and principles"
msgstr ""
-#: hypha/apply/determinations/forms.py:203
+#: hypha/apply/determinations/forms.py:205
msgid "Technical merit"
msgstr ""
-#: hypha/apply/determinations/forms.py:218
+#: hypha/apply/determinations/forms.py:220
msgid "Reasonable, realistic and sustainable"
msgstr ""
-#: hypha/apply/determinations/forms.py:232
+#: hypha/apply/determinations/forms.py:234
msgid "Other comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:265
+#: hypha/apply/determinations/forms.py:267
msgid "Positive aspects"
msgstr ""
-#: hypha/apply/determinations/forms.py:271
+#: hypha/apply/determinations/forms.py:273
msgid "Concerns"
msgstr ""
-#: hypha/apply/determinations/forms.py:277
+#: hypha/apply/determinations/forms.py:279
msgid "Items that must be addressed"
msgstr ""
-#: hypha/apply/determinations/forms.py:283
+#: hypha/apply/determinations/forms.py:285
msgid "Project overview questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:286
+#: hypha/apply/determinations/forms.py:288
msgid "Objectives questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:289
+#: hypha/apply/determinations/forms.py:291
msgid "Methods and strategy questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:292
+#: hypha/apply/determinations/forms.py:294
msgid "Technical feasibility questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:295
+#: hypha/apply/determinations/forms.py:297
msgid "Alternative analysis - \"red teaming\" questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:298
+#: hypha/apply/determinations/forms.py:300
msgid "Usability questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:301
+#: hypha/apply/determinations/forms.py:303
msgid "Sustainability questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:304
+#: hypha/apply/determinations/forms.py:306
msgid "Collaboration questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:307
+#: hypha/apply/determinations/forms.py:309
msgid "Cost realism questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:310
+#: hypha/apply/determinations/forms.py:312
msgid "Qualifications questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:313
+#: hypha/apply/determinations/forms.py:315
msgid "Evaluation questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:317
+#: hypha/apply/determinations/forms.py:319
msgid "Rationale and appropriateness questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:354
+#: hypha/apply/determinations/forms.py:359
#: hypha/apply/determinations/views.py:354
msgid "-- No proposal form selected -- "
msgstr ""
-#: hypha/apply/determinations/forms.py:356
+#: hypha/apply/determinations/forms.py:361
#: hypha/apply/determinations/views.py:356
msgid "Proposal Form"
msgstr ""
-#: hypha/apply/determinations/forms.py:358
+#: hypha/apply/determinations/forms.py:363
#: hypha/apply/determinations/views.py:358
msgid "Select the proposal form to use for proposal stage."
msgstr ""
-#: hypha/apply/determinations/models.py:110
+#: hypha/apply/determinations/models.py:109
#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:7
#: hypha/apply/funds/workflow.py:205 hypha/apply/funds/workflow.py:332
#: hypha/apply/funds/workflow.py:487 hypha/apply/funds/workflow.py:666
-#: hypha/apply/review/models.py:162
+#: hypha/apply/review/models.py:161
msgid "Draft"
msgstr ""
-#: hypha/apply/determinations/models.py:111
-#: hypha/apply/projects/models/vendor.py:49 hypha/apply/review/models.py:163
+#: hypha/apply/determinations/models.py:110
+#: hypha/apply/projects/models/vendor.py:49 hypha/apply/review/models.py:162
msgid "Creation time"
msgstr ""
-#: hypha/apply/determinations/models.py:112
-#: hypha/apply/projects/models/vendor.py:50 hypha/apply/review/models.py:164
+#: hypha/apply/determinations/models.py:111
+#: hypha/apply/projects/models/vendor.py:50 hypha/apply/review/models.py:163
msgid "Update time"
msgstr ""
-#: hypha/apply/determinations/models.py:113
+#: hypha/apply/determinations/models.py:112
msgid "Send message to applicant"
msgstr ""
-#: hypha/apply/determinations/models.py:229
+#: hypha/apply/determinations/models.py:228
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:22
msgid "Request"
msgstr ""
-#: hypha/apply/determinations/models.py:230
+#: hypha/apply/determinations/models.py:229
msgid "Concept note"
msgstr ""
-#: hypha/apply/determinations/models.py:231
+#: hypha/apply/determinations/models.py:230
#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:13
-#: hypha/apply/projects/templates/application_projects/project_detail.html:198
+#: hypha/apply/projects/templates/application_projects/project_detail.html:169
msgid "Proposal"
msgstr ""
-#: hypha/apply/determinations/models.py:351
+#: hypha/apply/determinations/models.py:350
msgid "Concept form"
msgstr ""
-#: hypha/apply/determinations/models.py:352
+#: hypha/apply/determinations/models.py:351
msgid "Proposal form"
msgstr ""
#: hypha/apply/determinations/options.py:10 hypha/apply/funds/workflow.py:315
#: hypha/apply/funds/workflow.py:469 hypha/apply/funds/workflow.py:648
#: hypha/apply/funds/workflow.py:769 hypha/apply/funds/workflow.py:923
-#: hypha/apply/funds/workflow.py:1145
+#: hypha/apply/funds/workflow.py:1155
msgid "Dismissed"
msgstr ""
@@ -1287,14 +1307,14 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:48
#: hypha/apply/funds/templates/funds/application_base.html:67
#: hypha/apply/funds/templates/funds/applicationsubmission_form.html:36
-#: hypha/apply/funds/views.py:939
+#: hypha/apply/funds/views.py:950
#: hypha/apply/review/templates/review/review_edit_form.html:40
#: hypha/apply/review/templates/review/review_form.html:41
msgid "Save draft"
msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:50
-#: hypha/apply/funds/views.py:938 hypha/apply/funds/workflow.py:200
+#: hypha/apply/funds/views.py:949 hypha/apply/funds/workflow.py:200
#: hypha/apply/funds/workflow.py:228 hypha/apply/funds/workflow.py:271
#: hypha/apply/funds/workflow.py:327 hypha/apply/funds/workflow.py:353
#: hypha/apply/funds/workflow.py:391 hypha/apply/funds/workflow.py:429
@@ -1309,6 +1329,7 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/vendor_form.html:27
#: hypha/apply/review/templates/review/review_edit_form.html:42
#: hypha/apply/review/templates/review/review_form.html:43
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:35
msgid "Submit"
msgstr ""
@@ -1415,7 +1436,7 @@ msgstr ""
msgid "There is a draft determination you do not have permission to edit."
msgstr ""
-#: hypha/apply/determinations/views.py:435
+#: hypha/apply/determinations/views.py:427
#, python-brace-format
msgid ""
"A determination of \"{current}\" exists but you tried to progress as "
@@ -1461,51 +1482,75 @@ msgstr ""
msgid "Closed"
msgstr ""
-#: hypha/apply/funds/admin_views.py:65
+#: hypha/apply/funds/admin_views.py:67
#, python-brace-format
msgid "Page '{0}' and {1} subpages copied."
msgstr ""
-#: hypha/apply/funds/admin_views.py:70
+#: hypha/apply/funds/admin_views.py:72
#, python-brace-format
msgid "Page '{0}' copied."
msgstr ""
-#: hypha/apply/funds/blocks.py:32
+#: hypha/apply/funds/blocks.py:30
+msgid "What is the title of your application?"
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:31
+msgid "This project name can be changed if a full proposal is requested."
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:34
msgid "Application title"
msgstr ""
-#: hypha/apply/funds/blocks.py:42
+#: hypha/apply/funds/blocks.py:44
msgid "Requested amount"
msgstr ""
-#: hypha/apply/funds/blocks.py:65
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:27
+#: hypha/apply/funds/blocks.py:53
+msgid "What email address should we use to contact you?"
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:55
+msgid ""
+"We will use this email address to communicate with you about your proposal."
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:71
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:29
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:17
#: hypha/apply/projects/models/vendor.py:20
#: hypha/apply/projects/models/vendor.py:57
-#: hypha/apply/projects/templates/application_projects/project_detail.html:110
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:55
msgid "Address"
msgstr ""
-#: hypha/apply/funds/blocks.py:183 hypha/apply/stream_forms/blocks.py:465
-#: hypha/apply/stream_forms/blocks.py:466
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482 hypha/apply/utils/blocks.py:74
+#: hypha/apply/funds/blocks.py:102
+msgid "What is your name?"
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:104
+msgid "We will use this name when we communicate with you about your proposal."
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:192 hypha/apply/stream_forms/blocks.py:466
+#: hypha/apply/stream_forms/blocks.py:467
+#: hypha/apply/stream_forms/blocks.py:482
+#: hypha/apply/stream_forms/blocks.py:483 hypha/apply/utils/blocks.py:84
msgid "Custom"
msgstr ""
-#: hypha/apply/funds/forms.py:59 hypha/apply/funds/forms.py:78
+#: hypha/apply/funds/forms.py:60 hypha/apply/funds/forms.py:79
msgid "Take action"
msgstr ""
-#: hypha/apply/funds/forms.py:138 hypha/apply/projects/forms/project.py:189
+#: hypha/apply/funds/forms.py:139 hypha/apply/projects/forms/project.py:182
#, python-brace-format
msgid "Update lead from {lead} to"
msgstr ""
-#: hypha/apply/funds/forms.py:143
+#: hypha/apply/funds/forms.py:144
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:25
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:27
#: hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html:20
@@ -1514,51 +1559,49 @@ msgstr ""
#: hypha/apply/funds/templates/funds/submission_sealed.html:14
#: hypha/apply/funds/templates/funds/submissions_by_round.html:12
#: hypha/apply/projects/filters.py:28 hypha/apply/projects/filters.py:42
-#: hypha/apply/projects/tables.py:49
+#: hypha/apply/projects/tables.py:45
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:104
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:19
msgid "Lead"
msgstr ""
-#: hypha/apply/funds/forms.py:195 hypha/apply/funds/tables.py:259
-#: hypha/apply/funds/tables.py:443
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:48
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:37
-msgid "Reviewers"
+#: hypha/apply/funds/forms.py:196
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:113
+msgid "External Reviewers"
msgstr ""
-#: hypha/apply/funds/forms.py:260
+#: hypha/apply/funds/forms.py:267
msgid "Can't unassign, just change, because review already submitted"
msgstr ""
-#: hypha/apply/funds/forms.py:265 hypha/apply/funds/forms.py:338
+#: hypha/apply/funds/forms.py:272 hypha/apply/funds/forms.py:345
msgid "Users cannot be assigned to multiple roles."
msgstr ""
-#: hypha/apply/funds/forms.py:364
+#: hypha/apply/funds/forms.py:371
msgid "-- No reviewer selected --"
msgstr ""
-#: hypha/apply/funds/forms.py:366
+#: hypha/apply/funds/forms.py:373
#, python-brace-format
msgid "{role_name} Reviewer"
msgstr ""
-#: hypha/apply/funds/forms.py:381
+#: hypha/apply/funds/forms.py:388
#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:49
msgid "Partners"
msgstr ""
-#: hypha/apply/funds/forms.py:442
+#: hypha/apply/funds/forms.py:449
msgid "Meta terms"
msgstr ""
-#: hypha/apply/funds/forms.py:445
+#: hypha/apply/funds/forms.py:452
msgid "Meta terms are hierarchical in nature."
msgstr ""
#: hypha/apply/funds/models/__init__.py:17 hypha/apply/funds/tables.py:74
-#: hypha/apply/projects/tables.py:48 hypha/apply/projects/tables.py:80
+#: hypha/apply/projects/tables.py:44 hypha/apply/projects/tables.py:69
msgid "Fund"
msgstr ""
@@ -1570,50 +1613,50 @@ msgstr ""
msgid "Lab"
msgstr ""
-#: hypha/apply/funds/models/applications.py:82
-#: hypha/apply/funds/models/applications.py:418
+#: hypha/apply/funds/models/applications.py:74
+#: hypha/apply/funds/models/applications.py:402
msgid "Link to the apply guide."
msgstr ""
-#: hypha/apply/funds/models/applications.py:84
+#: hypha/apply/funds/models/applications.py:76
msgid ""
"The slack #channel for notifications. If left empty, notifications will go "
"to the default channel."
msgstr ""
-#: hypha/apply/funds/models/applications.py:126
-#: hypha/apply/funds/models/applications.py:196
-#: hypha/apply/funds/models/applications.py:434
+#: hypha/apply/funds/models/applications.py:117
+#: hypha/apply/funds/models/applications.py:187
+#: hypha/apply/funds/models/applications.py:417
msgid "Content"
msgstr ""
-#: hypha/apply/funds/models/applications.py:128
-#: hypha/apply/funds/models/applications.py:197
-#: hypha/apply/funds/models/applications.py:436
+#: hypha/apply/funds/models/applications.py:119
+#: hypha/apply/funds/models/applications.py:188
+#: hypha/apply/funds/models/applications.py:419
msgid "Promote"
msgstr ""
-#: hypha/apply/funds/models/applications.py:175
+#: hypha/apply/funds/models/applications.py:166
msgid "When no end date is provided the round will remain open indefinitely."
msgstr ""
-#: hypha/apply/funds/models/applications.py:186
+#: hypha/apply/funds/models/applications.py:177
msgid "Dates"
msgstr ""
-#: hypha/apply/funds/models/applications.py:188
+#: hypha/apply/funds/models/applications.py:179
#: hypha/apply/funds/models/utils.py:52
msgid "Workflow"
msgstr ""
-#: hypha/apply/funds/models/applications.py:188
-#: hypha/apply/funds/models/applications.py:190
-#: hypha/apply/funds/models/applications.py:191
-#: hypha/apply/funds/models/applications.py:192
+#: hypha/apply/funds/models/applications.py:179
+#: hypha/apply/funds/models/applications.py:181
+#: hypha/apply/funds/models/applications.py:182
+#: hypha/apply/funds/models/applications.py:183
msgid "Copied from the fund."
msgstr ""
-#: hypha/apply/funds/models/applications.py:420
+#: hypha/apply/funds/models/applications.py:404
msgid "The slack #channel for notifications."
msgstr ""
@@ -1621,23 +1664,23 @@ msgstr ""
msgid "The order this role should appear in the Update Reviewers form."
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:63
+#: hypha/apply/funds/models/reviewer_role.py:64
msgid "Submissions for which reviewers should have access to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:69
+#: hypha/apply/funds/models/reviewer_role.py:70
msgid "Submissions states for which reviewers should have access to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:75
+#: hypha/apply/funds/models/reviewer_role.py:76
msgid "Submissions outcomes for which reviewers should have access to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:79
+#: hypha/apply/funds/models/reviewer_role.py:80
msgid "Submissions for which reviewer is assigned to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:83
+#: hypha/apply/funds/models/reviewer_role.py:84
msgid "Use the above configured variables to filter out submissions"
msgstr ""
@@ -1680,14 +1723,14 @@ msgstr ""
#: hypha/apply/funds/tables.py:72
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
#: hypha/apply/projects/filters.py:27 hypha/apply/projects/filters.py:43
-#: hypha/apply/projects/tables.py:79
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:16
+#: hypha/apply/projects/tables.py:68
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:17
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:26
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:63
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:62
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:71
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:20
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:19
-#: hypha/apply/users/templates/wagtailusers/users/list.html:23
+#: hypha/apply/users/templates/wagtailusers/users/list.html:24
#: hypha/public/partner/tables.py:51 hypha/public/partner/tables.py:97
msgid "Status"
msgstr ""
@@ -1715,7 +1758,7 @@ msgid "Screening"
msgstr ""
#: hypha/apply/funds/tables.py:169
-#: hypha/apply/users/templates/wagtailusers/users/list.html:21
+#: hypha/apply/users/templates/wagtailusers/users/list.html:22
msgid "Role"
msgstr ""
@@ -1741,6 +1784,12 @@ msgstr ""
msgid "Leads"
msgstr ""
+#: hypha/apply/funds/tables.py:259 hypha/apply/funds/tables.py:443
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:48
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:37
+msgid "Reviewers"
+msgstr ""
+
#: hypha/apply/funds/tables.py:260
msgid "No Status"
msgstr ""
@@ -1852,7 +1901,7 @@ msgid "Revisions for %(title)s"
msgstr ""
#: hypha/apply/funds/templates/funds/applicationrevision_list.html:8
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:53
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
msgid "Revisions"
msgstr ""
@@ -1899,7 +1948,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:19
#: hypha/apply/funds/templates/funds/includes/create_project_form.html:6
#: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:18
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:30
+#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:28
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:52
#: hypha/apply/review/templates/review/review_confirm_delete.html:18
msgid "Confirm"
@@ -1942,19 +1991,19 @@ msgstr ""
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:75
#: hypha/apply/funds/templates/funds/includes/batch_delete_submission_form.html:14
-#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:34
+#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:42
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:63
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:65
#: hypha/apply/review/templates/review/review_detail.html:33
msgid "Delete"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:131
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:126
msgid "Related submissions"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:133
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:137
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:128
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
msgid "View linked"
msgstr ""
@@ -2015,8 +2064,8 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:2
#: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:5
-#: hypha/apply/projects/templates/application_projects/project_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_detail.html:150
+#: hypha/apply/projects/templates/application_projects/project_detail.html:116
+#: hypha/apply/projects/templates/application_projects/project_detail.html:121
msgid "Actions to take"
msgstr ""
@@ -2058,12 +2107,16 @@ msgstr ""
msgid "Assign"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:54
+msgid "More actions"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:57
#: hypha/apply/funds/templates/funds/includes/meta_terms_block.html:3
msgid "Meta Terms"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:57
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:59
#: hypha/apply/funds/templates/funds/includes/create_reminder_form.html:3
msgid "Create Reminder"
msgstr ""
@@ -2083,6 +2136,7 @@ msgid ""
msgstr ""
#: hypha/apply/funds/templates/funds/includes/batch_progress_form.html:3
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:35
msgid "Update Status"
msgstr ""
@@ -2093,7 +2147,6 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/update_meta_terms_form.html:4
#: hypha/apply/funds/templates/funds/includes/update_partner_form.html:4
#: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:4
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:29
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:29
msgid "Update"
msgstr ""
@@ -2107,7 +2160,9 @@ msgid "Add Reviewers"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/create_project_form.html:4
-msgid "This will create a new project and notify the Applicant."
+msgid ""
+"This will create a new project. The Applicant will be notified only after a "
+"lead has been set for the project."
msgstr ""
#: hypha/apply/funds/templates/funds/includes/create_project_form.html:5
@@ -2121,12 +2176,12 @@ msgstr ""
msgid "Create"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:29
+#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:28
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:71
msgid "Close"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:30
+#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:29
#: hypha/apply/projects/templates/application_projects/includes/report_line.html:41
#: hypha/apply/projects/templates/application_projects/project_form.html:30
#: hypha/apply/projects/templates/application_projects/report_form.html:55
@@ -2141,7 +2196,7 @@ msgid ""
msgstr ""
#: hypha/apply/funds/templates/funds/includes/progress_form.html:5
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:28
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:34
msgid "Current status"
msgstr ""
@@ -2167,23 +2222,23 @@ msgstr ""
msgid "Requested Funding"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:12
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:13
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:15
msgid "Project Duration"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:17
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:19
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:9
msgid "Legal Name"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:18
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:20
msgid "Edit account"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:22
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:24
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:11
-#: hypha/apply/projects/templates/application_projects/project_detail.html:97
+#: hypha/apply/projects/templates/application_projects/project_detail.html:87
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:50
msgid "E-mail"
msgstr ""
@@ -2237,7 +2292,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/submission_stats.html:13
#: hypha/apply/funds/workflow.py:300 hypha/apply/funds/workflow.py:454
#: hypha/apply/funds/workflow.py:633 hypha/apply/funds/workflow.py:908
-#: hypha/apply/funds/workflow.py:1141
+#: hypha/apply/funds/workflow.py:1151
msgid "Accepted"
msgstr ""
@@ -2303,6 +2358,7 @@ msgid "Filter by"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:78
+#: hypha/apply/users/templates/wagtailusers/users/results.html:37
msgid "Filter"
msgstr ""
@@ -2394,6 +2450,14 @@ msgstr ""
msgid "All Submissions"
msgstr ""
+#: hypha/apply/funds/templates/funds/submissions_awaiting_review.html:5
+msgid "Awaiting Review"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/submissions_awaiting_review.html:11
+msgid "Waiting for your Review"
+msgstr ""
+
#: hypha/apply/funds/templates/funds/submissions_overview.html:12
msgid "Track and explore recent submissions"
msgstr ""
@@ -2465,45 +2529,45 @@ msgstr ""
msgid "Awaiting"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:96
+#: hypha/apply/funds/templates/funds/tables/table.html:95
msgid "Linked"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:130
+#: hypha/apply/funds/templates/funds/tables/table.html:129
#: hypha/public/partner/templates/partner/table.html:42
#: hypha/templates/includes/pagination.html:6
msgid "previous"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:137
+#: hypha/apply/funds/templates/funds/tables/table.html:136
msgid "Page"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:144
+#: hypha/apply/funds/templates/funds/tables/table.html:143
#: hypha/apply/projects/templates/application_projects/includes/report_line.html:5
#: hypha/public/partner/templates/partner/table.html:56
#: hypha/templates/includes/pagination.html:14
msgid "next"
msgstr ""
-#: hypha/apply/funds/views.py:231 hypha/apply/funds/views.py:263
-#: hypha/apply/funds/views.py:284 hypha/apply/projects/views/project.py:319
+#: hypha/apply/funds/views.py:232 hypha/apply/funds/views.py:264
+#: hypha/apply/funds/views.py:285 hypha/apply/projects/views/project.py:328
msgid "Sorry something went wrong"
msgstr ""
-#: hypha/apply/funds/views.py:327
+#: hypha/apply/funds/views.py:328
msgid "Failed to update: "
msgstr ""
-#: hypha/apply/funds/views.py:500 hypha/apply/funds/views.py:503
+#: hypha/apply/funds/views.py:524 hypha/apply/funds/views.py:527
msgid "No Round or Lab found matching the query"
msgstr ""
-#: hypha/apply/funds/views.py:526
+#: hypha/apply/funds/views.py:550
msgid "No statuses match the requested value"
msgstr ""
-#: hypha/apply/funds/views.py:1024
+#: hypha/apply/funds/views.py:1035
msgid "Submission saved successfully"
msgstr ""
@@ -2604,7 +2668,7 @@ msgstr ""
#: hypha/apply/funds/workflow.py:248 hypha/apply/funds/workflow.py:369
#: hypha/apply/funds/workflow.py:537 hypha/apply/funds/workflow.py:708
-#: hypha/apply/funds/workflow.py:822 hypha/apply/funds/workflow.py:1117
+#: hypha/apply/funds/workflow.py:822 hypha/apply/funds/workflow.py:1127
msgid "Internal Review"
msgstr ""
@@ -2636,7 +2700,7 @@ msgid "Ready For Discussion (revert)"
msgstr ""
#: hypha/apply/funds/workflow.py:293 hypha/apply/funds/workflow.py:447
-#: hypha/apply/funds/workflow.py:626 hypha/apply/funds/workflow.py:1137
+#: hypha/apply/funds/workflow.py:626 hypha/apply/funds/workflow.py:1147
msgid "Ready for Determination"
msgstr ""
@@ -2663,7 +2727,7 @@ msgid "Open Internal Review (revert)"
msgstr ""
#: hypha/apply/funds/workflow.py:407 hypha/apply/funds/workflow.py:586
-#: hypha/apply/funds/workflow.py:861 hypha/apply/funds/workflow.py:1133
+#: hypha/apply/funds/workflow.py:861 hypha/apply/funds/workflow.py:1143
msgid "External Review"
msgstr ""
@@ -2713,7 +2777,7 @@ msgstr ""
msgid "Ready For Final Determination"
msgstr ""
-#: hypha/apply/funds/workflow.py:782 hypha/apply/funds/workflow.py:1129
+#: hypha/apply/funds/workflow.py:782 hypha/apply/funds/workflow.py:1139
msgid "Invited for Proposal"
msgstr ""
@@ -2733,15 +2797,15 @@ msgstr ""
msgid "Final Determination"
msgstr ""
-#: hypha/apply/funds/workflow.py:1113
+#: hypha/apply/funds/workflow.py:1123
msgid "Received"
msgstr ""
-#: hypha/apply/funds/workflow.py:1121
+#: hypha/apply/funds/workflow.py:1131
msgid "Ready for Discussion"
msgstr ""
-#: hypha/apply/funds/workflow.py:1125
+#: hypha/apply/funds/workflow.py:1135
msgid "More Information Requested"
msgstr ""
@@ -2755,25 +2819,25 @@ msgstr ""
msgid "Reporting Period"
msgstr ""
-#: hypha/apply/projects/forms/payment.py:63
-msgid "You can only set a value when moving to the Paid status."
+#: hypha/apply/projects/forms/payment.py:75
+msgid "Required checks on this invoice need to be compeleted for approval."
msgstr ""
-#: hypha/apply/projects/forms/payment.py:86
-msgid "Date From must be before Date To"
+#: hypha/apply/projects/forms/payment.py:92
+msgid "The invoice must be a PDF."
msgstr ""
-#: hypha/apply/projects/forms/payment.py:95
+#: hypha/apply/projects/forms/payment.py:96
msgid ""
"Files that are related to the invoice. They could be xls, microsoft office "
"documents, open office documents, pdfs, txt files."
msgstr ""
-#: hypha/apply/projects/forms/payment.py:114
+#: hypha/apply/projects/forms/payment.py:115
msgid "Invoice File"
msgstr ""
-#: hypha/apply/projects/forms/payment.py:165
+#: hypha/apply/projects/forms/payment.py:166
msgid "File not found on submission"
msgstr ""
@@ -2793,15 +2857,15 @@ msgstr ""
msgid "Cannot approve for a different user"
msgstr ""
-#: hypha/apply/projects/forms/project.py:143
+#: hypha/apply/projects/forms/project.py:136
msgid "A Project can only be sent for Approval when Committed."
msgstr ""
-#: hypha/apply/projects/forms/project.py:146
+#: hypha/apply/projects/forms/project.py:139
msgid "A Project can only be sent for Approval once"
msgstr ""
-#: hypha/apply/projects/forms/project.py:173
+#: hypha/apply/projects/forms/project.py:166
msgid "File Name"
msgstr ""
@@ -2833,78 +2897,102 @@ msgstr ""
msgid "Cannot start a schedule beyond the end date"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:49
+#: hypha/apply/projects/forms/vendor.py:50
#: hypha/apply/projects/models/vendor.py:46
msgid "Yes, the account belongs to the organisation above"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:50
+#: hypha/apply/projects/forms/vendor.py:51
#: hypha/apply/projects/models/vendor.py:47
msgid "No, it is a personal bank account"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:105 hypha/apply/review/options.py:23
+#: hypha/apply/projects/forms/vendor.py:106 hypha/apply/review/options.py:23
msgid "No"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:105 hypha/apply/review/options.py:25
+#: hypha/apply/projects/forms/vendor.py:106 hypha/apply/review/options.py:25
msgid "Yes"
msgstr ""
-#: hypha/apply/projects/models/payment.py:22
-msgid "Changes Requested"
+#: hypha/apply/projects/models/payment.py:32
+msgid "Resubmitted"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:33
+msgid "Changes Requested by Staff"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:34
+msgid "Changes Requested by Finance 1"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:35
+msgid "Changes Requested by Finance 2"
msgstr ""
-#: hypha/apply/projects/models/payment.py:23
-msgid "Under Review"
+#: hypha/apply/projects/models/payment.py:36
+msgid "Approved by Staff"
msgstr ""
-#: hypha/apply/projects/models/payment.py:24
+#: hypha/apply/projects/models/payment.py:37
+msgid "Approved by Finance 1"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:38
+msgid "Approved by Finance 2"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:39
msgid "Paid"
msgstr ""
-#: hypha/apply/projects/models/payment.py:25
+#: hypha/apply/projects/models/payment.py:40
+msgid "Converted"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:41
msgid "Declined"
msgstr ""
-#: hypha/apply/projects/models/payment.py:64
+#: hypha/apply/projects/models/payment.py:108
msgid "Quantity Selected on an Invoice"
msgstr ""
-#: hypha/apply/projects/models/payment.py:97
+#: hypha/apply/projects/models/payment.py:133
msgid "Message"
msgstr ""
-#: hypha/apply/projects/models/payment.py:107
+#: hypha/apply/projects/models/payment.py:152
#, python-brace-format
msgid "Invoice requested for {project}"
msgstr ""
-#: hypha/apply/projects/models/project.py:51
+#: hypha/apply/projects/models/project.py:48
msgid "Committed"
msgstr ""
-#: hypha/apply/projects/models/project.py:52
+#: hypha/apply/projects/models/project.py:49
msgid "Contracting"
msgstr ""
-#: hypha/apply/projects/models/project.py:53
+#: hypha/apply/projects/models/project.py:50
msgid "In Progress"
msgstr ""
-#: hypha/apply/projects/models/project.py:54
+#: hypha/apply/projects/models/project.py:51
msgid "Closing"
msgstr ""
-#: hypha/apply/projects/models/project.py:55
+#: hypha/apply/projects/models/project.py:52
msgid "Complete"
msgstr ""
-#: hypha/apply/projects/models/project.py:147
+#: hypha/apply/projects/models/project.py:139
msgid "Proposed Start Date"
msgstr ""
-#: hypha/apply/projects/models/project.py:148
+#: hypha/apply/projects/models/project.py:140
msgid "Proposed End Date"
msgstr ""
@@ -2912,27 +3000,27 @@ msgstr ""
msgid "Proposed End Date must be after Proposed Start Date"
msgstr ""
-#: hypha/apply/projects/models/project.py:392
+#: hypha/apply/projects/models/project.py:391
#, python-brace-format
msgid "Approval of {project} by {user}"
msgstr ""
-#: hypha/apply/projects/models/project.py:414
-#: hypha/apply/projects/templates/application_projects/project_detail.html:222
+#: hypha/apply/projects/models/project.py:413
+#: hypha/apply/projects/templates/application_projects/project_detail.html:193
msgid "Signed"
msgstr ""
-#: hypha/apply/projects/models/project.py:414
-#: hypha/apply/projects/templates/application_projects/project_detail.html:233
+#: hypha/apply/projects/models/project.py:413
+#: hypha/apply/projects/templates/application_projects/project_detail.html:204
msgid "Unsigned"
msgstr ""
-#: hypha/apply/projects/models/project.py:417
+#: hypha/apply/projects/models/project.py:416
#, python-brace-format
msgid "Contract for {project} ({state})"
msgstr ""
-#: hypha/apply/projects/models/project.py:431
+#: hypha/apply/projects/models/project.py:430
#, python-brace-format
msgid "Project file: {title}"
msgstr ""
@@ -2978,34 +3066,29 @@ msgid "Every {occurrence} weeks on {weekday}"
msgstr ""
#: hypha/apply/projects/tables.py:16
-msgid "Invoice reference"
-msgstr ""
-
-#: hypha/apply/projects/tables.py:22
-#, python-brace-format
-msgid "Value ({currency})"
-msgstr ""
-
-#: hypha/apply/projects/tables.py:29
-msgid "Period Start"
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:16
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:61
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:70
+#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:22
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:21
+msgid "Invoice Number"
msgstr ""
-#: hypha/apply/projects/tables.py:30
-#: hypha/apply/projects/templates/application_projects/includes/reports.html:62
-#: hypha/apply/projects/templates/application_projects/includes/reports.html:71
-msgid "Period End"
+#: hypha/apply/projects/tables.py:20
+msgid "Project Name"
msgstr ""
-#: hypha/apply/projects/tables.py:81
+#: hypha/apply/projects/tables.py:70
#: hypha/apply/projects/templates/application_projects/includes/reports.html:5
msgid "Reporting"
msgstr ""
-#: hypha/apply/projects/tables.py:83
+#: hypha/apply/projects/tables.py:72
msgid "End Date"
msgstr ""
-#: hypha/apply/projects/tables.py:84
+#: hypha/apply/projects/tables.py:73
#, python-brace-format
msgid "Fund Allocation ({currency})"
msgstr ""
@@ -3018,41 +3101,33 @@ msgstr ""
msgid "to"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:3
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:5
msgid "Choose deliverables"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:7
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:9
msgid "Invoice Covers Deliverables"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:15
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:17
msgid "Available to invoice:"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:19
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:21
msgid "Quantity:"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:29
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:123
-msgid "Remove"
+msgid "Deliverables"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:35
-msgid "Total:"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/funding_block.html:4
-msgid "Fund total"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/funding_block.html:8
-msgid "Total paid"
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:125
+msgid "Remove"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/funding_block.html:13
-msgid "Awaiting payment"
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:41
+msgid "Total:"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/invoice_block.html:4
@@ -3073,32 +3148,15 @@ msgid "Invoices"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:8
-#: hypha/apply/projects/templates/application_projects/project_detail.html:184
+#: hypha/apply/projects/templates/application_projects/project_detail.html:155
msgid "Add Invoice"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:15
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:62
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:70
-msgid "Amount"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:17
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
-msgid "From"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:18
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:28
-msgid "To"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:48
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:46
msgid "No active Invoices."
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:54
msgid "Show rejected"
msgstr ""
@@ -3176,6 +3234,11 @@ msgstr ""
msgid "Past reports"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/includes/reports.html:62
+#: hypha/apply/projects/templates/application_projects/includes/reports.html:71
+msgid "Period End"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/includes/reports.html:87
msgid "Unskip"
msgstr ""
@@ -3185,86 +3248,93 @@ msgid "No reports submitted"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/reports.html:102
-#: hypha/apply/projects/templates/application_projects/project_detail.html:106
msgid "Show more"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/includes/required_checks_block.html:5
+msgid "Required Checks"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/includes/required_checks_block.html:8
+msgid "Make sure valid OFAC and SAM check, and W8/W9 are on file"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/includes/required_checks_block.html:17
+msgid "Link to SAM/OFAC/W8/W9:"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:6
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:75
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:77
msgid "Supporting documents"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:18
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:113
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:20
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:115
msgid "Download"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:26
-#: hypha/apply/projects/templates/application_projects/project_detail.html:200
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:171
#: hypha/apply/projects/views/vendor.py:250
msgid "Contracting Information"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:34
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:58
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:36
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:60
msgid "Fill in"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:50
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:52
msgid "Approval Form"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:84
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:87
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:86
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:89
msgid "Choose file"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:89
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:91
msgid "Upload new"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:94
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:96
msgid "Every project should include the following documents"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:141
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:143
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:74
msgid "Submit for Approval"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:148
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:150
msgid "Select a document"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:150
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:152
msgid "Copy"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:155
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:157
msgid "Upload a new document"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:157
-#: hypha/apply/projects/templates/application_projects/project_detail.html:169
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:159
+#: hypha/apply/projects/templates/application_projects/project_detail.html:140
msgid "Upload"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:18
-msgid "Cannot change from 'Paid' or 'Declined' state"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:23
-msgid "Change Status"
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:29
+msgid "Update Invoice Status"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:27
-msgid "Change status"
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:33
+msgid "Update Invoice status"
msgstr ""
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:4
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:28
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:26
#: hypha/apply/projects/templates/application_projects/invoice_form.html:4
#: hypha/apply/projects/templates/application_projects/invoice_form.html:8
msgid "Invoice"
@@ -3279,31 +3349,16 @@ msgstr ""
msgid "Vendor"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:22
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:21
-msgid "Invoice Number"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:23
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:22
-msgid "Period of Performance"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:24
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:23
-msgid "Total"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:29
+#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:27
msgid "Are you sure you want to delete this invoice for"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:33
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:31
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:125
msgid "Supporting Documents"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:48
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
msgid ""
"Only editable when 'Submitted' or you have been requested to make changes"
msgstr ""
@@ -3439,59 +3494,38 @@ msgid "Project Information"
msgstr ""
#: hypha/apply/projects/templates/application_projects/project_detail.html:82
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:35
-msgid "Proposed start date"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:87
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:40
-msgid "Project Proposed end date"
+msgid "Contractor"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:92
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:45
-msgid "Legal name"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:115
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:60
-msgid "Phone"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:120
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:65
-msgid "Value"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:158
+#: hypha/apply/projects/templates/application_projects/project_detail.html:129
msgid "Fill in Contracting Info"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:165
+#: hypha/apply/projects/templates/application_projects/project_detail.html:136
msgid "Upload Signed Contract"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:167
+#: hypha/apply/projects/templates/application_projects/project_detail.html:138
msgid "Upload Contract"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:177
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
msgid "Upload contract"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:196
+#: hypha/apply/projects/templates/application_projects/project_detail.html:167
msgid "Supporting Information"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:203
+#: hypha/apply/projects/templates/application_projects/project_detail.html:174
msgid "Approval form"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:214
+#: hypha/apply/projects/templates/application_projects/project_detail.html:185
msgid "Contracts"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:243
+#: hypha/apply/projects/templates/application_projects/project_detail.html:214
msgid "Approved by"
msgstr ""
@@ -3503,6 +3537,26 @@ msgstr ""
msgid "No Projects Available."
msgstr ""
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:35
+msgid "Proposed start date"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:40
+msgid "Project Proposed end date"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:45
+msgid "Legal name"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:60
+msgid "Phone"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:65
+msgid "Value"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:71
msgid "Sent to Compliance"
msgstr ""
@@ -3532,10 +3586,6 @@ msgstr ""
msgid "No reviews"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:113
-msgid "External Reviewers"
-msgstr ""
-
#: hypha/apply/projects/templates/application_projects/report_detail.html:4
msgid "Report"
msgstr ""
@@ -3663,8 +3713,17 @@ msgstr ""
msgid "Visit Project Detail Page"
msgstr ""
-#: hypha/apply/projects/views/project.py:589
-#: hypha/apply/projects/views/project.py:636
+#: hypha/apply/projects/views/payment.py:55
+#: hypha/apply/projects/views/payment.py:209
+#, python-brace-format
+msgid "<p>Invoice status updated to: {status}.</p>"
+msgstr ""
+
+#: hypha/apply/projects/views/payment.py:155
+msgid "<p>Invoice created.</p>"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:599
msgid "You are not allowed to edit the project at this time"
msgstr ""
@@ -3693,12 +3752,12 @@ msgstr ""
msgid "Paragraph"
msgstr ""
-#: hypha/apply/review/models.py:160
+#: hypha/apply/review/models.py:159
#: hypha/apply/review/templates/review/review_detail.html:19
msgid "Recommendation"
msgstr ""
-#: hypha/apply/review/models.py:165
+#: hypha/apply/review/models.py:164
msgid "Visibility"
msgstr ""
@@ -3800,10 +3859,6 @@ msgstr ""
msgid "Create Review"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:37
-msgid "Help text"
-msgstr ""
-
#: hypha/apply/stream_forms/blocks.py:38
msgid "Help link"
msgstr ""
@@ -3908,29 +3963,34 @@ msgstr ""
msgid "File field"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:432
+#: hypha/apply/stream_forms/blocks.py:433
msgid "Multiple File field"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:465
+#: hypha/apply/stream_forms/blocks.py:466
msgid "Section text"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:466
+#: hypha/apply/stream_forms/blocks.py:467
msgid "Section header"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:485 hypha/public/forms/models.py:62
+#: hypha/apply/stream_forms/blocks.py:486 hypha/public/forms/models.py:75
msgid "Form fields"
msgstr ""
+#: hypha/apply/stream_forms/models.py:67
+msgid ""
+"You are logged in so this information is fetched from your user account."
+msgstr ""
+
#: hypha/apply/templates/forms/includes/form_errors.html:5
msgid ""
"There were some errors with your form. Please amend the fields highlighted "
"below."
msgstr ""
-#: hypha/apply/users/admin_views.py:34 hypha/apply/users/admin_views.py:59
+#: hypha/apply/users/admin_views.py:64 hypha/apply/users/admin_views.py:89
msgid "Search users"
msgstr ""
@@ -3944,19 +4004,36 @@ msgstr ""
msgid "Only includes active, non-superusers"
msgstr ""
-#: hypha/apply/users/models.py:102
+#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/templates/users/activation/email.txt:16
+msgid "Password"
+msgstr ""
+
+#: hypha/apply/users/forms.py:88
+msgid "Email change requires you to put password."
+msgstr ""
+
+#: hypha/apply/users/forms.py:101 hypha/apply/users/forms.py:130
+msgid "Incorrect password. Please try again."
+msgstr ""
+
+#: hypha/apply/users/forms.py:117
+msgid "Please type your password to confirm"
+msgstr ""
+
+#: hypha/apply/users/models.py:105
msgid "email address"
msgstr ""
-#: hypha/apply/users/models.py:103
+#: hypha/apply/users/models.py:106
msgid "Full name"
msgstr ""
-#: hypha/apply/users/models.py:105
+#: hypha/apply/users/models.py:108
msgid "Slack name"
msgstr ""
-#: hypha/apply/users/models.py:107
+#: hypha/apply/users/models.py:110
msgid "This is the name we should \"@mention\" when sending notifications"
msgstr ""
@@ -3977,22 +4054,21 @@ msgid "Next"
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:6
-#: hypha/apply/users/templates/two_factor/profile/disable.html:6
msgid "Back"
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:7
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:7
#: hypha/apply/users/templates/two_factor/profile/profile.html:41
msgid "Backup Tokens"
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:8
msgid ""
-"Backup tokens can be used when your primary and backup\n"
-" phone numbers aren't available. The backup tokens below can be used\n"
-" for login verification. If you've used up all your backup tokens, you\n"
-" can generate a new set of backup tokens. Only the backup tokens shown\n"
-" below will be valid."
+"Backup tokens can be used when your primary and backup phone numbers aren't "
+"available. The backup tokens below can be used for login verification. If "
+"you've used up all your backup tokens, you can generate a new set of backup "
+"tokens. Only the backup tokens shown below will be valid."
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:20
@@ -4007,22 +4083,69 @@ msgstr ""
msgid "Generate Tokens"
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/disable.html:7
-msgid "Disable Two-factor Authentication"
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:6
+#: hypha/apply/users/templates/two_factor/profile/disable.html:6
+#: hypha/apply/users/templates/two_factor/profile/profile.html:6
+msgid "Back to account"
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/disable.html:8
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:8
msgid ""
-"You are about to disable two-factor authentication. This\n"
-" weakens your account security, are you sure?"
+"Backup tokens can be used when your primary and backup phone numbers aren't "
+"available. The backup tokens below can be used for login verification. </br> "
+"If you've used up all your backup tokens, you can generate a new set of "
+"backup tokens. Only the backup tokens shown below will be valid."
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/disable.html:14
-msgid "Disable"
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:27
+#: hypha/apply/users/templates/two_factor/profile/disable.html:22
+#: hypha/apply/users/templates/users/change_password.html:20
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:21
+#: hypha/apply/users/templates/users/password_reset/confirm.html:20
+msgid "<li>Please correct the error below.</li>"
+msgid_plural "<li>Please correct the errors below.</li>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:41
+#: hypha/apply/users/templates/two_factor/profile/profile.html:52
+msgid "Show Codes"
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/profile.html:6
-msgid "Back to account"
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:7
+msgid "Permission Denied"
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:9
+msgid ""
+"The page you requested, enforces users to verify using two-factor "
+"authentication for security reasons. You need to enable these security "
+"features in order to access this page. Without enabling these security "
+"features, You can only access the account(Profile section) or can logout "
+"from the system."
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:14
+#: hypha/apply/users/templates/two_factor/profile/profile.html:60
+msgid ""
+"Two-factor authentication is not enabled for your account. Enable two-factor "
+"authentication for enhanced account security."
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:20
+#: hypha/apply/users/templates/two_factor/profile/profile.html:64
+msgid "Enable Two-Factor Authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/profile/disable.html:7
+#: hypha/apply/users/templates/two_factor/profile/disable.html:36
+msgid "Disable Two-factor Authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/profile/disable.html:8
+msgid ""
+"Disabling Two-factor authentication weakens your account security. We "
+"recommend reenabling it when you can."
msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:9
@@ -4048,8 +4171,8 @@ msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:22
msgid ""
-"If your primary method is not available, we are able to\n"
-" send backup tokens to the phone numbers listed below."
+"If your primary method is not available, we are able to send backup tokens "
+"to the phone numbers listed below."
msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:32
@@ -4062,27 +4185,17 @@ msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:43
msgid ""
-"If you don't have any device with you, you can access\n"
-" your account using backup tokens."
+"If you don't have any device with you, you can access your account using "
+"backup tokens."
msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:45
#, python-format
-msgid ""
-"\n"
-" You have only one backup token remaining.\n"
-" "
-msgid_plural ""
-"\n"
-" You have %(counter)s backup tokens remaining.\n"
-" "
+msgid "You have only one backup token remaining."
+msgid_plural "You have %(counter)s backup tokens remaining."
msgstr[0] ""
msgstr[1] ""
-#: hypha/apply/users/templates/two_factor/profile/profile.html:52
-msgid "Show Codes"
-msgstr ""
-
#: hypha/apply/users/templates/two_factor/profile/profile.html:54
#: hypha/apply/users/templates/two_factor/profile/profile.html:58
msgid "Disable Two-Factor Authentication"
@@ -4090,19 +4203,8 @@ msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:55
msgid ""
-"However we strongly discourage you to do so, you can\n"
-" also disable two-factor authentication for your account."
-msgstr ""
-
-#: hypha/apply/users/templates/two_factor/profile/profile.html:60
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-" account. Enable two-factor authentication for enhanced account\n"
-" security."
-msgstr ""
-
-#: hypha/apply/users/templates/two_factor/profile/profile.html:64
-msgid "Enable Two-Factor Authentication"
+"However we strongly discourage you to do so, you can also disable two-factor "
+"authentication for your account."
msgstr ""
#: hypha/apply/users/templates/users/account.html:25
@@ -4154,14 +4256,10 @@ msgid "in the future using"
msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:15
-#: hypha/apply/users/templates/wagtailusers/users/list.html:14
+#: hypha/apply/users/templates/wagtailusers/users/list.html:15
msgid "Username"
msgstr ""
-#: hypha/apply/users/templates/users/activation/email.txt:16
-msgid "Password"
-msgstr ""
-
#: hypha/apply/users/templates/users/activation/email.txt:16
msgid "Your chosen password"
msgstr ""
@@ -4216,19 +4314,6 @@ msgstr ""
msgid "Set a password"
msgstr ""
-#: hypha/apply/users/templates/users/change_password.html:20
-#: hypha/apply/users/templates/users/password_reset/confirm.html:20
-msgid ""
-"\n"
-" <li>Please correct the error below.</li>\n"
-" "
-msgid_plural ""
-"\n"
-" <li>Please correct the errors below.</li>\n"
-" "
-msgstr[0] ""
-msgstr[1] ""
-
#: hypha/apply/users/templates/users/change_password.html:34
#: hypha/apply/users/templates/users/password_reset/complete.html:4
#: hypha/apply/users/templates/users/password_reset/confirm.html:34
@@ -4239,57 +4324,121 @@ msgstr[1] ""
msgid "Reset password"
msgstr ""
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:7
+#, python-format
+msgid ""
+"Request to change email of your account on the %(ORG_LONG_NAME)s web site "
+"has been accepted. Confirm your email by clicking this link or copying and "
+"pasting it to your browser:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:11
+#, python-format
+msgid ""
+"This link will only remain active for %(timeout_days)s days and will lead "
+"you to profile page after verification."
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:14
+#, python-format
+msgid ""
+"Kind Regards,\n"
+"The %(ORG_SHORT_NAME)s Team\n"
+"\n"
+"--\n"
+"%(ORG_LONG_NAME)s\n"
+"%(root_url)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:4
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:5
+#: hypha/apply/users/views.py:111
+msgid "Enter Password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/done.html:4
+#: hypha/apply/users/templates/users/password_reset/done.html:4
+msgid "Check your email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/done.html:5
+#: hypha/apply/users/views.py:157
+msgid "Verify Email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/done.html:9
+msgid ""
+"To start using the new email, please click on the confirmation link that has "
+"been sent to you on your new email."
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:4
+msgid "Invalid Confirmation"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:5
+msgid "Invalid Confirmation URL"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:9
+msgid "Possible reason:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:11
+msgid "The confirmation link has expired."
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:14
+#, python-format
+msgid ""
+"Try again to change email from accounts page. If that fails please contact "
+"%(ORG_SHORT_NAME)s at"
+msgstr ""
+
#: hypha/apply/users/templates/users/login.html:11
msgid "Enter your credentials."
msgstr ""
#: hypha/apply/users/templates/users/login.html:14
-msgid ""
-"We are calling your phone right now, please enter the\n"
-" digits you hear."
+msgid "We are calling your phone right now, please enter the digits you hear."
msgstr ""
#: hypha/apply/users/templates/users/login.html:17
-msgid ""
-"We sent you a text message, please enter the tokens we\n"
-" sent."
+msgid "We sent you a text message, please enter the tokens we sent."
msgstr ""
#: hypha/apply/users/templates/users/login.html:20
-msgid ""
-"Please enter the tokens generated by your token\n"
-" generator."
+msgid "Please enter the tokens generated by your token generator."
msgstr ""
#: hypha/apply/users/templates/users/login.html:24
msgid ""
-"Use this form for entering backup tokens for logging in.\n"
-" These tokens have been generated for you to print and keep safe. "
-"Please\n"
-" enter one of these backup tokens to login to your account."
+"Use this form for entering backup tokens for logging in. These tokens have "
+"been generated for you to print and keep safe. Please enter one of these "
+"backup tokens to login to your account."
msgstr ""
-#: hypha/apply/users/templates/users/login.html:38
+#: hypha/apply/users/templates/users/login.html:39
msgid "Forgot your password?"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:39
+#: hypha/apply/users/templates/users/login.html:41
msgid "Login"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:47
+#: hypha/apply/users/templates/users/login.html:49
msgid "Or, alternatively, use one of your backup phones:"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:57
+#: hypha/apply/users/templates/users/login.html:59
msgid "As a last resort, you can use a backup token:"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:60
+#: hypha/apply/users/templates/users/login.html:62
msgid "Use Backup Token"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:72
+#: hypha/apply/users/templates/users/login.html:74
#, python-format
msgid "Log in with your %(ORG_SHORT_NAME)s email"
msgstr ""
@@ -4326,10 +4475,6 @@ msgid ""
"used. Please request a new password reset."
msgstr ""
-#: hypha/apply/users/templates/users/password_reset/done.html:4
-msgid "Check your email"
-msgstr ""
-
#: hypha/apply/users/templates/users/password_reset/done.html:9
msgid "A link to reset your password has been emailed to you."
msgstr ""
@@ -4342,28 +4487,80 @@ msgstr ""
msgid "Your username (in case you've forgotten):"
msgstr ""
-#: hypha/apply/users/templates/wagtailusers/users/list.html:6
+#: hypha/apply/users/templates/wagtailusers/users/index.html:3
+#: hypha/apply/users/templates/wagtailusers/users/index.html:31
+msgid "Users"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/index.html:32
+msgid "Add a user"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/index.html:41
+msgid "Select all users in listing"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/list.html:7
#: hypha/public/people/models.py:180
msgid "Name"
msgstr ""
-#: hypha/apply/users/templates/wagtailusers/users/list.html:45
+#: hypha/apply/users/templates/wagtailusers/users/list.html:47
msgid "Admin"
msgstr ""
-#: hypha/apply/users/templates/wagtailusers/users/list.html:46
+#: hypha/apply/users/templates/wagtailusers/users/list.html:48
msgid "Inactive"
msgstr ""
-#: hypha/apply/utils/blocks.py:39
+#: hypha/apply/users/templates/wagtailusers/users/results.html:6
+#, python-format
+msgid "There is %(user_count)s user"
+msgid_plural "There are %(user_count)s users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:21
+#, python-format
+msgid "Sorry, no users match \"<em>%(query_string)s</em>\""
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:28
+#, python-format
+msgid ""
+"The %(group_name)s group has no users configured. Why not <a href="
+"\"%(wagtailusers_add_url)s\">add some</a>?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:31
+#, python-format
+msgid ""
+"There are no users configured. Why not <a href=\"%(wagtailusers_add_url)s"
+"\">add some</a>?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:44
+msgid "Apply filters"
+msgstr ""
+
+#: hypha/apply/users/views.py:142
+msgid "Password Page timed out. Try changing the email again."
+msgstr ""
+
+#: hypha/apply/users/views.py:192
+#, python-brace-format
+msgid "Your email has been successfully updated to {email}!"
+msgstr ""
+
+#: hypha/apply/utils/blocks.py:49
msgid "Rich text field"
msgstr ""
-#: hypha/apply/utils/blocks.py:54
+#: hypha/apply/utils/blocks.py:64
msgid "Markdown text field"
msgstr ""
-#: hypha/apply/utils/blocks.py:73
+#: hypha/apply/utils/blocks.py:83
msgid " Required"
msgstr ""
@@ -4689,7 +4886,7 @@ msgstr ""
msgid "Funding"
msgstr ""
-#: hypha/templates/base-apply.html:107 hypha/templates/base-apply.html:116
+#: hypha/templates/base-apply.html:104 hypha/templates/base-apply.html:113
msgid "Log out"
msgstr ""
diff --git a/hypha/locale/en/LC_MESSAGES/django.po b/hypha/locale/en/LC_MESSAGES/django.po
index 11554738e1d3809227e5cb24091849647f72bf72..f064db18c590afa13a7899f16ac6a10617c1d1cb 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: 2021-11-09 10:44+0000\n"
+"POT-Creation-Date: 2022-04-29 14:22+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,418 +18,418 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hypha/apply/activity/messaging.py:39
+#: hypha/apply/activity/messaging.py:53
#, python-brace-format
msgid " as {role}"
msgstr ""
-#: hypha/apply/activity/messaging.py:228
+#: hypha/apply/activity/messaging.py:242
#, python-brace-format
msgid "Submitted {source.title} for {source.page.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:229 hypha/apply/activity/messaging.py:230
+#: hypha/apply/activity/messaging.py:243 hypha/apply/activity/messaging.py:244
msgid "Edited"
msgstr ""
-#: hypha/apply/activity/messaging.py:231 hypha/apply/activity/messaging.py:245
+#: hypha/apply/activity/messaging.py:245 hypha/apply/activity/messaging.py:259
#, python-brace-format
msgid "Lead changed from {old_lead} to {source.lead}"
msgstr ""
-#: hypha/apply/activity/messaging.py:232
+#: hypha/apply/activity/messaging.py:246
#, python-brace-format
msgid "Batch Lead changed to {new_lead}"
msgstr ""
-#: hypha/apply/activity/messaging.py:233
+#: hypha/apply/activity/messaging.py:247
#, python-brace-format
msgid "Sent a determination. Outcome: {determination.clean_outcome}"
msgstr ""
-#: hypha/apply/activity/messaging.py:235
+#: hypha/apply/activity/messaging.py:249
msgid "Invited to submit a proposal"
msgstr ""
-#: hypha/apply/activity/messaging.py:239
+#: hypha/apply/activity/messaging.py:253
msgid "Submitted a review"
msgstr ""
-#: hypha/apply/activity/messaging.py:240
+#: hypha/apply/activity/messaging.py:254
msgid "Opened the submission while still sealed"
msgstr ""
-#: hypha/apply/activity/messaging.py:242
+#: hypha/apply/activity/messaging.py:256
#, python-brace-format
msgid ""
"{user} {opinion.opinion_display}s with {opinion.review.author}s review of "
"{source}"
msgstr ""
-#: hypha/apply/activity/messaging.py:243
+#: hypha/apply/activity/messaging.py:257
msgid "Created"
msgstr ""
-#: hypha/apply/activity/messaging.py:244
+#: hypha/apply/activity/messaging.py:258
#, python-brace-format
msgid "Progressed from {old_stage} to {source.status_display}"
msgstr ""
-#: hypha/apply/activity/messaging.py:246
+#: hypha/apply/activity/messaging.py:260
msgid "Requested approval"
msgstr ""
-#: hypha/apply/activity/messaging.py:247
+#: hypha/apply/activity/messaging.py:261
#: hypha/apply/determinations/options.py:12
msgid "Approved"
msgstr ""
-#: hypha/apply/activity/messaging.py:248
+#: hypha/apply/activity/messaging.py:262
#, python-brace-format
msgid "Requested changes for acceptance: \"{comment}\""
msgstr ""
-#: hypha/apply/activity/messaging.py:249
+#: hypha/apply/activity/messaging.py:263
#, python-brace-format
msgid "Uploaded a {contract.state} contract"
msgstr ""
-#: hypha/apply/activity/messaging.py:250
+#: hypha/apply/activity/messaging.py:264
msgid "Approved contract"
msgstr ""
-#: hypha/apply/activity/messaging.py:251
-#, python-brace-format
-msgid "Updated Invoice status to: {invoice.status_display}"
-msgstr ""
-
-#: hypha/apply/activity/messaging.py:252
+#: hypha/apply/activity/messaging.py:266
msgid "Invoice created"
msgstr ""
-#: hypha/apply/activity/messaging.py:253
+#: hypha/apply/activity/messaging.py:267
msgid "Submitted a report"
msgstr ""
-#: hypha/apply/activity/messaging.py:284
+#: hypha/apply/activity/messaging.py:298
msgid "Reviewers updated."
msgstr ""
-#: hypha/apply/activity/messaging.py:286 hypha/apply/activity/messaging.py:356
-#: hypha/apply/activity/messaging.py:513
+#: hypha/apply/activity/messaging.py:300 hypha/apply/activity/messaging.py:370
+#: hypha/apply/activity/messaging.py:552
msgid "Added:"
msgstr ""
-#: hypha/apply/activity/messaging.py:290 hypha/apply/activity/messaging.py:360
-#: hypha/apply/activity/messaging.py:517
+#: hypha/apply/activity/messaging.py:304 hypha/apply/activity/messaging.py:374
+#: hypha/apply/activity/messaging.py:556
msgid "Removed:"
msgstr ""
-#: hypha/apply/activity/messaging.py:296
+#: hypha/apply/activity/messaging.py:310
msgid "Batch Reviewers Updated."
msgstr ""
-#: hypha/apply/activity/messaging.py:298
+#: hypha/apply/activity/messaging.py:312
#, python-brace-format
msgid "{user} as {name}."
msgstr ""
-#: hypha/apply/activity/messaging.py:316
+#: hypha/apply/activity/messaging.py:330
#, python-brace-format
msgid "Successfully deleted submissions: {title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:320
+#: hypha/apply/activity/messaging.py:334
#, python-brace-format
msgid "Progressed from {old_display} to {new_display}"
msgstr ""
-#: hypha/apply/activity/messaging.py:354
+#: hypha/apply/activity/messaging.py:368
msgid "Partners updated."
msgstr ""
-#: hypha/apply/activity/messaging.py:367
+#: hypha/apply/activity/messaging.py:381
#, python-brace-format
msgid ""
"Updated reporting frequency. New schedule is: {new_schedule} starting on "
"{schedule_start}"
msgstr ""
-#: hypha/apply/activity/messaging.py:405
+#: hypha/apply/activity/messaging.py:390
+#, python-brace-format
+msgid "Updated Invoice status to: {status}."
+msgstr ""
+
+#: hypha/apply/activity/messaging.py:423
#, python-brace-format
msgid "Screening status from {old_status} to {new_status}"
msgstr ""
-#: hypha/apply/activity/messaging.py:412
+#: hypha/apply/activity/messaging.py:430
#, python-brace-format
msgid ""
"A new submission has been submitted for {source.page.title}: <{link}|{source."
"title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:413
+#: hypha/apply/activity/messaging.py:431
#, python-brace-format
msgid ""
"The lead of <{link}|{source.title}> has been updated from {old_lead} to "
"{source.lead} by {user}"
msgstr ""
-#: hypha/apply/activity/messaging.py:415
+#: hypha/apply/activity/messaging.py:433
#, python-brace-format
msgid ""
"A new {comment.visibility} comment has been posted on <{link}|{source.title}"
"> by {user}"
msgstr ""
-#: hypha/apply/activity/messaging.py:416 hypha/apply/activity/messaging.py:417
+#: hypha/apply/activity/messaging.py:434 hypha/apply/activity/messaging.py:435
#, python-brace-format
msgid "{user} has edited <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:420
+#: hypha/apply/activity/messaging.py:438
#, python-brace-format
msgid "{user} has updated the partners on <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:421
+#: hypha/apply/activity/messaging.py:439
#, python-brace-format
msgid ""
"{user} has updated the status of <{link}|{source.title}>: {old_phase."
"display_name} → {source.phase}"
msgstr ""
-#: hypha/apply/activity/messaging.py:425
+#: hypha/apply/activity/messaging.py:443
#, python-brace-format
msgid "A proposal has been submitted for review: <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:426
+#: hypha/apply/activity/messaging.py:444
#, python-brace-format
msgid ""
"<{link}|{source.title}> by {source.user} has been invited to submit a "
"proposal"
msgstr ""
-#: hypha/apply/activity/messaging.py:427
+#: hypha/apply/activity/messaging.py:445
#, python-brace-format
msgid ""
"{user} has submitted a review for <{link}|{source.title}>. Outcome: {review."
"outcome}, Score: {review.get_score_display}"
msgstr ""
-#: hypha/apply/activity/messaging.py:429
+#: hypha/apply/activity/messaging.py:447
#, python-brace-format
msgid "{user} has opened the sealed submission: <{link}|{source.title}>"
msgstr ""
-#: hypha/apply/activity/messaging.py:430
+#: hypha/apply/activity/messaging.py:448
#, python-brace-format
msgid ""
"{user} {opinion.opinion_display}s with {opinion.review.author}s review of "
"{source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:432
+#: hypha/apply/activity/messaging.py:450
#, python-brace-format
msgid "{user} has deleted {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:433
+#: hypha/apply/activity/messaging.py:451
#, python-brace-format
msgid "{user} has deleted {review.author} review for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:434
+#: hypha/apply/activity/messaging.py:452
#, python-brace-format
msgid "{user} has created a Project: <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:435
+#: hypha/apply/activity/messaging.py:453
#, python-brace-format
msgid ""
"The lead of project <{link}|{source.title}> has been updated from {old_lead} "
"to {source.lead} by {user}"
msgstr ""
-#: hypha/apply/activity/messaging.py:436
+#: hypha/apply/activity/messaging.py:454
#, python-brace-format
msgid "{user} has edited {review.author} review for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:437
+#: hypha/apply/activity/messaging.py:455
#, python-brace-format
msgid "{user} has requested approval on project <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:438
+#: hypha/apply/activity/messaging.py:456
#, python-brace-format
msgid "{user} has approved project <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:439
+#: hypha/apply/activity/messaging.py:457
#, python-brace-format
msgid ""
"{user} has requested changes for project acceptance on <{link}|{source.title}"
">."
msgstr ""
-#: hypha/apply/activity/messaging.py:440
+#: hypha/apply/activity/messaging.py:458
#, python-brace-format
msgid "{user} has uploaded a contract for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:441
+#: hypha/apply/activity/messaging.py:459
#, python-brace-format
msgid "{user} has approved contract for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:442
+#: hypha/apply/activity/messaging.py:460
#, python-brace-format
msgid "{user} has created invoice for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:443
+#: hypha/apply/activity/messaging.py:461
#, python-brace-format
msgid ""
"{user} has changed the status of <{link_related}|invoice> on <{link}|{source."
"title}> to {invoice.status_display}."
msgstr ""
-#: hypha/apply/activity/messaging.py:444
+#: hypha/apply/activity/messaging.py:462
#, python-brace-format
msgid "{user} has deleted invoice from <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:445
+#: hypha/apply/activity/messaging.py:463
#, python-brace-format
msgid "{user} has updated invoice for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:446
+#: hypha/apply/activity/messaging.py:464
#, python-brace-format
msgid "{user} has submitted a report for <{link}|{source.title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:510
+#: hypha/apply/activity/messaging.py:549
#, python-brace-format
msgid "{user} has updated the reviewers on <{link}|{title}>."
msgstr ""
-#: hypha/apply/activity/messaging.py:526
+#: hypha/apply/activity/messaging.py:565
#, python-brace-format
msgid "{user} has batch changed lead to {new_lead} on: {submissions_text}"
msgstr ""
-#: hypha/apply/activity/messaging.py:537 hypha/apply/activity/messaging.py:973
+#: hypha/apply/activity/messaging.py:576 hypha/apply/activity/messaging.py:1018
#, python-brace-format
msgid "{user} as {name},"
msgstr ""
-#: hypha/apply/activity/messaging.py:542
+#: hypha/apply/activity/messaging.py:581
#, python-brace-format
msgid ""
"{user} has batch added {reviewers_text} as reviewers on: {submissions_text}"
msgstr ""
-#: hypha/apply/activity/messaging.py:560
+#: hypha/apply/activity/messaging.py:599
#, python-brace-format
msgid "{user} has transitioned the following submissions: {submissions_links}"
msgstr ""
-#: hypha/apply/activity/messaging.py:570
+#: hypha/apply/activity/messaging.py:609
#, python-brace-format
msgid ""
"A determination for <{link}|{submission_title}> was sent by email. Outcome: "
"{determination_outcome}"
msgstr ""
-#: hypha/apply/activity/messaging.py:577
+#: hypha/apply/activity/messaging.py:616
#, python-brace-format
msgid ""
"A determination for <{link}|{submission_title}> was saved without sending an "
"email. Outcome: {determination_outcome}"
msgstr ""
-#: hypha/apply/activity/messaging.py:594
+#: hypha/apply/activity/messaging.py:633
#, python-brace-format
msgid "Determinations of {outcome} was sent for: {submissions_links}"
msgstr ""
-#: hypha/apply/activity/messaging.py:603
+#: hypha/apply/activity/messaging.py:642
#, python-brace-format
msgid "{user} has deleted submissions: {title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:617
+#: hypha/apply/activity/messaging.py:656
#, python-brace-format
msgid ""
"<{link}|{title}> is ready for review. The following are assigned as "
"reviewers: {reviewers}"
msgstr ""
-#: hypha/apply/activity/messaging.py:732
+#: hypha/apply/activity/messaging.py:771
#, python-brace-format
msgid "Application ready to review: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:734
+#: hypha/apply/activity/messaging.py:773
msgid "Multiple applications are now ready for your review"
msgstr ""
-#: hypha/apply/activity/messaging.py:736
+#: hypha/apply/activity/messaging.py:775
#, python-brace-format
msgid "Reminder: Application ready to review: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:739
+#: hypha/apply/activity/messaging.py:778
#, python-brace-format
msgid "Your application to {org_long_name}: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:741
+#: hypha/apply/activity/messaging.py:780
#, python-brace-format
msgid "Your {org_long_name} Project: {source.title}"
msgstr ""
-#: hypha/apply/activity/messaging.py:963
+#: hypha/apply/activity/messaging.py:1008
msgid "Successfully uploaded document"
msgstr ""
-#: hypha/apply/activity/messaging.py:964
+#: hypha/apply/activity/messaging.py:1009
msgid "Successfully removed document"
msgstr ""
-#: hypha/apply/activity/messaging.py:967
+#: hypha/apply/activity/messaging.py:1012
msgid "Reminder created"
msgstr ""
-#: hypha/apply/activity/messaging.py:968
+#: hypha/apply/activity/messaging.py:1013
msgid "Reminder deleted"
msgstr ""
-#: hypha/apply/activity/messaging.py:979
+#: hypha/apply/activity/messaging.py:1024
#, python-brace-format
msgid "Batch reviewers added: {reviewers_text} to "
msgstr ""
-#: hypha/apply/activity/messaging.py:984
+#: hypha/apply/activity/messaging.py:1029
#, python-brace-format
msgid ""
"Successfully updated reporting frequency. They will now report "
"{new_schedule} starting on {schedule_start}"
msgstr ""
-#: hypha/apply/activity/messaging.py:988
+#: hypha/apply/activity/messaging.py:1033
#, python-brace-format
msgid "Successfully skipped a Report for {start_date} to {end_date}"
msgstr ""
-#: hypha/apply/activity/messaging.py:990
+#: hypha/apply/activity/messaging.py:1035
#, python-brace-format
msgid "Successfully unskipped a Report for {start_date} to {end_date}"
msgstr ""
-#: hypha/apply/activity/messaging.py:1009
+#: hypha/apply/activity/messaging.py:1054
#, python-brace-format
msgid "Successfully determined as {outcome}: "
msgstr ""
@@ -478,6 +478,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/base.html:2
#: hypha/apply/users/templates/users/activation/email.txt:5
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:5
#, python-format
msgid "Dear %(user)s,"
msgstr ""
@@ -504,7 +505,7 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:10
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:7
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:14
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:16
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:9
#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:9
#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:9
@@ -518,7 +519,6 @@ msgstr ""
#: hypha/apply/activity/templates/messages/email/batch_ready_to_review.html:11
#: hypha/apply/activity/templates/messages/email/contract_uploaded.html:8
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:15
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:10
#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:10
#: hypha/apply/activity/templates/messages/email/partners_update_partner.html:10
@@ -598,16 +598,24 @@ msgid ""
"for period %(date_from)s to %(date_to)s."
msgstr ""
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:6
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:7
#: hypha/apply/activity/templates/messages/email/invoice_updated.html:7
#, python-format
msgid "It is now %(status)s."
msgstr ""
-#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:9
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:10
msgid "The staff member left this comment"
msgstr ""
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:15
+msgid "Invoice Link"
+msgstr ""
+
+#: hypha/apply/activity/templates/messages/email/invoice_status_updated.html:17
+msgid "Project Link"
+msgstr ""
+
#: hypha/apply/activity/templates/messages/email/partners_update_applicant.html:5
msgid "New partner(s) has been added to your submission."
msgstr ""
@@ -740,13 +748,13 @@ msgid "Contracting Information has been updated on %(title)s."
msgstr ""
#: hypha/apply/api/v1/determination/utils.py:25
-#: hypha/apply/determinations/forms.py:106
+#: hypha/apply/determinations/forms.py:108
#: hypha/apply/determinations/views.py:93
msgid "-- No determination selected -- "
msgstr ""
#: hypha/apply/api/v1/filters.py:23 hypha/apply/funds/tables.py:416
-#: hypha/apply/users/templates/wagtailusers/users/list.html:46
+#: hypha/apply/users/templates/wagtailusers/users/list.html:48
msgid "Active"
msgstr ""
@@ -770,19 +778,21 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: hypha/apply/api/v1/projects/views.py:39
+#: hypha/apply/api/v1/projects/views.py:50
msgid "Not Found"
msgstr ""
-#: hypha/apply/api/v1/projects/views.py:45
+#: hypha/apply/api/v1/projects/views.py:56
msgid "Invoice Already has this deliverable"
msgstr ""
-#: hypha/apply/api/v1/projects/views.py:48
+#: hypha/apply/api/v1/projects/views.py:59
msgid "Required quantity is more than available"
msgstr ""
-#: hypha/apply/categories/blocks.py:34 hypha/apply/stream_forms/blocks.py:36
+#: hypha/apply/categories/blocks.py:34 hypha/apply/funds/blocks.py:30
+#: hypha/apply/funds/blocks.py:53 hypha/apply/funds/blocks.py:102
+#: hypha/apply/stream_forms/blocks.py:36
msgid "Label"
msgstr ""
@@ -790,11 +800,17 @@ msgstr ""
msgid "Leave blank to use the default Category label"
msgstr ""
-#: hypha/apply/categories/blocks.py:40
+#: hypha/apply/categories/blocks.py:39 hypha/apply/funds/blocks.py:31
+#: hypha/apply/funds/blocks.py:54 hypha/apply/funds/blocks.py:103
+#: hypha/apply/stream_forms/blocks.py:37
+msgid "Help text"
+msgstr ""
+
+#: hypha/apply/categories/blocks.py:41
msgid "Leave blank to use the default Category help text"
msgstr ""
-#: hypha/apply/categories/blocks.py:43
+#: hypha/apply/categories/blocks.py:44
msgid "Multi select"
msgstr ""
@@ -877,7 +893,11 @@ msgstr ""
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:70
#: hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html:33
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:4
-#: hypha/apply/projects/models/payment.py:21 hypha/apply/projects/tables.py:21
+#: hypha/apply/projects/models/payment.py:31 hypha/apply/projects/tables.py:23
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:15
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:24
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:60
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:69
#: hypha/apply/projects/templates/application_projects/includes/reports.html:63
#: hypha/apply/projects/templates/application_projects/includes/reports.html:74
msgid "Submitted"
@@ -919,11 +939,10 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/determination_detail.html:25
#: hypha/apply/funds/templates/funds/admin/widgets/read_only.html:2
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:81
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:86
#: hypha/apply/projects/templates/application_projects/includes/reports.html:81
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:32
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:56
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:57
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:34
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:58
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:59
#: hypha/apply/projects/templates/application_projects/invoice_form.html:4
#: hypha/apply/projects/templates/application_projects/report_detail.html:59
#: hypha/apply/projects/templates/application_projects/vendor_detail.html:23
@@ -966,53 +985,54 @@ msgid "No submissions"
msgstr ""
#: hypha/apply/dashboard/templates/dashboard/community_dashboard.html:38
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:106
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:108
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:35
msgid "Your previous reviews"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:18
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:19
#: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:14
msgid "Apply admin"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:30
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:32
msgid "Submissions waiting for your review"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:32
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:39
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:47
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:55
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:34
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:41
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:49
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:57
#: hypha/apply/funds/templates/funds/includes/round-block-listing.html:23
#: hypha/apply/funds/templates/funds/includes/status-block.html:10
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:72
#: hypha/apply/projects/templates/application_projects/includes/reports.html:78
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:16
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:39
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:64
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:17
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:19
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:41
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:66
msgid "View"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:37
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:39
msgid "Live projects under your management"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:45
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:92
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:47
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:94
msgid "Projects awaiting approval"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:53
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:55
msgid "Requests for invoices requiring your attention"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:77
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:79
msgid "Your projects"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:83
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:112
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:85
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:114
#: hypha/apply/dashboard/templates/dashboard/includes/flagged.html:12
#: hypha/apply/dashboard/templates/dashboard/includes/waiting-for-review.html:13
#: hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html:41
@@ -1025,7 +1045,7 @@ msgstr ""
msgid "Show all"
msgstr ""
-#: hypha/apply/dashboard/templates/dashboard/dashboard.html:99
+#: hypha/apply/dashboard/templates/dashboard/dashboard.html:101
#: hypha/apply/dashboard/templates/dashboard/finance_dashboard.html:21
msgid "Active Invoices"
msgstr ""
@@ -1064,12 +1084,11 @@ msgstr ""
#: hypha/apply/determinations/blocks.py:65
#: hypha/apply/determinations/blocks.py:66
#: hypha/apply/determinations/blocks.py:67
-#: hypha/apply/determinations/blocks.py:68 hypha/apply/funds/blocks.py:184
+#: hypha/apply/determinations/blocks.py:68 hypha/apply/funds/blocks.py:193
#: hypha/apply/review/blocks.py:160 hypha/apply/review/blocks.py:161
#: hypha/apply/review/blocks.py:162 hypha/apply/review/blocks.py:163
#: hypha/apply/review/blocks.py:164 hypha/apply/review/blocks.py:165
-#: hypha/apply/review/blocks.py:166 hypha/apply/stream_forms/blocks.py:467
-#: hypha/apply/stream_forms/blocks.py:468
+#: hypha/apply/review/blocks.py:166 hypha/apply/stream_forms/blocks.py:468
#: hypha/apply/stream_forms/blocks.py:469
#: hypha/apply/stream_forms/blocks.py:470
#: hypha/apply/stream_forms/blocks.py:471
@@ -1081,8 +1100,9 @@ msgstr ""
#: hypha/apply/stream_forms/blocks.py:477
#: hypha/apply/stream_forms/blocks.py:478
#: hypha/apply/stream_forms/blocks.py:479
-#: hypha/apply/stream_forms/blocks.py:480 hypha/apply/utils/blocks.py:66
-#: hypha/apply/utils/blocks.py:67
+#: hypha/apply/stream_forms/blocks.py:480
+#: hypha/apply/stream_forms/blocks.py:481 hypha/apply/utils/blocks.py:76
+#: hypha/apply/utils/blocks.py:77
msgid "Fields"
msgstr ""
@@ -1090,161 +1110,161 @@ msgstr ""
msgid "Section text/header"
msgstr ""
-#: hypha/apply/determinations/forms.py:170
-#: hypha/apply/determinations/forms.py:251
-#: hypha/apply/determinations/forms.py:507
-#: hypha/apply/determinations/models.py:102
+#: hypha/apply/determinations/forms.py:172
+#: hypha/apply/determinations/forms.py:253
+#: hypha/apply/determinations/forms.py:515
+#: hypha/apply/determinations/models.py:101
#: hypha/apply/determinations/templates/determinations/determination_detail.html:12
#: hypha/apply/determinations/templates/determinations/determination_detail.html:20
msgid "Determination"
msgstr ""
-#: hypha/apply/determinations/forms.py:176
-#: hypha/apply/determinations/forms.py:257
-#: hypha/apply/determinations/models.py:103
+#: hypha/apply/determinations/forms.py:178
+#: hypha/apply/determinations/forms.py:259
+#: hypha/apply/determinations/models.py:102
msgid "Determination message"
msgstr ""
-#: hypha/apply/determinations/forms.py:183
+#: hypha/apply/determinations/forms.py:185
msgid "Goals and principles"
msgstr ""
-#: hypha/apply/determinations/forms.py:203
+#: hypha/apply/determinations/forms.py:205
msgid "Technical merit"
msgstr ""
-#: hypha/apply/determinations/forms.py:218
+#: hypha/apply/determinations/forms.py:220
msgid "Reasonable, realistic and sustainable"
msgstr ""
-#: hypha/apply/determinations/forms.py:232
+#: hypha/apply/determinations/forms.py:234
msgid "Other comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:265
+#: hypha/apply/determinations/forms.py:267
msgid "Positive aspects"
msgstr ""
-#: hypha/apply/determinations/forms.py:271
+#: hypha/apply/determinations/forms.py:273
msgid "Concerns"
msgstr ""
-#: hypha/apply/determinations/forms.py:277
+#: hypha/apply/determinations/forms.py:279
msgid "Items that must be addressed"
msgstr ""
-#: hypha/apply/determinations/forms.py:283
+#: hypha/apply/determinations/forms.py:285
msgid "Project overview questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:286
+#: hypha/apply/determinations/forms.py:288
msgid "Objectives questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:289
+#: hypha/apply/determinations/forms.py:291
msgid "Methods and strategy questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:292
+#: hypha/apply/determinations/forms.py:294
msgid "Technical feasibility questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:295
+#: hypha/apply/determinations/forms.py:297
msgid "Alternative analysis - \"red teaming\" questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:298
+#: hypha/apply/determinations/forms.py:300
msgid "Usability questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:301
+#: hypha/apply/determinations/forms.py:303
msgid "Sustainability questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:304
+#: hypha/apply/determinations/forms.py:306
msgid "Collaboration questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:307
+#: hypha/apply/determinations/forms.py:309
msgid "Cost realism questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:310
+#: hypha/apply/determinations/forms.py:312
msgid "Qualifications questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:313
+#: hypha/apply/determinations/forms.py:315
msgid "Evaluation questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:317
+#: hypha/apply/determinations/forms.py:319
msgid "Rationale and appropriateness questions and comments"
msgstr ""
-#: hypha/apply/determinations/forms.py:354
+#: hypha/apply/determinations/forms.py:359
#: hypha/apply/determinations/views.py:354
msgid "-- No proposal form selected -- "
msgstr ""
-#: hypha/apply/determinations/forms.py:356
+#: hypha/apply/determinations/forms.py:361
#: hypha/apply/determinations/views.py:356
msgid "Proposal Form"
msgstr ""
-#: hypha/apply/determinations/forms.py:358
+#: hypha/apply/determinations/forms.py:363
#: hypha/apply/determinations/views.py:358
msgid "Select the proposal form to use for proposal stage."
msgstr ""
-#: hypha/apply/determinations/models.py:110
+#: hypha/apply/determinations/models.py:109
#: hypha/apply/determinations/templates/determinations/includes/determination_block.html:7
#: hypha/apply/funds/workflow.py:205 hypha/apply/funds/workflow.py:332
#: hypha/apply/funds/workflow.py:487 hypha/apply/funds/workflow.py:666
-#: hypha/apply/review/models.py:162
+#: hypha/apply/review/models.py:161
msgid "Draft"
msgstr ""
-#: hypha/apply/determinations/models.py:111
-#: hypha/apply/projects/models/vendor.py:49 hypha/apply/review/models.py:163
+#: hypha/apply/determinations/models.py:110
+#: hypha/apply/projects/models/vendor.py:49 hypha/apply/review/models.py:162
msgid "Creation time"
msgstr ""
-#: hypha/apply/determinations/models.py:112
-#: hypha/apply/projects/models/vendor.py:50 hypha/apply/review/models.py:164
+#: hypha/apply/determinations/models.py:111
+#: hypha/apply/projects/models/vendor.py:50 hypha/apply/review/models.py:163
msgid "Update time"
msgstr ""
-#: hypha/apply/determinations/models.py:113
+#: hypha/apply/determinations/models.py:112
msgid "Send message to applicant"
msgstr ""
-#: hypha/apply/determinations/models.py:229
+#: hypha/apply/determinations/models.py:228
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:22
msgid "Request"
msgstr ""
-#: hypha/apply/determinations/models.py:230
+#: hypha/apply/determinations/models.py:229
msgid "Concept note"
msgstr ""
-#: hypha/apply/determinations/models.py:231
+#: hypha/apply/determinations/models.py:230
#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:13
-#: hypha/apply/projects/templates/application_projects/project_detail.html:198
+#: hypha/apply/projects/templates/application_projects/project_detail.html:169
msgid "Proposal"
msgstr ""
-#: hypha/apply/determinations/models.py:351
+#: hypha/apply/determinations/models.py:350
msgid "Concept form"
msgstr ""
-#: hypha/apply/determinations/models.py:352
+#: hypha/apply/determinations/models.py:351
msgid "Proposal form"
msgstr ""
#: hypha/apply/determinations/options.py:10 hypha/apply/funds/workflow.py:315
#: hypha/apply/funds/workflow.py:469 hypha/apply/funds/workflow.py:648
#: hypha/apply/funds/workflow.py:769 hypha/apply/funds/workflow.py:923
-#: hypha/apply/funds/workflow.py:1145
+#: hypha/apply/funds/workflow.py:1155
msgid "Dismissed"
msgstr ""
@@ -1287,14 +1307,14 @@ msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:48
#: hypha/apply/funds/templates/funds/application_base.html:67
#: hypha/apply/funds/templates/funds/applicationsubmission_form.html:36
-#: hypha/apply/funds/views.py:939
+#: hypha/apply/funds/views.py:950
#: hypha/apply/review/templates/review/review_edit_form.html:40
#: hypha/apply/review/templates/review/review_form.html:41
msgid "Save draft"
msgstr ""
#: hypha/apply/determinations/templates/determinations/base_determination_form.html:50
-#: hypha/apply/funds/views.py:938 hypha/apply/funds/workflow.py:200
+#: hypha/apply/funds/views.py:949 hypha/apply/funds/workflow.py:200
#: hypha/apply/funds/workflow.py:228 hypha/apply/funds/workflow.py:271
#: hypha/apply/funds/workflow.py:327 hypha/apply/funds/workflow.py:353
#: hypha/apply/funds/workflow.py:391 hypha/apply/funds/workflow.py:429
@@ -1309,6 +1329,7 @@ msgstr ""
#: hypha/apply/projects/templates/application_projects/vendor_form.html:27
#: hypha/apply/review/templates/review/review_edit_form.html:42
#: hypha/apply/review/templates/review/review_form.html:43
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:35
msgid "Submit"
msgstr ""
@@ -1415,7 +1436,7 @@ msgstr ""
msgid "There is a draft determination you do not have permission to edit."
msgstr ""
-#: hypha/apply/determinations/views.py:435
+#: hypha/apply/determinations/views.py:427
#, python-brace-format
msgid ""
"A determination of \"{current}\" exists but you tried to progress as "
@@ -1461,51 +1482,75 @@ msgstr ""
msgid "Closed"
msgstr ""
-#: hypha/apply/funds/admin_views.py:65
+#: hypha/apply/funds/admin_views.py:67
#, python-brace-format
msgid "Page '{0}' and {1} subpages copied."
msgstr ""
-#: hypha/apply/funds/admin_views.py:70
+#: hypha/apply/funds/admin_views.py:72
#, python-brace-format
msgid "Page '{0}' copied."
msgstr ""
-#: hypha/apply/funds/blocks.py:32
+#: hypha/apply/funds/blocks.py:30
+msgid "What is the title of your application?"
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:31
+msgid "This project name can be changed if a full proposal is requested."
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:34
msgid "Application title"
msgstr ""
-#: hypha/apply/funds/blocks.py:42
+#: hypha/apply/funds/blocks.py:44
msgid "Requested amount"
msgstr ""
-#: hypha/apply/funds/blocks.py:65
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:27
+#: hypha/apply/funds/blocks.py:53
+msgid "What email address should we use to contact you?"
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:55
+msgid ""
+"We will use this email address to communicate with you about your proposal."
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:71
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:29
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:17
#: hypha/apply/projects/models/vendor.py:20
#: hypha/apply/projects/models/vendor.py:57
-#: hypha/apply/projects/templates/application_projects/project_detail.html:110
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:55
msgid "Address"
msgstr ""
-#: hypha/apply/funds/blocks.py:183 hypha/apply/stream_forms/blocks.py:465
-#: hypha/apply/stream_forms/blocks.py:466
-#: hypha/apply/stream_forms/blocks.py:481
-#: hypha/apply/stream_forms/blocks.py:482 hypha/apply/utils/blocks.py:74
+#: hypha/apply/funds/blocks.py:102
+msgid "What is your name?"
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:104
+msgid "We will use this name when we communicate with you about your proposal."
+msgstr ""
+
+#: hypha/apply/funds/blocks.py:192 hypha/apply/stream_forms/blocks.py:466
+#: hypha/apply/stream_forms/blocks.py:467
+#: hypha/apply/stream_forms/blocks.py:482
+#: hypha/apply/stream_forms/blocks.py:483 hypha/apply/utils/blocks.py:84
msgid "Custom"
msgstr ""
-#: hypha/apply/funds/forms.py:59 hypha/apply/funds/forms.py:78
+#: hypha/apply/funds/forms.py:60 hypha/apply/funds/forms.py:79
msgid "Take action"
msgstr ""
-#: hypha/apply/funds/forms.py:138 hypha/apply/projects/forms/project.py:189
+#: hypha/apply/funds/forms.py:139 hypha/apply/projects/forms/project.py:182
#, python-brace-format
msgid "Update lead from {lead} to"
msgstr ""
-#: hypha/apply/funds/forms.py:143
+#: hypha/apply/funds/forms.py:144
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:25
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:27
#: hypha/apply/funds/templates/funds/applicationsubmission_simplified_detail.html:20
@@ -1514,51 +1559,49 @@ msgstr ""
#: hypha/apply/funds/templates/funds/submission_sealed.html:14
#: hypha/apply/funds/templates/funds/submissions_by_round.html:12
#: hypha/apply/projects/filters.py:28 hypha/apply/projects/filters.py:42
-#: hypha/apply/projects/tables.py:49
+#: hypha/apply/projects/tables.py:45
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:104
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:19
msgid "Lead"
msgstr ""
-#: hypha/apply/funds/forms.py:195 hypha/apply/funds/tables.py:259
-#: hypha/apply/funds/tables.py:443
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:48
-#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:37
-msgid "Reviewers"
+#: hypha/apply/funds/forms.py:196
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:113
+msgid "External Reviewers"
msgstr ""
-#: hypha/apply/funds/forms.py:260
+#: hypha/apply/funds/forms.py:267
msgid "Can't unassign, just change, because review already submitted"
msgstr ""
-#: hypha/apply/funds/forms.py:265 hypha/apply/funds/forms.py:338
+#: hypha/apply/funds/forms.py:272 hypha/apply/funds/forms.py:345
msgid "Users cannot be assigned to multiple roles."
msgstr ""
-#: hypha/apply/funds/forms.py:364
+#: hypha/apply/funds/forms.py:371
msgid "-- No reviewer selected --"
msgstr ""
-#: hypha/apply/funds/forms.py:366
+#: hypha/apply/funds/forms.py:373
#, python-brace-format
msgid "{role_name} Reviewer"
msgstr ""
-#: hypha/apply/funds/forms.py:381
+#: hypha/apply/funds/forms.py:388
#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:49
msgid "Partners"
msgstr ""
-#: hypha/apply/funds/forms.py:442
+#: hypha/apply/funds/forms.py:449
msgid "Meta terms"
msgstr ""
-#: hypha/apply/funds/forms.py:445
+#: hypha/apply/funds/forms.py:452
msgid "Meta terms are hierarchical in nature."
msgstr ""
#: hypha/apply/funds/models/__init__.py:17 hypha/apply/funds/tables.py:74
-#: hypha/apply/projects/tables.py:48 hypha/apply/projects/tables.py:80
+#: hypha/apply/projects/tables.py:44 hypha/apply/projects/tables.py:69
msgid "Fund"
msgstr ""
@@ -1570,50 +1613,50 @@ msgstr ""
msgid "Lab"
msgstr ""
-#: hypha/apply/funds/models/applications.py:82
-#: hypha/apply/funds/models/applications.py:418
+#: hypha/apply/funds/models/applications.py:74
+#: hypha/apply/funds/models/applications.py:402
msgid "Link to the apply guide."
msgstr ""
-#: hypha/apply/funds/models/applications.py:84
+#: hypha/apply/funds/models/applications.py:76
msgid ""
"The slack #channel for notifications. If left empty, notifications will go "
"to the default channel."
msgstr ""
-#: hypha/apply/funds/models/applications.py:126
-#: hypha/apply/funds/models/applications.py:196
-#: hypha/apply/funds/models/applications.py:434
+#: hypha/apply/funds/models/applications.py:117
+#: hypha/apply/funds/models/applications.py:187
+#: hypha/apply/funds/models/applications.py:417
msgid "Content"
msgstr ""
-#: hypha/apply/funds/models/applications.py:128
-#: hypha/apply/funds/models/applications.py:197
-#: hypha/apply/funds/models/applications.py:436
+#: hypha/apply/funds/models/applications.py:119
+#: hypha/apply/funds/models/applications.py:188
+#: hypha/apply/funds/models/applications.py:419
msgid "Promote"
msgstr ""
-#: hypha/apply/funds/models/applications.py:175
+#: hypha/apply/funds/models/applications.py:166
msgid "When no end date is provided the round will remain open indefinitely."
msgstr ""
-#: hypha/apply/funds/models/applications.py:186
+#: hypha/apply/funds/models/applications.py:177
msgid "Dates"
msgstr ""
-#: hypha/apply/funds/models/applications.py:188
+#: hypha/apply/funds/models/applications.py:179
#: hypha/apply/funds/models/utils.py:52
msgid "Workflow"
msgstr ""
-#: hypha/apply/funds/models/applications.py:188
-#: hypha/apply/funds/models/applications.py:190
-#: hypha/apply/funds/models/applications.py:191
-#: hypha/apply/funds/models/applications.py:192
+#: hypha/apply/funds/models/applications.py:179
+#: hypha/apply/funds/models/applications.py:181
+#: hypha/apply/funds/models/applications.py:182
+#: hypha/apply/funds/models/applications.py:183
msgid "Copied from the fund."
msgstr ""
-#: hypha/apply/funds/models/applications.py:420
+#: hypha/apply/funds/models/applications.py:404
msgid "The slack #channel for notifications."
msgstr ""
@@ -1621,23 +1664,23 @@ msgstr ""
msgid "The order this role should appear in the Update Reviewers form."
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:63
+#: hypha/apply/funds/models/reviewer_role.py:64
msgid "Submissions for which reviewers should have access to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:69
+#: hypha/apply/funds/models/reviewer_role.py:70
msgid "Submissions states for which reviewers should have access to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:75
+#: hypha/apply/funds/models/reviewer_role.py:76
msgid "Submissions outcomes for which reviewers should have access to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:79
+#: hypha/apply/funds/models/reviewer_role.py:80
msgid "Submissions for which reviewer is assigned to"
msgstr ""
-#: hypha/apply/funds/models/reviewer_role.py:83
+#: hypha/apply/funds/models/reviewer_role.py:84
msgid "Use the above configured variables to filter out submissions"
msgstr ""
@@ -1680,14 +1723,14 @@ msgstr ""
#: hypha/apply/funds/tables.py:72
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:27
#: hypha/apply/projects/filters.py:27 hypha/apply/projects/filters.py:43
-#: hypha/apply/projects/tables.py:79
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:16
+#: hypha/apply/projects/tables.py:68
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:17
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:26
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:63
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:62
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:71
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:20
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:19
-#: hypha/apply/users/templates/wagtailusers/users/list.html:23
+#: hypha/apply/users/templates/wagtailusers/users/list.html:24
#: hypha/public/partner/tables.py:51 hypha/public/partner/tables.py:97
msgid "Status"
msgstr ""
@@ -1715,7 +1758,7 @@ msgid "Screening"
msgstr ""
#: hypha/apply/funds/tables.py:169
-#: hypha/apply/users/templates/wagtailusers/users/list.html:21
+#: hypha/apply/users/templates/wagtailusers/users/list.html:22
msgid "Role"
msgstr ""
@@ -1741,6 +1784,12 @@ msgstr ""
msgid "Leads"
msgstr ""
+#: hypha/apply/funds/tables.py:259 hypha/apply/funds/tables.py:443
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:48
+#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:37
+msgid "Reviewers"
+msgstr ""
+
#: hypha/apply/funds/tables.py:260
msgid "No Status"
msgstr ""
@@ -1852,7 +1901,7 @@ msgid "Revisions for %(title)s"
msgstr ""
#: hypha/apply/funds/templates/funds/applicationrevision_list.html:8
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:53
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
msgid "Revisions"
msgstr ""
@@ -1899,7 +1948,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html:19
#: hypha/apply/funds/templates/funds/includes/create_project_form.html:6
#: hypha/apply/funds/templates/funds/reminder_confirm_delete.html:18
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:30
+#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:28
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:52
#: hypha/apply/review/templates/review/review_confirm_delete.html:18
msgid "Confirm"
@@ -1942,19 +1991,19 @@ msgstr ""
#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:75
#: hypha/apply/funds/templates/funds/includes/batch_delete_submission_form.html:14
-#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:34
+#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:33
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:42
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:63
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:65
#: hypha/apply/review/templates/review/review_detail.html:33
msgid "Delete"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:131
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:126
msgid "Related submissions"
msgstr ""
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:133
-#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:137
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:128
+#: hypha/apply/funds/templates/funds/applicationsubmission_detail.html:132
msgid "View linked"
msgstr ""
@@ -2015,8 +2064,8 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:2
#: hypha/apply/funds/templates/funds/includes/generic_primary_actions.html:5
-#: hypha/apply/projects/templates/application_projects/project_detail.html:145
-#: hypha/apply/projects/templates/application_projects/project_detail.html:150
+#: hypha/apply/projects/templates/application_projects/project_detail.html:116
+#: hypha/apply/projects/templates/application_projects/project_detail.html:121
msgid "Actions to take"
msgstr ""
@@ -2058,12 +2107,16 @@ msgstr ""
msgid "Assign"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:55
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:54
+msgid "More actions"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:57
#: hypha/apply/funds/templates/funds/includes/meta_terms_block.html:3
msgid "Meta Terms"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:57
+#: hypha/apply/funds/templates/funds/includes/admin_primary_actions.html:59
#: hypha/apply/funds/templates/funds/includes/create_reminder_form.html:3
msgid "Create Reminder"
msgstr ""
@@ -2083,6 +2136,7 @@ msgid ""
msgstr ""
#: hypha/apply/funds/templates/funds/includes/batch_progress_form.html:3
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:35
msgid "Update Status"
msgstr ""
@@ -2093,7 +2147,6 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/update_meta_terms_form.html:4
#: hypha/apply/funds/templates/funds/includes/update_partner_form.html:4
#: hypha/apply/funds/templates/funds/includes/update_reviewer_form.html:4
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:29
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:29
msgid "Update"
msgstr ""
@@ -2107,7 +2160,9 @@ msgid "Add Reviewers"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/create_project_form.html:4
-msgid "This will create a new project and notify the Applicant."
+msgid ""
+"This will create a new project. The Applicant will be notified only after a "
+"lead has been set for the project."
msgstr ""
#: hypha/apply/funds/templates/funds/includes/create_project_form.html:5
@@ -2121,12 +2176,12 @@ msgstr ""
msgid "Create"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:29
+#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:28
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:71
msgid "Close"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:30
+#: hypha/apply/funds/templates/funds/includes/delegated_form_base.html:29
#: hypha/apply/projects/templates/application_projects/includes/report_line.html:41
#: hypha/apply/projects/templates/application_projects/project_form.html:30
#: hypha/apply/projects/templates/application_projects/report_form.html:55
@@ -2141,7 +2196,7 @@ msgid ""
msgstr ""
#: hypha/apply/funds/templates/funds/includes/progress_form.html:5
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:28
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:34
msgid "Current status"
msgstr ""
@@ -2167,23 +2222,23 @@ msgstr ""
msgid "Requested Funding"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:12
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:13
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:15
msgid "Project Duration"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:17
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:19
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:9
msgid "Legal Name"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:18
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:20
msgid "Edit account"
msgstr ""
-#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:22
+#: hypha/apply/funds/templates/funds/includes/rendered_answers.html:24
#: hypha/apply/funds/templates/funds/includes/revision_diff_table.html:11
-#: hypha/apply/projects/templates/application_projects/project_detail.html:97
+#: hypha/apply/projects/templates/application_projects/project_detail.html:87
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:50
msgid "E-mail"
msgstr ""
@@ -2237,7 +2292,7 @@ msgstr ""
#: hypha/apply/funds/templates/funds/includes/submission_stats.html:13
#: hypha/apply/funds/workflow.py:300 hypha/apply/funds/workflow.py:454
#: hypha/apply/funds/workflow.py:633 hypha/apply/funds/workflow.py:908
-#: hypha/apply/funds/workflow.py:1141
+#: hypha/apply/funds/workflow.py:1151
msgid "Accepted"
msgstr ""
@@ -2303,6 +2358,7 @@ msgid "Filter by"
msgstr ""
#: hypha/apply/funds/templates/funds/includes/table_filter_and_search.html:78
+#: hypha/apply/users/templates/wagtailusers/users/results.html:37
msgid "Filter"
msgstr ""
@@ -2394,6 +2450,14 @@ msgstr ""
msgid "All Submissions"
msgstr ""
+#: hypha/apply/funds/templates/funds/submissions_awaiting_review.html:5
+msgid "Awaiting Review"
+msgstr ""
+
+#: hypha/apply/funds/templates/funds/submissions_awaiting_review.html:11
+msgid "Waiting for your Review"
+msgstr ""
+
#: hypha/apply/funds/templates/funds/submissions_overview.html:12
msgid "Track and explore recent submissions"
msgstr ""
@@ -2465,45 +2529,45 @@ msgstr ""
msgid "Awaiting"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:96
+#: hypha/apply/funds/templates/funds/tables/table.html:95
msgid "Linked"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:130
+#: hypha/apply/funds/templates/funds/tables/table.html:129
#: hypha/public/partner/templates/partner/table.html:42
#: hypha/templates/includes/pagination.html:6
msgid "previous"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:137
+#: hypha/apply/funds/templates/funds/tables/table.html:136
msgid "Page"
msgstr ""
-#: hypha/apply/funds/templates/funds/tables/table.html:144
+#: hypha/apply/funds/templates/funds/tables/table.html:143
#: hypha/apply/projects/templates/application_projects/includes/report_line.html:5
#: hypha/public/partner/templates/partner/table.html:56
#: hypha/templates/includes/pagination.html:14
msgid "next"
msgstr ""
-#: hypha/apply/funds/views.py:231 hypha/apply/funds/views.py:263
-#: hypha/apply/funds/views.py:284 hypha/apply/projects/views/project.py:319
+#: hypha/apply/funds/views.py:232 hypha/apply/funds/views.py:264
+#: hypha/apply/funds/views.py:285 hypha/apply/projects/views/project.py:328
msgid "Sorry something went wrong"
msgstr ""
-#: hypha/apply/funds/views.py:327
+#: hypha/apply/funds/views.py:328
msgid "Failed to update: "
msgstr ""
-#: hypha/apply/funds/views.py:500 hypha/apply/funds/views.py:503
+#: hypha/apply/funds/views.py:524 hypha/apply/funds/views.py:527
msgid "No Round or Lab found matching the query"
msgstr ""
-#: hypha/apply/funds/views.py:526
+#: hypha/apply/funds/views.py:550
msgid "No statuses match the requested value"
msgstr ""
-#: hypha/apply/funds/views.py:1024
+#: hypha/apply/funds/views.py:1035
msgid "Submission saved successfully"
msgstr ""
@@ -2604,7 +2668,7 @@ msgstr ""
#: hypha/apply/funds/workflow.py:248 hypha/apply/funds/workflow.py:369
#: hypha/apply/funds/workflow.py:537 hypha/apply/funds/workflow.py:708
-#: hypha/apply/funds/workflow.py:822 hypha/apply/funds/workflow.py:1117
+#: hypha/apply/funds/workflow.py:822 hypha/apply/funds/workflow.py:1127
msgid "Internal Review"
msgstr ""
@@ -2636,7 +2700,7 @@ msgid "Ready For Discussion (revert)"
msgstr ""
#: hypha/apply/funds/workflow.py:293 hypha/apply/funds/workflow.py:447
-#: hypha/apply/funds/workflow.py:626 hypha/apply/funds/workflow.py:1137
+#: hypha/apply/funds/workflow.py:626 hypha/apply/funds/workflow.py:1147
msgid "Ready for Determination"
msgstr ""
@@ -2663,7 +2727,7 @@ msgid "Open Internal Review (revert)"
msgstr ""
#: hypha/apply/funds/workflow.py:407 hypha/apply/funds/workflow.py:586
-#: hypha/apply/funds/workflow.py:861 hypha/apply/funds/workflow.py:1133
+#: hypha/apply/funds/workflow.py:861 hypha/apply/funds/workflow.py:1143
msgid "External Review"
msgstr ""
@@ -2713,7 +2777,7 @@ msgstr ""
msgid "Ready For Final Determination"
msgstr ""
-#: hypha/apply/funds/workflow.py:782 hypha/apply/funds/workflow.py:1129
+#: hypha/apply/funds/workflow.py:782 hypha/apply/funds/workflow.py:1139
msgid "Invited for Proposal"
msgstr ""
@@ -2733,15 +2797,15 @@ msgstr ""
msgid "Final Determination"
msgstr ""
-#: hypha/apply/funds/workflow.py:1113
+#: hypha/apply/funds/workflow.py:1123
msgid "Received"
msgstr ""
-#: hypha/apply/funds/workflow.py:1121
+#: hypha/apply/funds/workflow.py:1131
msgid "Ready for Discussion"
msgstr ""
-#: hypha/apply/funds/workflow.py:1125
+#: hypha/apply/funds/workflow.py:1135
msgid "More Information Requested"
msgstr ""
@@ -2755,25 +2819,25 @@ msgstr ""
msgid "Reporting Period"
msgstr ""
-#: hypha/apply/projects/forms/payment.py:63
-msgid "You can only set a value when moving to the Paid status."
+#: hypha/apply/projects/forms/payment.py:75
+msgid "Required checks on this invoice need to be compeleted for approval."
msgstr ""
-#: hypha/apply/projects/forms/payment.py:86
-msgid "Date From must be before Date To"
+#: hypha/apply/projects/forms/payment.py:92
+msgid "The invoice must be a PDF."
msgstr ""
-#: hypha/apply/projects/forms/payment.py:95
+#: hypha/apply/projects/forms/payment.py:96
msgid ""
"Files that are related to the invoice. They could be xls, microsoft office "
"documents, open office documents, pdfs, txt files."
msgstr ""
-#: hypha/apply/projects/forms/payment.py:114
+#: hypha/apply/projects/forms/payment.py:115
msgid "Invoice File"
msgstr ""
-#: hypha/apply/projects/forms/payment.py:165
+#: hypha/apply/projects/forms/payment.py:166
msgid "File not found on submission"
msgstr ""
@@ -2793,15 +2857,15 @@ msgstr ""
msgid "Cannot approve for a different user"
msgstr ""
-#: hypha/apply/projects/forms/project.py:143
+#: hypha/apply/projects/forms/project.py:136
msgid "A Project can only be sent for Approval when Committed."
msgstr ""
-#: hypha/apply/projects/forms/project.py:146
+#: hypha/apply/projects/forms/project.py:139
msgid "A Project can only be sent for Approval once"
msgstr ""
-#: hypha/apply/projects/forms/project.py:173
+#: hypha/apply/projects/forms/project.py:166
msgid "File Name"
msgstr ""
@@ -2833,78 +2897,102 @@ msgstr ""
msgid "Cannot start a schedule beyond the end date"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:49
+#: hypha/apply/projects/forms/vendor.py:50
#: hypha/apply/projects/models/vendor.py:46
msgid "Yes, the account belongs to the organisation above"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:50
+#: hypha/apply/projects/forms/vendor.py:51
#: hypha/apply/projects/models/vendor.py:47
msgid "No, it is a personal bank account"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:105 hypha/apply/review/options.py:23
+#: hypha/apply/projects/forms/vendor.py:106 hypha/apply/review/options.py:23
msgid "No"
msgstr ""
-#: hypha/apply/projects/forms/vendor.py:105 hypha/apply/review/options.py:25
+#: hypha/apply/projects/forms/vendor.py:106 hypha/apply/review/options.py:25
msgid "Yes"
msgstr ""
-#: hypha/apply/projects/models/payment.py:22
-msgid "Changes Requested"
+#: hypha/apply/projects/models/payment.py:32
+msgid "Resubmitted"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:33
+msgid "Changes Requested by Staff"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:34
+msgid "Changes Requested by Finance 1"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:35
+msgid "Changes Requested by Finance 2"
msgstr ""
-#: hypha/apply/projects/models/payment.py:23
-msgid "Under Review"
+#: hypha/apply/projects/models/payment.py:36
+msgid "Approved by Staff"
msgstr ""
-#: hypha/apply/projects/models/payment.py:24
+#: hypha/apply/projects/models/payment.py:37
+msgid "Approved by Finance 1"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:38
+msgid "Approved by Finance 2"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:39
msgid "Paid"
msgstr ""
-#: hypha/apply/projects/models/payment.py:25
+#: hypha/apply/projects/models/payment.py:40
+msgid "Converted"
+msgstr ""
+
+#: hypha/apply/projects/models/payment.py:41
msgid "Declined"
msgstr ""
-#: hypha/apply/projects/models/payment.py:64
+#: hypha/apply/projects/models/payment.py:108
msgid "Quantity Selected on an Invoice"
msgstr ""
-#: hypha/apply/projects/models/payment.py:97
+#: hypha/apply/projects/models/payment.py:133
msgid "Message"
msgstr ""
-#: hypha/apply/projects/models/payment.py:107
+#: hypha/apply/projects/models/payment.py:152
#, python-brace-format
msgid "Invoice requested for {project}"
msgstr ""
-#: hypha/apply/projects/models/project.py:51
+#: hypha/apply/projects/models/project.py:48
msgid "Committed"
msgstr ""
-#: hypha/apply/projects/models/project.py:52
+#: hypha/apply/projects/models/project.py:49
msgid "Contracting"
msgstr ""
-#: hypha/apply/projects/models/project.py:53
+#: hypha/apply/projects/models/project.py:50
msgid "In Progress"
msgstr ""
-#: hypha/apply/projects/models/project.py:54
+#: hypha/apply/projects/models/project.py:51
msgid "Closing"
msgstr ""
-#: hypha/apply/projects/models/project.py:55
+#: hypha/apply/projects/models/project.py:52
msgid "Complete"
msgstr ""
-#: hypha/apply/projects/models/project.py:147
+#: hypha/apply/projects/models/project.py:139
msgid "Proposed Start Date"
msgstr ""
-#: hypha/apply/projects/models/project.py:148
+#: hypha/apply/projects/models/project.py:140
msgid "Proposed End Date"
msgstr ""
@@ -2912,27 +3000,27 @@ msgstr ""
msgid "Proposed End Date must be after Proposed Start Date"
msgstr ""
-#: hypha/apply/projects/models/project.py:392
+#: hypha/apply/projects/models/project.py:391
#, python-brace-format
msgid "Approval of {project} by {user}"
msgstr ""
-#: hypha/apply/projects/models/project.py:414
-#: hypha/apply/projects/templates/application_projects/project_detail.html:222
+#: hypha/apply/projects/models/project.py:413
+#: hypha/apply/projects/templates/application_projects/project_detail.html:193
msgid "Signed"
msgstr ""
-#: hypha/apply/projects/models/project.py:414
-#: hypha/apply/projects/templates/application_projects/project_detail.html:233
+#: hypha/apply/projects/models/project.py:413
+#: hypha/apply/projects/templates/application_projects/project_detail.html:204
msgid "Unsigned"
msgstr ""
-#: hypha/apply/projects/models/project.py:417
+#: hypha/apply/projects/models/project.py:416
#, python-brace-format
msgid "Contract for {project} ({state})"
msgstr ""
-#: hypha/apply/projects/models/project.py:431
+#: hypha/apply/projects/models/project.py:430
#, python-brace-format
msgid "Project file: {title}"
msgstr ""
@@ -2978,34 +3066,29 @@ msgid "Every {occurrence} weeks on {weekday}"
msgstr ""
#: hypha/apply/projects/tables.py:16
-msgid "Invoice reference"
-msgstr ""
-
-#: hypha/apply/projects/tables.py:22
-#, python-brace-format
-msgid "Value ({currency})"
-msgstr ""
-
-#: hypha/apply/projects/tables.py:29
-msgid "Period Start"
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:16
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:61
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:70
+#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:22
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:21
+msgid "Invoice Number"
msgstr ""
-#: hypha/apply/projects/tables.py:30
-#: hypha/apply/projects/templates/application_projects/includes/reports.html:62
-#: hypha/apply/projects/templates/application_projects/includes/reports.html:71
-msgid "Period End"
+#: hypha/apply/projects/tables.py:20
+msgid "Project Name"
msgstr ""
-#: hypha/apply/projects/tables.py:81
+#: hypha/apply/projects/tables.py:70
#: hypha/apply/projects/templates/application_projects/includes/reports.html:5
msgid "Reporting"
msgstr ""
-#: hypha/apply/projects/tables.py:83
+#: hypha/apply/projects/tables.py:72
msgid "End Date"
msgstr ""
-#: hypha/apply/projects/tables.py:84
+#: hypha/apply/projects/tables.py:73
#, python-brace-format
msgid "Fund Allocation ({currency})"
msgstr ""
@@ -3018,41 +3101,33 @@ msgstr ""
msgid "to"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:3
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:5
msgid "Choose deliverables"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:7
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:9
msgid "Invoice Covers Deliverables"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:15
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:17
msgid "Available to invoice:"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:19
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:21
msgid "Quantity:"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:29
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:123
-msgid "Remove"
+msgid "Deliverables"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:35
-msgid "Total:"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/funding_block.html:4
-msgid "Fund total"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/funding_block.html:8
-msgid "Total paid"
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:125
+msgid "Remove"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/funding_block.html:13
-msgid "Awaiting payment"
+#: hypha/apply/projects/templates/application_projects/includes/deliverables_block.html:41
+msgid "Total:"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/invoice_block.html:4
@@ -3073,32 +3148,15 @@ msgid "Invoices"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/invoices.html:8
-#: hypha/apply/projects/templates/application_projects/project_detail.html:184
+#: hypha/apply/projects/templates/application_projects/project_detail.html:155
msgid "Add Invoice"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:15
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:25
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:62
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:70
-msgid "Amount"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:17
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:27
-msgid "From"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:18
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:28
-msgid "To"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:48
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:46
msgid "No active Invoices."
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/invoices.html:56
+#: hypha/apply/projects/templates/application_projects/includes/invoices.html:54
msgid "Show rejected"
msgstr ""
@@ -3176,6 +3234,11 @@ msgstr ""
msgid "Past reports"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/includes/reports.html:62
+#: hypha/apply/projects/templates/application_projects/includes/reports.html:71
+msgid "Period End"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/includes/reports.html:87
msgid "Unskip"
msgstr ""
@@ -3185,86 +3248,93 @@ msgid "No reports submitted"
msgstr ""
#: hypha/apply/projects/templates/application_projects/includes/reports.html:102
-#: hypha/apply/projects/templates/application_projects/project_detail.html:106
msgid "Show more"
msgstr ""
+#: hypha/apply/projects/templates/application_projects/includes/required_checks_block.html:5
+msgid "Required Checks"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/includes/required_checks_block.html:8
+msgid "Make sure valid OFAC and SAM check, and W8/W9 are on file"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/includes/required_checks_block.html:17
+msgid "Link to SAM/OFAC/W8/W9:"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:6
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:75
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:77
msgid "Supporting documents"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:18
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:113
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:20
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:115
msgid "Download"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:26
-#: hypha/apply/projects/templates/application_projects/project_detail.html:200
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:28
+#: hypha/apply/projects/templates/application_projects/project_detail.html:171
#: hypha/apply/projects/views/vendor.py:250
msgid "Contracting Information"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:34
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:58
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:36
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:60
msgid "Fill in"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:50
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:52
msgid "Approval Form"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:84
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:87
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:86
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:89
msgid "Choose file"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:89
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:91
msgid "Upload new"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:94
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:96
msgid "Every project should include the following documents"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:141
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:143
#: hypha/apply/projects/templates/application_projects/project_admin_detail.html:74
msgid "Submit for Approval"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:148
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:150
msgid "Select a document"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:150
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:152
msgid "Copy"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:155
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:157
msgid "Upload a new document"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:157
-#: hypha/apply/projects/templates/application_projects/project_detail.html:169
+#: hypha/apply/projects/templates/application_projects/includes/supporting_documents.html:159
+#: hypha/apply/projects/templates/application_projects/project_detail.html:140
msgid "Upload"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:18
-msgid "Cannot change from 'Paid' or 'Declined' state"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:23
-msgid "Change Status"
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:29
+msgid "Update Invoice Status"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:27
-msgid "Change status"
+#: hypha/apply/projects/templates/application_projects/invoice_admin_detail.html:33
+msgid "Update Invoice status"
msgstr ""
#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:4
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:4
#: hypha/apply/projects/templates/application_projects/invoice_detail.html:11
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:28
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:26
#: hypha/apply/projects/templates/application_projects/invoice_form.html:4
#: hypha/apply/projects/templates/application_projects/invoice_form.html:8
msgid "Invoice"
@@ -3279,31 +3349,16 @@ msgstr ""
msgid "Vendor"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:22
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:21
-msgid "Invoice Number"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:23
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:22
-msgid "Period of Performance"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:24
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:23
-msgid "Total"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:29
+#: hypha/apply/projects/templates/application_projects/invoice_confirm_delete.html:27
msgid "Are you sure you want to delete this invoice for"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:33
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:31
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:125
msgid "Supporting Documents"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/invoice_detail.html:48
+#: hypha/apply/projects/templates/application_projects/invoice_detail.html:50
msgid ""
"Only editable when 'Submitted' or you have been requested to make changes"
msgstr ""
@@ -3439,59 +3494,38 @@ msgid "Project Information"
msgstr ""
#: hypha/apply/projects/templates/application_projects/project_detail.html:82
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:35
-msgid "Proposed start date"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:87
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:40
-msgid "Project Proposed end date"
+msgid "Contractor"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:92
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:45
-msgid "Legal name"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:115
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:60
-msgid "Phone"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:120
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:65
-msgid "Value"
-msgstr ""
-
-#: hypha/apply/projects/templates/application_projects/project_detail.html:158
+#: hypha/apply/projects/templates/application_projects/project_detail.html:129
msgid "Fill in Contracting Info"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:165
+#: hypha/apply/projects/templates/application_projects/project_detail.html:136
msgid "Upload Signed Contract"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:167
+#: hypha/apply/projects/templates/application_projects/project_detail.html:138
msgid "Upload Contract"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:177
+#: hypha/apply/projects/templates/application_projects/project_detail.html:148
msgid "Upload contract"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:196
+#: hypha/apply/projects/templates/application_projects/project_detail.html:167
msgid "Supporting Information"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:203
+#: hypha/apply/projects/templates/application_projects/project_detail.html:174
msgid "Approval form"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:214
+#: hypha/apply/projects/templates/application_projects/project_detail.html:185
msgid "Contracts"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_detail.html:243
+#: hypha/apply/projects/templates/application_projects/project_detail.html:214
msgid "Approved by"
msgstr ""
@@ -3503,6 +3537,26 @@ msgstr ""
msgid "No Projects Available."
msgstr ""
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:35
+msgid "Proposed start date"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:40
+msgid "Project Proposed end date"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:45
+msgid "Legal name"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:60
+msgid "Phone"
+msgstr ""
+
+#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:65
+msgid "Value"
+msgstr ""
+
#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:71
msgid "Sent to Compliance"
msgstr ""
@@ -3532,10 +3586,6 @@ msgstr ""
msgid "No reviews"
msgstr ""
-#: hypha/apply/projects/templates/application_projects/project_simplified_detail.html:113
-msgid "External Reviewers"
-msgstr ""
-
#: hypha/apply/projects/templates/application_projects/report_detail.html:4
msgid "Report"
msgstr ""
@@ -3663,8 +3713,17 @@ msgstr ""
msgid "Visit Project Detail Page"
msgstr ""
-#: hypha/apply/projects/views/project.py:589
-#: hypha/apply/projects/views/project.py:636
+#: hypha/apply/projects/views/payment.py:55
+#: hypha/apply/projects/views/payment.py:209
+#, python-brace-format
+msgid "<p>Invoice status updated to: {status}.</p>"
+msgstr ""
+
+#: hypha/apply/projects/views/payment.py:155
+msgid "<p>Invoice created.</p>"
+msgstr ""
+
+#: hypha/apply/projects/views/project.py:599
msgid "You are not allowed to edit the project at this time"
msgstr ""
@@ -3693,12 +3752,12 @@ msgstr ""
msgid "Paragraph"
msgstr ""
-#: hypha/apply/review/models.py:160
+#: hypha/apply/review/models.py:159
#: hypha/apply/review/templates/review/review_detail.html:19
msgid "Recommendation"
msgstr ""
-#: hypha/apply/review/models.py:165
+#: hypha/apply/review/models.py:164
msgid "Visibility"
msgstr ""
@@ -3800,10 +3859,6 @@ msgstr ""
msgid "Create Review"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:37
-msgid "Help text"
-msgstr ""
-
#: hypha/apply/stream_forms/blocks.py:38
msgid "Help link"
msgstr ""
@@ -3908,29 +3963,34 @@ msgstr ""
msgid "File field"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:432
+#: hypha/apply/stream_forms/blocks.py:433
msgid "Multiple File field"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:465
+#: hypha/apply/stream_forms/blocks.py:466
msgid "Section text"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:466
+#: hypha/apply/stream_forms/blocks.py:467
msgid "Section header"
msgstr ""
-#: hypha/apply/stream_forms/blocks.py:485 hypha/public/forms/models.py:62
+#: hypha/apply/stream_forms/blocks.py:486 hypha/public/forms/models.py:75
msgid "Form fields"
msgstr ""
+#: hypha/apply/stream_forms/models.py:67
+msgid ""
+"You are logged in so this information is fetched from your user account."
+msgstr ""
+
#: hypha/apply/templates/forms/includes/form_errors.html:5
msgid ""
"There were some errors with your form. Please amend the fields highlighted "
"below."
msgstr ""
-#: hypha/apply/users/admin_views.py:34 hypha/apply/users/admin_views.py:59
+#: hypha/apply/users/admin_views.py:64 hypha/apply/users/admin_views.py:89
msgid "Search users"
msgstr ""
@@ -3944,19 +4004,36 @@ msgstr ""
msgid "Only includes active, non-superusers"
msgstr ""
-#: hypha/apply/users/models.py:102
+#: hypha/apply/users/forms.py:87
+#: hypha/apply/users/templates/users/activation/email.txt:16
+msgid "Password"
+msgstr ""
+
+#: hypha/apply/users/forms.py:88
+msgid "Email change requires you to put password."
+msgstr ""
+
+#: hypha/apply/users/forms.py:101 hypha/apply/users/forms.py:130
+msgid "Incorrect password. Please try again."
+msgstr ""
+
+#: hypha/apply/users/forms.py:117
+msgid "Please type your password to confirm"
+msgstr ""
+
+#: hypha/apply/users/models.py:105
msgid "email address"
msgstr ""
-#: hypha/apply/users/models.py:103
+#: hypha/apply/users/models.py:106
msgid "Full name"
msgstr ""
-#: hypha/apply/users/models.py:105
+#: hypha/apply/users/models.py:108
msgid "Slack name"
msgstr ""
-#: hypha/apply/users/models.py:107
+#: hypha/apply/users/models.py:110
msgid "This is the name we should \"@mention\" when sending notifications"
msgstr ""
@@ -3977,22 +4054,21 @@ msgid "Next"
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:6
-#: hypha/apply/users/templates/two_factor/profile/disable.html:6
msgid "Back"
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:7
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:7
#: hypha/apply/users/templates/two_factor/profile/profile.html:41
msgid "Backup Tokens"
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:8
msgid ""
-"Backup tokens can be used when your primary and backup\n"
-" phone numbers aren't available. The backup tokens below can be used\n"
-" for login verification. If you've used up all your backup tokens, you\n"
-" can generate a new set of backup tokens. Only the backup tokens shown\n"
-" below will be valid."
+"Backup tokens can be used when your primary and backup phone numbers aren't "
+"available. The backup tokens below can be used for login verification. If "
+"you've used up all your backup tokens, you can generate a new set of backup "
+"tokens. Only the backup tokens shown below will be valid."
msgstr ""
#: hypha/apply/users/templates/two_factor/core/backup_tokens.html:20
@@ -4007,22 +4083,69 @@ msgstr ""
msgid "Generate Tokens"
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/disable.html:7
-msgid "Disable Two-factor Authentication"
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:6
+#: hypha/apply/users/templates/two_factor/profile/disable.html:6
+#: hypha/apply/users/templates/two_factor/profile/profile.html:6
+msgid "Back to account"
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/disable.html:8
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:8
msgid ""
-"You are about to disable two-factor authentication. This\n"
-" weakens your account security, are you sure?"
+"Backup tokens can be used when your primary and backup phone numbers aren't "
+"available. The backup tokens below can be used for login verification. </br> "
+"If you've used up all your backup tokens, you can generate a new set of "
+"backup tokens. Only the backup tokens shown below will be valid."
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/disable.html:14
-msgid "Disable"
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:27
+#: hypha/apply/users/templates/two_factor/profile/disable.html:22
+#: hypha/apply/users/templates/users/change_password.html:20
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:21
+#: hypha/apply/users/templates/users/password_reset/confirm.html:20
+msgid "<li>Please correct the error below.</li>"
+msgid_plural "<li>Please correct the errors below.</li>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/users/templates/two_factor/core/backup_tokens_password.html:41
+#: hypha/apply/users/templates/two_factor/profile/profile.html:52
+msgid "Show Codes"
msgstr ""
-#: hypha/apply/users/templates/two_factor/profile/profile.html:6
-msgid "Back to account"
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:7
+msgid "Permission Denied"
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:9
+msgid ""
+"The page you requested, enforces users to verify using two-factor "
+"authentication for security reasons. You need to enable these security "
+"features in order to access this page. Without enabling these security "
+"features, You can only access the account(Profile section) or can logout "
+"from the system."
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:14
+#: hypha/apply/users/templates/two_factor/profile/profile.html:60
+msgid ""
+"Two-factor authentication is not enabled for your account. Enable two-factor "
+"authentication for enhanced account security."
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/core/two_factor_required.html:20
+#: hypha/apply/users/templates/two_factor/profile/profile.html:64
+msgid "Enable Two-Factor Authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/profile/disable.html:7
+#: hypha/apply/users/templates/two_factor/profile/disable.html:36
+msgid "Disable Two-factor Authentication"
+msgstr ""
+
+#: hypha/apply/users/templates/two_factor/profile/disable.html:8
+msgid ""
+"Disabling Two-factor authentication weakens your account security. We "
+"recommend reenabling it when you can."
msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:9
@@ -4048,8 +4171,8 @@ msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:22
msgid ""
-"If your primary method is not available, we are able to\n"
-" send backup tokens to the phone numbers listed below."
+"If your primary method is not available, we are able to send backup tokens "
+"to the phone numbers listed below."
msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:32
@@ -4062,27 +4185,17 @@ msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:43
msgid ""
-"If you don't have any device with you, you can access\n"
-" your account using backup tokens."
+"If you don't have any device with you, you can access your account using "
+"backup tokens."
msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:45
#, python-format
-msgid ""
-"\n"
-" You have only one backup token remaining.\n"
-" "
-msgid_plural ""
-"\n"
-" You have %(counter)s backup tokens remaining.\n"
-" "
+msgid "You have only one backup token remaining."
+msgid_plural "You have %(counter)s backup tokens remaining."
msgstr[0] ""
msgstr[1] ""
-#: hypha/apply/users/templates/two_factor/profile/profile.html:52
-msgid "Show Codes"
-msgstr ""
-
#: hypha/apply/users/templates/two_factor/profile/profile.html:54
#: hypha/apply/users/templates/two_factor/profile/profile.html:58
msgid "Disable Two-Factor Authentication"
@@ -4090,19 +4203,8 @@ msgstr ""
#: hypha/apply/users/templates/two_factor/profile/profile.html:55
msgid ""
-"However we strongly discourage you to do so, you can\n"
-" also disable two-factor authentication for your account."
-msgstr ""
-
-#: hypha/apply/users/templates/two_factor/profile/profile.html:60
-msgid ""
-"Two-factor authentication is not enabled for your\n"
-" account. Enable two-factor authentication for enhanced account\n"
-" security."
-msgstr ""
-
-#: hypha/apply/users/templates/two_factor/profile/profile.html:64
-msgid "Enable Two-Factor Authentication"
+"However we strongly discourage you to do so, you can also disable two-factor "
+"authentication for your account."
msgstr ""
#: hypha/apply/users/templates/users/account.html:25
@@ -4154,14 +4256,10 @@ msgid "in the future using"
msgstr ""
#: hypha/apply/users/templates/users/activation/email.txt:15
-#: hypha/apply/users/templates/wagtailusers/users/list.html:14
+#: hypha/apply/users/templates/wagtailusers/users/list.html:15
msgid "Username"
msgstr ""
-#: hypha/apply/users/templates/users/activation/email.txt:16
-msgid "Password"
-msgstr ""
-
#: hypha/apply/users/templates/users/activation/email.txt:16
msgid "Your chosen password"
msgstr ""
@@ -4216,19 +4314,6 @@ msgstr ""
msgid "Set a password"
msgstr ""
-#: hypha/apply/users/templates/users/change_password.html:20
-#: hypha/apply/users/templates/users/password_reset/confirm.html:20
-msgid ""
-"\n"
-" <li>Please correct the error below.</li>\n"
-" "
-msgid_plural ""
-"\n"
-" <li>Please correct the errors below.</li>\n"
-" "
-msgstr[0] ""
-msgstr[1] ""
-
#: hypha/apply/users/templates/users/change_password.html:34
#: hypha/apply/users/templates/users/password_reset/complete.html:4
#: hypha/apply/users/templates/users/password_reset/confirm.html:34
@@ -4239,57 +4324,121 @@ msgstr[1] ""
msgid "Reset password"
msgstr ""
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:7
+#, python-format
+msgid ""
+"Request to change email of your account on the %(ORG_LONG_NAME)s web site "
+"has been accepted. Confirm your email by clicking this link or copying and "
+"pasting it to your browser:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:11
+#, python-format
+msgid ""
+"This link will only remain active for %(timeout_days)s days and will lead "
+"you to profile page after verification."
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/confirm_email.txt:14
+#, python-format
+msgid ""
+"Kind Regards,\n"
+"The %(ORG_SHORT_NAME)s Team\n"
+"\n"
+"--\n"
+"%(ORG_LONG_NAME)s\n"
+"%(root_url)s"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:4
+#: hypha/apply/users/templates/users/email_change/confirm_password.html:5
+#: hypha/apply/users/views.py:111
+msgid "Enter Password"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/done.html:4
+#: hypha/apply/users/templates/users/password_reset/done.html:4
+msgid "Check your email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/done.html:5
+#: hypha/apply/users/views.py:157
+msgid "Verify Email"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/done.html:9
+msgid ""
+"To start using the new email, please click on the confirmation link that has "
+"been sent to you on your new email."
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:4
+msgid "Invalid Confirmation"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:5
+msgid "Invalid Confirmation URL"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:9
+msgid "Possible reason:"
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:11
+msgid "The confirmation link has expired."
+msgstr ""
+
+#: hypha/apply/users/templates/users/email_change/invalid_link.html:14
+#, python-format
+msgid ""
+"Try again to change email from accounts page. If that fails please contact "
+"%(ORG_SHORT_NAME)s at"
+msgstr ""
+
#: hypha/apply/users/templates/users/login.html:11
msgid "Enter your credentials."
msgstr ""
#: hypha/apply/users/templates/users/login.html:14
-msgid ""
-"We are calling your phone right now, please enter the\n"
-" digits you hear."
+msgid "We are calling your phone right now, please enter the digits you hear."
msgstr ""
#: hypha/apply/users/templates/users/login.html:17
-msgid ""
-"We sent you a text message, please enter the tokens we\n"
-" sent."
+msgid "We sent you a text message, please enter the tokens we sent."
msgstr ""
#: hypha/apply/users/templates/users/login.html:20
-msgid ""
-"Please enter the tokens generated by your token\n"
-" generator."
+msgid "Please enter the tokens generated by your token generator."
msgstr ""
#: hypha/apply/users/templates/users/login.html:24
msgid ""
-"Use this form for entering backup tokens for logging in.\n"
-" These tokens have been generated for you to print and keep safe. "
-"Please\n"
-" enter one of these backup tokens to login to your account."
+"Use this form for entering backup tokens for logging in. These tokens have "
+"been generated for you to print and keep safe. Please enter one of these "
+"backup tokens to login to your account."
msgstr ""
-#: hypha/apply/users/templates/users/login.html:38
+#: hypha/apply/users/templates/users/login.html:39
msgid "Forgot your password?"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:39
+#: hypha/apply/users/templates/users/login.html:41
msgid "Login"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:47
+#: hypha/apply/users/templates/users/login.html:49
msgid "Or, alternatively, use one of your backup phones:"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:57
+#: hypha/apply/users/templates/users/login.html:59
msgid "As a last resort, you can use a backup token:"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:60
+#: hypha/apply/users/templates/users/login.html:62
msgid "Use Backup Token"
msgstr ""
-#: hypha/apply/users/templates/users/login.html:72
+#: hypha/apply/users/templates/users/login.html:74
#, python-format
msgid "Log in with your %(ORG_SHORT_NAME)s email"
msgstr ""
@@ -4326,10 +4475,6 @@ msgid ""
"used. Please request a new password reset."
msgstr ""
-#: hypha/apply/users/templates/users/password_reset/done.html:4
-msgid "Check your email"
-msgstr ""
-
#: hypha/apply/users/templates/users/password_reset/done.html:9
msgid "A link to reset your password has been emailed to you."
msgstr ""
@@ -4342,28 +4487,80 @@ msgstr ""
msgid "Your username (in case you've forgotten):"
msgstr ""
-#: hypha/apply/users/templates/wagtailusers/users/list.html:6
+#: hypha/apply/users/templates/wagtailusers/users/index.html:3
+#: hypha/apply/users/templates/wagtailusers/users/index.html:31
+msgid "Users"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/index.html:32
+msgid "Add a user"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/index.html:41
+msgid "Select all users in listing"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/list.html:7
#: hypha/public/people/models.py:180
msgid "Name"
msgstr ""
-#: hypha/apply/users/templates/wagtailusers/users/list.html:45
+#: hypha/apply/users/templates/wagtailusers/users/list.html:47
msgid "Admin"
msgstr ""
-#: hypha/apply/users/templates/wagtailusers/users/list.html:46
+#: hypha/apply/users/templates/wagtailusers/users/list.html:48
msgid "Inactive"
msgstr ""
-#: hypha/apply/utils/blocks.py:39
+#: hypha/apply/users/templates/wagtailusers/users/results.html:6
+#, python-format
+msgid "There is %(user_count)s user"
+msgid_plural "There are %(user_count)s users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:21
+#, python-format
+msgid "Sorry, no users match \"<em>%(query_string)s</em>\""
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:28
+#, python-format
+msgid ""
+"The %(group_name)s group has no users configured. Why not <a href="
+"\"%(wagtailusers_add_url)s\">add some</a>?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:31
+#, python-format
+msgid ""
+"There are no users configured. Why not <a href=\"%(wagtailusers_add_url)s"
+"\">add some</a>?"
+msgstr ""
+
+#: hypha/apply/users/templates/wagtailusers/users/results.html:44
+msgid "Apply filters"
+msgstr ""
+
+#: hypha/apply/users/views.py:142
+msgid "Password Page timed out. Try changing the email again."
+msgstr ""
+
+#: hypha/apply/users/views.py:192
+#, python-brace-format
+msgid "Your email has been successfully updated to {email}!"
+msgstr ""
+
+#: hypha/apply/utils/blocks.py:49
msgid "Rich text field"
msgstr ""
-#: hypha/apply/utils/blocks.py:54
+#: hypha/apply/utils/blocks.py:64
msgid "Markdown text field"
msgstr ""
-#: hypha/apply/utils/blocks.py:73
+#: hypha/apply/utils/blocks.py:83
msgid " Required"
msgstr ""
@@ -4689,7 +4886,7 @@ msgstr ""
msgid "Funding"
msgstr ""
-#: hypha/templates/base-apply.html:107 hypha/templates/base-apply.html:116
+#: hypha/templates/base-apply.html:104 hypha/templates/base-apply.html:113
msgid "Log out"
msgstr ""