From 7c30445f15a17ea04612cbf8fc613191ee12a1cc Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Fri, 3 Nov 2023 15:40:15 +0100 Subject: [PATCH 1/7] Rough draft of adding date to review list vue template --- reviews/templates/reviews/vue_templates/review_list.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reviews/templates/reviews/vue_templates/review_list.html b/reviews/templates/reviews/vue_templates/review_list.html index f56929f52..87654c0f7 100644 --- a/reviews/templates/reviews/vue_templates/review_list.html +++ b/reviews/templates/reviews/vue_templates/review_list.html @@ -118,6 +118,14 @@

{{ review.get_stage_display }} {% endverbatim %} + {# For some reason context.review.REVISION and other class variables of continuation are None?#} + {# Only context.review.GO returns 1 for me, as it should #} + {# Which is why I've hardcoded the 1 here ... #} +
+ {% verbatim %} + {{review.decision.date_decision}} + {% endverbatim %} +
From 0c9ce531690a13006084909d306192564c2dadeb Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Mon, 6 Nov 2023 10:54:54 +0100 Subject: [PATCH 2/7] review.date_end is now display on list of reviews in revision --- locale/en/LC_MESSAGES/django.mo | Bin 149364 -> 150464 bytes locale/en/LC_MESSAGES/django.po | 191 ++---------------- .../reviews/vue_templates/review_list.html | 5 +- 3 files changed, 25 insertions(+), 171 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 937898bd69d492524b36395e9ee8ba36eeb96f74..83bb30771cfcb8bf016f493d9f314729d9991ec3 100644 GIT binary patch delta 19597 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 R>+_uc?HLja7xOR3^?#ak53B$H diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index f6fae7c6b..a3563555d 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-23 13:58+0200\n" +"POT-Creation-Date: 2023-11-06 10:52+0100\n" "PO-Revision-Date: 2020-10-07 11:22+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -153,7 +153,6 @@ msgstr "You can leave feedback on the FEtC-H portal here." #: observations/templates/observations/observation_update_attachments.html:39 #: proposals/templates/proposals/proposal_confirmation.html:36 #: proposals/templates/proposals/proposal_diff.html:294 -#: proposals/templates/proposals/proposal_diff.html:294 #: proposals/templates/proposals/proposal_update_attachments.html:26 #: reviews/templates/reviews/change_chamber_form.html:19 #: reviews/templates/reviews/decision_form.html:90 @@ -202,11 +201,11 @@ msgstr "" msgid "Feedback verstuurd" msgstr "Feedback sent" -#: fetc/settings.py:132 +#: fetc/settings.py:133 msgid "Nederlands" msgstr "Dutch" -#: fetc/settings.py:133 +#: fetc/settings.py:134 msgid "Engels" msgstr "English" @@ -333,26 +332,24 @@ msgid "Dit veld is verplicht." msgstr "This field is required." #: main/menus.py:6 main/templates/base/menu.html:7 -#: main/templates/main/index.html:7 main/templates/main/index.html:24 +#: main/templates/main/index.html:7 main/templates/main/index.html:56 #: main/templates/main/landing.html:34 msgid "Startpagina" msgstr "Start page" -#: main/menus.py:11 #: main/menus.py:11 msgid "Log in" msgstr "Log in" -#: main/menus.py:16 main/templates/base/login_header.html:7 #: main/menus.py:16 main/templates/base/login_header.html:7 msgid "Log uit" msgstr "Log out" -#: main/models.py:10 main/utils.py:13 +#: main/models.py:10 main/utils.py:15 msgid "ja" msgstr "yes" -#: main/models.py:11 main/utils.py:13 +#: main/models.py:11 main/utils.py:15 msgid "nee" msgstr "no" @@ -364,7 +361,7 @@ msgstr "uncertain" msgid "Geef aan waar de dataverzameling plaatsvindt" msgstr "Specify where the data collection will take place" -#: main/models.py:68 observations/models.py:129 proposals/models.py:255 +#: main/models.py:70 observations/models.py:129 proposals/models.py:255 #: studies/models.py:208 studies/models.py:244 tasks/models.py:157 #: tasks/models.py:169 msgid "Namelijk" @@ -444,7 +441,7 @@ msgstr "Phase" #: reviews/templates/reviews/committee_members_workload.html:26 #: reviews/templates/reviews/vue_templates/decision_list.html:153 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95 -#: reviews/templates/reviews/vue_templates/review_list.html:151 +#: reviews/templates/reviews/vue_templates/review_list.html:160 msgid "Datum ingediend" msgstr "Date submitted" @@ -452,7 +449,7 @@ msgstr "Date submitted" #: reviews/templates/reviews/committee_members_workload.html:27 #: reviews/templates/reviews/vue_templates/decision_list.html:163 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105 -#: reviews/templates/reviews/vue_templates/review_list.html:161 +#: reviews/templates/reviews/vue_templates/review_list.html:170 msgid "Gewenste einddatum" msgstr "Desired end date" @@ -463,9 +460,8 @@ msgstr "My decision" #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332 #: reviews/models.py:57 -#: reviews/models.py:57 #: reviews/templates/reviews/vue_templates/decision_list.html:133 -#: reviews/templates/reviews/vue_templates/review_list.html:131 +#: reviews/templates/reviews/vue_templates/review_list.html:140 msgid "Afhandeling" msgstr "Conclusion" @@ -474,7 +470,6 @@ msgstr "Conclusion" msgid "Acties" msgstr "Actions" -#: main/templates/auth/user_detail.html:75 reviews/models.py:135 #: main/templates/auth/user_detail.html:75 reviews/models.py:135 msgid ", met revisie" msgstr ", with revision" @@ -587,31 +582,26 @@ msgstr "Create an amendment to an already approved application" #: main/templates/base/menu.html:32 proposals/menus.py:56 #: proposals/views/proposal_views.py:76 -#: proposals/views/proposal_views.py:76 msgid "Mijn conceptaanvragen" msgstr "My draft applications" #: main/templates/base/menu.html:35 proposals/menus.py:60 #: proposals/views/proposal_views.py:126 -#: proposals/views/proposal_views.py:126 msgid "Mijn oefenaanvragen" msgstr "My practice applications" #: main/templates/base/menu.html:38 proposals/menus.py:64 #: proposals/views/proposal_views.py:88 -#: proposals/views/proposal_views.py:88 msgid "Mijn ingediende aanvragen" msgstr "My submitted applications" #: main/templates/base/menu.html:41 proposals/menus.py:68 #: proposals/views/proposal_views.py:100 -#: proposals/views/proposal_views.py:100 msgid "Mijn afgehandelde aanvragen" msgstr "My processed applications" #: main/templates/base/menu.html:44 proposals/menus.py:72 #: proposals/views/proposal_views.py:112 -#: proposals/views/proposal_views.py:112 msgid "Mijn aanvragen als eindverantwoordelijke" msgstr "My supervised applications" @@ -619,8 +609,8 @@ msgstr "My supervised applications" msgid "Al mijn aanvragen" msgstr "All my applications" -#: main/templates/base/menu.html:52 proposals/menus.py:108 -#: proposals/views/proposal_views.py:149 +#: main/templates/base/menu.html:52 proposals/menus.py:110 +#: proposals/views/proposal_views.py:153 msgid "Archief" msgstr "Archive" @@ -697,8 +687,6 @@ msgstr "FEtC-H website" #: main/templates/base/menu.html:152 main/templates/main/landing.html:77 #: main/templates/registration/login.html:15 #: main/templates/registration/login.html:32 -#: main/templates/registration/login.html:15 -#: main/templates/registration/login.html:32 msgid "Inloggen" msgstr "Log in" @@ -1106,7 +1094,6 @@ msgstr "" "You need a Solis-ID to log in. If you do not have a Solis ID, please contact " "the secretary of the FEtC-H." -#: main/templates/main/landing.html:86 main/templates/main/landing.html:93 #: main/templates/main/landing.html:86 main/templates/main/landing.html:93 msgid "Log in met je Solis-ID" msgstr "Log in with your Solis-ID" @@ -1122,23 +1109,19 @@ msgid "" msgstr "" "Click here to return to the start page." -#: main/templates/registration/login.html:23 #: main/templates/registration/login.html:23 msgid "" "Gebruikersnaam of wachtwoord incorrect. Probeer het alstublieft opnieuw." msgstr "Username or password incorrect. Please try again." -#: main/templates/registration/login.html:27 #: main/templates/registration/login.html:27 msgid "Je kan hier inloggen met je Solis-ID en wachtwoord." msgstr "You can log in here with your Solis-ID and password." -#: main/templates/registration/login.html:30 #: main/templates/registration/login.html:30 msgid "Gebruikersnaam" msgstr "Username" -#: main/templates/registration/login.html:31 #: main/templates/registration/login.html:31 msgid "Wachtwoord" msgstr "Password" @@ -1216,7 +1199,6 @@ msgstr "As might happen on forums where the researcher also has an account." #: observations/models.py:65 observations/models.py:75 #: observations/models.py:88 proposals/models.py:745 studies/models.py:172 -#: observations/models.py:88 proposals/models.py:745 studies/models.py:172 #: studies/models.py:228 studies/models.py:358 msgid "Licht toe" msgstr "Explain" @@ -1370,7 +1352,6 @@ msgstr "Last edited" msgid "Datum ingediend bij eindverantwoordelijke" msgstr "Date sent to supervisor" -#: proposals/forms.py:42 proposals/models.py:221 #: proposals/forms.py:42 proposals/models.py:221 msgid "" "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die " @@ -1440,12 +1421,10 @@ msgstr "" msgid "Ik maak een oefenaanvraag aan" msgstr "I am creating a practice application" -#: proposals/forms.py:276 proposals/models.py:536 #: proposals/forms.py:276 proposals/models.py:536 msgid "Te kopiëren aanvraag" msgstr "Application to be copied" -#: proposals/forms.py:278 proposals/models.py:538 #: proposals/forms.py:278 proposals/models.py:538 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent." msgstr "This field shows only applications in which you are involved." @@ -1598,54 +1577,44 @@ msgstr "View all approved applications of the General Chamber" msgid "Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer" msgstr "View all approved applications of the Linguistics Chamber" -#: proposals/mixins.py:20 #: proposals/mixins.py:20 #, python-format msgid "Aanvraag %(title)s bewerkt" msgstr "Application %(title)s edited" -#: proposals/models.py:143 #: proposals/models.py:143 msgid "Concept" msgstr "Draft" -#: proposals/models.py:146 #: proposals/models.py:146 msgid "Opgestuurd ter beoordeling door eindverantwoordelijke" msgstr "Sent for assessment by the researcher with final responsibility" -#: proposals/models.py:147 #: proposals/models.py:147 msgid "Opgestuurd ter beoordeling door FETC-GW" msgstr "Sent for assessment by FEtC-H" -#: proposals/models.py:149 proposals/models.py:150 #: proposals/models.py:149 proposals/models.py:150 msgid "Aanvraag is beoordeeld door FETC-GW" msgstr "Application has been assessed by FEtC-H" -#: proposals/models.py:156 #: proposals/models.py:156 msgid "in het kader van een cursus" msgstr "in the context of a course" -#: proposals/models.py:157 #: proposals/models.py:157 msgid "om de portal te exploreren" msgstr "to explore the portal" # Not actually used in the interface #: proposals/models.py:169 -#: proposals/models.py:169 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?" msgstr "Which chamber should be reviewing this application?" -#: proposals/models.py:178 #: proposals/models.py:178 msgid "Aan welk onderzoeksinstituut ben je verbonden?" msgstr "To which research institute are you affiliated?" -#: proposals/models.py:184 #: proposals/models.py:184 msgid "" "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt " @@ -1654,7 +1623,6 @@ msgstr "" "What is the desired starting date of the actual research for which this " "application is being submitted?" -#: proposals/models.py:185 #: proposals/models.py:185 msgid "" "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW " @@ -1665,7 +1633,6 @@ msgstr "" "has approved it cannot receive formal approval; in such cases, the FEtC-H " "only provides a post-hoc advice." -#: proposals/models.py:194 #: proposals/models.py:194 msgid "" "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle " @@ -1674,7 +1641,6 @@ msgstr "" "What is the title of your application? This title will be used in all formal " "correspondence." -#: proposals/models.py:199 #: proposals/models.py:199 msgid "" "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer " @@ -1687,7 +1653,6 @@ msgstr "" "portal. The title cannot be identical to that of a study you have previously " "submitted." -#: proposals/models.py:207 #: proposals/models.py:207 msgid "" "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. " @@ -1696,7 +1661,6 @@ msgstr "" "Give a clear, concise description of the research question or questions. Use " "a maximum of 200 words." -#: proposals/models.py:215 #: proposals/models.py:215 msgid "" "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd " @@ -1705,12 +1669,10 @@ msgstr "" "Are there any other researchers involved affiliated with ICON, OFR, OGK or " "ILS?" -#: proposals/models.py:229 #: proposals/models.py:229 msgid "Andere betrokkenen" msgstr "Other people involved" -#: proposals/models.py:234 #: proposals/models.py:234 msgid "" "Worden de informed consent formulieren nog vertaald naar een andere taal dan " @@ -1719,35 +1681,29 @@ msgstr "" "Will the informed consent forms be translated in a language other than Dutch " "or English?" -#: proposals/models.py:241 #: proposals/models.py:241 msgid "Andere talen:" msgstr "Other languages:" -#: proposals/models.py:250 #: proposals/models.py:250 msgid "Hoe wordt dit onderzoek gefinancierd?" msgstr "How is this study funded?" -#: proposals/models.py:261 #: proposals/models.py:261 msgid "" "Wat is de naam van het gefinancierde project en wat is het projectnummer?" msgstr "What is the name of the funded project and what is the project number?" -#: proposals/models.py:265 #: proposals/models.py:265 msgid "" "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt " "worden." msgstr "This title will be used in the formal letter of approval." -#: proposals/models.py:271 #: proposals/models.py:271 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden." msgstr "Space for possible comments. Use a maximum of a 1000 words." -#: proposals/models.py:277 #: proposals/models.py:277 msgid "" "

Je hebt aangegeven dat je gebruik wilt gaan maken van één van de " @@ -1771,7 +1727,6 @@ msgstr "" "> - The title of the study
- The planned starting date
- The " "facilities you intend to use (database, lab, Zep software)" -#: proposals/models.py:297 #: proposals/models.py:297 msgid "" "Als de deelnemers van je onderzoek moeten worden misleid, kan je " @@ -1784,18 +1739,15 @@ msgstr "" "for users of this portal. Would you like your application to be placed under " "a temporary embargo?" -#: proposals/models.py:308 #: proposals/models.py:308 msgid "" "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?" msgstr "From which date may your application be displayed in the archive?" -#: proposals/models.py:318 #: proposals/models.py:318 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)" msgstr "Upload your application here (in .pdf or .doc(x)-format)" -#: proposals/models.py:326 #: proposals/models.py:326 msgid "" "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd " @@ -1804,12 +1756,10 @@ msgstr "" "Do you have formal approval from an ethics committee, other than this FEtC-H " "committee?" -#: proposals/models.py:334 #: proposals/models.py:334 msgid "Welk instituut heeft de aanvraag goedgekeurd?" msgstr "Which institute approved the application?" -#: proposals/models.py:342 #: proposals/models.py:342 msgid "" "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ." @@ -1818,17 +1768,14 @@ msgstr "" "Please upload the formal approval letter from this institute here (in .pdf " "or .doc(x)-format)" -#: proposals/models.py:350 #: proposals/models.py:350 msgid "Ik vul de portal in in het kader van een cursus" msgstr "I am using this portal in the context of a course" -#: proposals/models.py:355 #: proposals/models.py:355 msgid "Ik vul de portal in om de portal te exploreren" msgstr "I am using this portal to explore the portal" -#: proposals/models.py:367 #: proposals/models.py:367 msgid "" "Kan voor alle deelnemersgroepen dezelfde informatiebrief en " @@ -1836,7 +1783,6 @@ msgid "" msgstr "" "Can the same informed consent documents be used for all participant groups?" -#: proposals/models.py:369 #: proposals/models.py:369 msgid "" "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is " @@ -1861,12 +1807,10 @@ msgstr "" "time. However, if separate groups receive different kinds of tasks, " "they constitute separate trajectories." -#: proposals/models.py:385 #: proposals/models.py:385 msgid "Hoeveel verschillende trajecten zijn er?" msgstr "How many different trajectories are there?" -#: proposals/models.py:403 #: proposals/models.py:403 msgid "" "Ik heb kennis genomen van het bovenstaande en begrijp mijn " @@ -1875,7 +1819,6 @@ msgstr "" "I have read the information above and have considered my responsibilities " "with regard to the AVG." -#: proposals/models.py:410 #: proposals/models.py:410 msgid "" "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om " @@ -1886,12 +1829,10 @@ msgstr "" "include it here. Supplying a DMP can expedite ethical assessment of " "proposals." -#: proposals/models.py:422 reviews/models.py:184 #: proposals/models.py:422 reviews/models.py:184 msgid "Ruimte voor eventuele opmerkingen" msgstr "Space for possible comments" -#: proposals/models.py:434 #: proposals/models.py:434 msgid "Datum bevestigingsbrief verstuurd" msgstr "Date confirmation sent" @@ -1900,12 +1841,10 @@ msgstr "Date confirmation sent" msgid "Is er een revisie geweest na het indienen van deze aanvraag?" msgstr "Has this proposal been amended after it was submitted?" -#: proposals/models.py:444 #: proposals/models.py:444 msgid "Leg uit" msgstr "Explain why" -#: proposals/models.py:450 #: proposals/models.py:450 msgid "" "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf " @@ -1915,27 +1854,22 @@ msgstr "" "please describe briefly how you will address them. Use a maximum of a 1000 " "words." -#: proposals/models.py:464 #: proposals/models.py:464 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?" msgstr "In what capacity are you involved in this application?" -#: proposals/models.py:472 #: proposals/models.py:472 msgid "Wat is je studierichting?" msgstr "What is your course of study?" -#: proposals/models.py:479 #: proposals/models.py:479 msgid "In welke context doe je dit onderzoek?" msgstr "In what capacity are you involved in this application?" -#: proposals/models.py:486 #: proposals/models.py:486 msgid "Namelijk:" msgstr "Please specify:" -#: proposals/models.py:493 #: proposals/models.py:493 msgid "" "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) " @@ -1950,7 +1884,6 @@ msgstr "" "do not not, you can terminate your proposal now. If you do, please explain " "what the reason is:" -#: proposals/models.py:510 #: proposals/models.py:510 msgid "" "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten " @@ -1960,14 +1893,12 @@ msgstr "" "researchers need to have logged into this portal at least once, in order to " "be selectable here." -#: proposals/models.py:517 #: proposals/models.py:517 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 #: proposals/templates/proposals/vue_templates/proposal_list.html:166 msgid "Eindverantwoordelijke onderzoeker" msgstr "Researcher with final responsibility" -#: proposals/models.py:520 #: proposals/models.py:520 msgid "" "Aan het einde van de procedure kan je deze aanvraag ter\n" @@ -1990,7 +1921,6 @@ msgstr "" "can continue filling in the application while you wait for them to do this, " "but remember to come back and fill in this field before submitting." -#: proposals/models.py:545 #: proposals/models.py:545 msgid "" "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?" @@ -1998,12 +1928,10 @@ msgstr "" "Is this application a revision or an amendment of a previously submitted " "application?" -#: proposals/models.py:617 #: proposals/models.py:617 msgid "Amendement" msgstr "Amendment" -#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328 #: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328 #: reviews/templates/reviews/committee_members_workload.html:36 #: reviews/templates/reviews/committee_members_workload.html:82 @@ -2011,42 +1939,34 @@ msgstr "Amendment" msgid "Revisie" msgstr "Revision" -#: proposals/models.py:623 #: proposals/models.py:623 msgid "Normaal" msgstr "Normal" -#: proposals/models.py:628 #: proposals/models.py:628 msgid "Voortoetsing" msgstr "Preliminary assessment" -#: proposals/models.py:630 #: proposals/models.py:630 msgid "Oefening" msgstr "Practice" -#: proposals/models.py:632 #: proposals/models.py:632 msgid "Extern getoetst" msgstr "External approval" -#: proposals/models.py:730 #: proposals/models.py:730 msgid "Geen beoordeling door METC noodzakelijk" msgstr "Assessment by METC not required" -#: proposals/models.py:731 #: proposals/models.py:731 msgid "In afwachting beslissing METC" msgstr "Pending decision by METC" -#: proposals/models.py:732 #: proposals/models.py:732 msgid "Beslissing METC geüpload" msgstr "METC decision uploaded" -#: proposals/models.py:736 #: proposals/models.py:736 msgid "" "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling " @@ -2055,12 +1975,10 @@ msgstr "" "Will the data collection take place at the UMC Utrecht or another " "institution for which an assessment by a METC is required?" -#: proposals/models.py:750 #: proposals/models.py:750 msgid "Welke instelling?" msgstr "Which institution?" -#: proposals/models.py:756 #: proposals/models.py:756 msgid "" "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd " @@ -2069,7 +1987,6 @@ msgstr "" "Is the nature of the research question medical (as defined by the Medical " "Research Involving Human Subjects Act (WMO))?" -#: proposals/models.py:758 #: proposals/models.py:758 msgid "" "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-" @@ -2091,7 +2008,6 @@ msgstr "" "Committee on Research Involving Human Subjects, Definition of medical " "research, 2005, ccmo.nl)" -#: proposals/models.py:774 #: proposals/models.py:774 msgid "" "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de " @@ -2101,17 +2017,14 @@ msgstr "" "registered with the FEtC-H. Has an application for this project already been " "submitted to an METC?" -#: proposals/models.py:781 #: proposals/models.py:781 msgid "Is de METC al tot een beslissing gekomen?" msgstr "Has the METC already come to a decision?" -#: proposals/models.py:786 #: proposals/models.py:786 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)" msgstr "Please upload the decision of METC (in .pdf or .doc(x)-format) here" -#: proposals/models.py:824 #: proposals/models.py:824 #, python-brace-format msgid "WMO {title}, status {status}" @@ -2218,10 +2131,6 @@ msgstr "" #: proposals/templates/proposals/proposal_diff.html:211 #: proposals/templates/proposals/proposal_diff.html:244 #: proposals/templates/proposals/proposal_diff.html:268 -#: proposals/templates/proposals/proposal_diff.html:178 -#: proposals/templates/proposals/proposal_diff.html:211 -#: proposals/templates/proposals/proposal_diff.html:244 -#: proposals/templates/proposals/proposal_diff.html:268 msgid "Originele aanvraag" msgstr "Original application" @@ -2241,10 +2150,6 @@ msgstr "Original application" #: proposals/templates/proposals/proposal_diff.html:212 #: proposals/templates/proposals/proposal_diff.html:245 #: proposals/templates/proposals/proposal_diff.html:269 -#: proposals/templates/proposals/proposal_diff.html:179 -#: proposals/templates/proposals/proposal_diff.html:212 -#: proposals/templates/proposals/proposal_diff.html:245 -#: proposals/templates/proposals/proposal_diff.html:269 msgid "Revisie/amendement" msgstr "Revision/amendment" @@ -2341,16 +2246,6 @@ msgstr "yes,no," #: proposals/templates/proposals/proposal_diff.html:250 #: proposals/templates/proposals/proposal_diff.html:273 #: proposals/templates/proposals/proposal_diff.html:274 -#: proposals/templates/proposals/proposal_diff.html:121 -#: proposals/templates/proposals/proposal_diff.html:122 -#: proposals/templates/proposals/proposal_diff.html:216 -#: proposals/templates/proposals/proposal_diff.html:217 -#: proposals/templates/proposals/proposal_diff.html:221 -#: proposals/templates/proposals/proposal_diff.html:222 -#: proposals/templates/proposals/proposal_diff.html:249 -#: proposals/templates/proposals/proposal_diff.html:250 -#: proposals/templates/proposals/proposal_diff.html:273 -#: proposals/templates/proposals/proposal_diff.html:274 #: proposals/templates/proposals/proposal_pdf.html:109 #: proposals/templates/proposals/proposal_pdf.html:125 #: proposals/templates/proposals/proposal_pdf.html:182 @@ -2408,8 +2303,6 @@ msgstr "" #: proposals/templates/proposals/pdf/observation_v1.html:53 #: proposals/templates/proposals/proposal_diff.html:228 #: proposals/templates/proposals/proposal_diff.html:232 -#: proposals/templates/proposals/proposal_diff.html:228 -#: proposals/templates/proposals/proposal_diff.html:232 #: proposals/templates/proposals/proposal_pdf.html:189 #: proposals/templates/proposals/proposal_pdf.html:444 #: proposals/templates/proposals/proposal_pdf.html:447 @@ -2812,8 +2705,6 @@ msgstr "" msgid "Algemene informatie over de aanvraag" msgstr "General information about the application" -#: proposals/templates/proposals/proposal_diff.html:133 -#: proposals/templates/proposals/proposal_diff.html:134 #: proposals/templates/proposals/proposal_diff.html:133 #: proposals/templates/proposals/proposal_diff.html:134 #: proposals/templates/proposals/proposal_pdf.html:133 @@ -2823,7 +2714,6 @@ msgstr "General information about the application" msgid "onbekend" msgstr "unknown" -#: proposals/templates/proposals/proposal_diff.html:174 #: proposals/templates/proposals/proposal_diff.html:174 #: proposals/templates/proposals/proposal_pdf.html:159 #: proposals/templates/proposals/proposal_pdf_empty.html:104 @@ -2835,7 +2725,6 @@ msgid "" msgstr "" "Ethical assessment by a Medical Ethical Testing Committee (METC) required?" -#: proposals/templates/proposals/proposal_diff.html:207 #: proposals/templates/proposals/proposal_diff.html:207 #: proposals/templates/proposals/proposal_pdf.html:179 #: proposals/templates/proposals/proposal_pdf_empty.html:120 @@ -2844,7 +2733,6 @@ msgstr "" msgid "Aanmelding bij de METC" msgstr "Registration with the METC" -#: proposals/templates/proposals/proposal_diff.html:240 #: proposals/templates/proposals/proposal_diff.html:240 #: proposals/templates/proposals/proposal_pdf.html:201 #: proposals/templates/proposals/proposal_pdf_empty.html:134 @@ -2854,7 +2742,6 @@ msgstr "Registration with the METC" msgid "Eén of meerdere trajecten?" msgstr "One or more trajectories?" -#: proposals/templates/proposals/proposal_diff.html:264 #: proposals/templates/proposals/proposal_diff.html:264 #: proposals/templates/proposals/proposal_submit.html:179 msgid "Concept-aanmelding versturen" @@ -3714,7 +3601,7 @@ msgstr "Route:" #: proposals/templates/proposals/vue_templates/proposal_list.html:187 #: reviews/templates/reviews/vue_templates/decision_list.html:185 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128 -#: reviews/templates/reviews/vue_templates/review_list.html:184 +#: reviews/templates/reviews/vue_templates/review_list.html:193 msgid "Indieners" msgstr "Applicants" @@ -3735,7 +3622,7 @@ msgstr "Hide" #: proposals/templates/proposals/vue_templates/proposal_list.html:139 #: reviews/templates/reviews/vue_templates/decision_list.html:141 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83 -#: reviews/templates/reviews/vue_templates/review_list.html:139 +#: reviews/templates/reviews/vue_templates/review_list.html:148 msgid "Revisie/amendement van" msgstr "Revision/amendment of" @@ -3789,12 +3676,10 @@ msgstr "Forms" msgid "Versturen" msgstr "Submit" -#: proposals/utils/proposal_utils.py:416 #: proposals/utils/proposal_utils.py:416 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: A revised application uses lab facilities" -#: proposals/utils/proposal_utils.py:418 #: proposals/utils/proposal_utils.py:418 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: New application uses lab facilities" @@ -3844,48 +3729,39 @@ msgstr "" "You must confirm your understanding of the AVG before you can submit your " "application." -#: proposals/views/proposal_views.py:43 #: proposals/views/proposal_views.py:43 msgid "Publiek archief" msgstr "Public archive" -#: proposals/views/proposal_views.py:44 #: proposals/views/proposal_views.py:44 msgid "Dit overzicht toont alle goedgekeurde aanvragen." msgstr "This overview shows all approved applications." -#: proposals/views/proposal_views.py:63 #: proposals/views/proposal_views.py:63 msgid "Mijn aanvraag" msgstr "My application" -#: proposals/views/proposal_views.py:64 #: proposals/views/proposal_views.py:64 msgid "Dit overzicht toont al je aanvragen." msgstr "This overview shows all your applications." -#: proposals/views/proposal_views.py:77 #: proposals/views/proposal_views.py:77 msgid "Dit overzicht toont al je nog niet ingediende aanvragen." msgstr "This overview shows all the applications you have not yet submitted." -#: proposals/views/proposal_views.py:89 #: proposals/views/proposal_views.py:89 msgid "Dit overzicht toont al je ingediende aanvragen." msgstr "This overview shows all the applications you have submitted." -#: proposals/views/proposal_views.py:101 #: proposals/views/proposal_views.py:101 msgid "Dit overzicht toont al je beoordeelde aanvragen." msgstr "This overview shows all your applications that have been assessed." -#: proposals/views/proposal_views.py:114 #: proposals/views/proposal_views.py:114 msgid "" "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent." msgstr "This overview shows all your supervised applications." -#: proposals/views/proposal_views.py:127 #: proposals/views/proposal_views.py:127 msgid "" "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of " @@ -3894,15 +3770,15 @@ msgstr "" "This overview shows all practice applications in which you are involved as a " "student, researcher or accountable researcher." -#: proposals/views/proposal_views.py:242 +#: proposals/views/proposal_views.py:246 msgid "Aanvraag verwijderd" msgstr "Application deleted" -#: proposals/views/proposal_views.py:380 +#: proposals/views/proposal_views.py:384 msgid "Wijzigingen opgeslagen" msgstr "Changes saved" -#: proposals/views/proposal_views.py:481 +#: proposals/views/proposal_views.py:485 msgid "Aanvraag gekopieerd" msgstr "Application copied" @@ -3943,7 +3819,7 @@ msgstr "Stage" #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45 #: reviews/templates/reviews/vue_templates/decision_list.html:178 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121 -#: reviews/templates/reviews/vue_templates/review_list.html:177 +#: reviews/templates/reviews/vue_templates/review_list.html:186 msgid "Route" msgstr "Route" @@ -4055,33 +3931,27 @@ msgstr "Post hoc negative advice by FETC-H" msgid "Niet verder in behandeling genomen" msgstr "Not to be assessed further" -#: reviews/models.py:51 reviews/models.py:178 #: reviews/models.py:51 reviews/models.py:178 #: reviews/templates/reviews/review_table.html:9 msgid "Beslissing" msgstr "Decision" -#: reviews/models.py:126 #: reviews/models.py:126 msgid "Onbekend" msgstr "Unknown" -#: reviews/models.py:143 #: reviews/models.py:143 msgid "nog geen route" msgstr "no route assigned" -#: reviews/models.py:172 #: reviews/models.py:172 msgid "goedgekeurd" msgstr "endorsed" -#: reviews/models.py:173 #: reviews/models.py:173 msgid "niet goedgekeurd" msgstr "not endorsed" -#: reviews/models.py:174 #: reviews/models.py:174 msgid "revisie noodzakelijk" msgstr "revision necessary" @@ -4690,6 +4560,10 @@ msgstr "Remove this application from the archive" msgid "Plaats aanvraag in archief" msgstr "Add this application to the archive" +#: reviews/templates/reviews/vue_templates/review_list.html:125 +msgid "Reviewronde beëindigd: " +msgstr "Reviewing round ended: " + #: reviews/templatetags/documents_list.py:145 msgid "Hoofdtraject" msgstr "Main trajectory" @@ -4770,73 +4644,60 @@ msgstr "Change date of confirmation letter" msgid "Plaats aanvraag in het archief." msgstr "Add this application to the archive" -#: reviews/utils/review_utils.py:54 #: reviews/utils/review_utils.py:54 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding" msgstr "FEtC-H {}: confirmation of draft application submission" -#: reviews/utils/review_utils.py:74 #: reviews/utils/review_utils.py:74 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke" msgstr "FEtC-H {}: assess as researcher with final responsibility" -#: reviews/utils/review_utils.py:124 #: reviews/utils/review_utils.py:124 msgid "FETC-GW {}: aanmelding ontvangen" msgstr "FEtC-H {}: application received" -#: reviews/utils/review_utils.py:218 #: reviews/utils/review_utils.py:218 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing" msgstr "FEtC-H {}: new application for preliminary assessment" -#: reviews/utils/review_utils.py:232 #: reviews/utils/review_utils.py:232 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing" msgstr "" "FEtC-H {}: confirmation of submission of application for preliminary " "assessment" -#: reviews/utils/review_utils.py:281 #: reviews/utils/review_utils.py:281 msgid "FETC-GW {}: nieuwe aanvraag ingediend" msgstr "FEtC-H {}: new application submitted" -#: reviews/utils/review_utils.py:296 #: reviews/utils/review_utils.py:296 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd" msgstr "FEtC-H {}: new decision added" -#: reviews/utils/review_utils.py:312 #: reviews/utils/review_utils.py:312 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld" msgstr "FEtC-H {}: a supervisor has reviewed your application" -#: reviews/utils/review_utils.py:338 #: reviews/utils/review_utils.py:338 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen." msgstr "" "The application contains the participation of adults incapable of informed " "consent." -#: reviews/utils/review_utils.py:341 #: reviews/utils/review_utils.py:341 msgid "De aanvraag bevat het gebruik van misleiding." msgstr "The application contains the use of misrepresentation." -#: reviews/utils/review_utils.py:344 #: reviews/utils/review_utils.py:344 msgid "" "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)" msgstr "" "A hierarchal relationship between researcher(s) and participant(s) exists." -#: reviews/utils/review_utils.py:347 #: reviews/utils/review_utils.py:347 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens." msgstr "This study collects special or sensitive personal details." -#: reviews/utils/review_utils.py:350 #: reviews/utils/review_utils.py:350 msgid "" "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht " @@ -4845,7 +4706,6 @@ msgstr "" "The study selects participants based on particular characteristics which " "might entail increased vulnerability." -#: reviews/utils/review_utils.py:356 #: reviews/utils/review_utils.py:356 msgid "" "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op " @@ -4856,7 +4716,6 @@ msgstr "" "study, in part or in its entirety, is so burdensome that despite acquiring " "informed consent it might raise questions." -#: reviews/utils/review_utils.py:360 #: reviews/utils/review_utils.py:360 msgid "" "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op " @@ -4867,7 +4726,6 @@ msgstr "" "psychological or physical harm in participating in the study are more than " "minimal." -#: reviews/utils/review_utils.py:367 #: reviews/utils/review_utils.py:367 #, python-brace-format msgid "" @@ -4879,7 +4737,6 @@ msgstr "" "non-task elements ({d} minutes) is greater than the task duration limit " "({max_d} minutes) for the age group {ag}." -#: reviews/utils/review_utils.py:384 #: reviews/utils/review_utils.py:384 #, python-brace-format msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}" @@ -4887,7 +4744,6 @@ msgstr "" "The application contains sessions with participants in the following " "setting: {s}" -#: reviews/utils/review_utils.py:388 #: reviews/utils/review_utils.py:388 msgid "" "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met " @@ -4896,7 +4752,6 @@ msgstr "" "The study observes participants in a non-public space and works with " "retrospective informed consent." -#: reviews/utils/review_utils.py:390 #: reviews/utils/review_utils.py:390 msgid "" "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke " @@ -4907,12 +4762,10 @@ msgstr "" "(e.g. a digital discussion group), and takes part actively in the discussion " "and/or collects data which can be traced back to individuals." -#: reviews/utils/review_utils.py:395 #: reviews/utils/review_utils.py:395 msgid "De aanvraag bevat het gebruik van {}" msgstr "The application makes use of {}" -#: reviews/utils/review_utils.py:416 #: reviews/utils/review_utils.py:416 msgid "" "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar." diff --git a/reviews/templates/reviews/vue_templates/review_list.html b/reviews/templates/reviews/vue_templates/review_list.html index 87654c0f7..8eafa24eb 100644 --- a/reviews/templates/reviews/vue_templates/review_list.html +++ b/reviews/templates/reviews/vue_templates/review_list.html @@ -119,11 +119,12 @@

{% endverbatim %} {# For some reason context.review.REVISION and other class variables of continuation are None?#} - {# Only context.review.GO returns 1 for me, as it should #} + {# Only context.review.GO returns 0 for me, as it should #} {# Which is why I've hardcoded the 1 here ... #}
+ {% trans "Reviewronde beëindigd: " %} {% verbatim %} - {{review.decision.date_decision}} + {{ review.date_end | date("DD-MM-YYYY") }} {% endverbatim %}
From f49afa4a4f3677b12529c8339b3b73859499d19b Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Tue, 7 Nov 2023 15:16:52 +0100 Subject: [PATCH 3/7] Secretary is now able to adjust the start_date from review detail page. --- locale/en/LC_MESSAGES/django.mo | Bin 150464 -> 151278 bytes locale/en/LC_MESSAGES/django.po | 72 +++++++++++++----- proposals/forms.py | 7 ++ .../proposals/proposal_update_date_start.html | 36 +++++++++ proposals/urls.py | 11 ++- proposals/views/proposal_views.py | 15 +++- reviews/templates/reviews/documents_list.html | 8 ++ reviews/templatetags/documents_list.py | 5 ++ 8 files changed, 128 insertions(+), 26 deletions(-) create mode 100644 proposals/templates/proposals/proposal_update_date_start.html diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 83bb30771cfcb8bf016f493d9f314729d9991ec3..a4c6935b3184c3adbb835146bb238d71a5f9f931 100644 GIT binary patch delta 17379 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 delta 16713 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 ALI3~& diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index a3563555d..d4d3df4dd 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-06 10:52+0100\n" +"POT-Creation-Date: 2023-11-07 15:10+0100\n" "PO-Revision-Date: 2020-10-07 11:22+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -154,6 +154,7 @@ msgstr "You can leave feedback on the FEtC-H portal here." #: proposals/templates/proposals/proposal_confirmation.html:36 #: proposals/templates/proposals/proposal_diff.html:294 #: proposals/templates/proposals/proposal_update_attachments.html:26 +#: proposals/templates/proposals/proposal_update_date_start.html:32 #: reviews/templates/reviews/change_chamber_form.html:19 #: reviews/templates/reviews/decision_form.html:90 #: reviews/templates/reviews/review_assign_form.html:46 @@ -326,7 +327,7 @@ msgstr "Intervention saved" #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83 -#: proposals/forms.py:560 proposals/forms.py:624 proposals/forms.py:639 +#: proposals/forms.py:560 proposals/forms.py:631 proposals/forms.py:646 #: studies/forms.py:104 tasks/forms.py:87 msgid "Dit veld is verplicht." msgstr "This field is required." @@ -1310,6 +1311,7 @@ msgstr "Recording behaviour" #: proposals/templates/proposals/proposal_update_attachments.html:7 #: proposals/templates/proposals/proposal_update_attachments.html:14 #: proposals/templates/proposals/proposal_update_attachments.html:25 +#: proposals/templates/proposals/proposal_update_date_start.html:7 #: studies/templates/studies/study_update_attachments.html:7 #: studies/templates/studies/study_update_attachments.html:14 #: studies/templates/studies/study_update_attachments.html:25 @@ -1465,7 +1467,7 @@ msgid "" "bent." msgstr "This field shows only approved applications in which you are involved." -#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:672 +#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:679 msgid "Dit veld is verplicht om verder te gaan." msgstr "This field is required to continue." @@ -1525,15 +1527,15 @@ msgstr "" "If different trajectories are used, at least two different trajectories " "should be filled in." -#: proposals/forms.py:631 +#: proposals/forms.py:638 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd." msgstr "Declaration of consent for trajectory {} not yet added." -#: proposals/forms.py:635 +#: proposals/forms.py:642 msgid "Informatiebrief voor traject {} nog niet toegevoegd." msgstr "Information letter for trajectory {} not yet added." -#: proposals/forms.py:647 +#: proposals/forms.py:654 msgid "" "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar " "van vandaag." @@ -1541,7 +1543,7 @@ msgstr "" "The embargo-period can last a maximum of 2 years. Pick a date within 2 years " "from today." -#: proposals/forms.py:678 +#: proposals/forms.py:685 msgid "Vul in in welke talen de formulieren worden vertaald." msgstr "Please fill in the languages" @@ -2547,7 +2549,7 @@ msgstr "" #: proposals/templates/proposals/proposal_data_management.html:24 #: proposals/templates/proposals/proposal_pdf.html:499 -#: reviews/templatetags/documents_list.py:245 +#: reviews/templatetags/documents_list.py:250 msgid "Data Management Plan" msgstr "Data Management Plan" @@ -3450,6 +3452,29 @@ msgstr "" "On this page you can edit the forms related to the proposal " "%(title)s(reference number %(ref_number)s)" +#: proposals/templates/proposals/proposal_update_date_start.html:14 +#: proposals/templates/proposals/proposal_update_date_start.html:31 +msgid "Startdatum aanpassen" +msgstr "Edit start date" + +#: proposals/templates/proposals/proposal_update_date_start.html:17 +msgid "" +"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " +"(referentienummer %(ref_number)s). Let op! Als de review al " +"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " +"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op " +"met" +msgstr "" +"On this page, the start date of proposal %(title)s (reference number " +"%(ref_number)s) can be edited. Note! If the review has " +"already been concluded, the new start date will not be displayed in the PDF. " +"If you would like the PDF to be generated with the new start date, please " +"reach out to " + +#: proposals/templates/proposals/proposal_update_date_start.html:26 +msgid "Vul de datum in als 'DD-MM-YYYY'." +msgstr "Enter the date as 'YYYY-MM-DD'." + #: proposals/templates/proposals/study_consent.html:27 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement" msgstr "Informed consent school director/ head of the institution" @@ -3774,11 +3799,11 @@ msgstr "" msgid "Aanvraag verwijderd" msgstr "Application deleted" -#: proposals/views/proposal_views.py:384 +#: proposals/views/proposal_views.py:396 msgid "Wijzigingen opgeslagen" msgstr "Changes saved" -#: proposals/views/proposal_views.py:485 +#: proposals/views/proposal_views.py:497 msgid "Aanvraag gekopieerd" msgstr "Application copied" @@ -4282,6 +4307,11 @@ msgstr "Edit Data Management Plan" #: reviews/templates/reviews/documents_list.html:44 #: reviews/templates/reviews/documents_list.html:46 +msgid "Startdatum wijzigen" +msgstr "Edit start date" + +#: reviews/templates/reviews/documents_list.html:52 +#: reviews/templates/reviews/documents_list.html:54 msgid "Documenten wijzigen" msgstr "Edit documents" @@ -4576,47 +4606,47 @@ msgstr "Trajectory {}: {}" msgid "Extra documenten {}" msgstr "Extra documents {}" -#: reviews/templatetags/documents_list.py:213 +#: reviews/templatetags/documents_list.py:214 msgid "Aanmelding" msgstr "Application" -#: reviews/templatetags/documents_list.py:215 +#: reviews/templatetags/documents_list.py:216 msgid "Aanvraag in PDF-vorm" msgstr "Application in PDF format" -#: reviews/templatetags/documents_list.py:228 +#: reviews/templatetags/documents_list.py:233 msgid "Eerdere goedkeuring" msgstr "Prior approval" -#: reviews/templatetags/documents_list.py:236 +#: reviews/templatetags/documents_list.py:241 msgid "Aanvraag bij voortoetsing" msgstr "Application for preliminary assessment" -#: reviews/templatetags/documents_list.py:257 +#: reviews/templatetags/documents_list.py:262 msgid "Beslissing METC" msgstr "Decision by METC" -#: reviews/templatetags/documents_list.py:282 +#: reviews/templatetags/documents_list.py:287 msgid "Informed consent" msgstr "Informed consent" -#: reviews/templatetags/documents_list.py:283 +#: reviews/templatetags/documents_list.py:288 msgid "Informatiebrief" msgstr "Information letter" -#: reviews/templatetags/documents_list.py:284 +#: reviews/templatetags/documents_list.py:289 msgid "Consent declaratie directeur/departementshoofd" msgstr "Declaration of consent school director/head of the department" -#: reviews/templatetags/documents_list.py:286 +#: reviews/templatetags/documents_list.py:291 msgid "Informatiebrief directeur/departementshoofd" msgstr "Information letter school director/head of the department" -#: reviews/templatetags/documents_list.py:288 +#: reviews/templatetags/documents_list.py:293 msgid "Informatiebrief ouders" msgstr "Information letter for the parents" -#: reviews/templatetags/documents_list.py:296 +#: reviews/templatetags/documents_list.py:301 msgid "Toestemmingsdocument observatie" msgstr "Consent document for observation" diff --git a/proposals/forms.py b/proposals/forms.py index fee52a503..75ea839aa 100644 --- a/proposals/forms.py +++ b/proposals/forms.py @@ -574,6 +574,13 @@ class Meta: 'dmp_file' ] +class ProposalUpdateDateStartForm(forms.ModelForm): + class Meta: + model = Proposal + fields = [ + 'date_start' + ] + class ProposalSubmitForm(forms.ModelForm): class Meta: model = Proposal diff --git a/proposals/templates/proposals/proposal_update_date_start.html b/proposals/templates/proposals/proposal_update_date_start.html new file mode 100644 index 000000000..4c7dabc3c --- /dev/null +++ b/proposals/templates/proposals/proposal_update_date_start.html @@ -0,0 +1,36 @@ +{% extends "base/base.html" %} + +{% load static %} +{% load i18n %} + +{% block header_title %} + {% trans "Formulieren aanpassen" %} - {{ block.super }} +{% endblock %} + +{% block content %} +
+
+

+ {% trans "Startdatum aanpassen" %} +

+

+ {% blocktrans trimmed with title=proposal.title ref_number=proposal.reference_number %} + Op deze pagina kan de startdatum worden aangepast van de aanvraag {{ title }} + (referentienummer {{ ref_number }}). Let op! Als de review al is afgerond, + wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht u de PDF + opnieuw willen genereren, neem hierover dan contact op met + {% endblocktrans %} + portalsupport.gw@uu.nl. +

+

+ {% trans "Vul de datum in als 'DD-MM-YYYY'." %} +

+
{% csrf_token %} + {{ form.as_table }}
+ + + {% trans "Terug naar de vorige pagina" %} +
+
+
+{% endblock %} \ No newline at end of file diff --git a/proposals/urls.py b/proposals/urls.py index d7dcd56e5..b237908c1 100644 --- a/proposals/urls.py +++ b/proposals/urls.py @@ -15,7 +15,8 @@ ProposalSubmitPreApproved, ProposalUpdatePreApproved, \ ProposalUsersOnlyArchiveView, \ ProposalCopyAmendment, ProposalsPublicArchiveView, \ - ProposalUpdateDataManagement, TranslatedConsentFormsView + ProposalUpdateDataManagement, TranslatedConsentFormsView, \ + ProposalUpdateDateStart from .views.study_views import StudyStart, StudyConsent from .views.wmo_views import WmoCreate, WmoUpdate, \ @@ -84,10 +85,12 @@ name='data_management'), path('update_data_management//', ProposalUpdateDataManagement.as_view(), name='update_data_management'), + path('update_date_start//', ProposalUpdateDateStart.as_view(), + name='update_date_start'), + + path('submit//', include([msgstr "" + - path('submit//', include([ - path('', ProposalSubmit.as_view(), name='submit'), - path('pre/', ProposalSubmitPreAssessment.as_view(), name='submit_pre'), path('pre_approved/', ProposalSubmitPreApproved.as_view(), name='submit_pre_approved'), diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py index 67c635aa2..1353e5c66 100644 --- a/proposals/views/proposal_views.py +++ b/proposals/views/proposal_views.py @@ -27,7 +27,8 @@ from ..forms import ProposalConfirmationForm, ProposalCopyForm, \ ProposalDataManagementForm, ProposalForm, ProposalStartPracticeForm, \ ProposalSubmitForm, RevisionProposalCopyForm, AmendmentProposalCopyForm, \ - ProposalUpdateDataManagementForm, TranslatedConsentForms + ProposalUpdateDataManagementForm, ProposalUpdateDateStartForm, \ + TranslatedConsentForms from ..models import Proposal, Wmo from ..utils import generate_pdf, generate_ref_number from proposals.mixins import ProposalMixin, ProposalContextMixin, \ @@ -375,7 +376,19 @@ class ProposalUpdateDataManagement(GroupRequiredMixin, generic.UpdateView): def get_success_url(self): """Continue to the URL specified in the 'next' POST parameter""" return reverse('reviews:detail', args=[self.object.latest_review().pk]) + +class ProposalUpdateDateStart(GroupRequiredMixin, generic.UpdateView): + """ + Allows the secretary to change the date_start on the Proposal level + """ + model = Proposal + template_name = 'proposals/proposal_update_date_start.html' + form_class = ProposalUpdateDateStartForm + group_required = settings.GROUP_SECRETARY + def get_success_url(self): + """Continue to the URL specified in the 'next' POST parameter""" + return reverse('reviews:detail', args=[self.object.latest_review().pk]) class ProposalSubmit(ProposalContextMixin, AllowErrorsOnBackbuttonMixin, UpdateView, ): model = Proposal diff --git a/reviews/templates/reviews/documents_list.html b/reviews/templates/reviews/documents_list.html index 42c683277..b02a54113 100644 --- a/reviews/templates/reviews/documents_list.html +++ b/reviews/templates/reviews/documents_list.html @@ -39,6 +39,14 @@
{% endif %} +{% if container.date_start_edit_link %} + + {% trans "Startdatum wijzigen" %} + + +{% endif %} + {% if container.edit_link %} {% trans "Documenten wijzigen" %} diff --git a/reviews/templatetags/documents_list.py b/reviews/templatetags/documents_list.py index 19b5972b4..38611afac 100644 --- a/reviews/templatetags/documents_list.py +++ b/reviews/templatetags/documents_list.py @@ -165,6 +165,7 @@ def __init__(self, header, **kwargs): self.edit_link = False self.dmp_edit_link = False + self.date_start_edit_link = False self.header = header self.items = [] @@ -222,6 +223,10 @@ def documents_list(review, user): pdf_container.items.append(proposal_pdf) + if is_secretary(user): + pdf_container.date_start_edit_link = reverse('proposals:update_date_start', + args=[proposal.pk]) + # Pre-approval if proposal.pre_approval_pdf: From f2d701bfe31fe568f333ea2db2a11bd2a9a67019 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Tue, 7 Nov 2023 15:26:46 +0100 Subject: [PATCH 4/7] removed accidental garbage in proposals/urls.py --- proposals/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/urls.py b/proposals/urls.py index b237908c1..8b42ab94c 100644 --- a/proposals/urls.py +++ b/proposals/urls.py @@ -88,9 +88,9 @@ path('update_date_start//', ProposalUpdateDateStart.as_view(), name='update_date_start'), - path('submit//', include([msgstr "" - - + path('submit//', include([ + path('', ProposalSubmit.as_view(), name='submit'), + path('pre/', ProposalSubmitPreAssessment.as_view(), name='submit_pre'), path('pre_approved/', ProposalSubmitPreApproved.as_view(), name='submit_pre_approved'), From 380cd970734210589ff14a0b39c28b3942edc35f Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Tue, 7 Nov 2023 16:47:15 +0100 Subject: [PATCH 5/7] msgcat --- locale/en/LC_MESSAGES/django.mo | Bin 151278 -> 148903 bytes locale/en/LC_MESSAGES/django.po | 1030 ++++++++++++++----------------- 2 files changed, 451 insertions(+), 579 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index a4c6935b3184c3adbb835146bb238d71a5f9f931..9024e24d3b3c2752f9349179c5099766d275735c 100644 GIT binary patch delta 20290 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 diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index d4d3df4dd..c13119c5c 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -2,62 +2,19 @@ # Copyright (C) 2016 # This file is distributed under the same license as the fetc-h package. # Martijn van der Klis , 2016. +#, fuzzy msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 15:10+0100\n" -"PO-Revision-Date: 2020-10-07 11:22+0200\n" +"POT-Creation-Date: 2023-11-07 10:34+0100\n" +"PO-Revision-Date: 2023-11-07 10:36+0100\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# django.po.develop #-#-#-#-#\n" -"#-#-#-#-# django.po.develop #-#-#-#-#\n" -"#-#-#-#-# django.po.pr #-#-#-#-#\n" -"#-#-#-#-# django.po.pr #-#-#-#-#\n" -"#-#-#-#-# manual.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# github.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# django.po.develop #-#-#-#-#\n" -"#-#-#-#-# manual.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# github.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# django.po.develop #-#-#-#-#\n" -"#-#-#-#-# manual.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# github.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# django.po.acc #-#-#-#-#\n" -"#-#-#-#-# manual.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# github.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# django.po.acc #-#-#-#-#\n" -"#-#-#-#-# django.po.pr #-#-#-#-#\n" -"#-#-#-#-# manual.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# github.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# django.po.acc #-#-#-#-#\n" -"#-#-#-#-# manual.po #-#-#-#-#\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" -"#-#-#-#-# github.po #-#-#-#-#\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.1\n" @@ -81,9 +38,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/" #: faqs/menus.py:17 main/templates/base/menu.html:134 #: main/templates/main/index.html:209 -#: proposals/templates/proposals/proposal_pdf.html:430 #: proposals/templates/proposals/study_consent.html:8 #: proposals/templates/proposals/translated_consent_forms.html:7 +#: proposals/utils/pdf_diff_logic.py:859 msgid "Informed consent formulieren" msgstr "Informed consent forms" @@ -152,9 +109,8 @@ msgstr "You can leave feedback on the FEtC-H portal here." #: feedback/templates/feedback/feedback_form.html:23 #: observations/templates/observations/observation_update_attachments.html:39 #: proposals/templates/proposals/proposal_confirmation.html:36 -#: proposals/templates/proposals/proposal_diff.html:294 +#: proposals/templates/proposals/proposal_diff.html:58 #: proposals/templates/proposals/proposal_update_attachments.html:26 -#: proposals/templates/proposals/proposal_update_date_start.html:32 #: reviews/templates/reviews/change_chamber_form.html:19 #: reviews/templates/reviews/decision_form.html:90 #: reviews/templates/reviews/review_assign_form.html:46 @@ -283,9 +239,8 @@ msgstr "How many times a week will the intervention session take place?" #: interventions/templates/interventions/intervention_form.html:7 #: interventions/templates/interventions/intervention_form.html:49 -#: proposals/templates/proposals/diff/intervention.html:4 -#: proposals/templates/proposals/proposal_pdf.html:285 #: proposals/templates/proposals/proposal_pdf_empty.html:186 +#: proposals/utils/pdf_diff_logic.py:586 msgid "Het interventieonderzoek" msgstr "Intervention study" @@ -327,7 +282,7 @@ msgstr "Intervention saved" #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83 -#: proposals/forms.py:560 proposals/forms.py:631 proposals/forms.py:646 +#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648 #: studies/forms.py:104 tasks/forms.py:87 msgid "Dit veld is verplicht." msgstr "This field is required." @@ -346,11 +301,11 @@ msgstr "Log in" msgid "Log uit" msgstr "Log out" -#: main/models.py:10 main/utils.py:15 +#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234 msgid "ja" msgstr "yes" -#: main/models.py:11 main/utils.py:15 +#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234 msgid "nee" msgstr "no" @@ -403,7 +358,7 @@ msgid "Gebruiksersnaam" msgstr "Username" #: main/templates/auth/user_detail.html:30 -#: proposals/templates/proposals/proposal_pdf.html:79 +#: proposals/templates/proposals/proposal_pdf.html:119 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66 msgid "E-mail" msgstr "E-mail" @@ -442,7 +397,7 @@ msgstr "Phase" #: reviews/templates/reviews/committee_members_workload.html:26 #: reviews/templates/reviews/vue_templates/decision_list.html:153 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95 -#: reviews/templates/reviews/vue_templates/review_list.html:160 +#: reviews/templates/reviews/vue_templates/review_list.html:151 msgid "Datum ingediend" msgstr "Date submitted" @@ -450,7 +405,7 @@ msgstr "Date submitted" #: reviews/templates/reviews/committee_members_workload.html:27 #: reviews/templates/reviews/vue_templates/decision_list.html:163 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105 -#: reviews/templates/reviews/vue_templates/review_list.html:170 +#: reviews/templates/reviews/vue_templates/review_list.html:161 msgid "Gewenste einddatum" msgstr "Desired end date" @@ -462,7 +417,7 @@ msgstr "My decision" #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332 #: reviews/models.py:57 #: reviews/templates/reviews/vue_templates/decision_list.html:133 -#: reviews/templates/reviews/vue_templates/review_list.html:140 +#: reviews/templates/reviews/vue_templates/review_list.html:131 msgid "Afhandeling" msgstr "Conclusion" @@ -548,7 +503,7 @@ msgstr "Save and go to next step >>" #: main/templates/base/login_header.html:6 msgid "Welkom {}" -msgstr "" +msgstr "Welcome {}" #: main/templates/base/menu.html:11 proposals/menus.py:80 msgid "Mijn aanvragen" @@ -582,27 +537,27 @@ msgid "Maak een amendement van een al goedgekeurde aanvraag" msgstr "Create an amendment to an already approved application" #: main/templates/base/menu.html:32 proposals/menus.py:56 -#: proposals/views/proposal_views.py:76 +#: proposals/views/proposal_views.py:77 msgid "Mijn conceptaanvragen" msgstr "My draft applications" #: main/templates/base/menu.html:35 proposals/menus.py:60 -#: proposals/views/proposal_views.py:126 +#: proposals/views/proposal_views.py:127 msgid "Mijn oefenaanvragen" msgstr "My practice applications" #: main/templates/base/menu.html:38 proposals/menus.py:64 -#: proposals/views/proposal_views.py:88 +#: proposals/views/proposal_views.py:89 msgid "Mijn ingediende aanvragen" msgstr "My submitted applications" #: main/templates/base/menu.html:41 proposals/menus.py:68 -#: proposals/views/proposal_views.py:100 +#: proposals/views/proposal_views.py:101 msgid "Mijn afgehandelde aanvragen" msgstr "My processed applications" #: main/templates/base/menu.html:44 proposals/menus.py:72 -#: proposals/views/proposal_views.py:112 +#: proposals/views/proposal_views.py:113 msgid "Mijn aanvragen als eindverantwoordelijke" msgstr "My supervised applications" @@ -611,7 +566,7 @@ msgid "Al mijn aanvragen" msgstr "All my applications" #: main/templates/base/menu.html:52 proposals/menus.py:110 -#: proposals/views/proposal_views.py:153 +#: proposals/views/proposal_views.py:154 msgid "Archief" msgstr "Archive" @@ -1199,7 +1154,7 @@ msgid "" msgstr "As might happen on forums where the researcher also has an account." #: observations/models.py:65 observations/models.py:75 -#: observations/models.py:88 proposals/models.py:745 studies/models.py:172 +#: observations/models.py:88 proposals/models.py:747 studies/models.py:172 #: studies/models.py:228 studies/models.py:358 msgid "Licht toe" msgstr "Explain" @@ -1283,9 +1238,8 @@ msgstr "How many hours of observation will take place on average per day?" #: observations/templates/observations/observation_form.html:7 #: observations/templates/observations/observation_form.html:44 -#: proposals/templates/proposals/diff/observation.html:4 -#: proposals/templates/proposals/proposal_pdf.html:297 #: proposals/templates/proposals/proposal_pdf_empty.html:229 +#: proposals/utils/pdf_diff_logic.py:642 msgid "Het observatieonderzoek" msgstr "Observational study" @@ -1311,7 +1265,6 @@ msgstr "Recording behaviour" #: proposals/templates/proposals/proposal_update_attachments.html:7 #: proposals/templates/proposals/proposal_update_attachments.html:14 #: proposals/templates/proposals/proposal_update_attachments.html:25 -#: proposals/templates/proposals/proposal_update_date_start.html:7 #: studies/templates/studies/study_update_attachments.html:7 #: studies/templates/studies/study_update_attachments.html:14 #: studies/templates/studies/study_update_attachments.html:25 @@ -1363,11 +1316,11 @@ msgstr "" "Are there any other researchers involved outside the above-" "mentioned institutes? " -#: proposals/forms.py:63 proposals/forms.py:270 proposals/validators.py:25 +#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25 msgid "Er bestaat al een aanvraag met deze titel." msgstr "There is an existing application with this title." -#: proposals/forms.py:134 +#: proposals/forms.py:133 msgid "Selecteer..." msgstr "Select..." @@ -1386,19 +1339,23 @@ msgstr "" "This application will not be published in the semipublic archive of the FEtC-" "H." -#: proposals/forms.py:189 -msgid "Je dient een eindverantwoordelijke op te geven." -msgstr "You are required to specify the researcher with final responsibility." +#: proposals/forms.py:192 +msgid "Je dient een promotor/begeleider op te geven." +msgstr "You are required to specify a promotor/supervisor." + +#: proposals/forms.py:199 +msgid "Je kunt niet jezelf als promotor/begeleider opgeven." +msgstr "You cannot submit yourself as the promotor/supervisor." -#: proposals/forms.py:204 +#: proposals/forms.py:213 msgid "Je hebt jezelf niet als onderzoekers geselecteerd." msgstr "You have not selected yourself." -#: proposals/forms.py:209 +#: proposals/forms.py:218 msgid "Je hebt geen andere onderzoekers geselecteerd." msgstr "You have not selected any other researchers." -#: proposals/forms.py:219 +#: proposals/forms.py:228 msgid "" "Dit veld is verplicht, maar je kunt later terugkomen om " "hem verder in te vullen." @@ -1406,7 +1363,7 @@ msgstr "" "This field is required, but you may choose to come back to this page later " "to fill it in." -#: proposals/forms.py:229 +#: proposals/forms.py:238 msgid "" "Indien je geen toestemming hebt van een andere ethische commissie, dien je " "het normale formulier in te vullen. Ga terug naar de startpagina, en " @@ -1419,23 +1376,23 @@ msgstr "" "page, and select \"Submit a new application that is completely new in this " "portal\" or \"from a copy of an old application.\"" -#: proposals/forms.py:256 +#: proposals/forms.py:265 msgid "Ik maak een oefenaanvraag aan" msgstr "I am creating a practice application" -#: proposals/forms.py:276 proposals/models.py:536 +#: proposals/forms.py:285 proposals/models.py:538 msgid "Te kopiëren aanvraag" msgstr "Application to be copied" -#: proposals/forms.py:278 proposals/models.py:538 +#: proposals/forms.py:287 proposals/models.py:540 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent." msgstr "This field shows only applications in which you are involved." -#: proposals/forms.py:318 proposals/forms.py:353 +#: proposals/forms.py:327 proposals/forms.py:362 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen." msgstr "You can, if necessary, change the title of your application here." -#: proposals/forms.py:320 proposals/forms.py:355 +#: proposals/forms.py:329 proposals/forms.py:364 msgid "" "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer " "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van " @@ -1445,11 +1402,11 @@ msgstr "" "application is approved, also to employees viewing the archive of this " "portal." -#: proposals/forms.py:327 +#: proposals/forms.py:336 msgid "Te reviseren aanvraag" msgstr "Application to be revised" -#: proposals/forms.py:328 +#: proposals/forms.py:337 msgid "" "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij " "een medeuitvoerende bent." @@ -1457,69 +1414,69 @@ msgstr "" "This field only shows submitted applications that have not been approved " "(yet) in which you are involved." -#: proposals/forms.py:362 +#: proposals/forms.py:371 msgid "Te amenderen aanvraag" msgstr "Application to be amended" -#: proposals/forms.py:363 +#: proposals/forms.py:372 msgid "" "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende " "bent." msgstr "This field shows only approved applications in which you are involved." -#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:679 +#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681 msgid "Dit veld is verplicht om verder te gaan." msgstr "This field is required to continue." -#: proposals/forms.py:426 +#: proposals/forms.py:435 msgid "Je dient een instelling op te geven." msgstr "You are required to specify an institution." -#: proposals/forms.py:484 +#: proposals/forms.py:493 msgid "In dit geval is een beslissing van een METC vereist" msgstr "In this case, a decision by a METC is required" -#: proposals/forms.py:492 +#: proposals/forms.py:501 msgid "Naam traject 1" msgstr "Title of trajectory 1" -#: proposals/forms.py:494 +#: proposals/forms.py:503 msgid "Naam traject 2" msgstr "Title of trajectory 2" -#: proposals/forms.py:496 +#: proposals/forms.py:505 msgid "Naam traject 3" msgstr "Title of trajectory 3" -#: proposals/forms.py:498 +#: proposals/forms.py:507 msgid "Naam traject 4" msgstr "Title of trajectory 4" -#: proposals/forms.py:500 +#: proposals/forms.py:509 msgid "Naam traject 5" msgstr "Title of trajectory 5" -#: proposals/forms.py:502 +#: proposals/forms.py:511 msgid "Naam traject 6" msgstr "Title of trajectory 6" -#: proposals/forms.py:504 +#: proposals/forms.py:513 msgid "Naam traject 7" msgstr "Title of trajectory 7" -#: proposals/forms.py:506 +#: proposals/forms.py:515 msgid "Naam traject 8" msgstr "Title of trajectory 8" -#: proposals/forms.py:508 +#: proposals/forms.py:517 msgid "Naam traject 9" msgstr "Title of trajectory 9" -#: proposals/forms.py:510 +#: proposals/forms.py:519 msgid "Naam traject 10" msgstr "Title of trajectory 10" -#: proposals/forms.py:554 +#: proposals/forms.py:563 msgid "" "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee " "verschillende trajecten zijn." @@ -1527,15 +1484,15 @@ msgstr "" "If different trajectories are used, at least two different trajectories " "should be filled in." -#: proposals/forms.py:638 +#: proposals/forms.py:640 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd." msgstr "Declaration of consent for trajectory {} not yet added." -#: proposals/forms.py:642 +#: proposals/forms.py:644 msgid "Informatiebrief voor traject {} nog niet toegevoegd." msgstr "Information letter for trajectory {} not yet added." -#: proposals/forms.py:654 +#: proposals/forms.py:656 msgid "" "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar " "van vandaag." @@ -1543,7 +1500,7 @@ msgstr "" "The embargo-period can last a maximum of 2 years. Pick a date within 2 years " "from today." -#: proposals/forms.py:685 +#: proposals/forms.py:687 msgid "Vul in in welke talen de formulieren worden vertaald." msgstr "Please fill in the languages" @@ -1831,7 +1788,8 @@ msgstr "" "include it here. Supplying a DMP can expedite ethical assessment of " "proposals." -#: proposals/models.py:422 reviews/models.py:184 +#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980 +#: reviews/models.py:184 msgid "Ruimte voor eventuele opmerkingen" msgstr "Space for possible comments" @@ -1898,78 +1856,86 @@ msgstr "" #: proposals/models.py:517 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 #: proposals/templates/proposals/vue_templates/proposal_list.html:166 -msgid "Eindverantwoordelijke onderzoeker" -msgstr "Researcher with final responsibility" +msgid "Promotor/Begeleider" +msgstr "Promotor/Supervisor" #: proposals/models.py:520 msgid "" -"Aan het einde van de procedure kan je deze aanvraag ter\n" -" verificatie naar je eindverantwoordelijke sturen. De\n" -" eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen " -"en\n" -" indienen bij de FETC-GW.

NB: als je je\n" -" eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n" -" waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog " -"wel\n" -" verder met de aanvraag, maar vergeet dit veld niet in te vullen voor " -"je de\n" -" aanvraag indient." -msgstr "" -"At the end of the procedure, you can send this application to the researcher " -"with final responsibility for verification. The researcher with final " -"responsibility can then make adjustments and submit the study to the FEtC-H. " -"Note: if you cannot find your supervisor using this field, " -"they may have to log into this portal at least once with their Solis-ID. You " -"can continue filling in the application while you wait for them to do this, " -"but remember to come back and fill in this field before submitting." - -#: proposals/models.py:545 +"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n" +" naar je promotor of begeleider gestuurd worden. Deze " +"persoon \n" +" is de eindverantwoordelijk onderzoeker, en zal de " +"aanvraag \n" +" vervolgens waar nodig kunnen aanpassen en indienen bij " +"de FETC-GW.\n" +"

Belangrijk: als je je promotor " +"of \n" +" begeleider niet kunt vinden met dit veld, dan moeten " +"zij \n" +" waarschijnlijk eerst één keer inloggen in deze portal. \n" +" Je kunt nog wel verder met de aanvraag, maar vergeet dit " +"veld \n" +" niet in te vullen voor je de aanvraag indient. Je " +"aanvraag \n" +" zal dan namelijk niet in behandeling kunnen worden " +"genomen." +msgstr "" +"At the end of the procedure, you need to send this application to your " +"promotor or supervisor for verification. this person is the researcher with " +"final responsibility and can then make adjustments and submit the study to " +"the FEtC-H. Note: if you cannot find your promotor or " +"supervisor using this field, they may have to log into this portal at least " +"once with their Solis-ID. You can continue filling in the application, while " +"you wait for them to do this, but remember to come back and fill in this " +"field before submitting." + +#: proposals/models.py:547 msgid "" "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?" msgstr "" "Is this application a revision or an amendment of a previously submitted " "application?" -#: proposals/models.py:617 +#: proposals/models.py:619 msgid "Amendement" msgstr "Amendment" -#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328 +#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328 #: reviews/templates/reviews/committee_members_workload.html:36 #: reviews/templates/reviews/committee_members_workload.html:82 #: reviews/templates/reviews/review_detail_sidebar.html:106 msgid "Revisie" msgstr "Revision" -#: proposals/models.py:623 +#: proposals/models.py:625 msgid "Normaal" msgstr "Normal" -#: proposals/models.py:628 +#: proposals/models.py:630 msgid "Voortoetsing" msgstr "Preliminary assessment" -#: proposals/models.py:630 +#: proposals/models.py:632 msgid "Oefening" msgstr "Practice" -#: proposals/models.py:632 +#: proposals/models.py:634 msgid "Extern getoetst" msgstr "External approval" -#: proposals/models.py:730 +#: proposals/models.py:732 msgid "Geen beoordeling door METC noodzakelijk" msgstr "Assessment by METC not required" -#: proposals/models.py:731 +#: proposals/models.py:733 msgid "In afwachting beslissing METC" msgstr "Pending decision by METC" -#: proposals/models.py:732 +#: proposals/models.py:734 msgid "Beslissing METC geüpload" msgstr "METC decision uploaded" -#: proposals/models.py:736 +#: proposals/models.py:738 msgid "" "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling " "waar toetsing door een METC verplicht is gesteld?" @@ -1977,11 +1943,11 @@ msgstr "" "Will the data collection take place at the UMC Utrecht or another " "institution for which an assessment by a METC is required?" -#: proposals/models.py:750 +#: proposals/models.py:752 msgid "Welke instelling?" msgstr "Which institution?" -#: proposals/models.py:756 +#: proposals/models.py:758 msgid "" "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd " "door de WMO)?" @@ -1989,7 +1955,7 @@ msgstr "" "Is the nature of the research question medical (as defined by the Medical " "Research Involving Human Subjects Act (WMO))?" -#: proposals/models.py:758 +#: proposals/models.py:760 msgid "" "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-" "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden " @@ -2010,7 +1976,7 @@ msgstr "" "Committee on Research Involving Human Subjects, Definition of medical " "research, 2005, ccmo.nl)" -#: proposals/models.py:774 +#: proposals/models.py:776 msgid "" "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de " "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?" @@ -2019,15 +1985,15 @@ msgstr "" "registered with the FEtC-H. Has an application for this project already been " "submitted to an METC?" -#: proposals/models.py:781 +#: proposals/models.py:783 msgid "Is de METC al tot een beslissing gekomen?" msgstr "Has the METC already come to a decision?" -#: proposals/models.py:786 +#: proposals/models.py:788 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)" msgstr "Please upload the decision of METC (in .pdf or .doc(x)-format) here" -#: proposals/models.py:824 +#: proposals/models.py:826 #, python-brace-format msgid "WMO {title}, status {status}" msgstr "WMO {title}, status {status}" @@ -2091,298 +2057,6 @@ msgstr "Old" msgid "Nieuw" msgstr "New" -#: proposals/templates/proposals/diff/intervention.html:8 -msgid "" -"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat " -"niet bevat." -msgstr "" -"This revision involves intervention research, whereas the original " -"application does not." - -#: proposals/templates/proposals/diff/intervention.html:12 -msgid "" -"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag " -"dat wel bevat." -msgstr "" -"This revision does not involve intervention research, whereas the original " -"application does include this." - -#: proposals/templates/proposals/diff/intervention.html:28 -msgid "" -"De revisie en de originele aanvraag hebben beide een interventieonderzoek, " -"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere " -"versie van het formulier gebruikt." -msgstr "" -"This revision and the original application both involve intervention " -"research, but this aspect cannot be compared. The revision uses a newer " -"version of the form than the original." - -#: proposals/templates/proposals/diff/intervention_v1.html:8 -#: proposals/templates/proposals/diff/intervention_v2.html:8 -#: proposals/templates/proposals/diff/observation_v1.html:9 -#: proposals/templates/proposals/diff/observation_v2.html:9 -#: proposals/templates/proposals/diff/sessions.html:23 -#: proposals/templates/proposals/diff/sessions.html:42 -#: proposals/templates/proposals/diff/sessions.html:103 -#: proposals/templates/proposals/diff/sessions.html:174 -#: proposals/templates/proposals/diff/study.html:25 -#: proposals/templates/proposals/diff/study.html:151 -#: proposals/templates/proposals/diff/study.html:215 -#: proposals/templates/proposals/proposal_diff.html:53 -#: proposals/templates/proposals/proposal_diff.html:178 -#: proposals/templates/proposals/proposal_diff.html:211 -#: proposals/templates/proposals/proposal_diff.html:244 -#: proposals/templates/proposals/proposal_diff.html:268 -msgid "Originele aanvraag" -msgstr "Original application" - -#: proposals/templates/proposals/diff/intervention_v1.html:9 -#: proposals/templates/proposals/diff/intervention_v2.html:9 -#: proposals/templates/proposals/diff/observation_v1.html:10 -#: proposals/templates/proposals/diff/observation_v2.html:10 -#: proposals/templates/proposals/diff/sessions.html:24 -#: proposals/templates/proposals/diff/sessions.html:43 -#: proposals/templates/proposals/diff/sessions.html:104 -#: proposals/templates/proposals/diff/sessions.html:175 -#: proposals/templates/proposals/diff/study.html:26 -#: proposals/templates/proposals/diff/study.html:152 -#: proposals/templates/proposals/diff/study.html:216 -#: proposals/templates/proposals/proposal_diff.html:54 -#: proposals/templates/proposals/proposal_diff.html:179 -#: proposals/templates/proposals/proposal_diff.html:212 -#: proposals/templates/proposals/proposal_diff.html:245 -#: proposals/templates/proposals/proposal_diff.html:269 -msgid "Revisie/amendement" -msgstr "Revision/amendment" - -#: proposals/templates/proposals/diff/intervention_v1.html:28 -#: proposals/templates/proposals/diff/intervention_v1.html:33 -#: proposals/templates/proposals/diff/intervention_v1.html:42 -#: proposals/templates/proposals/diff/intervention_v1.html:47 -#: proposals/templates/proposals/diff/intervention_v2.html:28 -#: proposals/templates/proposals/diff/intervention_v2.html:33 -#: proposals/templates/proposals/diff/intervention_v2.html:42 -#: proposals/templates/proposals/diff/intervention_v2.html:47 -#: proposals/templates/proposals/diff/intervention_v2.html:62 -#: proposals/templates/proposals/diff/intervention_v2.html:67 -#: proposals/templates/proposals/diff/observation_v1.html:43 -#: proposals/templates/proposals/diff/observation_v1.html:48 -#: proposals/templates/proposals/diff/observation_v2.html:43 -#: proposals/templates/proposals/diff/observation_v2.html:48 -#: proposals/templates/proposals/diff/sessions.html:62 -#: proposals/templates/proposals/diff/sessions.html:67 -#: proposals/templates/proposals/diff/sessions.html:76 -#: proposals/templates/proposals/diff/sessions.html:81 -msgid "ja,nee," -msgstr "yes,no," - -#: proposals/templates/proposals/diff/intervention_v1.html:87 -#: proposals/templates/proposals/diff/intervention_v1.html:92 -#: proposals/templates/proposals/diff/intervention_v2.html:102 -#: proposals/templates/proposals/diff/intervention_v2.html:107 -#: proposals/templates/proposals/diff/observation_v1.html:29 -#: proposals/templates/proposals/diff/observation_v1.html:34 -#: proposals/templates/proposals/diff/observation_v1.html:68 -#: proposals/templates/proposals/diff/observation_v1.html:73 -#: proposals/templates/proposals/diff/observation_v1.html:81 -#: proposals/templates/proposals/diff/observation_v1.html:86 -#: proposals/templates/proposals/diff/observation_v1.html:94 -#: proposals/templates/proposals/diff/observation_v1.html:99 -#: proposals/templates/proposals/diff/observation_v1.html:108 -#: proposals/templates/proposals/diff/observation_v1.html:113 -#: proposals/templates/proposals/diff/observation_v1.html:122 -#: proposals/templates/proposals/diff/observation_v1.html:127 -#: proposals/templates/proposals/diff/observation_v2.html:29 -#: proposals/templates/proposals/diff/observation_v2.html:34 -#: proposals/templates/proposals/diff/observation_v2.html:73 -#: proposals/templates/proposals/diff/observation_v2.html:78 -#: proposals/templates/proposals/diff/observation_v2.html:93 -#: proposals/templates/proposals/diff/observation_v2.html:98 -#: proposals/templates/proposals/diff/observation_v2.html:113 -#: proposals/templates/proposals/diff/observation_v2.html:118 -#: proposals/templates/proposals/diff/observation_v2.html:132 -#: proposals/templates/proposals/diff/observation_v2.html:137 -#: proposals/templates/proposals/diff/observation_v2.html:146 -#: proposals/templates/proposals/diff/observation_v2.html:151 -#: proposals/templates/proposals/diff/sessions.html:151 -#: proposals/templates/proposals/diff/sessions.html:156 -#: proposals/templates/proposals/diff/study.html:43 -#: proposals/templates/proposals/diff/study.html:48 -#: proposals/templates/proposals/diff/study.html:63 -#: proposals/templates/proposals/diff/study.html:64 -#: proposals/templates/proposals/diff/study.html:220 -#: proposals/templates/proposals/diff/study.html:221 -#: proposals/templates/proposals/diff/study.html:262 -#: proposals/templates/proposals/diff/study.html:267 -#: proposals/templates/proposals/pdf/intervention_v1.html:16 -#: proposals/templates/proposals/pdf/intervention_v1.html:20 -#: proposals/templates/proposals/pdf/intervention_v1.html:43 -#: proposals/templates/proposals/pdf/intervention_v2.html:16 -#: proposals/templates/proposals/pdf/intervention_v2.html:20 -#: proposals/templates/proposals/pdf/intervention_v2.html:28 -#: proposals/templates/proposals/pdf/intervention_v2.html:48 -#: proposals/templates/proposals/pdf/intervention_v2.html:57 -#: proposals/templates/proposals/pdf/observation_v1.html:16 -#: proposals/templates/proposals/pdf/observation_v1.html:20 -#: proposals/templates/proposals/pdf/observation_v1.html:31 -#: proposals/templates/proposals/pdf/observation_v1.html:34 -#: proposals/templates/proposals/pdf/observation_v1.html:37 -#: proposals/templates/proposals/pdf/observation_v1.html:41 -#: proposals/templates/proposals/pdf/observation_v1.html:45 -#: proposals/templates/proposals/pdf/observation_v2.html:16 -#: proposals/templates/proposals/pdf/observation_v2.html:20 -#: proposals/templates/proposals/pdf/observation_v2.html:34 -#: proposals/templates/proposals/pdf/observation_v2.html:42 -#: proposals/templates/proposals/pdf/observation_v2.html:50 -#: proposals/templates/proposals/pdf/observation_v2.html:57 -#: proposals/templates/proposals/pdf/observation_v2.html:67 -#: proposals/templates/proposals/proposal_diff.html:95 -#: proposals/templates/proposals/proposal_diff.html:96 -#: proposals/templates/proposals/proposal_diff.html:121 -#: proposals/templates/proposals/proposal_diff.html:122 -#: proposals/templates/proposals/proposal_diff.html:216 -#: proposals/templates/proposals/proposal_diff.html:217 -#: proposals/templates/proposals/proposal_diff.html:221 -#: proposals/templates/proposals/proposal_diff.html:222 -#: proposals/templates/proposals/proposal_diff.html:249 -#: proposals/templates/proposals/proposal_diff.html:250 -#: proposals/templates/proposals/proposal_diff.html:273 -#: proposals/templates/proposals/proposal_diff.html:274 -#: proposals/templates/proposals/proposal_pdf.html:109 -#: proposals/templates/proposals/proposal_pdf.html:125 -#: proposals/templates/proposals/proposal_pdf.html:182 -#: proposals/templates/proposals/proposal_pdf.html:185 -#: proposals/templates/proposals/proposal_pdf.html:204 -#: proposals/templates/proposals/proposal_pdf.html:223 -#: proposals/templates/proposals/proposal_pdf.html:232 -#: proposals/templates/proposals/proposal_pdf.html:274 -#: proposals/templates/proposals/proposal_pdf.html:329 -#: proposals/templates/proposals/proposal_pdf.html:333 -#: proposals/templates/proposals/proposal_pdf.html:369 -#: proposals/templates/proposals/proposal_pdf.html:435 -#: proposals/templates/proposals/proposal_pdf.html:452 -#: proposals/templates/proposals/proposal_pdf.html:516 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91 -#: tasks/templates/tasks/task_list.html:21 -msgid "ja,nee" -msgstr "yes,no" - -#: proposals/templates/proposals/diff/observation.html:8 -msgid "" -"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet " -"bevat." -msgstr "" -"This revision involves observation research, whereas the original " -"application does not." - -#: proposals/templates/proposals/diff/observation.html:12 -msgid "" -"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat " -"wel bevat." -msgstr "" -"This revision does not involve intervention research, whereas the original " -"application involve this." - -#: proposals/templates/proposals/diff/observation.html:28 -msgid "" -"De revisie en de originele aanvraag hebben beide een observatieonderzoek, " -"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere " -"versie van het formulier gebruikt." -msgstr "" -"This revision and the original application both involve observation " -"research, but this aspect cannot be compared. The revision uses a newer " -"version of the form than the original." - -#: proposals/templates/proposals/diff/observation_v1.html:139 -#: proposals/templates/proposals/diff/observation_v1.html:140 -#: proposals/templates/proposals/diff/study.html:233 -#: proposals/templates/proposals/diff/study.html:239 -#: proposals/templates/proposals/diff/study.html:247 -#: proposals/templates/proposals/diff/study.html:253 -#: proposals/templates/proposals/pdf/observation_v1.html:53 -#: proposals/templates/proposals/proposal_diff.html:228 -#: proposals/templates/proposals/proposal_diff.html:232 -#: proposals/templates/proposals/proposal_pdf.html:189 -#: proposals/templates/proposals/proposal_pdf.html:444 -#: proposals/templates/proposals/proposal_pdf.html:447 -#: proposals/templates/proposals/proposal_pdf.html:462 -#: proposals/templates/proposals/proposal_pdf.html:467 -#: proposals/templates/proposals/proposal_pdf.html:472 -#: proposals/templates/proposals/proposal_pdf.html:486 -#: proposals/templates/proposals/proposal_pdf.html:491 -#: proposals/templates/proposals/proposal_pdf.html:507 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105 -msgid "Download" -msgstr "Download" - -#: proposals/templates/proposals/diff/sessions.html:7 -#: proposals/templates/proposals/proposal_pdf.html:308 -#: proposals/templates/proposals/proposal_pdf_empty.html:279 -#: studies/templates/studies/session_start.html:7 -#: studies/templates/studies/session_start.html:17 -#: tasks/templates/tasks/task_form.html:7 -#: tasks/templates/tasks/task_form.html:30 -#: tasks/templates/tasks/task_start.html:7 -#: tasks/templates/tasks/task_start.html:28 -msgid "Het takenonderzoek en interviews" -msgstr "Task-based research and interviews" - -#: proposals/templates/proposals/diff/sessions.html:11 -msgid "" -"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet " -"bevat." -msgstr "" -"This revision involves tasks research, whereas the original application does " -"not." - -#: proposals/templates/proposals/diff/sessions.html:15 -msgid "" -"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel " -"bevat." -msgstr "" -"This revision does not involve tasks research, whereas the original " -"application does involve this." - -#: proposals/templates/proposals/diff/sessions.html:170 -#: proposals/templates/proposals/proposal_pdf.html:381 -#: proposals/templates/proposals/proposal_pdf_empty.html:335 -#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18 -msgid "Overzicht van het takenonderzoek" -msgstr "Overview of task-based research" - -#: proposals/templates/proposals/diff/study.html:9 -#: proposals/templates/proposals/proposal_pdf.html:215 -#: proposals/templates/proposals/proposal_pdf_empty.html:145 -#: studies/templates/studies/study_form.html:7 -#: studies/templates/studies/study_form.html:82 -msgid "De deelnemers" -msgstr "Participants" - -#: proposals/templates/proposals/diff/study.html:14 -msgid "Dit traject is nieuw in de revisie." -msgstr "This trajectory was added in this revision." - -#: proposals/templates/proposals/diff/study.html:18 -msgid "Dit traject is weggehaald uit de revisie" -msgstr "This trajectory was removed in this revision." - -#: proposals/templates/proposals/diff/study.html:144 -#: proposals/templates/proposals/proposal_pdf.html:391 -#: proposals/templates/proposals/proposal_pdf_empty.html:343 -#: studies/templates/studies/study_end.html:7 -#: studies/templates/studies/study_end.html:28 -msgid "Overzicht en eigen beoordeling van het gehele onderzoek" -msgstr "Overview and self-assessment of the entire study" - -#: proposals/templates/proposals/diff/study.html:206 -#: proposals/templates/proposals/proposal_pdf_empty.html:372 -msgid "Informed consent formulieren voor het onderzoek" -msgstr "Informed consent forms for the study" - #: proposals/templates/proposals/proposal_confirm_delete.html:6 #: proposals/templates/proposals/proposal_confirm_delete.html:12 msgid "Aanvraag verwijderen" @@ -2548,8 +2222,8 @@ msgstr "" "follow with regard to data." #: proposals/templates/proposals/proposal_data_management.html:24 -#: proposals/templates/proposals/proposal_pdf.html:499 -#: reviews/templatetags/documents_list.py:250 +#: proposals/utils/pdf_diff_logic.py:954 +#: reviews/templatetags/documents_list.py:245 msgid "Data Management Plan" msgstr "Data Management Plan" @@ -2678,11 +2352,14 @@ msgstr "" "gw@uu.nl." #: proposals/templates/proposals/proposal_diff.html:11 -#: proposals/templates/proposals/proposal_diff.html:37 msgid "Overzicht van wijzigingen" msgstr "Summary of changes" -#: proposals/templates/proposals/proposal_diff.html:39 +#: proposals/templates/proposals/proposal_diff.html:38 +msgid "Overzicht van wijzigingen bij aanmelding " +msgstr "Summary of changes of application " + +#: proposals/templates/proposals/proposal_diff.html:42 msgid "" "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten " "opzichte van de originele aanvraag." @@ -2690,72 +2367,28 @@ msgstr "" "This overview shows the changes made in the revision/amendment with respect " "to the original application." -#: proposals/templates/proposals/proposal_diff.html:49 #: proposals/templates/proposals/proposal_form.html:7 -#: proposals/templates/proposals/proposal_form.html:92 +#: proposals/templates/proposals/proposal_form.html:76 #: proposals/templates/proposals/proposal_form_pre_approved.html:7 #: proposals/templates/proposals/proposal_form_pre_approved.html:81 -#: proposals/templates/proposals/proposal_pdf.html:82 #: proposals/templates/proposals/proposal_pdf_empty.html:60 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59 -#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55 -#: proposals/utils/validate_proposal.py:33 +#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40 +#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33 #: proposals/utils/validate_proposal.py:43 #: proposals/utils/validate_proposal.py:50 #: proposals/utils/validate_proposal.py:57 msgid "Algemene informatie over de aanvraag" msgstr "General information about the application" -#: proposals/templates/proposals/proposal_diff.html:133 -#: proposals/templates/proposals/proposal_diff.html:134 -#: proposals/templates/proposals/proposal_pdf.html:133 -#: proposals/templates/proposals/proposal_pdf.html:520 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99 -msgid "onbekend" -msgstr "unknown" - -#: proposals/templates/proposals/proposal_diff.html:174 -#: proposals/templates/proposals/proposal_pdf.html:159 -#: proposals/templates/proposals/proposal_pdf_empty.html:104 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110 -#: proposals/templates/proposals/wmo_form.html:7 -#: proposals/templates/proposals/wmo_form.html:30 -msgid "" -"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" -msgstr "" -"Ethical assessment by a Medical Ethical Testing Committee (METC) required?" - -#: proposals/templates/proposals/proposal_diff.html:207 -#: proposals/templates/proposals/proposal_pdf.html:179 -#: proposals/templates/proposals/proposal_pdf_empty.html:120 -#: proposals/templates/proposals/wmo_application.html:7 -#: proposals/templates/proposals/wmo_application.html:27 -msgid "Aanmelding bij de METC" -msgstr "Registration with the METC" - -#: proposals/templates/proposals/proposal_diff.html:240 -#: proposals/templates/proposals/proposal_pdf.html:201 -#: proposals/templates/proposals/proposal_pdf_empty.html:134 -#: proposals/templates/proposals/study_start.html:7 -#: proposals/templates/proposals/study_start.html:64 -#: proposals/utils/validate_proposal.py:87 -msgid "Eén of meerdere trajecten?" -msgstr "One or more trajectories?" - -#: proposals/templates/proposals/proposal_diff.html:264 -#: proposals/templates/proposals/proposal_submit.html:179 -msgid "Concept-aanmelding versturen" -msgstr "Submit draft application" - -#: proposals/templates/proposals/proposal_form.html:72 +#: proposals/templates/proposals/proposal_form.html:56 #: proposals/templates/proposals/proposal_form_pre_approved.html:72 #: proposals/templates/proposals/proposal_submit.html:33 msgid "Aantal woorden:" msgstr "Number of words:" -#: proposals/templates/proposals/proposal_form.html:89 +#: proposals/templates/proposals/proposal_form.html:73 #: proposals/templates/proposals/proposal_submit.html:168 msgid "" "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling " @@ -2764,7 +2397,7 @@ msgstr "" "You are currently editing a practice application. These can not be submitted " "to the FETC-H for review." -#: proposals/templates/proposals/proposal_form.html:94 +#: proposals/templates/proposals/proposal_form.html:78 msgid "" "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw " "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD " @@ -2774,7 +2407,7 @@ msgstr "" "supervision. Please note that this form should be filled in as if you were " "that student/PhD candidate. " -#: proposals/templates/proposals/proposal_form.html:121 +#: proposals/templates/proposals/proposal_form.html:105 msgid "" "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag " "ligt, kan de FETC geen officiële goedkeuring meer geven." @@ -2882,7 +2515,7 @@ msgstr "" "Click to submit an application to " "the archive." -#: proposals/templates/proposals/proposal_pdf.html:44 +#: proposals/templates/proposals/proposal_pdf.html:87 #, python-format msgid "" "FETC-GW - %(title)s (referentienummer %(reference_number)s, " @@ -2891,47 +2524,31 @@ msgstr "" "FEtC-H - %(title)s (reference number %(reference_number)s, " "submitted by %(submitter)s)" -#: proposals/templates/proposals/proposal_pdf.html:50 +#: proposals/templates/proposals/proposal_pdf.html:93 #, python-format msgid "%(type)s van referentienummer %(reference_number)s" msgstr "%(type)s of reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:66 +#: proposals/templates/proposals/proposal_pdf.html:109 #, python-format msgid "Referentienummer %(reference_number)s" msgstr "Reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:70 +#: proposals/templates/proposals/proposal_pdf.html:113 msgid "Huidige staat van de aanvraag" msgstr "Current state of the application" -#: proposals/templates/proposals/proposal_pdf.html:73 +#: proposals/templates/proposals/proposal_pdf.html:116 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60 msgid "Indiener" msgstr "Applicant" -#: proposals/templates/proposals/proposal_pdf.html:76 +#: proposals/templates/proposals/proposal_pdf.html:118 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63 #: tasks/templates/tasks/task_list.html:7 msgid "Naam" msgstr "Name" -#: proposals/templates/proposals/proposal_pdf.html:194 -msgid "Niet aangeleverd" -msgstr "Not provided" - -#: proposals/templates/proposals/proposal_pdf.html:481 -#: proposals/templates/proposals/study_consent.html:138 -msgid "Extra formulieren" -msgstr "Additional forms" - -#: proposals/templates/proposals/proposal_pdf.html:513 -#: proposals/templates/proposals/proposal_pdf_empty.html:389 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150 -#: proposals/templates/proposals/proposal_submit.html:181 -msgid "Aanmelding versturen" -msgstr "Submit application" - #: proposals/templates/proposals/proposal_pdf_empty.html:42 msgid "" "\n" @@ -2954,6 +2571,49 @@ msgstr "" " Reference number reference number\n" " " +#: proposals/templates/proposals/proposal_pdf_empty.html:104 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110 +#: proposals/templates/proposals/wmo_form.html:7 +#: proposals/templates/proposals/wmo_form.html:30 +#: proposals/utils/pdf_diff_logic.py:478 +msgid "" +"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" +msgstr "" +"Ethical assessment by a Medical Ethical Testing Committee (METC) required?" + +#: proposals/templates/proposals/proposal_pdf_empty.html:120 +#: proposals/templates/proposals/wmo_application.html:7 +#: proposals/templates/proposals/wmo_application.html:27 +#: proposals/utils/pdf_diff_logic.py:503 +msgid "Aanmelding bij de METC" +msgstr "Registration with the METC" + +#: proposals/templates/proposals/proposal_pdf_empty.html:134 +#: proposals/templates/proposals/study_start.html:7 +#: proposals/templates/proposals/study_start.html:64 +#: proposals/utils/pdf_diff_logic.py:511 +#: proposals/utils/validate_proposal.py:87 +msgid "Eén of meerdere trajecten?" +msgstr "One or more trajectories?" + +#: proposals/templates/proposals/proposal_pdf_empty.html:145 +#: proposals/utils/pdf_diff_logic.py:529 +#: studies/templates/studies/study_form.html:7 +#: studies/templates/studies/study_form.html:82 +msgid "De deelnemers" +msgstr "Participants" + +#: proposals/templates/proposals/proposal_pdf_empty.html:279 +#: proposals/utils/pdf_diff_logic.py:733 +#: studies/templates/studies/session_start.html:7 +#: studies/templates/studies/session_start.html:17 +#: tasks/templates/tasks/task_form.html:7 +#: tasks/templates/tasks/task_form.html:30 +#: tasks/templates/tasks/task_start.html:7 +#: tasks/templates/tasks/task_start.html:28 +msgid "Het takenonderzoek en interviews" +msgstr "Task-based research and interviews" + #: proposals/templates/proposals/proposal_pdf_empty.html:286 #: proposals/templates/proposals/proposal_start.html:62 #: proposals/templates/proposals/proposal_start_practice.html:63 @@ -2968,6 +2628,30 @@ msgstr "Session" msgid "Taak" msgstr "Task" +#: proposals/templates/proposals/proposal_pdf_empty.html:335 +#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7 +#: tasks/templates/tasks/task_end.html:18 +msgid "Overzicht van het takenonderzoek" +msgstr "Overview of task-based research" + +#: proposals/templates/proposals/proposal_pdf_empty.html:343 +#: proposals/utils/pdf_diff_logic.py:821 +#: studies/templates/studies/study_end.html:7 +#: studies/templates/studies/study_end.html:28 +msgid "Overzicht en eigen beoordeling van het gehele onderzoek" +msgstr "Overview and self-assessment of the entire study" + +#: proposals/templates/proposals/proposal_pdf_empty.html:372 +msgid "Informed consent formulieren voor het onderzoek" +msgstr "Informed consent forms for the study" + +#: proposals/templates/proposals/proposal_pdf_empty.html:389 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150 +#: proposals/templates/proposals/proposal_submit.html:181 +#: proposals/utils/pdf_diff_logic.py:962 +msgid "Aanmelding versturen" +msgstr "Submit application" + #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42 #, python-format msgid "" @@ -2993,6 +2677,25 @@ msgstr "" " Reference number %(reference_number)s\n" " " +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91 +#: tasks/templates/tasks/task_list.html:21 +msgid "ja,nee" +msgstr "yes,no" + +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99 +msgid "onbekend" +msgstr "unknown" + +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105 +#: proposals/utils/pdf_diff_logic.py:281 +msgid "Download" +msgstr "Download" + #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41 #, python-format msgid "" @@ -3098,6 +2801,7 @@ msgstr "" #: proposals/templates/proposals/proposal_start.html:53 #: proposals/templates/proposals/proposal_start_practice.html:55 #: proposals/templates/proposals/study_start.html:73 +#: proposals/utils/pdf_diff_logic.py:328 #: reviews/templates/reviews/committee_members_workload.html:24 msgid "Traject" msgstr "Trajectory" @@ -3403,6 +3107,10 @@ msgstr "" msgid "Terug naar beoordeling >>" msgstr "Back to review >>" +#: proposals/templates/proposals/proposal_submit.html:179 +msgid "Concept-aanmelding versturen" +msgstr "Submit draft application" + #: proposals/templates/proposals/proposal_submitted.html:8 #: proposals/templates/proposals/proposal_submitted.html:22 msgid "Aanvraag voor voortoetsing verstuurd" @@ -3452,29 +3160,6 @@ msgstr "" "On this page you can edit the forms related to the proposal " "%(title)s(reference number %(ref_number)s)" -#: proposals/templates/proposals/proposal_update_date_start.html:14 -#: proposals/templates/proposals/proposal_update_date_start.html:31 -msgid "Startdatum aanpassen" -msgstr "Edit start date" - -#: proposals/templates/proposals/proposal_update_date_start.html:17 -msgid "" -"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " -"(referentienummer %(ref_number)s). Let op! Als de review al " -"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " -"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op " -"met" -msgstr "" -"On this page, the start date of proposal %(title)s (reference number " -"%(ref_number)s) can be edited. Note! If the review has " -"already been concluded, the new start date will not be displayed in the PDF. " -"If you would like the PDF to be generated with the new start date, please " -"reach out to " - -#: proposals/templates/proposals/proposal_update_date_start.html:26 -msgid "Vul de datum in als 'DD-MM-YYYY'." -msgstr "Enter the date as 'YYYY-MM-DD'." - #: proposals/templates/proposals/study_consent.html:27 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement" msgstr "Informed consent school director/ head of the institution" @@ -3544,6 +3229,10 @@ msgstr "" msgid "Voeg extra formulieren toe" msgstr "Add additional forms" +#: proposals/templates/proposals/study_consent.html:138 +msgid "Extra formulieren" +msgstr "Additional forms" + #: proposals/templates/proposals/study_start.html:13 msgid "" "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters." @@ -3565,6 +3254,14 @@ msgstr "" "You can now describe the nature of each trajectory of the study on " "the following pages." +#: proposals/templates/proposals/table_with_header_diff.html:13 +msgid "Originele aanvraag" +msgstr "Original application" + +#: proposals/templates/proposals/table_with_header_diff.html:14 +msgid "Revisie/amendement" +msgstr "Revision/amendment" + #: proposals/templates/proposals/translated_consent_forms.html:25 #: proposals/utils/validate_proposal.py:223 msgid "Vertaling informed consent formulieren" @@ -3626,7 +3323,7 @@ msgstr "Route:" #: proposals/templates/proposals/vue_templates/proposal_list.html:187 #: reviews/templates/reviews/vue_templates/decision_list.html:185 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128 -#: reviews/templates/reviews/vue_templates/review_list.html:193 +#: reviews/templates/reviews/vue_templates/review_list.html:184 msgid "Indieners" msgstr "Applicants" @@ -3647,7 +3344,7 @@ msgstr "Hide" #: proposals/templates/proposals/vue_templates/proposal_list.html:139 #: reviews/templates/reviews/vue_templates/decision_list.html:141 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83 -#: reviews/templates/reviews/vue_templates/review_list.html:148 +#: reviews/templates/reviews/vue_templates/review_list.html:139 msgid "Revisie/amendement van" msgstr "Revision/amendment of" @@ -3668,6 +3365,50 @@ msgstr "WMO check" msgid "Opnieuw beginnen" msgstr "Start again" +#: proposals/utils/pdf_diff_logic.py:93 +msgid "" +"Dit onderdeel is nieuw in de revisie en bestond niet in de originele " +"aanvraag." +msgstr "" +"This section was added in the revision, and did not feature in the original " +"application." + +#: proposals/utils/pdf_diff_logic.py:100 +msgid "" +"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie." +msgstr "" +"This section was present in the original application, but was removed for " +"the revision." + +#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126 +msgid "Onbekend" +msgstr "Unknown" + +#: proposals/utils/pdf_diff_logic.py:284 +msgid "Niet aangeleverd" +msgstr "Not provided" + +#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348 +#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381 +msgid "Traject " +msgstr "Trajectory " + +#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384 +msgid "sessie " +msgstr "session " + +#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392 +msgid "Sessie " +msgstr "Session " + +#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394 +msgid ", taak " +msgstr ", task " + +#: proposals/utils/pdf_diff_logic.py:930 +msgid "Extra formulieren " +msgstr "Additional forms " + #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69 #: proposals/utils/validate_proposal.py:76 msgid "Ethische toetsing nodig door een METC?" @@ -3701,11 +3442,11 @@ msgstr "Forms" msgid "Versturen" msgstr "Submit" -#: proposals/utils/proposal_utils.py:416 +#: proposals/utils/proposal_utils.py:415 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: A revised application uses lab facilities" -#: proposals/utils/proposal_utils.py:418 +#: proposals/utils/proposal_utils.py:417 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: New application uses lab facilities" @@ -3754,40 +3495,40 @@ msgstr "" "You must confirm your understanding of the AVG before you can submit your " "application." -#: proposals/views/proposal_views.py:43 +#: proposals/views/proposal_views.py:44 msgid "Publiek archief" msgstr "Public archive" -#: proposals/views/proposal_views.py:44 +#: proposals/views/proposal_views.py:45 msgid "Dit overzicht toont alle goedgekeurde aanvragen." msgstr "This overview shows all approved applications." -#: proposals/views/proposal_views.py:63 +#: proposals/views/proposal_views.py:64 msgid "Mijn aanvraag" msgstr "My application" -#: proposals/views/proposal_views.py:64 +#: proposals/views/proposal_views.py:65 msgid "Dit overzicht toont al je aanvragen." msgstr "This overview shows all your applications." -#: proposals/views/proposal_views.py:77 +#: proposals/views/proposal_views.py:78 msgid "Dit overzicht toont al je nog niet ingediende aanvragen." msgstr "This overview shows all the applications you have not yet submitted." -#: proposals/views/proposal_views.py:89 +#: proposals/views/proposal_views.py:90 msgid "Dit overzicht toont al je ingediende aanvragen." msgstr "This overview shows all the applications you have submitted." -#: proposals/views/proposal_views.py:101 +#: proposals/views/proposal_views.py:102 msgid "Dit overzicht toont al je beoordeelde aanvragen." msgstr "This overview shows all your applications that have been assessed." -#: proposals/views/proposal_views.py:114 +#: proposals/views/proposal_views.py:115 msgid "" "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent." msgstr "This overview shows all your supervised applications." -#: proposals/views/proposal_views.py:127 +#: proposals/views/proposal_views.py:128 msgid "" "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of " "eindverantwoordelijke bij betrokken bent." @@ -3795,15 +3536,15 @@ msgstr "" "This overview shows all practice applications in which you are involved as a " "student, researcher or accountable researcher." -#: proposals/views/proposal_views.py:246 +#: proposals/views/proposal_views.py:247 msgid "Aanvraag verwijderd" msgstr "Application deleted" -#: proposals/views/proposal_views.py:396 +#: proposals/views/proposal_views.py:385 msgid "Wijzigingen opgeslagen" msgstr "Changes saved" -#: proposals/views/proposal_views.py:497 +#: proposals/views/proposal_views.py:486 msgid "Aanvraag gekopieerd" msgstr "Application copied" @@ -3844,7 +3585,7 @@ msgstr "Stage" #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45 #: reviews/templates/reviews/vue_templates/decision_list.html:178 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121 -#: reviews/templates/reviews/vue_templates/review_list.html:186 +#: reviews/templates/reviews/vue_templates/review_list.html:177 msgid "Route" msgstr "Route" @@ -3961,10 +3702,6 @@ msgstr "Not to be assessed further" msgid "Beslissing" msgstr "Decision" -#: reviews/models.py:126 -msgid "Onbekend" -msgstr "Unknown" - #: reviews/models.py:143 msgid "nog geen route" msgstr "no route assigned" @@ -4307,11 +4044,6 @@ msgstr "Edit Data Management Plan" #: reviews/templates/reviews/documents_list.html:44 #: reviews/templates/reviews/documents_list.html:46 -msgid "Startdatum wijzigen" -msgstr "Edit start date" - -#: reviews/templates/reviews/documents_list.html:52 -#: reviews/templates/reviews/documents_list.html:54 msgid "Documenten wijzigen" msgstr "Edit documents" @@ -4590,10 +4322,6 @@ msgstr "Remove this application from the archive" msgid "Plaats aanvraag in archief" msgstr "Add this application to the archive" -#: reviews/templates/reviews/vue_templates/review_list.html:125 -msgid "Reviewronde beëindigd: " -msgstr "Reviewing round ended: " - #: reviews/templatetags/documents_list.py:145 msgid "Hoofdtraject" msgstr "Main trajectory" @@ -4606,47 +4334,47 @@ msgstr "Trajectory {}: {}" msgid "Extra documenten {}" msgstr "Extra documents {}" -#: reviews/templatetags/documents_list.py:214 +#: reviews/templatetags/documents_list.py:213 msgid "Aanmelding" msgstr "Application" -#: reviews/templatetags/documents_list.py:216 +#: reviews/templatetags/documents_list.py:215 msgid "Aanvraag in PDF-vorm" msgstr "Application in PDF format" -#: reviews/templatetags/documents_list.py:233 +#: reviews/templatetags/documents_list.py:228 msgid "Eerdere goedkeuring" msgstr "Prior approval" -#: reviews/templatetags/documents_list.py:241 +#: reviews/templatetags/documents_list.py:236 msgid "Aanvraag bij voortoetsing" msgstr "Application for preliminary assessment" -#: reviews/templatetags/documents_list.py:262 +#: reviews/templatetags/documents_list.py:257 msgid "Beslissing METC" msgstr "Decision by METC" -#: reviews/templatetags/documents_list.py:287 +#: reviews/templatetags/documents_list.py:282 msgid "Informed consent" msgstr "Informed consent" -#: reviews/templatetags/documents_list.py:288 +#: reviews/templatetags/documents_list.py:283 msgid "Informatiebrief" msgstr "Information letter" -#: reviews/templatetags/documents_list.py:289 +#: reviews/templatetags/documents_list.py:284 msgid "Consent declaratie directeur/departementshoofd" msgstr "Declaration of consent school director/head of the department" -#: reviews/templatetags/documents_list.py:291 +#: reviews/templatetags/documents_list.py:286 msgid "Informatiebrief directeur/departementshoofd" msgstr "Information letter school director/head of the department" -#: reviews/templatetags/documents_list.py:293 +#: reviews/templatetags/documents_list.py:288 msgid "Informatiebrief ouders" msgstr "Information letter for the parents" -#: reviews/templatetags/documents_list.py:301 +#: reviews/templatetags/documents_list.py:296 msgid "Toestemmingsdocument observatie" msgstr "Consent document for observation" @@ -5974,3 +5702,147 @@ msgstr "Task edited" #: tasks/views/task_views.py:50 msgid "Taak verwijderd" msgstr "Task deleted" + +#: proposals/forms.py:189 +msgid "Je dient een eindverantwoordelijke op te geven." +msgstr "You are required to specify the researcher with final responsibility." + +#: proposals/models.py:517 +#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 +#: proposals/templates/proposals/vue_templates/proposal_list.html:166 +msgid "Eindverantwoordelijke onderzoeker" +msgstr "Researcher with final responsibility" + +#: proposals/templates/proposals/proposal_update_date_start.html:14 +#: proposals/templates/proposals/proposal_update_date_start.html:31 +msgid "Startdatum aanpassen" +msgstr "Edit start date" + +#: proposals/templates/proposals/proposal_update_date_start.html:17 +msgid "" +"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " +"(referentienummer %(ref_number)s). Let op! Als de review al " +"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " +"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op " +"met" +msgstr "" +"On this page, the start date of proposal %(title)s (reference number " +"%(ref_number)s) can be edited. Note! If the review has " +"already been concluded, the new start date will not be displayed in the PDF. " +"If you would like the PDF to be generated with the new start date, please " +"reach out to " + +#: proposals/templates/proposals/proposal_update_date_start.html:26 +msgid "Vul de datum in als 'DD-MM-YYYY'." +msgstr "Enter the date as 'YYYY-MM-DD'." + +#: reviews/templates/reviews/documents_list.html:44 +#: reviews/templates/reviews/documents_list.html:46 +msgid "Startdatum wijzigen" +msgstr "Edit start date" + +#: reviews/templates/reviews/vue_templates/review_list.html:125 +msgid "Reviewronde beëindigd: " +msgstr "Reviewing round ended: " + +#~ msgid "" +#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat " +#~ "niet bevat." +#~ msgstr "" +#~ "This revision involves intervention research, whereas the original " +#~ "application does not." + +#~ msgid "" +#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag " +#~ "dat wel bevat." +#~ msgstr "" +#~ "This revision does not involve intervention research, whereas the " +#~ "original application does include this." + +#~ msgid "" +#~ "De revisie en de originele aanvraag hebben beide een " +#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt " +#~ "doordat de revisie een andere versie van het formulier gebruikt." +#~ msgstr "" +#~ "This revision and the original application both involve intervention " +#~ "research, but this aspect cannot be compared. The revision uses a newer " +#~ "version of the form than the original." + +#~ msgid "ja,nee," +#~ msgstr "yes,no," + +#~ msgid "" +#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat " +#~ "niet bevat." +#~ msgstr "" +#~ "This revision involves observation research, whereas the original " +#~ "application does not." + +#~ msgid "" +#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag " +#~ "dat wel bevat." +#~ msgstr "" +#~ "This revision does not involve intervention research, whereas the " +#~ "original application involve this." + +#~ msgid "" +#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, " +#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een " +#~ "andere versie van het formulier gebruikt." +#~ msgstr "" +#~ "This revision and the original application both involve observation " +#~ "research, but this aspect cannot be compared. The revision uses a newer " +#~ "version of the form than the original." + +#~ msgid "" +#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet " +#~ "bevat." +#~ msgstr "" +#~ "This revision involves tasks research, whereas the original application " +#~ "does not." + +#~ msgid "" +#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat " +#~ "wel bevat." +#~ msgstr "" +#~ "This revision does not involve tasks research, whereas the original " +#~ "application does involve this." + +#~ msgid "Dit traject is nieuw in de revisie." +#~ msgstr "This trajectory was added in this revision." + +#~ msgid "Dit traject is weggehaald uit de revisie" +#~ msgstr "This trajectory was removed in this revision." + +#, python-format +#~ msgid "" +#~ "Klik hier om opnieuw in te loggen met je " +#~ "Solis-ID." +#~ msgstr "" +#~ "Click here to log in again with your Solis-" +#~ "ID." + +#~ msgid "" +#~ "Aan het einde van de procedure kan je deze aanvraag ter\n" +#~ " verificatie naar je eindverantwoordelijke sturen. De\n" +#~ " eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen " +#~ "en\n" +#~ " indienen bij de FETC-GW.

NB: als je je\n" +#~ " eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n" +#~ " waarschijnlijk eerst één keer inloggen in deze portal. Je kunt " +#~ "nog wel\n" +#~ " verder met de aanvraag, maar vergeet dit veld niet in te vullen " +#~ "voor je de\n" +#~ " aanvraag indient." +#~ msgstr "" +#~ "At the end of the procedure, you can send this application to the " +#~ "researcher with final responsibility for verification. The researcher " +#~ "with final responsibility can then make adjustments and submit the study " +#~ "to the FEtC-H. Note: if you cannot find your supervisor " +#~ "using this field, they may have to log into this portal at least once " +#~ "with their Solis-ID. You can continue filling in the application while " +#~ "you wait for them to do this, but remember to come back and fill in this " +#~ "field before submitting." + +#~ msgid "Werkverdeling overzicht van afgelopen jaar" +#~ msgstr "Workload overview of past year" From 1bcd6a29a387b7287eaa2b8cf91d26017b5675ad Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Wed, 8 Nov 2023 15:52:40 +0100 Subject: [PATCH 6/7] Ty's requested changes --- locale/en/LC_MESSAGES/django.mo | Bin 148903 -> 149824 bytes locale/en/LC_MESSAGES/django.po | 973 ++++++++++-------- proposals/forms.py | 3 + .../proposals/proposal_update_date_start.html | 5 +- reviews/api/views.py | 2 + reviews/templates/reviews/documents_list.html | 8 - .../reviews/vue_templates/review_list.html | 5 +- reviews/templatetags/documents_list.py | 5 - reviews/utils/review_actions.py | 21 + 9 files changed, 599 insertions(+), 423 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 9024e24d3b3c2752f9349179c5099766d275735c..41f2784f491f506863bab211539321cea43c0095 100644 GIT binary patch delta 20518 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\n" "Language-Team: \n" @@ -38,9 +38,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/" #: faqs/menus.py:17 main/templates/base/menu.html:134 #: main/templates/main/index.html:209 +#: proposals/templates/proposals/proposal_pdf.html:430 #: proposals/templates/proposals/study_consent.html:8 #: proposals/templates/proposals/translated_consent_forms.html:7 -#: proposals/utils/pdf_diff_logic.py:859 msgid "Informed consent formulieren" msgstr "Informed consent forms" @@ -109,8 +109,9 @@ msgstr "You can leave feedback on the FEtC-H portal here." #: feedback/templates/feedback/feedback_form.html:23 #: observations/templates/observations/observation_update_attachments.html:39 #: proposals/templates/proposals/proposal_confirmation.html:36 -#: proposals/templates/proposals/proposal_diff.html:58 +#: proposals/templates/proposals/proposal_diff.html:294 #: proposals/templates/proposals/proposal_update_attachments.html:26 +#: proposals/templates/proposals/proposal_update_date_start.html:29 #: reviews/templates/reviews/change_chamber_form.html:19 #: reviews/templates/reviews/decision_form.html:90 #: reviews/templates/reviews/review_assign_form.html:46 @@ -239,8 +240,9 @@ msgstr "How many times a week will the intervention session take place?" #: interventions/templates/interventions/intervention_form.html:7 #: interventions/templates/interventions/intervention_form.html:49 +#: proposals/templates/proposals/diff/intervention.html:4 +#: proposals/templates/proposals/proposal_pdf.html:285 #: proposals/templates/proposals/proposal_pdf_empty.html:186 -#: proposals/utils/pdf_diff_logic.py:586 msgid "Het interventieonderzoek" msgstr "Intervention study" @@ -282,7 +284,7 @@ msgstr "Intervention saved" #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83 -#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648 +#: proposals/forms.py:561 proposals/forms.py:635 proposals/forms.py:650 #: studies/forms.py:104 tasks/forms.py:87 msgid "Dit veld is verplicht." msgstr "This field is required." @@ -301,11 +303,11 @@ msgstr "Log in" msgid "Log uit" msgstr "Log out" -#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234 +#: main/models.py:10 main/utils.py:15 msgid "ja" msgstr "yes" -#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234 +#: main/models.py:11 main/utils.py:15 msgid "nee" msgstr "no" @@ -358,7 +360,7 @@ msgid "Gebruiksersnaam" msgstr "Username" #: main/templates/auth/user_detail.html:30 -#: proposals/templates/proposals/proposal_pdf.html:119 +#: proposals/templates/proposals/proposal_pdf.html:79 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66 msgid "E-mail" msgstr "E-mail" @@ -397,7 +399,7 @@ msgstr "Phase" #: reviews/templates/reviews/committee_members_workload.html:26 #: reviews/templates/reviews/vue_templates/decision_list.html:153 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95 -#: reviews/templates/reviews/vue_templates/review_list.html:151 +#: reviews/templates/reviews/vue_templates/review_list.html:157 msgid "Datum ingediend" msgstr "Date submitted" @@ -405,7 +407,7 @@ msgstr "Date submitted" #: reviews/templates/reviews/committee_members_workload.html:27 #: reviews/templates/reviews/vue_templates/decision_list.html:163 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105 -#: reviews/templates/reviews/vue_templates/review_list.html:161 +#: reviews/templates/reviews/vue_templates/review_list.html:167 msgid "Gewenste einddatum" msgstr "Desired end date" @@ -417,7 +419,7 @@ msgstr "My decision" #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332 #: reviews/models.py:57 #: reviews/templates/reviews/vue_templates/decision_list.html:133 -#: reviews/templates/reviews/vue_templates/review_list.html:131 +#: reviews/templates/reviews/vue_templates/review_list.html:137 msgid "Afhandeling" msgstr "Conclusion" @@ -468,7 +470,7 @@ msgstr "Website export text" #: proposals/templates/proposals/proposal_confirmation.html:25 #: reviews/templates/reviews/vue_templates/decision_list.html:95 #: reviews/templates/reviews/vue_templates/review_list.html:88 -#: reviews/utils/review_actions.py:244 +#: reviews/utils/review_actions.py:245 msgid "Bevestigingsbrief versturen" msgstr "Send confirmation letter" @@ -1154,7 +1156,7 @@ msgid "" msgstr "As might happen on forums where the researcher also has an account." #: observations/models.py:65 observations/models.py:75 -#: observations/models.py:88 proposals/models.py:747 studies/models.py:172 +#: observations/models.py:88 proposals/models.py:745 studies/models.py:172 #: studies/models.py:228 studies/models.py:358 msgid "Licht toe" msgstr "Explain" @@ -1238,8 +1240,9 @@ msgstr "How many hours of observation will take place on average per day?" #: observations/templates/observations/observation_form.html:7 #: observations/templates/observations/observation_form.html:44 +#: proposals/templates/proposals/diff/observation.html:4 +#: proposals/templates/proposals/proposal_pdf.html:297 #: proposals/templates/proposals/proposal_pdf_empty.html:229 -#: proposals/utils/pdf_diff_logic.py:642 msgid "Het observatieonderzoek" msgstr "Observational study" @@ -1265,6 +1268,7 @@ msgstr "Recording behaviour" #: proposals/templates/proposals/proposal_update_attachments.html:7 #: proposals/templates/proposals/proposal_update_attachments.html:14 #: proposals/templates/proposals/proposal_update_attachments.html:25 +#: proposals/templates/proposals/proposal_update_date_start.html:7 #: studies/templates/studies/study_update_attachments.html:7 #: studies/templates/studies/study_update_attachments.html:14 #: studies/templates/studies/study_update_attachments.html:25 @@ -1307,7 +1311,7 @@ msgstr "Last edited" msgid "Datum ingediend bij eindverantwoordelijke" msgstr "Date sent to supervisor" -#: proposals/forms.py:42 proposals/models.py:221 +#: proposals/forms.py:43 proposals/models.py:221 msgid "" "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die " "niet geaffilieerd zijn aan een van de onderzoeksinstituten " @@ -1316,19 +1320,19 @@ msgstr "" "Are there any other researchers involved outside the above-" "mentioned institutes? " -#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25 +#: proposals/forms.py:64 proposals/forms.py:271 proposals/validators.py:25 msgid "Er bestaat al een aanvraag met deze titel." msgstr "There is an existing application with this title." -#: proposals/forms.py:133 +#: proposals/forms.py:135 msgid "Selecteer..." msgstr "Select..." -#: proposals/forms.py:140 +#: proposals/forms.py:141 msgid "Docent" msgstr "Professor" -#: proposals/forms.py:141 +#: proposals/forms.py:142 msgid "" "Vul hier de docent van de cursus in waarbinnen je deze portal moet " "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De " @@ -1339,23 +1343,19 @@ msgstr "" "This application will not be published in the semipublic archive of the FEtC-" "H." -#: proposals/forms.py:192 -msgid "Je dient een promotor/begeleider op te geven." -msgstr "You are required to specify a promotor/supervisor." - -#: proposals/forms.py:199 -msgid "Je kunt niet jezelf als promotor/begeleider opgeven." -msgstr "You cannot submit yourself as the promotor/supervisor." +#: proposals/forms.py:190 +msgid "Je dient een eindverantwoordelijke op te geven." +msgstr "You are required to specify the researcher with final responsibility." -#: proposals/forms.py:213 +#: proposals/forms.py:205 msgid "Je hebt jezelf niet als onderzoekers geselecteerd." msgstr "You have not selected yourself." -#: proposals/forms.py:218 +#: proposals/forms.py:210 msgid "Je hebt geen andere onderzoekers geselecteerd." msgstr "You have not selected any other researchers." -#: proposals/forms.py:228 +#: proposals/forms.py:220 msgid "" "Dit veld is verplicht, maar je kunt later terugkomen om " "hem verder in te vullen." @@ -1363,7 +1363,7 @@ msgstr "" "This field is required, but you may choose to come back to this page later " "to fill it in." -#: proposals/forms.py:238 +#: proposals/forms.py:230 msgid "" "Indien je geen toestemming hebt van een andere ethische commissie, dien je " "het normale formulier in te vullen. Ga terug naar de startpagina, en " @@ -1376,23 +1376,23 @@ msgstr "" "page, and select \"Submit a new application that is completely new in this " "portal\" or \"from a copy of an old application.\"" -#: proposals/forms.py:265 +#: proposals/forms.py:257 msgid "Ik maak een oefenaanvraag aan" msgstr "I am creating a practice application" -#: proposals/forms.py:285 proposals/models.py:538 +#: proposals/forms.py:277 proposals/models.py:536 msgid "Te kopiëren aanvraag" msgstr "Application to be copied" -#: proposals/forms.py:287 proposals/models.py:540 +#: proposals/forms.py:279 proposals/models.py:538 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent." msgstr "This field shows only applications in which you are involved." -#: proposals/forms.py:327 proposals/forms.py:362 +#: proposals/forms.py:319 proposals/forms.py:354 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen." msgstr "You can, if necessary, change the title of your application here." -#: proposals/forms.py:329 proposals/forms.py:364 +#: proposals/forms.py:321 proposals/forms.py:356 msgid "" "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer " "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van " @@ -1402,11 +1402,11 @@ msgstr "" "application is approved, also to employees viewing the archive of this " "portal." -#: proposals/forms.py:336 +#: proposals/forms.py:328 msgid "Te reviseren aanvraag" msgstr "Application to be revised" -#: proposals/forms.py:337 +#: proposals/forms.py:329 msgid "" "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij " "een medeuitvoerende bent." @@ -1414,69 +1414,69 @@ msgstr "" "This field only shows submitted applications that have not been approved " "(yet) in which you are involved." -#: proposals/forms.py:371 +#: proposals/forms.py:363 msgid "Te amenderen aanvraag" msgstr "Application to be amended" -#: proposals/forms.py:372 +#: proposals/forms.py:364 msgid "" "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende " "bent." msgstr "This field shows only approved applications in which you are involved." -#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681 +#: proposals/forms.py:419 proposals/forms.py:549 proposals/forms.py:683 msgid "Dit veld is verplicht om verder te gaan." msgstr "This field is required to continue." -#: proposals/forms.py:435 +#: proposals/forms.py:427 msgid "Je dient een instelling op te geven." msgstr "You are required to specify an institution." -#: proposals/forms.py:493 +#: proposals/forms.py:485 msgid "In dit geval is een beslissing van een METC vereist" msgstr "In this case, a decision by a METC is required" -#: proposals/forms.py:501 +#: proposals/forms.py:493 msgid "Naam traject 1" msgstr "Title of trajectory 1" -#: proposals/forms.py:503 +#: proposals/forms.py:495 msgid "Naam traject 2" msgstr "Title of trajectory 2" -#: proposals/forms.py:505 +#: proposals/forms.py:497 msgid "Naam traject 3" msgstr "Title of trajectory 3" -#: proposals/forms.py:507 +#: proposals/forms.py:499 msgid "Naam traject 4" msgstr "Title of trajectory 4" -#: proposals/forms.py:509 +#: proposals/forms.py:501 msgid "Naam traject 5" msgstr "Title of trajectory 5" -#: proposals/forms.py:511 +#: proposals/forms.py:503 msgid "Naam traject 6" msgstr "Title of trajectory 6" -#: proposals/forms.py:513 +#: proposals/forms.py:505 msgid "Naam traject 7" msgstr "Title of trajectory 7" -#: proposals/forms.py:515 +#: proposals/forms.py:507 msgid "Naam traject 8" msgstr "Title of trajectory 8" -#: proposals/forms.py:517 +#: proposals/forms.py:509 msgid "Naam traject 9" msgstr "Title of trajectory 9" -#: proposals/forms.py:519 +#: proposals/forms.py:511 msgid "Naam traject 10" msgstr "Title of trajectory 10" -#: proposals/forms.py:563 +#: proposals/forms.py:555 msgid "" "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee " "verschillende trajecten zijn." @@ -1484,15 +1484,19 @@ msgstr "" "If different trajectories are used, at least two different trajectories " "should be filled in." -#: proposals/forms.py:640 +#: proposals/forms.py:579 +msgid "Nieuwe beoogde startdatum" +msgstr "New intended start date" + +#: proposals/forms.py:642 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd." msgstr "Declaration of consent for trajectory {} not yet added." -#: proposals/forms.py:644 +#: proposals/forms.py:646 msgid "Informatiebrief voor traject {} nog niet toegevoegd." msgstr "Information letter for trajectory {} not yet added." -#: proposals/forms.py:656 +#: proposals/forms.py:658 msgid "" "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar " "van vandaag." @@ -1500,7 +1504,7 @@ msgstr "" "The embargo-period can last a maximum of 2 years. Pick a date within 2 years " "from today." -#: proposals/forms.py:687 +#: proposals/forms.py:689 msgid "Vul in in welke talen de formulieren worden vertaald." msgstr "Please fill in the languages" @@ -1788,8 +1792,7 @@ msgstr "" "include it here. Supplying a DMP can expedite ethical assessment of " "proposals." -#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980 -#: reviews/models.py:184 +#: proposals/models.py:422 reviews/models.py:184 msgid "Ruimte voor eventuele opmerkingen" msgstr "Space for possible comments" @@ -1856,86 +1859,78 @@ msgstr "" #: proposals/models.py:517 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 #: proposals/templates/proposals/vue_templates/proposal_list.html:166 -msgid "Promotor/Begeleider" -msgstr "Promotor/Supervisor" +msgid "Eindverantwoordelijke onderzoeker" +msgstr "Researcher with final responsibility" #: proposals/models.py:520 msgid "" -"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n" -" naar je promotor of begeleider gestuurd worden. Deze " -"persoon \n" -" is de eindverantwoordelijk onderzoeker, en zal de " -"aanvraag \n" -" vervolgens waar nodig kunnen aanpassen en indienen bij " -"de FETC-GW.\n" -"

Belangrijk: als je je promotor " -"of \n" -" begeleider niet kunt vinden met dit veld, dan moeten " -"zij \n" -" waarschijnlijk eerst één keer inloggen in deze portal. \n" -" Je kunt nog wel verder met de aanvraag, maar vergeet dit " -"veld \n" -" niet in te vullen voor je de aanvraag indient. Je " -"aanvraag \n" -" zal dan namelijk niet in behandeling kunnen worden " -"genomen." -msgstr "" -"At the end of the procedure, you need to send this application to your " -"promotor or supervisor for verification. this person is the researcher with " -"final responsibility and can then make adjustments and submit the study to " -"the FEtC-H. Note: if you cannot find your promotor or " -"supervisor using this field, they may have to log into this portal at least " -"once with their Solis-ID. You can continue filling in the application, while " -"you wait for them to do this, but remember to come back and fill in this " -"field before submitting." - -#: proposals/models.py:547 +"Aan het einde van de procedure kan je deze aanvraag ter\n" +" verificatie naar je eindverantwoordelijke sturen. De\n" +" eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen " +"en\n" +" indienen bij de FETC-GW.

NB: als je je\n" +" eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n" +" waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog " +"wel\n" +" verder met de aanvraag, maar vergeet dit veld niet in te vullen voor " +"je de\n" +" aanvraag indient." +msgstr "" +"At the end of the procedure, you can send this application to the researcher " +"with final responsibility for verification. The researcher with final " +"responsibility can then make adjustments and submit the study to the FEtC-H. " +"Note: if you cannot find your supervisor using this field, " +"they may have to log into this portal at least once with their Solis-ID. You " +"can continue filling in the application while you wait for them to do this, " +"but remember to come back and fill in this field before submitting." + +#: proposals/models.py:545 msgid "" "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?" msgstr "" "Is this application a revision or an amendment of a previously submitted " "application?" -#: proposals/models.py:619 +#: proposals/models.py:617 msgid "Amendement" msgstr "Amendment" -#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328 +#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328 #: reviews/templates/reviews/committee_members_workload.html:36 #: reviews/templates/reviews/committee_members_workload.html:82 #: reviews/templates/reviews/review_detail_sidebar.html:106 msgid "Revisie" msgstr "Revision" -#: proposals/models.py:625 +#: proposals/models.py:623 msgid "Normaal" msgstr "Normal" -#: proposals/models.py:630 +#: proposals/models.py:628 msgid "Voortoetsing" msgstr "Preliminary assessment" -#: proposals/models.py:632 +#: proposals/models.py:630 msgid "Oefening" msgstr "Practice" -#: proposals/models.py:634 +#: proposals/models.py:632 msgid "Extern getoetst" msgstr "External approval" -#: proposals/models.py:732 +#: proposals/models.py:730 msgid "Geen beoordeling door METC noodzakelijk" msgstr "Assessment by METC not required" -#: proposals/models.py:733 +#: proposals/models.py:731 msgid "In afwachting beslissing METC" msgstr "Pending decision by METC" -#: proposals/models.py:734 +#: proposals/models.py:732 msgid "Beslissing METC geüpload" msgstr "METC decision uploaded" -#: proposals/models.py:738 +#: proposals/models.py:736 msgid "" "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling " "waar toetsing door een METC verplicht is gesteld?" @@ -1943,11 +1938,11 @@ msgstr "" "Will the data collection take place at the UMC Utrecht or another " "institution for which an assessment by a METC is required?" -#: proposals/models.py:752 +#: proposals/models.py:750 msgid "Welke instelling?" msgstr "Which institution?" -#: proposals/models.py:758 +#: proposals/models.py:756 msgid "" "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd " "door de WMO)?" @@ -1955,7 +1950,7 @@ msgstr "" "Is the nature of the research question medical (as defined by the Medical " "Research Involving Human Subjects Act (WMO))?" -#: proposals/models.py:760 +#: proposals/models.py:758 msgid "" "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-" "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden " @@ -1976,7 +1971,7 @@ msgstr "" "Committee on Research Involving Human Subjects, Definition of medical " "research, 2005, ccmo.nl)" -#: proposals/models.py:776 +#: proposals/models.py:774 msgid "" "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de " "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?" @@ -1985,15 +1980,15 @@ msgstr "" "registered with the FEtC-H. Has an application for this project already been " "submitted to an METC?" -#: proposals/models.py:783 +#: proposals/models.py:781 msgid "Is de METC al tot een beslissing gekomen?" msgstr "Has the METC already come to a decision?" -#: proposals/models.py:788 +#: proposals/models.py:786 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)" msgstr "Please upload the decision of METC (in .pdf or .doc(x)-format) here" -#: proposals/models.py:826 +#: proposals/models.py:824 #, python-brace-format msgid "WMO {title}, status {status}" msgstr "WMO {title}, status {status}" @@ -2057,6 +2052,298 @@ msgstr "Old" msgid "Nieuw" msgstr "New" +#: proposals/templates/proposals/diff/intervention.html:8 +msgid "" +"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat " +"niet bevat." +msgstr "" +"This revision involves intervention research, whereas the original " +"application does not." + +#: proposals/templates/proposals/diff/intervention.html:12 +msgid "" +"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag " +"dat wel bevat." +msgstr "" +"This revision does not involve intervention research, whereas the original " +"application does include this." + +#: proposals/templates/proposals/diff/intervention.html:28 +msgid "" +"De revisie en de originele aanvraag hebben beide een interventieonderzoek, " +"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere " +"versie van het formulier gebruikt." +msgstr "" +"This revision and the original application both involve intervention " +"research, but this aspect cannot be compared. The revision uses a newer " +"version of the form than the original." + +#: proposals/templates/proposals/diff/intervention_v1.html:8 +#: proposals/templates/proposals/diff/intervention_v2.html:8 +#: proposals/templates/proposals/diff/observation_v1.html:9 +#: proposals/templates/proposals/diff/observation_v2.html:9 +#: proposals/templates/proposals/diff/sessions.html:23 +#: proposals/templates/proposals/diff/sessions.html:42 +#: proposals/templates/proposals/diff/sessions.html:103 +#: proposals/templates/proposals/diff/sessions.html:174 +#: proposals/templates/proposals/diff/study.html:25 +#: proposals/templates/proposals/diff/study.html:151 +#: proposals/templates/proposals/diff/study.html:215 +#: proposals/templates/proposals/proposal_diff.html:53 +#: proposals/templates/proposals/proposal_diff.html:178 +#: proposals/templates/proposals/proposal_diff.html:211 +#: proposals/templates/proposals/proposal_diff.html:244 +#: proposals/templates/proposals/proposal_diff.html:268 +msgid "Originele aanvraag" +msgstr "Original application" + +#: proposals/templates/proposals/diff/intervention_v1.html:9 +#: proposals/templates/proposals/diff/intervention_v2.html:9 +#: proposals/templates/proposals/diff/observation_v1.html:10 +#: proposals/templates/proposals/diff/observation_v2.html:10 +#: proposals/templates/proposals/diff/sessions.html:24 +#: proposals/templates/proposals/diff/sessions.html:43 +#: proposals/templates/proposals/diff/sessions.html:104 +#: proposals/templates/proposals/diff/sessions.html:175 +#: proposals/templates/proposals/diff/study.html:26 +#: proposals/templates/proposals/diff/study.html:152 +#: proposals/templates/proposals/diff/study.html:216 +#: proposals/templates/proposals/proposal_diff.html:54 +#: proposals/templates/proposals/proposal_diff.html:179 +#: proposals/templates/proposals/proposal_diff.html:212 +#: proposals/templates/proposals/proposal_diff.html:245 +#: proposals/templates/proposals/proposal_diff.html:269 +msgid "Revisie/amendement" +msgstr "Revision/amendment" + +#: proposals/templates/proposals/diff/intervention_v1.html:28 +#: proposals/templates/proposals/diff/intervention_v1.html:33 +#: proposals/templates/proposals/diff/intervention_v1.html:42 +#: proposals/templates/proposals/diff/intervention_v1.html:47 +#: proposals/templates/proposals/diff/intervention_v2.html:28 +#: proposals/templates/proposals/diff/intervention_v2.html:33 +#: proposals/templates/proposals/diff/intervention_v2.html:42 +#: proposals/templates/proposals/diff/intervention_v2.html:47 +#: proposals/templates/proposals/diff/intervention_v2.html:62 +#: proposals/templates/proposals/diff/intervention_v2.html:67 +#: proposals/templates/proposals/diff/observation_v1.html:43 +#: proposals/templates/proposals/diff/observation_v1.html:48 +#: proposals/templates/proposals/diff/observation_v2.html:43 +#: proposals/templates/proposals/diff/observation_v2.html:48 +#: proposals/templates/proposals/diff/sessions.html:62 +#: proposals/templates/proposals/diff/sessions.html:67 +#: proposals/templates/proposals/diff/sessions.html:76 +#: proposals/templates/proposals/diff/sessions.html:81 +msgid "ja,nee," +msgstr "yes,no," + +#: proposals/templates/proposals/diff/intervention_v1.html:87 +#: proposals/templates/proposals/diff/intervention_v1.html:92 +#: proposals/templates/proposals/diff/intervention_v2.html:102 +#: proposals/templates/proposals/diff/intervention_v2.html:107 +#: proposals/templates/proposals/diff/observation_v1.html:29 +#: proposals/templates/proposals/diff/observation_v1.html:34 +#: proposals/templates/proposals/diff/observation_v1.html:68 +#: proposals/templates/proposals/diff/observation_v1.html:73 +#: proposals/templates/proposals/diff/observation_v1.html:81 +#: proposals/templates/proposals/diff/observation_v1.html:86 +#: proposals/templates/proposals/diff/observation_v1.html:94 +#: proposals/templates/proposals/diff/observation_v1.html:99 +#: proposals/templates/proposals/diff/observation_v1.html:108 +#: proposals/templates/proposals/diff/observation_v1.html:113 +#: proposals/templates/proposals/diff/observation_v1.html:122 +#: proposals/templates/proposals/diff/observation_v1.html:127 +#: proposals/templates/proposals/diff/observation_v2.html:29 +#: proposals/templates/proposals/diff/observation_v2.html:34 +#: proposals/templates/proposals/diff/observation_v2.html:73 +#: proposals/templates/proposals/diff/observation_v2.html:78 +#: proposals/templates/proposals/diff/observation_v2.html:93 +#: proposals/templates/proposals/diff/observation_v2.html:98 +#: proposals/templates/proposals/diff/observation_v2.html:113 +#: proposals/templates/proposals/diff/observation_v2.html:118 +#: proposals/templates/proposals/diff/observation_v2.html:132 +#: proposals/templates/proposals/diff/observation_v2.html:137 +#: proposals/templates/proposals/diff/observation_v2.html:146 +#: proposals/templates/proposals/diff/observation_v2.html:151 +#: proposals/templates/proposals/diff/sessions.html:151 +#: proposals/templates/proposals/diff/sessions.html:156 +#: proposals/templates/proposals/diff/study.html:43 +#: proposals/templates/proposals/diff/study.html:48 +#: proposals/templates/proposals/diff/study.html:63 +#: proposals/templates/proposals/diff/study.html:64 +#: proposals/templates/proposals/diff/study.html:220 +#: proposals/templates/proposals/diff/study.html:221 +#: proposals/templates/proposals/diff/study.html:262 +#: proposals/templates/proposals/diff/study.html:267 +#: proposals/templates/proposals/pdf/intervention_v1.html:16 +#: proposals/templates/proposals/pdf/intervention_v1.html:20 +#: proposals/templates/proposals/pdf/intervention_v1.html:43 +#: proposals/templates/proposals/pdf/intervention_v2.html:16 +#: proposals/templates/proposals/pdf/intervention_v2.html:20 +#: proposals/templates/proposals/pdf/intervention_v2.html:28 +#: proposals/templates/proposals/pdf/intervention_v2.html:48 +#: proposals/templates/proposals/pdf/intervention_v2.html:57 +#: proposals/templates/proposals/pdf/observation_v1.html:16 +#: proposals/templates/proposals/pdf/observation_v1.html:20 +#: proposals/templates/proposals/pdf/observation_v1.html:31 +#: proposals/templates/proposals/pdf/observation_v1.html:34 +#: proposals/templates/proposals/pdf/observation_v1.html:37 +#: proposals/templates/proposals/pdf/observation_v1.html:41 +#: proposals/templates/proposals/pdf/observation_v1.html:45 +#: proposals/templates/proposals/pdf/observation_v2.html:16 +#: proposals/templates/proposals/pdf/observation_v2.html:20 +#: proposals/templates/proposals/pdf/observation_v2.html:34 +#: proposals/templates/proposals/pdf/observation_v2.html:42 +#: proposals/templates/proposals/pdf/observation_v2.html:50 +#: proposals/templates/proposals/pdf/observation_v2.html:57 +#: proposals/templates/proposals/pdf/observation_v2.html:67 +#: proposals/templates/proposals/proposal_diff.html:95 +#: proposals/templates/proposals/proposal_diff.html:96 +#: proposals/templates/proposals/proposal_diff.html:121 +#: proposals/templates/proposals/proposal_diff.html:122 +#: proposals/templates/proposals/proposal_diff.html:216 +#: proposals/templates/proposals/proposal_diff.html:217 +#: proposals/templates/proposals/proposal_diff.html:221 +#: proposals/templates/proposals/proposal_diff.html:222 +#: proposals/templates/proposals/proposal_diff.html:249 +#: proposals/templates/proposals/proposal_diff.html:250 +#: proposals/templates/proposals/proposal_diff.html:273 +#: proposals/templates/proposals/proposal_diff.html:274 +#: proposals/templates/proposals/proposal_pdf.html:109 +#: proposals/templates/proposals/proposal_pdf.html:125 +#: proposals/templates/proposals/proposal_pdf.html:182 +#: proposals/templates/proposals/proposal_pdf.html:185 +#: proposals/templates/proposals/proposal_pdf.html:204 +#: proposals/templates/proposals/proposal_pdf.html:223 +#: proposals/templates/proposals/proposal_pdf.html:232 +#: proposals/templates/proposals/proposal_pdf.html:274 +#: proposals/templates/proposals/proposal_pdf.html:329 +#: proposals/templates/proposals/proposal_pdf.html:333 +#: proposals/templates/proposals/proposal_pdf.html:369 +#: proposals/templates/proposals/proposal_pdf.html:435 +#: proposals/templates/proposals/proposal_pdf.html:452 +#: proposals/templates/proposals/proposal_pdf.html:516 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91 +#: tasks/templates/tasks/task_list.html:21 +msgid "ja,nee" +msgstr "yes,no" + +#: proposals/templates/proposals/diff/observation.html:8 +msgid "" +"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet " +"bevat." +msgstr "" +"This revision involves observation research, whereas the original " +"application does not." + +#: proposals/templates/proposals/diff/observation.html:12 +msgid "" +"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat " +"wel bevat." +msgstr "" +"This revision does not involve intervention research, whereas the original " +"application involve this." + +#: proposals/templates/proposals/diff/observation.html:28 +msgid "" +"De revisie en de originele aanvraag hebben beide een observatieonderzoek, " +"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere " +"versie van het formulier gebruikt." +msgstr "" +"This revision and the original application both involve observation " +"research, but this aspect cannot be compared. The revision uses a newer " +"version of the form than the original." + +#: proposals/templates/proposals/diff/observation_v1.html:139 +#: proposals/templates/proposals/diff/observation_v1.html:140 +#: proposals/templates/proposals/diff/study.html:233 +#: proposals/templates/proposals/diff/study.html:239 +#: proposals/templates/proposals/diff/study.html:247 +#: proposals/templates/proposals/diff/study.html:253 +#: proposals/templates/proposals/pdf/observation_v1.html:53 +#: proposals/templates/proposals/proposal_diff.html:228 +#: proposals/templates/proposals/proposal_diff.html:232 +#: proposals/templates/proposals/proposal_pdf.html:189 +#: proposals/templates/proposals/proposal_pdf.html:444 +#: proposals/templates/proposals/proposal_pdf.html:447 +#: proposals/templates/proposals/proposal_pdf.html:462 +#: proposals/templates/proposals/proposal_pdf.html:467 +#: proposals/templates/proposals/proposal_pdf.html:472 +#: proposals/templates/proposals/proposal_pdf.html:486 +#: proposals/templates/proposals/proposal_pdf.html:491 +#: proposals/templates/proposals/proposal_pdf.html:507 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105 +msgid "Download" +msgstr "Download" + +#: proposals/templates/proposals/diff/sessions.html:7 +#: proposals/templates/proposals/proposal_pdf.html:308 +#: proposals/templates/proposals/proposal_pdf_empty.html:279 +#: studies/templates/studies/session_start.html:7 +#: studies/templates/studies/session_start.html:17 +#: tasks/templates/tasks/task_form.html:7 +#: tasks/templates/tasks/task_form.html:30 +#: tasks/templates/tasks/task_start.html:7 +#: tasks/templates/tasks/task_start.html:28 +msgid "Het takenonderzoek en interviews" +msgstr "Task-based research and interviews" + +#: proposals/templates/proposals/diff/sessions.html:11 +msgid "" +"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet " +"bevat." +msgstr "" +"This revision involves tasks research, whereas the original application does " +"not." + +#: proposals/templates/proposals/diff/sessions.html:15 +msgid "" +"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel " +"bevat." +msgstr "" +"This revision does not involve tasks research, whereas the original " +"application does involve this." + +#: proposals/templates/proposals/diff/sessions.html:170 +#: proposals/templates/proposals/proposal_pdf.html:381 +#: proposals/templates/proposals/proposal_pdf_empty.html:335 +#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18 +msgid "Overzicht van het takenonderzoek" +msgstr "Overview of task-based research" + +#: proposals/templates/proposals/diff/study.html:9 +#: proposals/templates/proposals/proposal_pdf.html:215 +#: proposals/templates/proposals/proposal_pdf_empty.html:145 +#: studies/templates/studies/study_form.html:7 +#: studies/templates/studies/study_form.html:82 +msgid "De deelnemers" +msgstr "Participants" + +#: proposals/templates/proposals/diff/study.html:14 +msgid "Dit traject is nieuw in de revisie." +msgstr "This trajectory was added in this revision." + +#: proposals/templates/proposals/diff/study.html:18 +msgid "Dit traject is weggehaald uit de revisie" +msgstr "This trajectory was removed in this revision." + +#: proposals/templates/proposals/diff/study.html:144 +#: proposals/templates/proposals/proposal_pdf.html:391 +#: proposals/templates/proposals/proposal_pdf_empty.html:343 +#: studies/templates/studies/study_end.html:7 +#: studies/templates/studies/study_end.html:28 +msgid "Overzicht en eigen beoordeling van het gehele onderzoek" +msgstr "Overview and self-assessment of the entire study" + +#: proposals/templates/proposals/diff/study.html:206 +#: proposals/templates/proposals/proposal_pdf_empty.html:372 +msgid "Informed consent formulieren voor het onderzoek" +msgstr "Informed consent forms for the study" + #: proposals/templates/proposals/proposal_confirm_delete.html:6 #: proposals/templates/proposals/proposal_confirm_delete.html:12 msgid "Aanvraag verwijderen" @@ -2222,7 +2509,7 @@ msgstr "" "follow with regard to data." #: proposals/templates/proposals/proposal_data_management.html:24 -#: proposals/utils/pdf_diff_logic.py:954 +#: proposals/templates/proposals/proposal_pdf.html:499 #: reviews/templatetags/documents_list.py:245 msgid "Data Management Plan" msgstr "Data Management Plan" @@ -2352,14 +2639,11 @@ msgstr "" "gw@uu.nl." #: proposals/templates/proposals/proposal_diff.html:11 +#: proposals/templates/proposals/proposal_diff.html:37 msgid "Overzicht van wijzigingen" msgstr "Summary of changes" -#: proposals/templates/proposals/proposal_diff.html:38 -msgid "Overzicht van wijzigingen bij aanmelding " -msgstr "Summary of changes of application " - -#: proposals/templates/proposals/proposal_diff.html:42 +#: proposals/templates/proposals/proposal_diff.html:39 msgid "" "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten " "opzichte van de originele aanvraag." @@ -2367,28 +2651,72 @@ msgstr "" "This overview shows the changes made in the revision/amendment with respect " "to the original application." +#: proposals/templates/proposals/proposal_diff.html:49 #: proposals/templates/proposals/proposal_form.html:7 -#: proposals/templates/proposals/proposal_form.html:76 +#: proposals/templates/proposals/proposal_form.html:92 #: proposals/templates/proposals/proposal_form_pre_approved.html:7 #: proposals/templates/proposals/proposal_form_pre_approved.html:81 +#: proposals/templates/proposals/proposal_pdf.html:82 #: proposals/templates/proposals/proposal_pdf_empty.html:60 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59 -#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40 -#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33 +#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55 +#: proposals/utils/validate_proposal.py:33 #: proposals/utils/validate_proposal.py:43 #: proposals/utils/validate_proposal.py:50 #: proposals/utils/validate_proposal.py:57 msgid "Algemene informatie over de aanvraag" msgstr "General information about the application" -#: proposals/templates/proposals/proposal_form.html:56 +#: proposals/templates/proposals/proposal_diff.html:133 +#: proposals/templates/proposals/proposal_diff.html:134 +#: proposals/templates/proposals/proposal_pdf.html:133 +#: proposals/templates/proposals/proposal_pdf.html:520 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99 +msgid "onbekend" +msgstr "unknown" + +#: proposals/templates/proposals/proposal_diff.html:174 +#: proposals/templates/proposals/proposal_pdf.html:159 +#: proposals/templates/proposals/proposal_pdf_empty.html:104 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110 +#: proposals/templates/proposals/wmo_form.html:7 +#: proposals/templates/proposals/wmo_form.html:30 +msgid "" +"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" +msgstr "" +"Ethical assessment by a Medical Ethical Testing Committee (METC) required?" + +#: proposals/templates/proposals/proposal_diff.html:207 +#: proposals/templates/proposals/proposal_pdf.html:179 +#: proposals/templates/proposals/proposal_pdf_empty.html:120 +#: proposals/templates/proposals/wmo_application.html:7 +#: proposals/templates/proposals/wmo_application.html:27 +msgid "Aanmelding bij de METC" +msgstr "Registration with the METC" + +#: proposals/templates/proposals/proposal_diff.html:240 +#: proposals/templates/proposals/proposal_pdf.html:201 +#: proposals/templates/proposals/proposal_pdf_empty.html:134 +#: proposals/templates/proposals/study_start.html:7 +#: proposals/templates/proposals/study_start.html:64 +#: proposals/utils/validate_proposal.py:87 +msgid "Eén of meerdere trajecten?" +msgstr "One or more trajectories?" + +#: proposals/templates/proposals/proposal_diff.html:264 +#: proposals/templates/proposals/proposal_submit.html:179 +msgid "Concept-aanmelding versturen" +msgstr "Submit draft application" + +#: proposals/templates/proposals/proposal_form.html:72 #: proposals/templates/proposals/proposal_form_pre_approved.html:72 #: proposals/templates/proposals/proposal_submit.html:33 msgid "Aantal woorden:" msgstr "Number of words:" -#: proposals/templates/proposals/proposal_form.html:73 +#: proposals/templates/proposals/proposal_form.html:89 #: proposals/templates/proposals/proposal_submit.html:168 msgid "" "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling " @@ -2397,7 +2725,7 @@ msgstr "" "You are currently editing a practice application. These can not be submitted " "to the FETC-H for review." -#: proposals/templates/proposals/proposal_form.html:78 +#: proposals/templates/proposals/proposal_form.html:94 msgid "" "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw " "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD " @@ -2407,7 +2735,7 @@ msgstr "" "supervision. Please note that this form should be filled in as if you were " "that student/PhD candidate. " -#: proposals/templates/proposals/proposal_form.html:105 +#: proposals/templates/proposals/proposal_form.html:121 msgid "" "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag " "ligt, kan de FETC geen officiële goedkeuring meer geven." @@ -2515,7 +2843,7 @@ msgstr "" "Click to submit an application to " "the archive." -#: proposals/templates/proposals/proposal_pdf.html:87 +#: proposals/templates/proposals/proposal_pdf.html:44 #, python-format msgid "" "FETC-GW - %(title)s (referentienummer %(reference_number)s, " @@ -2524,31 +2852,47 @@ msgstr "" "FEtC-H - %(title)s (reference number %(reference_number)s, " "submitted by %(submitter)s)" -#: proposals/templates/proposals/proposal_pdf.html:93 +#: proposals/templates/proposals/proposal_pdf.html:50 #, python-format msgid "%(type)s van referentienummer %(reference_number)s" msgstr "%(type)s of reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:109 +#: proposals/templates/proposals/proposal_pdf.html:66 #, python-format msgid "Referentienummer %(reference_number)s" msgstr "Reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:113 +#: proposals/templates/proposals/proposal_pdf.html:70 msgid "Huidige staat van de aanvraag" msgstr "Current state of the application" -#: proposals/templates/proposals/proposal_pdf.html:116 +#: proposals/templates/proposals/proposal_pdf.html:73 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60 msgid "Indiener" msgstr "Applicant" -#: proposals/templates/proposals/proposal_pdf.html:118 +#: proposals/templates/proposals/proposal_pdf.html:76 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63 #: tasks/templates/tasks/task_list.html:7 msgid "Naam" msgstr "Name" +#: proposals/templates/proposals/proposal_pdf.html:194 +msgid "Niet aangeleverd" +msgstr "Not provided" + +#: proposals/templates/proposals/proposal_pdf.html:481 +#: proposals/templates/proposals/study_consent.html:138 +msgid "Extra formulieren" +msgstr "Additional forms" + +#: proposals/templates/proposals/proposal_pdf.html:513 +#: proposals/templates/proposals/proposal_pdf_empty.html:389 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150 +#: proposals/templates/proposals/proposal_submit.html:181 +msgid "Aanmelding versturen" +msgstr "Submit application" + #: proposals/templates/proposals/proposal_pdf_empty.html:42 msgid "" "\n" @@ -2571,49 +2915,6 @@ msgstr "" " Reference number reference number\n" " " -#: proposals/templates/proposals/proposal_pdf_empty.html:104 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110 -#: proposals/templates/proposals/wmo_form.html:7 -#: proposals/templates/proposals/wmo_form.html:30 -#: proposals/utils/pdf_diff_logic.py:478 -msgid "" -"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" -msgstr "" -"Ethical assessment by a Medical Ethical Testing Committee (METC) required?" - -#: proposals/templates/proposals/proposal_pdf_empty.html:120 -#: proposals/templates/proposals/wmo_application.html:7 -#: proposals/templates/proposals/wmo_application.html:27 -#: proposals/utils/pdf_diff_logic.py:503 -msgid "Aanmelding bij de METC" -msgstr "Registration with the METC" - -#: proposals/templates/proposals/proposal_pdf_empty.html:134 -#: proposals/templates/proposals/study_start.html:7 -#: proposals/templates/proposals/study_start.html:64 -#: proposals/utils/pdf_diff_logic.py:511 -#: proposals/utils/validate_proposal.py:87 -msgid "Eén of meerdere trajecten?" -msgstr "One or more trajectories?" - -#: proposals/templates/proposals/proposal_pdf_empty.html:145 -#: proposals/utils/pdf_diff_logic.py:529 -#: studies/templates/studies/study_form.html:7 -#: studies/templates/studies/study_form.html:82 -msgid "De deelnemers" -msgstr "Participants" - -#: proposals/templates/proposals/proposal_pdf_empty.html:279 -#: proposals/utils/pdf_diff_logic.py:733 -#: studies/templates/studies/session_start.html:7 -#: studies/templates/studies/session_start.html:17 -#: tasks/templates/tasks/task_form.html:7 -#: tasks/templates/tasks/task_form.html:30 -#: tasks/templates/tasks/task_start.html:7 -#: tasks/templates/tasks/task_start.html:28 -msgid "Het takenonderzoek en interviews" -msgstr "Task-based research and interviews" - #: proposals/templates/proposals/proposal_pdf_empty.html:286 #: proposals/templates/proposals/proposal_start.html:62 #: proposals/templates/proposals/proposal_start_practice.html:63 @@ -2628,30 +2929,6 @@ msgstr "Session" msgid "Taak" msgstr "Task" -#: proposals/templates/proposals/proposal_pdf_empty.html:335 -#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7 -#: tasks/templates/tasks/task_end.html:18 -msgid "Overzicht van het takenonderzoek" -msgstr "Overview of task-based research" - -#: proposals/templates/proposals/proposal_pdf_empty.html:343 -#: proposals/utils/pdf_diff_logic.py:821 -#: studies/templates/studies/study_end.html:7 -#: studies/templates/studies/study_end.html:28 -msgid "Overzicht en eigen beoordeling van het gehele onderzoek" -msgstr "Overview and self-assessment of the entire study" - -#: proposals/templates/proposals/proposal_pdf_empty.html:372 -msgid "Informed consent formulieren voor het onderzoek" -msgstr "Informed consent forms for the study" - -#: proposals/templates/proposals/proposal_pdf_empty.html:389 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150 -#: proposals/templates/proposals/proposal_submit.html:181 -#: proposals/utils/pdf_diff_logic.py:962 -msgid "Aanmelding versturen" -msgstr "Submit application" - #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42 #, python-format msgid "" @@ -2677,25 +2954,6 @@ msgstr "" " Reference number %(reference_number)s\n" " " -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91 -#: tasks/templates/tasks/task_list.html:21 -msgid "ja,nee" -msgstr "yes,no" - -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99 -msgid "onbekend" -msgstr "unknown" - -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105 -#: proposals/utils/pdf_diff_logic.py:281 -msgid "Download" -msgstr "Download" - #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41 #, python-format msgid "" @@ -2801,7 +3059,6 @@ msgstr "" #: proposals/templates/proposals/proposal_start.html:53 #: proposals/templates/proposals/proposal_start_practice.html:55 #: proposals/templates/proposals/study_start.html:73 -#: proposals/utils/pdf_diff_logic.py:328 #: reviews/templates/reviews/committee_members_workload.html:24 msgid "Traject" msgstr "Trajectory" @@ -3107,10 +3364,6 @@ msgstr "" msgid "Terug naar beoordeling >>" msgstr "Back to review >>" -#: proposals/templates/proposals/proposal_submit.html:179 -msgid "Concept-aanmelding versturen" -msgstr "Submit draft application" - #: proposals/templates/proposals/proposal_submitted.html:8 #: proposals/templates/proposals/proposal_submitted.html:22 msgid "Aanvraag voor voortoetsing verstuurd" @@ -3160,6 +3413,25 @@ msgstr "" "On this page you can edit the forms related to the proposal " "%(title)s(reference number %(ref_number)s)" +#: proposals/templates/proposals/proposal_update_date_start.html:14 +#: proposals/templates/proposals/proposal_update_date_start.html:28 +msgid "Startdatum aanpassen" +msgstr "Edit start date" + +#: proposals/templates/proposals/proposal_update_date_start.html:17 +msgid "" +"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " +"(referentienummer %(ref_number)s). Let op! Als de review al " +"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " +"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op " +"met" +msgstr "" +"On this page, the start date of proposal %(title)s (reference number " +"%(ref_number)s) can be edited. Note! If the review has " +"already been concluded, the new start date will not be displayed in the PDF. " +"If you would like the PDF to be generated with the new start date, please " +"reach out to " + #: proposals/templates/proposals/study_consent.html:27 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement" msgstr "Informed consent school director/ head of the institution" @@ -3229,10 +3501,6 @@ msgstr "" msgid "Voeg extra formulieren toe" msgstr "Add additional forms" -#: proposals/templates/proposals/study_consent.html:138 -msgid "Extra formulieren" -msgstr "Additional forms" - #: proposals/templates/proposals/study_start.html:13 msgid "" "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters." @@ -3254,14 +3522,6 @@ msgstr "" "You can now describe the nature of each trajectory of the study on " "the following pages." -#: proposals/templates/proposals/table_with_header_diff.html:13 -msgid "Originele aanvraag" -msgstr "Original application" - -#: proposals/templates/proposals/table_with_header_diff.html:14 -msgid "Revisie/amendement" -msgstr "Revision/amendment" - #: proposals/templates/proposals/translated_consent_forms.html:25 #: proposals/utils/validate_proposal.py:223 msgid "Vertaling informed consent formulieren" @@ -3323,7 +3583,7 @@ msgstr "Route:" #: proposals/templates/proposals/vue_templates/proposal_list.html:187 #: reviews/templates/reviews/vue_templates/decision_list.html:185 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128 -#: reviews/templates/reviews/vue_templates/review_list.html:184 +#: reviews/templates/reviews/vue_templates/review_list.html:190 msgid "Indieners" msgstr "Applicants" @@ -3344,7 +3604,7 @@ msgstr "Hide" #: proposals/templates/proposals/vue_templates/proposal_list.html:139 #: reviews/templates/reviews/vue_templates/decision_list.html:141 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83 -#: reviews/templates/reviews/vue_templates/review_list.html:139 +#: reviews/templates/reviews/vue_templates/review_list.html:145 msgid "Revisie/amendement van" msgstr "Revision/amendment of" @@ -3365,50 +3625,6 @@ msgstr "WMO check" msgid "Opnieuw beginnen" msgstr "Start again" -#: proposals/utils/pdf_diff_logic.py:93 -msgid "" -"Dit onderdeel is nieuw in de revisie en bestond niet in de originele " -"aanvraag." -msgstr "" -"This section was added in the revision, and did not feature in the original " -"application." - -#: proposals/utils/pdf_diff_logic.py:100 -msgid "" -"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie." -msgstr "" -"This section was present in the original application, but was removed for " -"the revision." - -#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126 -msgid "Onbekend" -msgstr "Unknown" - -#: proposals/utils/pdf_diff_logic.py:284 -msgid "Niet aangeleverd" -msgstr "Not provided" - -#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348 -#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381 -msgid "Traject " -msgstr "Trajectory " - -#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384 -msgid "sessie " -msgstr "session " - -#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392 -msgid "Sessie " -msgstr "Session " - -#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394 -msgid ", taak " -msgstr ", task " - -#: proposals/utils/pdf_diff_logic.py:930 -msgid "Extra formulieren " -msgstr "Additional forms " - #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69 #: proposals/utils/validate_proposal.py:76 msgid "Ethische toetsing nodig door een METC?" @@ -3442,11 +3658,11 @@ msgstr "Forms" msgid "Versturen" msgstr "Submit" -#: proposals/utils/proposal_utils.py:415 +#: proposals/utils/proposal_utils.py:416 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: A revised application uses lab facilities" -#: proposals/utils/proposal_utils.py:417 +#: proposals/utils/proposal_utils.py:418 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: New application uses lab facilities" @@ -3540,11 +3756,11 @@ msgstr "" msgid "Aanvraag verwijderd" msgstr "Application deleted" -#: proposals/views/proposal_views.py:385 +#: proposals/views/proposal_views.py:397 msgid "Wijzigingen opgeslagen" msgstr "Changes saved" -#: proposals/views/proposal_views.py:486 +#: proposals/views/proposal_views.py:498 msgid "Aanvraag gekopieerd" msgstr "Application copied" @@ -3585,7 +3801,7 @@ msgstr "Stage" #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45 #: reviews/templates/reviews/vue_templates/decision_list.html:178 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121 -#: reviews/templates/reviews/vue_templates/review_list.html:177 +#: reviews/templates/reviews/vue_templates/review_list.html:183 msgid "Route" msgstr "Route" @@ -3702,6 +3918,10 @@ msgstr "Not to be assessed further" msgid "Beslissing" msgstr "Decision" +#: reviews/models.py:126 +msgid "Onbekend" +msgstr "Unknown" + #: reviews/models.py:143 msgid "nog geen route" msgstr "no route assigned" @@ -4314,7 +4534,7 @@ msgid "Verplaats naar andere kamer" msgstr "Move study to different reviewing chamber" #: reviews/templates/reviews/vue_templates/review_list.html:95 -#: reviews/utils/review_actions.py:281 +#: reviews/utils/review_actions.py:282 msgid "Verberg aanvraag uit het archief" msgstr "Remove this application from the archive" @@ -4322,6 +4542,10 @@ msgstr "Remove this application from the archive" msgid "Plaats aanvraag in archief" msgstr "Add this application to the archive" +#: reviews/templates/reviews/vue_templates/review_list.html:122 +msgid "Reviewronde beëindigd: " +msgstr "Reviewing round ended: " + #: reviews/templatetags/documents_list.py:145 msgid "Hoofdtraject" msgstr "Main trajectory" @@ -4378,30 +4602,34 @@ msgstr "Information letter for the parents" msgid "Toestemmingsdocument observatie" msgstr "Consent document for observation" -#: reviews/utils/review_actions.py:129 +#: reviews/utils/review_actions.py:130 msgid "Geef jouw beslissing en/of commentaar door" msgstr "Provide feedback on this proposal" -#: reviews/utils/review_actions.py:155 +#: reviews/utils/review_actions.py:156 msgid "Deze aanvraag afsluiten" msgstr "Conclude this application" -#: reviews/utils/review_actions.py:185 +#: reviews/utils/review_actions.py:186 msgid "Beëindig definitief de afhandeling van deze aanvraag" msgstr "Discontinue assessment of this application" -#: reviews/utils/review_actions.py:215 +#: reviews/utils/review_actions.py:216 msgid "Verander aangestelde commissieleden" msgstr "Change appointment of committee members" -#: reviews/utils/review_actions.py:245 +#: reviews/utils/review_actions.py:246 msgid "Datum van bevestigingsbrief aanpassen" msgstr "Change date of confirmation letter" -#: reviews/utils/review_actions.py:283 +#: reviews/utils/review_actions.py:284 msgid "Plaats aanvraag in het archief." msgstr "Add this application to the archive" +#: reviews/utils/review_actions.py:304 +msgid "Startdatum wijzigen" +msgstr "Edit start date" + #: reviews/utils/review_utils.py:54 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding" msgstr "FEtC-H {}: confirmation of draft application submission" @@ -5703,116 +5931,79 @@ msgstr "Task edited" msgid "Taak verwijderd" msgstr "Task deleted" -#: proposals/forms.py:189 -msgid "Je dient een eindverantwoordelijke op te geven." -msgstr "You are required to specify the researcher with final responsibility." +#~ msgid "Je dient een promotor/begeleider op te geven." +#~ msgstr "You are required to specify a promotor/supervisor." -#: proposals/models.py:517 -#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 -#: proposals/templates/proposals/vue_templates/proposal_list.html:166 -msgid "Eindverantwoordelijke onderzoeker" -msgstr "Researcher with final responsibility" +#~ msgid "Je kunt niet jezelf als promotor/begeleider opgeven." +#~ msgstr "You cannot submit yourself as the promotor/supervisor." -#: proposals/templates/proposals/proposal_update_date_start.html:14 -#: proposals/templates/proposals/proposal_update_date_start.html:31 -msgid "Startdatum aanpassen" -msgstr "Edit start date" - -#: proposals/templates/proposals/proposal_update_date_start.html:17 -msgid "" -"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " -"(referentienummer %(ref_number)s). Let op! Als de review al " -"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " -"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op " -"met" -msgstr "" -"On this page, the start date of proposal %(title)s (reference number " -"%(ref_number)s) can be edited. Note! If the review has " -"already been concluded, the new start date will not be displayed in the PDF. " -"If you would like the PDF to be generated with the new start date, please " -"reach out to " - -#: proposals/templates/proposals/proposal_update_date_start.html:26 -msgid "Vul de datum in als 'DD-MM-YYYY'." -msgstr "Enter the date as 'YYYY-MM-DD'." - -#: reviews/templates/reviews/documents_list.html:44 -#: reviews/templates/reviews/documents_list.html:46 -msgid "Startdatum wijzigen" -msgstr "Edit start date" - -#: reviews/templates/reviews/vue_templates/review_list.html:125 -msgid "Reviewronde beëindigd: " -msgstr "Reviewing round ended: " +#~ msgid "Promotor/Begeleider" +#~ msgstr "Promotor/Supervisor" #~ msgid "" -#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat " -#~ "niet bevat." +#~ "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n" +#~ " naar je promotor of begeleider gestuurd worden. Deze " +#~ "persoon \n" +#~ " is de eindverantwoordelijk onderzoeker, en zal de " +#~ "aanvraag \n" +#~ " vervolgens waar nodig kunnen aanpassen en indienen " +#~ "bij de FETC-GW.\n" +#~ "

Belangrijk: als je je " +#~ "promotor of \n" +#~ " begeleider niet kunt vinden met dit veld, dan moeten " +#~ "zij \n" +#~ " waarschijnlijk eerst één keer inloggen in deze " +#~ "portal. \n" +#~ " Je kunt nog wel verder met de aanvraag, maar vergeet " +#~ "dit veld \n" +#~ " niet in te vullen voor je de aanvraag indient. Je " +#~ "aanvraag \n" +#~ " zal dan namelijk niet in behandeling kunnen worden " +#~ "genomen." #~ msgstr "" -#~ "This revision involves intervention research, whereas the original " -#~ "application does not." +#~ "At the end of the procedure, you need to send this application to your " +#~ "promotor or supervisor for verification. this person is the researcher " +#~ "with final responsibility and can then make adjustments and submit the " +#~ "study to the FEtC-H. Note: if you cannot find your " +#~ "promotor or supervisor using this field, they may have to log into this " +#~ "portal at least once with their Solis-ID. You can continue filling in the " +#~ "application, while you wait for them to do this, but remember to come " +#~ "back and fill in this field before submitting." + +#~ msgid "Overzicht van wijzigingen bij aanmelding " +#~ msgstr "Summary of changes of application " #~ msgid "" -#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag " -#~ "dat wel bevat." +#~ "Dit onderdeel is nieuw in de revisie en bestond niet in de originele " +#~ "aanvraag." #~ msgstr "" -#~ "This revision does not involve intervention research, whereas the " -#~ "original application does include this." +#~ "This section was added in the revision, and did not feature in the " +#~ "original application." #~ msgid "" -#~ "De revisie en de originele aanvraag hebben beide een " -#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt " -#~ "doordat de revisie een andere versie van het formulier gebruikt." +#~ "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de " +#~ "revisie." #~ msgstr "" -#~ "This revision and the original application both involve intervention " -#~ "research, but this aspect cannot be compared. The revision uses a newer " -#~ "version of the form than the original." +#~ "This section was present in the original application, but was removed for " +#~ "the revision." -#~ msgid "ja,nee," -#~ msgstr "yes,no," - -#~ msgid "" -#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat " -#~ "niet bevat." -#~ msgstr "" -#~ "This revision involves observation research, whereas the original " -#~ "application does not." - -#~ msgid "" -#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag " -#~ "dat wel bevat." -#~ msgstr "" -#~ "This revision does not involve intervention research, whereas the " -#~ "original application involve this." +#~ msgid "Traject " +#~ msgstr "Trajectory " -#~ msgid "" -#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, " -#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een " -#~ "andere versie van het formulier gebruikt." -#~ msgstr "" -#~ "This revision and the original application both involve observation " -#~ "research, but this aspect cannot be compared. The revision uses a newer " -#~ "version of the form than the original." +#~ msgid "sessie " +#~ msgstr "session " -#~ msgid "" -#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet " -#~ "bevat." -#~ msgstr "" -#~ "This revision involves tasks research, whereas the original application " -#~ "does not." +#~ msgid "Sessie " +#~ msgstr "Session " -#~ msgid "" -#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat " -#~ "wel bevat." -#~ msgstr "" -#~ "This revision does not involve tasks research, whereas the original " -#~ "application does involve this." +#~ msgid ", taak " +#~ msgstr ", task " -#~ msgid "Dit traject is nieuw in de revisie." -#~ msgstr "This trajectory was added in this revision." +#~ msgid "Extra formulieren " +#~ msgstr "Additional forms " -#~ msgid "Dit traject is weggehaald uit de revisie" -#~ msgstr "This trajectory was removed in this revision." +#~ msgid "Vul de datum in als 'DD-MM-YYYY'." +#~ msgstr "Enter the date as 'YYYY-MM-DD'." #, python-format #~ msgid "" @@ -5822,27 +6013,5 @@ msgstr "Reviewing round ended: " #~ "Click here to log in again with your Solis-" #~ "ID." -#~ msgid "" -#~ "Aan het einde van de procedure kan je deze aanvraag ter\n" -#~ " verificatie naar je eindverantwoordelijke sturen. De\n" -#~ " eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen " -#~ "en\n" -#~ " indienen bij de FETC-GW.

NB: als je je\n" -#~ " eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n" -#~ " waarschijnlijk eerst één keer inloggen in deze portal. Je kunt " -#~ "nog wel\n" -#~ " verder met de aanvraag, maar vergeet dit veld niet in te vullen " -#~ "voor je de\n" -#~ " aanvraag indient." -#~ msgstr "" -#~ "At the end of the procedure, you can send this application to the " -#~ "researcher with final responsibility for verification. The researcher " -#~ "with final responsibility can then make adjustments and submit the study " -#~ "to the FEtC-H. Note: if you cannot find your supervisor " -#~ "using this field, they may have to log into this portal at least once " -#~ "with their Solis-ID. You can continue filling in the application while " -#~ "you wait for them to do this, but remember to come back and fill in this " -#~ "field before submitting." - #~ msgid "Werkverdeling overzicht van afgelopen jaar" #~ msgstr "Workload overview of past year" diff --git a/proposals/forms.py b/proposals/forms.py index 75ea839aa..b912d8637 100644 --- a/proposals/forms.py +++ b/proposals/forms.py @@ -21,6 +21,7 @@ from .validators import UniqueTitleValidator from .widgets import SelectMultipleUser, SelectUser +from cdh.core.forms import DateField class ProposalForm(UserKwargModelFormMixin, SoftValidationMixin, ConditionalModelForm): @@ -575,6 +576,8 @@ class Meta: ] class ProposalUpdateDateStartForm(forms.ModelForm): + date_start = DateField(label=_('Nieuwe beoogde startdatum')) + class Meta: model = Proposal fields = [ diff --git a/proposals/templates/proposals/proposal_update_date_start.html b/proposals/templates/proposals/proposal_update_date_start.html index 4c7dabc3c..389eceac6 100644 --- a/proposals/templates/proposals/proposal_update_date_start.html +++ b/proposals/templates/proposals/proposal_update_date_start.html @@ -17,14 +17,11 @@

{% blocktrans trimmed with title=proposal.title ref_number=proposal.reference_number %} Op deze pagina kan de startdatum worden aangepast van de aanvraag {{ title }} (referentienummer {{ ref_number }}). Let op! Als de review al is afgerond, - wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht u de PDF + wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op met {% endblocktrans %} portalsupport.gw@uu.nl.

-

- {% trans "Vul de datum in als 'DD-MM-YYYY'." %} -

{% csrf_token %} {{ form.as_table }}
diff --git a/reviews/api/views.py b/reviews/api/views.py index 9d8953025..37d5aa0a8 100644 --- a/reviews/api/views.py +++ b/reviews/api/views.py @@ -360,6 +360,8 @@ def get_context(self): 'CLOSED': Review.CLOSED, 'GO': Review.GO, 'GO_POST_HOC': Review.GO_POST_HOC, + 'REVISION': Review.REVISION, + } context['current_user_pk'] = self.request.user.pk diff --git a/reviews/templates/reviews/documents_list.html b/reviews/templates/reviews/documents_list.html index b02a54113..42c683277 100644 --- a/reviews/templates/reviews/documents_list.html +++ b/reviews/templates/reviews/documents_list.html @@ -39,14 +39,6 @@
{% endif %} -{% if container.date_start_edit_link %} - - {% trans "Startdatum wijzigen" %} - - -{% endif %} - {% if container.edit_link %} {% trans "Documenten wijzigen" %} diff --git a/reviews/templates/reviews/vue_templates/review_list.html b/reviews/templates/reviews/vue_templates/review_list.html index 8eafa24eb..b9f90fcea 100644 --- a/reviews/templates/reviews/vue_templates/review_list.html +++ b/reviews/templates/reviews/vue_templates/review_list.html @@ -118,10 +118,7 @@

{{ review.get_stage_display }} {% endverbatim %} - {# For some reason context.review.REVISION and other class variables of continuation are None?#} - {# Only context.review.GO returns 0 for me, as it should #} - {# Which is why I've hardcoded the 1 here ... #} -
+
{% trans "Reviewronde beëindigd: " %} {% verbatim %} {{ review.date_end | date("DD-MM-YYYY") }} diff --git a/reviews/templatetags/documents_list.py b/reviews/templatetags/documents_list.py index 38611afac..19b5972b4 100644 --- a/reviews/templatetags/documents_list.py +++ b/reviews/templatetags/documents_list.py @@ -165,7 +165,6 @@ def __init__(self, header, **kwargs): self.edit_link = False self.dmp_edit_link = False - self.date_start_edit_link = False self.header = header self.items = [] @@ -223,10 +222,6 @@ def documents_list(review, user): pdf_container.items.append(proposal_pdf) - if is_secretary(user): - pdf_container.date_start_edit_link = reverse('proposals:update_date_start', - args=[proposal.pk]) - # Pre-approval if proposal.pre_approval_pdf: diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py index a9d61bc2c..41801ca66 100644 --- a/reviews/utils/review_actions.py +++ b/reviews/utils/review_actions.py @@ -22,6 +22,7 @@ def __init__(self, review, user): DiscontinueReview(review, user), SendConfirmation(review, user), ChangeArchiveStatus(review, user), + ChangeDateStart(review, user), ] self.ufl_actions = [] @@ -281,4 +282,24 @@ def description(self): return _('Verberg aanvraag uit het archief') else: return _('Plaats aanvraag in het archief.') + +class ChangeDateStart(ReviewAction): + + def is_available(self): + + user = self.user + + user_groups = user.groups.values_list("name", flat=True) + if not settings.GROUP_SECRETARY in user_groups: + return False + + return True + + def action_url(self): + + return reverse('proposals:update_date_start', args=(self.review.proposal.pk,)) + + def description(self): + + return _('Startdatum wijzigen') From f8e57cbf33c6cdf7da3470bd25c4d050c915ca55 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Wed, 8 Nov 2023 16:41:53 +0100 Subject: [PATCH 7/7] msgcat again ... --- locale/en/LC_MESSAGES/django.mo | Bin 149824 -> 148888 bytes locale/en/LC_MESSAGES/django.po | 975 +++++++++++++------------------- 2 files changed, 404 insertions(+), 571 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 41f2784f491f506863bab211539321cea43c0095..7f7aaf9ee8ba9bd0b2971da546689db7d244d140 100644 GIT binary patch delta 19315 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 VJG7IhvYp473XE=M*9gy@{{uS@$ZG%q delta 20334 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 diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 7bfd49009..53741844f 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-08 15:47+0100\n" +"POT-Creation-Date: 2023-11-07 10:34+0100\n" "PO-Revision-Date: 2023-11-07 10:36+0100\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -38,9 +38,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/" #: faqs/menus.py:17 main/templates/base/menu.html:134 #: main/templates/main/index.html:209 -#: proposals/templates/proposals/proposal_pdf.html:430 #: proposals/templates/proposals/study_consent.html:8 #: proposals/templates/proposals/translated_consent_forms.html:7 +#: proposals/utils/pdf_diff_logic.py:859 msgid "Informed consent formulieren" msgstr "Informed consent forms" @@ -109,9 +109,8 @@ msgstr "You can leave feedback on the FEtC-H portal here." #: feedback/templates/feedback/feedback_form.html:23 #: observations/templates/observations/observation_update_attachments.html:39 #: proposals/templates/proposals/proposal_confirmation.html:36 -#: proposals/templates/proposals/proposal_diff.html:294 +#: proposals/templates/proposals/proposal_diff.html:58 #: proposals/templates/proposals/proposal_update_attachments.html:26 -#: proposals/templates/proposals/proposal_update_date_start.html:29 #: reviews/templates/reviews/change_chamber_form.html:19 #: reviews/templates/reviews/decision_form.html:90 #: reviews/templates/reviews/review_assign_form.html:46 @@ -240,9 +239,8 @@ msgstr "How many times a week will the intervention session take place?" #: interventions/templates/interventions/intervention_form.html:7 #: interventions/templates/interventions/intervention_form.html:49 -#: proposals/templates/proposals/diff/intervention.html:4 -#: proposals/templates/proposals/proposal_pdf.html:285 #: proposals/templates/proposals/proposal_pdf_empty.html:186 +#: proposals/utils/pdf_diff_logic.py:586 msgid "Het interventieonderzoek" msgstr "Intervention study" @@ -284,7 +282,7 @@ msgstr "Intervention saved" #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83 -#: proposals/forms.py:561 proposals/forms.py:635 proposals/forms.py:650 +#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648 #: studies/forms.py:104 tasks/forms.py:87 msgid "Dit veld is verplicht." msgstr "This field is required." @@ -303,11 +301,11 @@ msgstr "Log in" msgid "Log uit" msgstr "Log out" -#: main/models.py:10 main/utils.py:15 +#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234 msgid "ja" msgstr "yes" -#: main/models.py:11 main/utils.py:15 +#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234 msgid "nee" msgstr "no" @@ -360,7 +358,7 @@ msgid "Gebruiksersnaam" msgstr "Username" #: main/templates/auth/user_detail.html:30 -#: proposals/templates/proposals/proposal_pdf.html:79 +#: proposals/templates/proposals/proposal_pdf.html:119 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66 msgid "E-mail" msgstr "E-mail" @@ -399,7 +397,7 @@ msgstr "Phase" #: reviews/templates/reviews/committee_members_workload.html:26 #: reviews/templates/reviews/vue_templates/decision_list.html:153 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95 -#: reviews/templates/reviews/vue_templates/review_list.html:157 +#: reviews/templates/reviews/vue_templates/review_list.html:151 msgid "Datum ingediend" msgstr "Date submitted" @@ -407,7 +405,7 @@ msgstr "Date submitted" #: reviews/templates/reviews/committee_members_workload.html:27 #: reviews/templates/reviews/vue_templates/decision_list.html:163 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105 -#: reviews/templates/reviews/vue_templates/review_list.html:167 +#: reviews/templates/reviews/vue_templates/review_list.html:161 msgid "Gewenste einddatum" msgstr "Desired end date" @@ -419,7 +417,7 @@ msgstr "My decision" #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332 #: reviews/models.py:57 #: reviews/templates/reviews/vue_templates/decision_list.html:133 -#: reviews/templates/reviews/vue_templates/review_list.html:137 +#: reviews/templates/reviews/vue_templates/review_list.html:131 msgid "Afhandeling" msgstr "Conclusion" @@ -470,7 +468,7 @@ msgstr "Website export text" #: proposals/templates/proposals/proposal_confirmation.html:25 #: reviews/templates/reviews/vue_templates/decision_list.html:95 #: reviews/templates/reviews/vue_templates/review_list.html:88 -#: reviews/utils/review_actions.py:245 +#: reviews/utils/review_actions.py:244 msgid "Bevestigingsbrief versturen" msgstr "Send confirmation letter" @@ -1156,7 +1154,7 @@ msgid "" msgstr "As might happen on forums where the researcher also has an account." #: observations/models.py:65 observations/models.py:75 -#: observations/models.py:88 proposals/models.py:745 studies/models.py:172 +#: observations/models.py:88 proposals/models.py:747 studies/models.py:172 #: studies/models.py:228 studies/models.py:358 msgid "Licht toe" msgstr "Explain" @@ -1240,9 +1238,8 @@ msgstr "How many hours of observation will take place on average per day?" #: observations/templates/observations/observation_form.html:7 #: observations/templates/observations/observation_form.html:44 -#: proposals/templates/proposals/diff/observation.html:4 -#: proposals/templates/proposals/proposal_pdf.html:297 #: proposals/templates/proposals/proposal_pdf_empty.html:229 +#: proposals/utils/pdf_diff_logic.py:642 msgid "Het observatieonderzoek" msgstr "Observational study" @@ -1268,7 +1265,6 @@ msgstr "Recording behaviour" #: proposals/templates/proposals/proposal_update_attachments.html:7 #: proposals/templates/proposals/proposal_update_attachments.html:14 #: proposals/templates/proposals/proposal_update_attachments.html:25 -#: proposals/templates/proposals/proposal_update_date_start.html:7 #: studies/templates/studies/study_update_attachments.html:7 #: studies/templates/studies/study_update_attachments.html:14 #: studies/templates/studies/study_update_attachments.html:25 @@ -1311,7 +1307,7 @@ msgstr "Last edited" msgid "Datum ingediend bij eindverantwoordelijke" msgstr "Date sent to supervisor" -#: proposals/forms.py:43 proposals/models.py:221 +#: proposals/forms.py:42 proposals/models.py:221 msgid "" "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die " "niet geaffilieerd zijn aan een van de onderzoeksinstituten " @@ -1320,19 +1316,19 @@ msgstr "" "Are there any other researchers involved outside the above-" "mentioned institutes? " -#: proposals/forms.py:64 proposals/forms.py:271 proposals/validators.py:25 +#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25 msgid "Er bestaat al een aanvraag met deze titel." msgstr "There is an existing application with this title." -#: proposals/forms.py:135 +#: proposals/forms.py:133 msgid "Selecteer..." msgstr "Select..." -#: proposals/forms.py:141 +#: proposals/forms.py:140 msgid "Docent" msgstr "Professor" -#: proposals/forms.py:142 +#: proposals/forms.py:141 msgid "" "Vul hier de docent van de cursus in waarbinnen je deze portal moet " "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De " @@ -1343,19 +1339,23 @@ msgstr "" "This application will not be published in the semipublic archive of the FEtC-" "H." -#: proposals/forms.py:190 -msgid "Je dient een eindverantwoordelijke op te geven." -msgstr "You are required to specify the researcher with final responsibility." +#: proposals/forms.py:192 +msgid "Je dient een promotor/begeleider op te geven." +msgstr "You are required to specify a promotor/supervisor." -#: proposals/forms.py:205 +#: proposals/forms.py:199 +msgid "Je kunt niet jezelf als promotor/begeleider opgeven." +msgstr "You cannot submit yourself as the promotor/supervisor." + +#: proposals/forms.py:213 msgid "Je hebt jezelf niet als onderzoekers geselecteerd." msgstr "You have not selected yourself." -#: proposals/forms.py:210 +#: proposals/forms.py:218 msgid "Je hebt geen andere onderzoekers geselecteerd." msgstr "You have not selected any other researchers." -#: proposals/forms.py:220 +#: proposals/forms.py:228 msgid "" "Dit veld is verplicht, maar je kunt later terugkomen om " "hem verder in te vullen." @@ -1363,7 +1363,7 @@ msgstr "" "This field is required, but you may choose to come back to this page later " "to fill it in." -#: proposals/forms.py:230 +#: proposals/forms.py:238 msgid "" "Indien je geen toestemming hebt van een andere ethische commissie, dien je " "het normale formulier in te vullen. Ga terug naar de startpagina, en " @@ -1376,23 +1376,23 @@ msgstr "" "page, and select \"Submit a new application that is completely new in this " "portal\" or \"from a copy of an old application.\"" -#: proposals/forms.py:257 +#: proposals/forms.py:265 msgid "Ik maak een oefenaanvraag aan" msgstr "I am creating a practice application" -#: proposals/forms.py:277 proposals/models.py:536 +#: proposals/forms.py:285 proposals/models.py:538 msgid "Te kopiëren aanvraag" msgstr "Application to be copied" -#: proposals/forms.py:279 proposals/models.py:538 +#: proposals/forms.py:287 proposals/models.py:540 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent." msgstr "This field shows only applications in which you are involved." -#: proposals/forms.py:319 proposals/forms.py:354 +#: proposals/forms.py:327 proposals/forms.py:362 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen." msgstr "You can, if necessary, change the title of your application here." -#: proposals/forms.py:321 proposals/forms.py:356 +#: proposals/forms.py:329 proposals/forms.py:364 msgid "" "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer " "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van " @@ -1402,11 +1402,11 @@ msgstr "" "application is approved, also to employees viewing the archive of this " "portal." -#: proposals/forms.py:328 +#: proposals/forms.py:336 msgid "Te reviseren aanvraag" msgstr "Application to be revised" -#: proposals/forms.py:329 +#: proposals/forms.py:337 msgid "" "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij " "een medeuitvoerende bent." @@ -1414,69 +1414,69 @@ msgstr "" "This field only shows submitted applications that have not been approved " "(yet) in which you are involved." -#: proposals/forms.py:363 +#: proposals/forms.py:371 msgid "Te amenderen aanvraag" msgstr "Application to be amended" -#: proposals/forms.py:364 +#: proposals/forms.py:372 msgid "" "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende " "bent." msgstr "This field shows only approved applications in which you are involved." -#: proposals/forms.py:419 proposals/forms.py:549 proposals/forms.py:683 +#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681 msgid "Dit veld is verplicht om verder te gaan." msgstr "This field is required to continue." -#: proposals/forms.py:427 +#: proposals/forms.py:435 msgid "Je dient een instelling op te geven." msgstr "You are required to specify an institution." -#: proposals/forms.py:485 +#: proposals/forms.py:493 msgid "In dit geval is een beslissing van een METC vereist" msgstr "In this case, a decision by a METC is required" -#: proposals/forms.py:493 +#: proposals/forms.py:501 msgid "Naam traject 1" msgstr "Title of trajectory 1" -#: proposals/forms.py:495 +#: proposals/forms.py:503 msgid "Naam traject 2" msgstr "Title of trajectory 2" -#: proposals/forms.py:497 +#: proposals/forms.py:505 msgid "Naam traject 3" msgstr "Title of trajectory 3" -#: proposals/forms.py:499 +#: proposals/forms.py:507 msgid "Naam traject 4" msgstr "Title of trajectory 4" -#: proposals/forms.py:501 +#: proposals/forms.py:509 msgid "Naam traject 5" msgstr "Title of trajectory 5" -#: proposals/forms.py:503 +#: proposals/forms.py:511 msgid "Naam traject 6" msgstr "Title of trajectory 6" -#: proposals/forms.py:505 +#: proposals/forms.py:513 msgid "Naam traject 7" msgstr "Title of trajectory 7" -#: proposals/forms.py:507 +#: proposals/forms.py:515 msgid "Naam traject 8" msgstr "Title of trajectory 8" -#: proposals/forms.py:509 +#: proposals/forms.py:517 msgid "Naam traject 9" msgstr "Title of trajectory 9" -#: proposals/forms.py:511 +#: proposals/forms.py:519 msgid "Naam traject 10" msgstr "Title of trajectory 10" -#: proposals/forms.py:555 +#: proposals/forms.py:563 msgid "" "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee " "verschillende trajecten zijn." @@ -1484,19 +1484,15 @@ msgstr "" "If different trajectories are used, at least two different trajectories " "should be filled in." -#: proposals/forms.py:579 -msgid "Nieuwe beoogde startdatum" -msgstr "New intended start date" - -#: proposals/forms.py:642 +#: proposals/forms.py:640 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd." msgstr "Declaration of consent for trajectory {} not yet added." -#: proposals/forms.py:646 +#: proposals/forms.py:644 msgid "Informatiebrief voor traject {} nog niet toegevoegd." msgstr "Information letter for trajectory {} not yet added." -#: proposals/forms.py:658 +#: proposals/forms.py:656 msgid "" "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar " "van vandaag." @@ -1504,7 +1500,7 @@ msgstr "" "The embargo-period can last a maximum of 2 years. Pick a date within 2 years " "from today." -#: proposals/forms.py:689 +#: proposals/forms.py:687 msgid "Vul in in welke talen de formulieren worden vertaald." msgstr "Please fill in the languages" @@ -1792,7 +1788,8 @@ msgstr "" "include it here. Supplying a DMP can expedite ethical assessment of " "proposals." -#: proposals/models.py:422 reviews/models.py:184 +#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980 +#: reviews/models.py:184 msgid "Ruimte voor eventuele opmerkingen" msgstr "Space for possible comments" @@ -1859,78 +1856,86 @@ msgstr "" #: proposals/models.py:517 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 #: proposals/templates/proposals/vue_templates/proposal_list.html:166 -msgid "Eindverantwoordelijke onderzoeker" -msgstr "Researcher with final responsibility" +msgid "Promotor/Begeleider" +msgstr "Promotor/Supervisor" #: proposals/models.py:520 msgid "" -"Aan het einde van de procedure kan je deze aanvraag ter\n" -" verificatie naar je eindverantwoordelijke sturen. De\n" -" eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen " -"en\n" -" indienen bij de FETC-GW.

NB: als je je\n" -" eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n" -" waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog " -"wel\n" -" verder met de aanvraag, maar vergeet dit veld niet in te vullen voor " -"je de\n" -" aanvraag indient." -msgstr "" -"At the end of the procedure, you can send this application to the researcher " -"with final responsibility for verification. The researcher with final " -"responsibility can then make adjustments and submit the study to the FEtC-H. " -"Note: if you cannot find your supervisor using this field, " -"they may have to log into this portal at least once with their Solis-ID. You " -"can continue filling in the application while you wait for them to do this, " -"but remember to come back and fill in this field before submitting." - -#: proposals/models.py:545 +"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n" +" naar je promotor of begeleider gestuurd worden. Deze " +"persoon \n" +" is de eindverantwoordelijk onderzoeker, en zal de " +"aanvraag \n" +" vervolgens waar nodig kunnen aanpassen en indienen bij " +"de FETC-GW.\n" +"

Belangrijk: als je je promotor " +"of \n" +" begeleider niet kunt vinden met dit veld, dan moeten " +"zij \n" +" waarschijnlijk eerst één keer inloggen in deze portal. \n" +" Je kunt nog wel verder met de aanvraag, maar vergeet dit " +"veld \n" +" niet in te vullen voor je de aanvraag indient. Je " +"aanvraag \n" +" zal dan namelijk niet in behandeling kunnen worden " +"genomen." +msgstr "" +"At the end of the procedure, you need to send this application to your " +"promotor or supervisor for verification. this person is the researcher with " +"final responsibility and can then make adjustments and submit the study to " +"the FEtC-H. Note: if you cannot find your promotor or " +"supervisor using this field, they may have to log into this portal at least " +"once with their Solis-ID. You can continue filling in the application, while " +"you wait for them to do this, but remember to come back and fill in this " +"field before submitting." + +#: proposals/models.py:547 msgid "" "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?" msgstr "" "Is this application a revision or an amendment of a previously submitted " "application?" -#: proposals/models.py:617 +#: proposals/models.py:619 msgid "Amendement" msgstr "Amendment" -#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328 +#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328 #: reviews/templates/reviews/committee_members_workload.html:36 #: reviews/templates/reviews/committee_members_workload.html:82 #: reviews/templates/reviews/review_detail_sidebar.html:106 msgid "Revisie" msgstr "Revision" -#: proposals/models.py:623 +#: proposals/models.py:625 msgid "Normaal" msgstr "Normal" -#: proposals/models.py:628 +#: proposals/models.py:630 msgid "Voortoetsing" msgstr "Preliminary assessment" -#: proposals/models.py:630 +#: proposals/models.py:632 msgid "Oefening" msgstr "Practice" -#: proposals/models.py:632 +#: proposals/models.py:634 msgid "Extern getoetst" msgstr "External approval" -#: proposals/models.py:730 +#: proposals/models.py:732 msgid "Geen beoordeling door METC noodzakelijk" msgstr "Assessment by METC not required" -#: proposals/models.py:731 +#: proposals/models.py:733 msgid "In afwachting beslissing METC" msgstr "Pending decision by METC" -#: proposals/models.py:732 +#: proposals/models.py:734 msgid "Beslissing METC geüpload" msgstr "METC decision uploaded" -#: proposals/models.py:736 +#: proposals/models.py:738 msgid "" "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling " "waar toetsing door een METC verplicht is gesteld?" @@ -1938,11 +1943,11 @@ msgstr "" "Will the data collection take place at the UMC Utrecht or another " "institution for which an assessment by a METC is required?" -#: proposals/models.py:750 +#: proposals/models.py:752 msgid "Welke instelling?" msgstr "Which institution?" -#: proposals/models.py:756 +#: proposals/models.py:758 msgid "" "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd " "door de WMO)?" @@ -1950,7 +1955,7 @@ msgstr "" "Is the nature of the research question medical (as defined by the Medical " "Research Involving Human Subjects Act (WMO))?" -#: proposals/models.py:758 +#: proposals/models.py:760 msgid "" "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-" "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden " @@ -1971,7 +1976,7 @@ msgstr "" "Committee on Research Involving Human Subjects, Definition of medical " "research, 2005, ccmo.nl)" -#: proposals/models.py:774 +#: proposals/models.py:776 msgid "" "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de " "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?" @@ -1980,15 +1985,15 @@ msgstr "" "registered with the FEtC-H. Has an application for this project already been " "submitted to an METC?" -#: proposals/models.py:781 +#: proposals/models.py:783 msgid "Is de METC al tot een beslissing gekomen?" msgstr "Has the METC already come to a decision?" -#: proposals/models.py:786 +#: proposals/models.py:788 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)" msgstr "Please upload the decision of METC (in .pdf or .doc(x)-format) here" -#: proposals/models.py:824 +#: proposals/models.py:826 #, python-brace-format msgid "WMO {title}, status {status}" msgstr "WMO {title}, status {status}" @@ -2052,298 +2057,6 @@ msgstr "Old" msgid "Nieuw" msgstr "New" -#: proposals/templates/proposals/diff/intervention.html:8 -msgid "" -"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat " -"niet bevat." -msgstr "" -"This revision involves intervention research, whereas the original " -"application does not." - -#: proposals/templates/proposals/diff/intervention.html:12 -msgid "" -"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag " -"dat wel bevat." -msgstr "" -"This revision does not involve intervention research, whereas the original " -"application does include this." - -#: proposals/templates/proposals/diff/intervention.html:28 -msgid "" -"De revisie en de originele aanvraag hebben beide een interventieonderzoek, " -"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere " -"versie van het formulier gebruikt." -msgstr "" -"This revision and the original application both involve intervention " -"research, but this aspect cannot be compared. The revision uses a newer " -"version of the form than the original." - -#: proposals/templates/proposals/diff/intervention_v1.html:8 -#: proposals/templates/proposals/diff/intervention_v2.html:8 -#: proposals/templates/proposals/diff/observation_v1.html:9 -#: proposals/templates/proposals/diff/observation_v2.html:9 -#: proposals/templates/proposals/diff/sessions.html:23 -#: proposals/templates/proposals/diff/sessions.html:42 -#: proposals/templates/proposals/diff/sessions.html:103 -#: proposals/templates/proposals/diff/sessions.html:174 -#: proposals/templates/proposals/diff/study.html:25 -#: proposals/templates/proposals/diff/study.html:151 -#: proposals/templates/proposals/diff/study.html:215 -#: proposals/templates/proposals/proposal_diff.html:53 -#: proposals/templates/proposals/proposal_diff.html:178 -#: proposals/templates/proposals/proposal_diff.html:211 -#: proposals/templates/proposals/proposal_diff.html:244 -#: proposals/templates/proposals/proposal_diff.html:268 -msgid "Originele aanvraag" -msgstr "Original application" - -#: proposals/templates/proposals/diff/intervention_v1.html:9 -#: proposals/templates/proposals/diff/intervention_v2.html:9 -#: proposals/templates/proposals/diff/observation_v1.html:10 -#: proposals/templates/proposals/diff/observation_v2.html:10 -#: proposals/templates/proposals/diff/sessions.html:24 -#: proposals/templates/proposals/diff/sessions.html:43 -#: proposals/templates/proposals/diff/sessions.html:104 -#: proposals/templates/proposals/diff/sessions.html:175 -#: proposals/templates/proposals/diff/study.html:26 -#: proposals/templates/proposals/diff/study.html:152 -#: proposals/templates/proposals/diff/study.html:216 -#: proposals/templates/proposals/proposal_diff.html:54 -#: proposals/templates/proposals/proposal_diff.html:179 -#: proposals/templates/proposals/proposal_diff.html:212 -#: proposals/templates/proposals/proposal_diff.html:245 -#: proposals/templates/proposals/proposal_diff.html:269 -msgid "Revisie/amendement" -msgstr "Revision/amendment" - -#: proposals/templates/proposals/diff/intervention_v1.html:28 -#: proposals/templates/proposals/diff/intervention_v1.html:33 -#: proposals/templates/proposals/diff/intervention_v1.html:42 -#: proposals/templates/proposals/diff/intervention_v1.html:47 -#: proposals/templates/proposals/diff/intervention_v2.html:28 -#: proposals/templates/proposals/diff/intervention_v2.html:33 -#: proposals/templates/proposals/diff/intervention_v2.html:42 -#: proposals/templates/proposals/diff/intervention_v2.html:47 -#: proposals/templates/proposals/diff/intervention_v2.html:62 -#: proposals/templates/proposals/diff/intervention_v2.html:67 -#: proposals/templates/proposals/diff/observation_v1.html:43 -#: proposals/templates/proposals/diff/observation_v1.html:48 -#: proposals/templates/proposals/diff/observation_v2.html:43 -#: proposals/templates/proposals/diff/observation_v2.html:48 -#: proposals/templates/proposals/diff/sessions.html:62 -#: proposals/templates/proposals/diff/sessions.html:67 -#: proposals/templates/proposals/diff/sessions.html:76 -#: proposals/templates/proposals/diff/sessions.html:81 -msgid "ja,nee," -msgstr "yes,no," - -#: proposals/templates/proposals/diff/intervention_v1.html:87 -#: proposals/templates/proposals/diff/intervention_v1.html:92 -#: proposals/templates/proposals/diff/intervention_v2.html:102 -#: proposals/templates/proposals/diff/intervention_v2.html:107 -#: proposals/templates/proposals/diff/observation_v1.html:29 -#: proposals/templates/proposals/diff/observation_v1.html:34 -#: proposals/templates/proposals/diff/observation_v1.html:68 -#: proposals/templates/proposals/diff/observation_v1.html:73 -#: proposals/templates/proposals/diff/observation_v1.html:81 -#: proposals/templates/proposals/diff/observation_v1.html:86 -#: proposals/templates/proposals/diff/observation_v1.html:94 -#: proposals/templates/proposals/diff/observation_v1.html:99 -#: proposals/templates/proposals/diff/observation_v1.html:108 -#: proposals/templates/proposals/diff/observation_v1.html:113 -#: proposals/templates/proposals/diff/observation_v1.html:122 -#: proposals/templates/proposals/diff/observation_v1.html:127 -#: proposals/templates/proposals/diff/observation_v2.html:29 -#: proposals/templates/proposals/diff/observation_v2.html:34 -#: proposals/templates/proposals/diff/observation_v2.html:73 -#: proposals/templates/proposals/diff/observation_v2.html:78 -#: proposals/templates/proposals/diff/observation_v2.html:93 -#: proposals/templates/proposals/diff/observation_v2.html:98 -#: proposals/templates/proposals/diff/observation_v2.html:113 -#: proposals/templates/proposals/diff/observation_v2.html:118 -#: proposals/templates/proposals/diff/observation_v2.html:132 -#: proposals/templates/proposals/diff/observation_v2.html:137 -#: proposals/templates/proposals/diff/observation_v2.html:146 -#: proposals/templates/proposals/diff/observation_v2.html:151 -#: proposals/templates/proposals/diff/sessions.html:151 -#: proposals/templates/proposals/diff/sessions.html:156 -#: proposals/templates/proposals/diff/study.html:43 -#: proposals/templates/proposals/diff/study.html:48 -#: proposals/templates/proposals/diff/study.html:63 -#: proposals/templates/proposals/diff/study.html:64 -#: proposals/templates/proposals/diff/study.html:220 -#: proposals/templates/proposals/diff/study.html:221 -#: proposals/templates/proposals/diff/study.html:262 -#: proposals/templates/proposals/diff/study.html:267 -#: proposals/templates/proposals/pdf/intervention_v1.html:16 -#: proposals/templates/proposals/pdf/intervention_v1.html:20 -#: proposals/templates/proposals/pdf/intervention_v1.html:43 -#: proposals/templates/proposals/pdf/intervention_v2.html:16 -#: proposals/templates/proposals/pdf/intervention_v2.html:20 -#: proposals/templates/proposals/pdf/intervention_v2.html:28 -#: proposals/templates/proposals/pdf/intervention_v2.html:48 -#: proposals/templates/proposals/pdf/intervention_v2.html:57 -#: proposals/templates/proposals/pdf/observation_v1.html:16 -#: proposals/templates/proposals/pdf/observation_v1.html:20 -#: proposals/templates/proposals/pdf/observation_v1.html:31 -#: proposals/templates/proposals/pdf/observation_v1.html:34 -#: proposals/templates/proposals/pdf/observation_v1.html:37 -#: proposals/templates/proposals/pdf/observation_v1.html:41 -#: proposals/templates/proposals/pdf/observation_v1.html:45 -#: proposals/templates/proposals/pdf/observation_v2.html:16 -#: proposals/templates/proposals/pdf/observation_v2.html:20 -#: proposals/templates/proposals/pdf/observation_v2.html:34 -#: proposals/templates/proposals/pdf/observation_v2.html:42 -#: proposals/templates/proposals/pdf/observation_v2.html:50 -#: proposals/templates/proposals/pdf/observation_v2.html:57 -#: proposals/templates/proposals/pdf/observation_v2.html:67 -#: proposals/templates/proposals/proposal_diff.html:95 -#: proposals/templates/proposals/proposal_diff.html:96 -#: proposals/templates/proposals/proposal_diff.html:121 -#: proposals/templates/proposals/proposal_diff.html:122 -#: proposals/templates/proposals/proposal_diff.html:216 -#: proposals/templates/proposals/proposal_diff.html:217 -#: proposals/templates/proposals/proposal_diff.html:221 -#: proposals/templates/proposals/proposal_diff.html:222 -#: proposals/templates/proposals/proposal_diff.html:249 -#: proposals/templates/proposals/proposal_diff.html:250 -#: proposals/templates/proposals/proposal_diff.html:273 -#: proposals/templates/proposals/proposal_diff.html:274 -#: proposals/templates/proposals/proposal_pdf.html:109 -#: proposals/templates/proposals/proposal_pdf.html:125 -#: proposals/templates/proposals/proposal_pdf.html:182 -#: proposals/templates/proposals/proposal_pdf.html:185 -#: proposals/templates/proposals/proposal_pdf.html:204 -#: proposals/templates/proposals/proposal_pdf.html:223 -#: proposals/templates/proposals/proposal_pdf.html:232 -#: proposals/templates/proposals/proposal_pdf.html:274 -#: proposals/templates/proposals/proposal_pdf.html:329 -#: proposals/templates/proposals/proposal_pdf.html:333 -#: proposals/templates/proposals/proposal_pdf.html:369 -#: proposals/templates/proposals/proposal_pdf.html:435 -#: proposals/templates/proposals/proposal_pdf.html:452 -#: proposals/templates/proposals/proposal_pdf.html:516 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91 -#: tasks/templates/tasks/task_list.html:21 -msgid "ja,nee" -msgstr "yes,no" - -#: proposals/templates/proposals/diff/observation.html:8 -msgid "" -"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet " -"bevat." -msgstr "" -"This revision involves observation research, whereas the original " -"application does not." - -#: proposals/templates/proposals/diff/observation.html:12 -msgid "" -"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat " -"wel bevat." -msgstr "" -"This revision does not involve intervention research, whereas the original " -"application involve this." - -#: proposals/templates/proposals/diff/observation.html:28 -msgid "" -"De revisie en de originele aanvraag hebben beide een observatieonderzoek, " -"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere " -"versie van het formulier gebruikt." -msgstr "" -"This revision and the original application both involve observation " -"research, but this aspect cannot be compared. The revision uses a newer " -"version of the form than the original." - -#: proposals/templates/proposals/diff/observation_v1.html:139 -#: proposals/templates/proposals/diff/observation_v1.html:140 -#: proposals/templates/proposals/diff/study.html:233 -#: proposals/templates/proposals/diff/study.html:239 -#: proposals/templates/proposals/diff/study.html:247 -#: proposals/templates/proposals/diff/study.html:253 -#: proposals/templates/proposals/pdf/observation_v1.html:53 -#: proposals/templates/proposals/proposal_diff.html:228 -#: proposals/templates/proposals/proposal_diff.html:232 -#: proposals/templates/proposals/proposal_pdf.html:189 -#: proposals/templates/proposals/proposal_pdf.html:444 -#: proposals/templates/proposals/proposal_pdf.html:447 -#: proposals/templates/proposals/proposal_pdf.html:462 -#: proposals/templates/proposals/proposal_pdf.html:467 -#: proposals/templates/proposals/proposal_pdf.html:472 -#: proposals/templates/proposals/proposal_pdf.html:486 -#: proposals/templates/proposals/proposal_pdf.html:491 -#: proposals/templates/proposals/proposal_pdf.html:507 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105 -msgid "Download" -msgstr "Download" - -#: proposals/templates/proposals/diff/sessions.html:7 -#: proposals/templates/proposals/proposal_pdf.html:308 -#: proposals/templates/proposals/proposal_pdf_empty.html:279 -#: studies/templates/studies/session_start.html:7 -#: studies/templates/studies/session_start.html:17 -#: tasks/templates/tasks/task_form.html:7 -#: tasks/templates/tasks/task_form.html:30 -#: tasks/templates/tasks/task_start.html:7 -#: tasks/templates/tasks/task_start.html:28 -msgid "Het takenonderzoek en interviews" -msgstr "Task-based research and interviews" - -#: proposals/templates/proposals/diff/sessions.html:11 -msgid "" -"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet " -"bevat." -msgstr "" -"This revision involves tasks research, whereas the original application does " -"not." - -#: proposals/templates/proposals/diff/sessions.html:15 -msgid "" -"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel " -"bevat." -msgstr "" -"This revision does not involve tasks research, whereas the original " -"application does involve this." - -#: proposals/templates/proposals/diff/sessions.html:170 -#: proposals/templates/proposals/proposal_pdf.html:381 -#: proposals/templates/proposals/proposal_pdf_empty.html:335 -#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18 -msgid "Overzicht van het takenonderzoek" -msgstr "Overview of task-based research" - -#: proposals/templates/proposals/diff/study.html:9 -#: proposals/templates/proposals/proposal_pdf.html:215 -#: proposals/templates/proposals/proposal_pdf_empty.html:145 -#: studies/templates/studies/study_form.html:7 -#: studies/templates/studies/study_form.html:82 -msgid "De deelnemers" -msgstr "Participants" - -#: proposals/templates/proposals/diff/study.html:14 -msgid "Dit traject is nieuw in de revisie." -msgstr "This trajectory was added in this revision." - -#: proposals/templates/proposals/diff/study.html:18 -msgid "Dit traject is weggehaald uit de revisie" -msgstr "This trajectory was removed in this revision." - -#: proposals/templates/proposals/diff/study.html:144 -#: proposals/templates/proposals/proposal_pdf.html:391 -#: proposals/templates/proposals/proposal_pdf_empty.html:343 -#: studies/templates/studies/study_end.html:7 -#: studies/templates/studies/study_end.html:28 -msgid "Overzicht en eigen beoordeling van het gehele onderzoek" -msgstr "Overview and self-assessment of the entire study" - -#: proposals/templates/proposals/diff/study.html:206 -#: proposals/templates/proposals/proposal_pdf_empty.html:372 -msgid "Informed consent formulieren voor het onderzoek" -msgstr "Informed consent forms for the study" - #: proposals/templates/proposals/proposal_confirm_delete.html:6 #: proposals/templates/proposals/proposal_confirm_delete.html:12 msgid "Aanvraag verwijderen" @@ -2509,7 +2222,7 @@ msgstr "" "follow with regard to data." #: proposals/templates/proposals/proposal_data_management.html:24 -#: proposals/templates/proposals/proposal_pdf.html:499 +#: proposals/utils/pdf_diff_logic.py:954 #: reviews/templatetags/documents_list.py:245 msgid "Data Management Plan" msgstr "Data Management Plan" @@ -2639,11 +2352,14 @@ msgstr "" "gw@uu.nl." #: proposals/templates/proposals/proposal_diff.html:11 -#: proposals/templates/proposals/proposal_diff.html:37 msgid "Overzicht van wijzigingen" msgstr "Summary of changes" -#: proposals/templates/proposals/proposal_diff.html:39 +#: proposals/templates/proposals/proposal_diff.html:38 +msgid "Overzicht van wijzigingen bij aanmelding " +msgstr "Summary of changes of application " + +#: proposals/templates/proposals/proposal_diff.html:42 msgid "" "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten " "opzichte van de originele aanvraag." @@ -2651,72 +2367,28 @@ msgstr "" "This overview shows the changes made in the revision/amendment with respect " "to the original application." -#: proposals/templates/proposals/proposal_diff.html:49 #: proposals/templates/proposals/proposal_form.html:7 -#: proposals/templates/proposals/proposal_form.html:92 +#: proposals/templates/proposals/proposal_form.html:76 #: proposals/templates/proposals/proposal_form_pre_approved.html:7 #: proposals/templates/proposals/proposal_form_pre_approved.html:81 -#: proposals/templates/proposals/proposal_pdf.html:82 #: proposals/templates/proposals/proposal_pdf_empty.html:60 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59 -#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55 -#: proposals/utils/validate_proposal.py:33 +#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40 +#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33 #: proposals/utils/validate_proposal.py:43 #: proposals/utils/validate_proposal.py:50 #: proposals/utils/validate_proposal.py:57 msgid "Algemene informatie over de aanvraag" msgstr "General information about the application" -#: proposals/templates/proposals/proposal_diff.html:133 -#: proposals/templates/proposals/proposal_diff.html:134 -#: proposals/templates/proposals/proposal_pdf.html:133 -#: proposals/templates/proposals/proposal_pdf.html:520 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99 -msgid "onbekend" -msgstr "unknown" - -#: proposals/templates/proposals/proposal_diff.html:174 -#: proposals/templates/proposals/proposal_pdf.html:159 -#: proposals/templates/proposals/proposal_pdf_empty.html:104 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110 -#: proposals/templates/proposals/wmo_form.html:7 -#: proposals/templates/proposals/wmo_form.html:30 -msgid "" -"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" -msgstr "" -"Ethical assessment by a Medical Ethical Testing Committee (METC) required?" - -#: proposals/templates/proposals/proposal_diff.html:207 -#: proposals/templates/proposals/proposal_pdf.html:179 -#: proposals/templates/proposals/proposal_pdf_empty.html:120 -#: proposals/templates/proposals/wmo_application.html:7 -#: proposals/templates/proposals/wmo_application.html:27 -msgid "Aanmelding bij de METC" -msgstr "Registration with the METC" - -#: proposals/templates/proposals/proposal_diff.html:240 -#: proposals/templates/proposals/proposal_pdf.html:201 -#: proposals/templates/proposals/proposal_pdf_empty.html:134 -#: proposals/templates/proposals/study_start.html:7 -#: proposals/templates/proposals/study_start.html:64 -#: proposals/utils/validate_proposal.py:87 -msgid "Eén of meerdere trajecten?" -msgstr "One or more trajectories?" - -#: proposals/templates/proposals/proposal_diff.html:264 -#: proposals/templates/proposals/proposal_submit.html:179 -msgid "Concept-aanmelding versturen" -msgstr "Submit draft application" - -#: proposals/templates/proposals/proposal_form.html:72 +#: proposals/templates/proposals/proposal_form.html:56 #: proposals/templates/proposals/proposal_form_pre_approved.html:72 #: proposals/templates/proposals/proposal_submit.html:33 msgid "Aantal woorden:" msgstr "Number of words:" -#: proposals/templates/proposals/proposal_form.html:89 +#: proposals/templates/proposals/proposal_form.html:73 #: proposals/templates/proposals/proposal_submit.html:168 msgid "" "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling " @@ -2725,7 +2397,7 @@ msgstr "" "You are currently editing a practice application. These can not be submitted " "to the FETC-H for review." -#: proposals/templates/proposals/proposal_form.html:94 +#: proposals/templates/proposals/proposal_form.html:78 msgid "" "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw " "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD " @@ -2735,7 +2407,7 @@ msgstr "" "supervision. Please note that this form should be filled in as if you were " "that student/PhD candidate. " -#: proposals/templates/proposals/proposal_form.html:121 +#: proposals/templates/proposals/proposal_form.html:105 msgid "" "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag " "ligt, kan de FETC geen officiële goedkeuring meer geven." @@ -2843,7 +2515,7 @@ msgstr "" "Click to submit an application to " "the archive." -#: proposals/templates/proposals/proposal_pdf.html:44 +#: proposals/templates/proposals/proposal_pdf.html:87 #, python-format msgid "" "FETC-GW - %(title)s (referentienummer %(reference_number)s, " @@ -2852,47 +2524,31 @@ msgstr "" "FEtC-H - %(title)s (reference number %(reference_number)s, " "submitted by %(submitter)s)" -#: proposals/templates/proposals/proposal_pdf.html:50 +#: proposals/templates/proposals/proposal_pdf.html:93 #, python-format msgid "%(type)s van referentienummer %(reference_number)s" msgstr "%(type)s of reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:66 +#: proposals/templates/proposals/proposal_pdf.html:109 #, python-format msgid "Referentienummer %(reference_number)s" msgstr "Reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:70 +#: proposals/templates/proposals/proposal_pdf.html:113 msgid "Huidige staat van de aanvraag" msgstr "Current state of the application" -#: proposals/templates/proposals/proposal_pdf.html:73 +#: proposals/templates/proposals/proposal_pdf.html:116 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60 msgid "Indiener" msgstr "Applicant" -#: proposals/templates/proposals/proposal_pdf.html:76 +#: proposals/templates/proposals/proposal_pdf.html:118 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63 #: tasks/templates/tasks/task_list.html:7 msgid "Naam" msgstr "Name" -#: proposals/templates/proposals/proposal_pdf.html:194 -msgid "Niet aangeleverd" -msgstr "Not provided" - -#: proposals/templates/proposals/proposal_pdf.html:481 -#: proposals/templates/proposals/study_consent.html:138 -msgid "Extra formulieren" -msgstr "Additional forms" - -#: proposals/templates/proposals/proposal_pdf.html:513 -#: proposals/templates/proposals/proposal_pdf_empty.html:389 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150 -#: proposals/templates/proposals/proposal_submit.html:181 -msgid "Aanmelding versturen" -msgstr "Submit application" - #: proposals/templates/proposals/proposal_pdf_empty.html:42 msgid "" "\n" @@ -2915,6 +2571,49 @@ msgstr "" " Reference number reference number\n" " " +#: proposals/templates/proposals/proposal_pdf_empty.html:104 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110 +#: proposals/templates/proposals/wmo_form.html:7 +#: proposals/templates/proposals/wmo_form.html:30 +#: proposals/utils/pdf_diff_logic.py:478 +msgid "" +"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" +msgstr "" +"Ethical assessment by a Medical Ethical Testing Committee (METC) required?" + +#: proposals/templates/proposals/proposal_pdf_empty.html:120 +#: proposals/templates/proposals/wmo_application.html:7 +#: proposals/templates/proposals/wmo_application.html:27 +#: proposals/utils/pdf_diff_logic.py:503 +msgid "Aanmelding bij de METC" +msgstr "Registration with the METC" + +#: proposals/templates/proposals/proposal_pdf_empty.html:134 +#: proposals/templates/proposals/study_start.html:7 +#: proposals/templates/proposals/study_start.html:64 +#: proposals/utils/pdf_diff_logic.py:511 +#: proposals/utils/validate_proposal.py:87 +msgid "Eén of meerdere trajecten?" +msgstr "One or more trajectories?" + +#: proposals/templates/proposals/proposal_pdf_empty.html:145 +#: proposals/utils/pdf_diff_logic.py:529 +#: studies/templates/studies/study_form.html:7 +#: studies/templates/studies/study_form.html:82 +msgid "De deelnemers" +msgstr "Participants" + +#: proposals/templates/proposals/proposal_pdf_empty.html:279 +#: proposals/utils/pdf_diff_logic.py:733 +#: studies/templates/studies/session_start.html:7 +#: studies/templates/studies/session_start.html:17 +#: tasks/templates/tasks/task_form.html:7 +#: tasks/templates/tasks/task_form.html:30 +#: tasks/templates/tasks/task_start.html:7 +#: tasks/templates/tasks/task_start.html:28 +msgid "Het takenonderzoek en interviews" +msgstr "Task-based research and interviews" + #: proposals/templates/proposals/proposal_pdf_empty.html:286 #: proposals/templates/proposals/proposal_start.html:62 #: proposals/templates/proposals/proposal_start_practice.html:63 @@ -2929,6 +2628,30 @@ msgstr "Session" msgid "Taak" msgstr "Task" +#: proposals/templates/proposals/proposal_pdf_empty.html:335 +#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7 +#: tasks/templates/tasks/task_end.html:18 +msgid "Overzicht van het takenonderzoek" +msgstr "Overview of task-based research" + +#: proposals/templates/proposals/proposal_pdf_empty.html:343 +#: proposals/utils/pdf_diff_logic.py:821 +#: studies/templates/studies/study_end.html:7 +#: studies/templates/studies/study_end.html:28 +msgid "Overzicht en eigen beoordeling van het gehele onderzoek" +msgstr "Overview and self-assessment of the entire study" + +#: proposals/templates/proposals/proposal_pdf_empty.html:372 +msgid "Informed consent formulieren voor het onderzoek" +msgstr "Informed consent forms for the study" + +#: proposals/templates/proposals/proposal_pdf_empty.html:389 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150 +#: proposals/templates/proposals/proposal_submit.html:181 +#: proposals/utils/pdf_diff_logic.py:962 +msgid "Aanmelding versturen" +msgstr "Submit application" + #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42 #, python-format msgid "" @@ -2954,6 +2677,25 @@ msgstr "" " Reference number %(reference_number)s\n" " " +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92 +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91 +#: tasks/templates/tasks/task_list.html:21 +msgid "ja,nee" +msgstr "yes,no" + +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99 +msgid "onbekend" +msgstr "unknown" + +#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143 +#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105 +#: proposals/utils/pdf_diff_logic.py:281 +msgid "Download" +msgstr "Download" + #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41 #, python-format msgid "" @@ -3059,6 +2801,7 @@ msgstr "" #: proposals/templates/proposals/proposal_start.html:53 #: proposals/templates/proposals/proposal_start_practice.html:55 #: proposals/templates/proposals/study_start.html:73 +#: proposals/utils/pdf_diff_logic.py:328 #: reviews/templates/reviews/committee_members_workload.html:24 msgid "Traject" msgstr "Trajectory" @@ -3364,6 +3107,10 @@ msgstr "" msgid "Terug naar beoordeling >>" msgstr "Back to review >>" +#: proposals/templates/proposals/proposal_submit.html:179 +msgid "Concept-aanmelding versturen" +msgstr "Submit draft application" + #: proposals/templates/proposals/proposal_submitted.html:8 #: proposals/templates/proposals/proposal_submitted.html:22 msgid "Aanvraag voor voortoetsing verstuurd" @@ -3413,25 +3160,6 @@ msgstr "" "On this page you can edit the forms related to the proposal " "%(title)s(reference number %(ref_number)s)" -#: proposals/templates/proposals/proposal_update_date_start.html:14 -#: proposals/templates/proposals/proposal_update_date_start.html:28 -msgid "Startdatum aanpassen" -msgstr "Edit start date" - -#: proposals/templates/proposals/proposal_update_date_start.html:17 -msgid "" -"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " -"(referentienummer %(ref_number)s). Let op! Als de review al " -"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " -"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op " -"met" -msgstr "" -"On this page, the start date of proposal %(title)s (reference number " -"%(ref_number)s) can be edited. Note! If the review has " -"already been concluded, the new start date will not be displayed in the PDF. " -"If you would like the PDF to be generated with the new start date, please " -"reach out to " - #: proposals/templates/proposals/study_consent.html:27 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement" msgstr "Informed consent school director/ head of the institution" @@ -3501,6 +3229,10 @@ msgstr "" msgid "Voeg extra formulieren toe" msgstr "Add additional forms" +#: proposals/templates/proposals/study_consent.html:138 +msgid "Extra formulieren" +msgstr "Additional forms" + #: proposals/templates/proposals/study_start.html:13 msgid "" "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters." @@ -3522,6 +3254,14 @@ msgstr "" "You can now describe the nature of each trajectory of the study on " "the following pages." +#: proposals/templates/proposals/table_with_header_diff.html:13 +msgid "Originele aanvraag" +msgstr "Original application" + +#: proposals/templates/proposals/table_with_header_diff.html:14 +msgid "Revisie/amendement" +msgstr "Revision/amendment" + #: proposals/templates/proposals/translated_consent_forms.html:25 #: proposals/utils/validate_proposal.py:223 msgid "Vertaling informed consent formulieren" @@ -3583,7 +3323,7 @@ msgstr "Route:" #: proposals/templates/proposals/vue_templates/proposal_list.html:187 #: reviews/templates/reviews/vue_templates/decision_list.html:185 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128 -#: reviews/templates/reviews/vue_templates/review_list.html:190 +#: reviews/templates/reviews/vue_templates/review_list.html:184 msgid "Indieners" msgstr "Applicants" @@ -3604,7 +3344,7 @@ msgstr "Hide" #: proposals/templates/proposals/vue_templates/proposal_list.html:139 #: reviews/templates/reviews/vue_templates/decision_list.html:141 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83 -#: reviews/templates/reviews/vue_templates/review_list.html:145 +#: reviews/templates/reviews/vue_templates/review_list.html:139 msgid "Revisie/amendement van" msgstr "Revision/amendment of" @@ -3625,6 +3365,50 @@ msgstr "WMO check" msgid "Opnieuw beginnen" msgstr "Start again" +#: proposals/utils/pdf_diff_logic.py:93 +msgid "" +"Dit onderdeel is nieuw in de revisie en bestond niet in de originele " +"aanvraag." +msgstr "" +"This section was added in the revision, and did not feature in the original " +"application." + +#: proposals/utils/pdf_diff_logic.py:100 +msgid "" +"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie." +msgstr "" +"This section was present in the original application, but was removed for " +"the revision." + +#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126 +msgid "Onbekend" +msgstr "Unknown" + +#: proposals/utils/pdf_diff_logic.py:284 +msgid "Niet aangeleverd" +msgstr "Not provided" + +#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348 +#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381 +msgid "Traject " +msgstr "Trajectory " + +#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384 +msgid "sessie " +msgstr "session " + +#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392 +msgid "Sessie " +msgstr "Session " + +#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394 +msgid ", taak " +msgstr ", task " + +#: proposals/utils/pdf_diff_logic.py:930 +msgid "Extra formulieren " +msgstr "Additional forms " + #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69 #: proposals/utils/validate_proposal.py:76 msgid "Ethische toetsing nodig door een METC?" @@ -3658,11 +3442,11 @@ msgstr "Forms" msgid "Versturen" msgstr "Submit" -#: proposals/utils/proposal_utils.py:416 +#: proposals/utils/proposal_utils.py:415 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: A revised application uses lab facilities" -#: proposals/utils/proposal_utils.py:418 +#: proposals/utils/proposal_utils.py:417 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: New application uses lab facilities" @@ -3756,11 +3540,11 @@ msgstr "" msgid "Aanvraag verwijderd" msgstr "Application deleted" -#: proposals/views/proposal_views.py:397 +#: proposals/views/proposal_views.py:385 msgid "Wijzigingen opgeslagen" msgstr "Changes saved" -#: proposals/views/proposal_views.py:498 +#: proposals/views/proposal_views.py:486 msgid "Aanvraag gekopieerd" msgstr "Application copied" @@ -3801,7 +3585,7 @@ msgstr "Stage" #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45 #: reviews/templates/reviews/vue_templates/decision_list.html:178 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121 -#: reviews/templates/reviews/vue_templates/review_list.html:183 +#: reviews/templates/reviews/vue_templates/review_list.html:177 msgid "Route" msgstr "Route" @@ -3918,10 +3702,6 @@ msgstr "Not to be assessed further" msgid "Beslissing" msgstr "Decision" -#: reviews/models.py:126 -msgid "Onbekend" -msgstr "Unknown" - #: reviews/models.py:143 msgid "nog geen route" msgstr "no route assigned" @@ -4534,7 +4314,7 @@ msgid "Verplaats naar andere kamer" msgstr "Move study to different reviewing chamber" #: reviews/templates/reviews/vue_templates/review_list.html:95 -#: reviews/utils/review_actions.py:282 +#: reviews/utils/review_actions.py:281 msgid "Verberg aanvraag uit het archief" msgstr "Remove this application from the archive" @@ -4542,10 +4322,6 @@ msgstr "Remove this application from the archive" msgid "Plaats aanvraag in archief" msgstr "Add this application to the archive" -#: reviews/templates/reviews/vue_templates/review_list.html:122 -msgid "Reviewronde beëindigd: " -msgstr "Reviewing round ended: " - #: reviews/templatetags/documents_list.py:145 msgid "Hoofdtraject" msgstr "Main trajectory" @@ -4602,34 +4378,30 @@ msgstr "Information letter for the parents" msgid "Toestemmingsdocument observatie" msgstr "Consent document for observation" -#: reviews/utils/review_actions.py:130 +#: reviews/utils/review_actions.py:129 msgid "Geef jouw beslissing en/of commentaar door" msgstr "Provide feedback on this proposal" -#: reviews/utils/review_actions.py:156 +#: reviews/utils/review_actions.py:155 msgid "Deze aanvraag afsluiten" msgstr "Conclude this application" -#: reviews/utils/review_actions.py:186 +#: reviews/utils/review_actions.py:185 msgid "Beëindig definitief de afhandeling van deze aanvraag" msgstr "Discontinue assessment of this application" -#: reviews/utils/review_actions.py:216 +#: reviews/utils/review_actions.py:215 msgid "Verander aangestelde commissieleden" msgstr "Change appointment of committee members" -#: reviews/utils/review_actions.py:246 +#: reviews/utils/review_actions.py:245 msgid "Datum van bevestigingsbrief aanpassen" msgstr "Change date of confirmation letter" -#: reviews/utils/review_actions.py:284 +#: reviews/utils/review_actions.py:283 msgid "Plaats aanvraag in het archief." msgstr "Add this application to the archive" -#: reviews/utils/review_actions.py:304 -msgid "Startdatum wijzigen" -msgstr "Edit start date" - #: reviews/utils/review_utils.py:54 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding" msgstr "FEtC-H {}: confirmation of draft application submission" @@ -5931,79 +5703,115 @@ msgstr "Task edited" msgid "Taak verwijderd" msgstr "Task deleted" -#~ msgid "Je dient een promotor/begeleider op te geven." -#~ msgstr "You are required to specify a promotor/supervisor." +#: proposals/forms.py:190 +msgid "Je dient een eindverantwoordelijke op te geven." +msgstr "You are required to specify the researcher with final responsibility." + +#: proposals/forms.py:579 +msgid "Nieuwe beoogde startdatum" +msgstr "New intended start date" + +#: proposals/models.py:517 +#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 +#: proposals/templates/proposals/vue_templates/proposal_list.html:166 +msgid "Eindverantwoordelijke onderzoeker" +msgstr "Researcher with final responsibility" + +#: proposals/templates/proposals/proposal_update_date_start.html:14 +#: proposals/templates/proposals/proposal_update_date_start.html:28 +msgid "Startdatum aanpassen" +msgstr "Edit start date" + +#: proposals/templates/proposals/proposal_update_date_start.html:17 +msgid "" +"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " +"(referentienummer %(ref_number)s). Let op! Als de review al " +"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " +"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op " +"met" +msgstr "" +"On this page, the start date of proposal %(title)s (reference number " +"%(ref_number)s) can be edited. Note! If the review has " +"already been concluded, the new start date will not be displayed in the PDF. " +"If you would like the PDF to be generated with the new start date, please " +"reach out to " -#~ msgid "Je kunt niet jezelf als promotor/begeleider opgeven." -#~ msgstr "You cannot submit yourself as the promotor/supervisor." +#: reviews/templates/reviews/vue_templates/review_list.html:122 +msgid "Reviewronde beëindigd: " +msgstr "Reviewing round ended: " -#~ msgid "Promotor/Begeleider" -#~ msgstr "Promotor/Supervisor" +#: reviews/utils/review_actions.py:304 +msgid "Startdatum wijzigen" +msgstr "Edit start date" #~ msgid "" -#~ "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n" -#~ " naar je promotor of begeleider gestuurd worden. Deze " -#~ "persoon \n" -#~ " is de eindverantwoordelijk onderzoeker, en zal de " -#~ "aanvraag \n" -#~ " vervolgens waar nodig kunnen aanpassen en indienen " -#~ "bij de FETC-GW.\n" -#~ "

Belangrijk: als je je " -#~ "promotor of \n" -#~ " begeleider niet kunt vinden met dit veld, dan moeten " -#~ "zij \n" -#~ " waarschijnlijk eerst één keer inloggen in deze " -#~ "portal. \n" -#~ " Je kunt nog wel verder met de aanvraag, maar vergeet " -#~ "dit veld \n" -#~ " niet in te vullen voor je de aanvraag indient. Je " -#~ "aanvraag \n" -#~ " zal dan namelijk niet in behandeling kunnen worden " -#~ "genomen." +#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat " +#~ "niet bevat." #~ msgstr "" -#~ "At the end of the procedure, you need to send this application to your " -#~ "promotor or supervisor for verification. this person is the researcher " -#~ "with final responsibility and can then make adjustments and submit the " -#~ "study to the FEtC-H. Note: if you cannot find your " -#~ "promotor or supervisor using this field, they may have to log into this " -#~ "portal at least once with their Solis-ID. You can continue filling in the " -#~ "application, while you wait for them to do this, but remember to come " -#~ "back and fill in this field before submitting." - -#~ msgid "Overzicht van wijzigingen bij aanmelding " -#~ msgstr "Summary of changes of application " +#~ "This revision involves intervention research, whereas the original " +#~ "application does not." #~ msgid "" -#~ "Dit onderdeel is nieuw in de revisie en bestond niet in de originele " -#~ "aanvraag." +#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag " +#~ "dat wel bevat." #~ msgstr "" -#~ "This section was added in the revision, and did not feature in the " -#~ "original application." +#~ "This revision does not involve intervention research, whereas the " +#~ "original application does include this." #~ msgid "" -#~ "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de " -#~ "revisie." +#~ "De revisie en de originele aanvraag hebben beide een " +#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt " +#~ "doordat de revisie een andere versie van het formulier gebruikt." #~ msgstr "" -#~ "This section was present in the original application, but was removed for " -#~ "the revision." +#~ "This revision and the original application both involve intervention " +#~ "research, but this aspect cannot be compared. The revision uses a newer " +#~ "version of the form than the original." -#~ msgid "Traject " -#~ msgstr "Trajectory " +#~ msgid "ja,nee," +#~ msgstr "yes,no," -#~ msgid "sessie " -#~ msgstr "session " +#~ msgid "" +#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat " +#~ "niet bevat." +#~ msgstr "" +#~ "This revision involves observation research, whereas the original " +#~ "application does not." -#~ msgid "Sessie " -#~ msgstr "Session " +#~ msgid "" +#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag " +#~ "dat wel bevat." +#~ msgstr "" +#~ "This revision does not involve intervention research, whereas the " +#~ "original application involve this." -#~ msgid ", taak " -#~ msgstr ", task " +#~ msgid "" +#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, " +#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een " +#~ "andere versie van het formulier gebruikt." +#~ msgstr "" +#~ "This revision and the original application both involve observation " +#~ "research, but this aspect cannot be compared. The revision uses a newer " +#~ "version of the form than the original." -#~ msgid "Extra formulieren " -#~ msgstr "Additional forms " +#~ msgid "" +#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet " +#~ "bevat." +#~ msgstr "" +#~ "This revision involves tasks research, whereas the original application " +#~ "does not." -#~ msgid "Vul de datum in als 'DD-MM-YYYY'." -#~ msgstr "Enter the date as 'YYYY-MM-DD'." +#~ msgid "" +#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat " +#~ "wel bevat." +#~ msgstr "" +#~ "This revision does not involve tasks research, whereas the original " +#~ "application does involve this." + +#~ msgid "Dit traject is nieuw in de revisie." +#~ msgstr "This trajectory was added in this revision." + +#~ msgid "Dit traject is weggehaald uit de revisie" +#~ msgstr "This trajectory was removed in this revision." #, python-format #~ msgid "" @@ -6013,5 +5821,30 @@ msgstr "Task deleted" #~ "Click here to log in again with your Solis-" #~ "ID." +#~ msgid "" +#~ "Aan het einde van de procedure kan je deze aanvraag ter\n" +#~ " verificatie naar je eindverantwoordelijke sturen. De\n" +#~ " eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen " +#~ "en\n" +#~ " indienen bij de FETC-GW.

NB: als je je\n" +#~ " eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n" +#~ " waarschijnlijk eerst één keer inloggen in deze portal. Je kunt " +#~ "nog wel\n" +#~ " verder met de aanvraag, maar vergeet dit veld niet in te vullen " +#~ "voor je de\n" +#~ " aanvraag indient." +#~ msgstr "" +#~ "At the end of the procedure, you can send this application to the " +#~ "researcher with final responsibility for verification. The researcher " +#~ "with final responsibility can then make adjustments and submit the study " +#~ "to the FEtC-H. Note: if you cannot find your supervisor " +#~ "using this field, they may have to log into this portal at least once " +#~ "with their Solis-ID. You can continue filling in the application while " +#~ "you wait for them to do this, but remember to come back and fill in this " +#~ "field before submitting." + #~ msgid "Werkverdeling overzicht van afgelopen jaar" #~ msgstr "Workload overview of past year" + +#~ msgid "Vul de datum in als 'DD-MM-YYYY'." +#~ msgstr "Enter the date as 'YYYY-MM-DD'."