From d58e013e614ae84b7ae7030847bb4103f7821bcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Nov 2020 21:44:26 +0000
Subject: [PATCH 01/13] Bump lodash from 4.17.15 to 4.17.20
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)
Signed-off-by: dependabot[bot]
k?nGaI_P;8I4lp-VMa@V(bPp2L%>02`G!ao|#IdM)
z3s471zJVUTV)HE-wY@H30yd2HI2-U?)WOy##!P)Y>O*RJOwhdJcgWDxrlAg?BltT0
zh^=v)&*T1Laz93qjvHh~d %5}(`OXg&Pu5fE+
zlYBBw73t73l;yG=tNGM}9#_pr-kXHegizbgKzxaG9>Q8W688A{Uyyjs-g$}mC@OZe
z=^uy}u@5?;dfeQZkVIHO2qEZ7hhI^5D)H`Em3w|B?+W+aA?TV(C`VaK{E)J<+W)%v
z<%N6wh=-`$oYX5=iAH|K666==#vuer{t&yrbp%HLUpK!wK8hS8sctjh2Ax8Y|Mdbw-D;Runjdc&ry3OPZKlX
zHt12s$wc&GNYvDI7Gha!i1)A?7Hj4@8*mlsMb)smnfeZ>51o;yQ?M8{wNa?^eH?$m
zn^*<=w{X3`Cp?I)NVjdt`PV!BXiKvz&*D_l*HCNN`A66Jg2PcG_Ox=nzi=3jI)-mi
zAE%+MP5maAigXXu1IJ?xyojSQV;fih=
\n" "Language-Team: English\n" "Language: en_GB\n" @@ -94,22 +94,33 @@ msgstr "" msgid "Invalid JSON format" msgstr "" -#: ../../app/controllers/api/v1/plans_controller.rb:36 -#: ../../app/controllers/api/v1/plans_controller.rb:39 +#: ../../app/controllers/api/v1/plans_controller.rb:20 msgid "Plan not found" msgstr "" -#: ../../app/controllers/api/v1/plans_controller.rb:59 -#: ../../app/controllers/api/v1/plans_controller.rb:69 +#: ../../app/controllers/api/v1/plans_controller.rb:37 +msgid "Unable to create your DMP" +msgstr "" + +#: ../../app/controllers/api/v1/plans_controller.rb:38 msgid "Plan already exists. Send an update instead." msgstr "" -#: ../../app/controllers/api/v1/plans_controller.rb:83 -#: ../../app/controllers/api/v1/plans_controller.rb:87 +#: ../../app/controllers/api/v1/plans_controller.rb:39 +msgid "" +"Could not determine ownership of the DMP. Please add an\n" +" :affiliation to the :contact" +msgstr "" + +#: ../../app/controllers/api/v1/plans_controller.rb:74 +msgid "Invalid JSON!" +msgstr "" + +#: ../../app/controllers/api/v1/plans_controller.rb:77 msgid "Invalid JSON" msgstr "" -#: ../../app/controllers/api/v1/plans_controller.rb:104 +#: ../../app/controllers/api/v1/plans_controller.rb:93 msgid "No Plans found" msgstr "" @@ -189,7 +200,7 @@ msgstr "" msgid "Restricted access to View All the records" msgstr "" -#: ../../app/controllers/concerns/paginable.rb:163 +#: ../../app/controllers/concerns/paginable.rb:161 msgid "Sort by %{sort_field}" msgstr "" @@ -245,7 +256,7 @@ msgstr "" #: ../../app/controllers/org_admin/departments_controller.rb:48 #: ../../app/controllers/org_admin/sections_controller.rb:102 #: ../../app/controllers/org_admin/templates_controller.rb:203 -#: ../../app/controllers/orgs_controller.rb:83 +#: ../../app/controllers/orgs_controller.rb:87 #: ../../app/controllers/plans_controller.rb:257 #: ../../app/controllers/plans_controller.rb:260 #: ../../app/controllers/registrations_controller.rb:236 @@ -264,7 +275,7 @@ msgstr "" #: ../../app/controllers/org_admin/departments_controller.rb:50 #: ../../app/controllers/org_admin/sections_controller.rb:104 #: ../../app/controllers/org_admin/templates_controller.rb:208 -#: ../../app/controllers/orgs_controller.rb:85 +#: ../../app/controllers/orgs_controller.rb:89 #: ../../app/controllers/plans_controller.rb:266 #: ../../app/controllers/plans_controller.rb:269 #: ../../app/controllers/plans_controller.rb:273 @@ -313,7 +324,7 @@ msgstr "" #: ../../app/controllers/org_admin/sections_controller.rb:78 #: ../../app/controllers/org_admin/templates_controller.rb:177 #: ../../app/controllers/plans_controller.rb:118 -#: ../../app/controllers/super_admin/api_clients_controller.rb:36 +#: ../../app/controllers/super_admin/api_clients_controller.rb:44 #: ../../app/controllers/super_admin/notifications_controller.rb:38 #: ../../app/controllers/super_admin/orgs_controller.rb:62 #: ../../app/controllers/super_admin/themes_controller.rb:22 @@ -329,7 +340,7 @@ msgstr "" #: ../../app/controllers/org_admin/sections_controller.rb:85 #: ../../app/controllers/org_admin/templates_controller.rb:179 #: ../../app/controllers/plans_controller.rb:151 -#: ../../app/controllers/super_admin/api_clients_controller.rb:43 +#: ../../app/controllers/super_admin/api_clients_controller.rb:51 #: ../../app/controllers/super_admin/notifications_controller.rb:41 #: ../../app/controllers/super_admin/orgs_controller.rb:65 #: ../../app/controllers/super_admin/themes_controller.rb:25 @@ -362,7 +373,7 @@ msgstr "" #: ../../app/controllers/org_admin/questions_controller.rb:197 #: ../../app/controllers/org_admin/sections_controller.rb:126 #: ../../app/controllers/plans_controller.rb:318 -#: ../../app/controllers/super_admin/api_clients_controller.rb:65 +#: ../../app/controllers/super_admin/api_clients_controller.rb:79 #: ../../app/controllers/super_admin/notifications_controller.rb:83 #: ../../app/controllers/super_admin/themes_controller.rb:50 msgid "deleted" @@ -376,7 +387,7 @@ msgstr "" #: ../../app/controllers/org_admin/questions_controller.rb:199 #: ../../app/controllers/org_admin/sections_controller.rb:128 #: ../../app/controllers/plans_controller.rb:323 -#: ../../app/controllers/super_admin/api_clients_controller.rb:68 +#: ../../app/controllers/super_admin/api_clients_controller.rb:82 #: ../../app/controllers/super_admin/notifications_controller.rb:86 #: ../../app/controllers/super_admin/themes_controller.rb:53 msgid "delete" @@ -424,7 +435,7 @@ msgstr "" #: ../../app/controllers/org_admin/questions_controller.rb:166 #: ../../app/controllers/org_admin/users_controller.rb:30 #: ../../app/controllers/plans_controller.rb:386 -#: ../../app/controllers/super_admin/api_clients_controller.rb:53 +#: ../../app/controllers/super_admin/api_clients_controller.rb:67 #: ../../app/controllers/super_admin/notifications_controller.rb:51 #: ../../app/controllers/super_admin/themes_controller.rb:39 #: ../../app/controllers/super_admin/users_controller.rb:55 @@ -436,7 +447,7 @@ msgstr "" #: ../../app/controllers/org_admin/questions_controller.rb:169 #: ../../app/controllers/org_admin/users_controller.rb:32 #: ../../app/controllers/plans_controller.rb:389 -#: ../../app/controllers/super_admin/api_clients_controller.rb:55 +#: ../../app/controllers/super_admin/api_clients_controller.rb:69 #: ../../app/controllers/super_admin/notifications_controller.rb:53 #: ../../app/controllers/super_admin/themes_controller.rb:41 #: ../../app/controllers/super_admin/users_controller.rb:57 @@ -562,19 +573,19 @@ msgstr "" msgid "Unable to download the DMP Template at this time." msgstr "" -#: ../../app/controllers/orgs_controller.rb:106 +#: ../../app/controllers/orgs_controller.rb:111 msgid "No organisations are currently registered." msgstr "" -#: ../../app/controllers/orgs_controller.rb:128 +#: ../../app/controllers/orgs_controller.rb:133 msgid "Your organisation does not seem to be properly configured." msgstr "" -#: ../../app/controllers/orgs_controller.rb:133 +#: ../../app/controllers/orgs_controller.rb:138 msgid "Please choose an organisation" msgstr "" -#: ../../app/controllers/plan_exports_controller.rb:83 +#: ../../app/controllers/plan_exports_controller.rb:84 msgid "Created using %{application_name}. Last modified %{date}" msgstr "" @@ -779,7 +790,7 @@ msgstr "" msgid "An error has occurred while saving/resetting your export settings." msgstr "" -#: ../../app/controllers/super_admin/api_clients_controller.rb:37 +#: ../../app/controllers/super_admin/api_clients_controller.rb:45 msgid ". The API credentials have been emailed to %{email}" msgstr "" @@ -943,6 +954,11 @@ msgid "" " at %{organisation_email}.
" msgstr "" +#: ../../app/helpers/identifier_helper.rb:6 +#: ../../spec/helpers/identifier_helper_spec.rb:14 +msgid "None defined" +msgstr "" + #: ../../app/helpers/mailer_helper.rb:31 msgid "co-owner" msgstr "" @@ -1310,11 +1326,11 @@ msgstr "" msgid "You must specify at least one role." msgstr "" -#: ../../app/models/contributor.rb:108 +#: ../../app/models/contributor.rb:135 msgid "can't be blank if no email is provided" msgstr "" -#: ../../app/models/contributor.rb:109 +#: ../../app/models/contributor.rb:136 msgid "can't be blank if no name is provided" msgstr "" @@ -1376,7 +1392,7 @@ msgstr "" msgid "private" msgstr "" -#: ../../app/models/plan.rb:583 +#: ../../app/models/plan.rb:585 ../../app/models/research_output.rb:119 msgid "must be after the start date" msgstr "" @@ -1468,7 +1484,7 @@ msgstr "" msgid "Conditions in the template refer backwards" msgstr "" -#: ../../app/models/user.rb:372 +#: ../../app/models/user.rb:377 msgid "A Data Management Plan in %{application_name} has been shared with you" msgstr "" @@ -1519,11 +1535,6 @@ msgid "" "and execution." msgstr "" -#: ../../app/presenters/identifier_presenter.rb:27 -#: ../../spec/presenters/identifier_presenter_spec.rb:54 -msgid "None defined" -msgstr "" - #: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40 msgid "Invalid grant type" msgstr "" @@ -1544,6 +1555,35 @@ msgstr "" msgid "Missing token" msgstr "" +#: ../../app/services/api/v1/json_validation_service.rb:11 +msgid ":title and the contact's :mbox are both required fields" +msgstr "" + +#: ../../app/services/api/v1/json_validation_service.rb:12 +msgid ":type and :identifier are required for all ids" +msgstr "" + +#: ../../app/services/api/v1/json_validation_service.rb:13 +msgid ":name is required for every :affiliation and :funding" +msgstr "" + +#: ../../app/services/api/v1/json_validation_service.rb:14 +msgid ":role and either the :name or :email are required for each :contributor" +msgstr "" + +#: ../../app/services/api/v1/json_validation_service.rb:15 +msgid ":name, :funder_id or :grant_id are required for each funding" +msgstr "" + +#: ../../app/services/api/v1/json_validation_service.rb:16 +msgid ":title is required for each :dataset" +msgstr "" + +#: ../../app/services/api/v1/json_validation_service.rb:59 +#: ../../spec/services/api/v1/json_validation_service_spec.rb:129 +msgid "invalid JSON" +msgstr "" + #: ../../app/services/template/upgrade_customization_service.rb:66 msgid "upgrade_customization! requires a customised template" msgstr "" @@ -1613,7 +1653,7 @@ msgstr "" #: ../../app/views/contributors/_form.html.erb:91 #: ../../app/views/devise/passwords/edit.html.erb:28 #: ../../app/views/devise/registrations/_password_details.html.erb:31 -#: ../../app/views/devise/registrations/_personal_details.html.erb:100 +#: ../../app/views/devise/registrations/_personal_details.html.erb:89 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23 #: ../../app/views/guidances/new_edit.html.erb:48 #: ../../app/views/notes/_edit.html.erb:9 @@ -1631,7 +1671,7 @@ msgstr "" #: ../../app/views/plans/_edit_details.html.erb:10 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 -#: ../../app/views/super_admin/api_clients/_form.html.erb:58 +#: ../../app/views/super_admin/api_clients/_form.html.erb:65 #: ../../app/views/super_admin/notifications/_form.html.erb:65 #: ../../app/views/super_admin/themes/_form.html.erb:13 #: ../../app/views/super_admin/users/edit.html.erb:61 @@ -1681,7 +1721,7 @@ msgstr "" #: ../../app/views/paginable/guidance_groups/_index.html.erb:6 #: ../../app/views/paginable/themes/_index.html.erb:4 #: ../../app/views/paginable/users/_index.html.erb:20 -#: ../../app/views/super_admin/api_clients/_form.html.erb:10 +#: ../../app/views/super_admin/api_clients/_form.html.erb:11 msgid "Name" msgstr "Name" @@ -1754,7 +1794,7 @@ msgstr "" #: ../../app/views/paginable/templates/_organisational.html.erb:85 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:28 #: ../../app/views/paginable/templates/_publicly_visible.html.erb:35 -#: ../../app/views/plans/_download_form.html.erb:116 +#: ../../app/views/plans/_download_form.html.erb:119 #: ../../app/views/static_pages/about_us.html.erb:22 #: ../../app/views/static_pages/about_us.html.erb:29 #: ../../app/views/static_pages/termsuse.html.erb:46 @@ -1795,8 +1835,8 @@ msgstr "" #: ../../app/views/org_admin/conditions/_container.html.erb:11 #: ../../app/views/org_admin/conditions/_form.html.erb:31 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:40 -#: ../../app/views/paginable/api_clients/_index.html.erb:52 -#: ../../app/views/paginable/contributors/_index.html.erb:61 +#: ../../app/views/paginable/api_clients/_index.html.erb:44 +#: ../../app/views/paginable/contributors/_index.html.erb:55 #: ../../app/views/paginable/departments/_index.html.erb:28 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50 #: ../../app/views/paginable/guidances/_index.html.erb:61 @@ -1819,7 +1859,7 @@ msgstr "" #: ../../app/views/org_admin/questions/_form.html.erb:105 #: ../../app/views/plans/_guidance_selection.html.erb:35 #: ../../app/views/plans/new.html.erb:124 -#: ../../app/views/super_admin/api_clients/_form.html.erb:77 +#: ../../app/views/super_admin/api_clients/_form.html.erb:84 #: ../../app/views/super_admin/notifications/_form.html.erb:72 #: ../../app/views/super_admin/themes/_form.html.erb:19 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15 @@ -2046,6 +2086,36 @@ msgstr "" msgid "Send" msgstr "" +#: ../../app/views/devise/registrations/_api_token.html.erb:6 +msgid "Access token" +msgstr "" + +#: ../../app/views/devise/registrations/_api_token.html.erb:10 +msgid "Click the button below to generate an API token" +msgstr "" + +#: ../../app/views/devise/registrations/_api_token.html.erb:14 +msgid "Documentation" +msgstr "" + +#: ../../app/views/devise/registrations/_api_token.html.erb:16 +msgid "" +"See the documentation for v0 for more details on " +"the original API which includes access to statistics, the full text of plans a" +"nd the ability to connect users with departments." +msgstr "" + +#: ../../app/views/devise/registrations/_api_token.html.erb:18 +msgid "" +"See the documentation for v1 for more details on " +"the API that supports the RDA Common metadata st" +"andard for DMPs." +msgstr "" + +#: ../../app/views/devise/registrations/_api_token.html.erb:21 +msgid "Regenerate token" +msgstr "" + #: ../../app/views/devise/registrations/_external_identifier.html.erb:5 #: ../../app/views/devise/registrations/_external_identifier.html.erb:21 msgid "" @@ -2174,18 +2244,6 @@ msgstr "" msgid "Organisational Admin" msgstr "" -#: ../../app/views/devise/registrations/_personal_details.html.erb:90 -msgid "API token" -msgstr "" - -#: ../../app/views/devise/registrations/_personal_details.html.erb:94 -msgid "API Information" -msgstr "" - -#: ../../app/views/devise/registrations/_personal_details.html.erb:95 -msgid "How to use the API" -msgstr "" - #: ../../app/views/devise/registrations/edit.html.erb:1 #: ../../app/views/devise/registrations/edit.html.erb:4 #: ../../app/views/layouts/_signin_signout.html.erb:29 @@ -2196,7 +2254,11 @@ msgstr "" msgid "Personal Details" msgstr "" -#: ../../app/views/devise/registrations/edit.html.erb:21 +#: ../../app/views/devise/registrations/edit.html.erb:22 +msgid "API Access" +msgstr "" + +#: ../../app/views/devise/registrations/edit.html.erb:27 msgid "Notification Preferences" msgstr "" @@ -2209,7 +2271,7 @@ msgid "Do you have a %{application_name} account?" msgstr "" #: ../../app/views/devise/registrations/new.html.erb:22 -#: ../../app/views/layouts/_navigation.html.erb:64 +#: ../../app/views/layouts/_navigation.html.erb:63 #: ../../app/views/layouts/_signin_signout.html.erb:41 #: ../../app/views/shared/_access_controls.html.erb:5 #: ../../app/views/shared/_sign_in_form.html.erb:19 @@ -2406,7 +2468,7 @@ msgid "Admin" msgstr "" #: ../../app/views/layouts/_branding.html.erb:66 -#: ../../app/views/org_admin/users/edit.html.erb:72 +#: ../../app/views/org_admin/users/edit.html.erb:71 #: ../../app/views/paginable/users/_index.html.erb:26 #: ../../app/views/super_admin/users/edit.html.erb:105 msgid "Plans" @@ -2502,24 +2564,24 @@ msgid "Reference" msgstr "" #: ../../app/views/layouts/_navigation.html.erb:36 -#: ../../app/views/layouts/_navigation.html.erb:48 +#: ../../app/views/layouts/_navigation.html.erb:47 #: ../../app/views/public_pages/plan_index.html.erb:1 #: ../../app/views/public_pages/plan_index.html.erb:4 msgid "Public DMPs" msgstr "" #: ../../app/views/layouts/_navigation.html.erb:39 -#: ../../app/views/layouts/_navigation.html.erb:51 +#: ../../app/views/layouts/_navigation.html.erb:50 #: ../../app/views/public_pages/template_index.html.erb:1 #: ../../app/views/public_pages/template_index.html.erb:4 msgid "DMP Templates" msgstr "" -#: ../../app/views/layouts/_navigation.html.erb:45 +#: ../../app/views/layouts/_navigation.html.erb:44 msgid "Home" msgstr "" -#: ../../app/views/layouts/_navigation.html.erb:56 +#: ../../app/views/layouts/_navigation.html.erb:55 #: ../../app/views/static_pages/about_us.html.erb:35 #: ../../app/views/static_pages/help.html.erb:1 #: ../../app/views/static_pages/help.html.erb:4 @@ -2649,8 +2711,8 @@ msgstr "" #: ../../app/views/notes/_list.html.erb:15 #: ../../app/views/org_admin/questions/_show.html.erb:217 -#: ../../app/views/paginable/api_clients/_index.html.erb:51 -#: ../../app/views/paginable/contributors/_index.html.erb:59 +#: ../../app/views/paginable/api_clients/_index.html.erb:43 +#: ../../app/views/paginable/contributors/_index.html.erb:53 #: ../../app/views/paginable/departments/_index.html.erb:27 #: ../../app/views/paginable/guidance_groups/_index.html.erb:44 #: ../../app/views/paginable/guidances/_index.html.erb:54 @@ -2782,9 +2844,8 @@ msgstr "" #: ../../app/views/org_admin/sections/_form.html.erb:11 #: ../../app/views/org_admin/templates/_form.html.erb:10 #: ../../app/views/org_admin/templates/_show.html.erb:5 -#: ../../app/views/paginable/api_clients/_index.html.erb:9 #: ../../app/views/paginable/templates/_organisational.html.erb:10 -#: ../../app/views/super_admin/api_clients/_form.html.erb:20 +#: ../../app/views/super_admin/api_clients/_form.html.erb:21 msgid "Description" msgstr "" @@ -2898,10 +2959,10 @@ msgid "Type" msgstr "" #: ../../app/views/org_admin/plans/index.html.erb:19 -#: ../../app/views/paginable/api_clients/_index.html.erb:26 -#: ../../app/views/paginable/api_clients/_index.html.erb:48 +#: ../../app/views/paginable/api_clients/_index.html.erb:20 +#: ../../app/views/paginable/api_clients/_index.html.erb:40 #: ../../app/views/paginable/contributors/_index.html.erb:19 -#: ../../app/views/paginable/contributors/_index.html.erb:56 +#: ../../app/views/paginable/contributors/_index.html.erb:50 #: ../../app/views/paginable/departments/_index.html.erb:7 #: ../../app/views/paginable/departments/_index.html.erb:24 #: ../../app/views/paginable/guidance_groups/_index.html.erb:10 @@ -3020,7 +3081,7 @@ msgstr "" #: ../../app/views/org_admin/questions/_form.html.erb:102 #: ../../app/views/org_admin/sections/_form.html.erb:19 -#: ../../app/views/super_admin/api_clients/_form.html.erb:70 +#: ../../app/views/super_admin/api_clients/_form.html.erb:77 #: ../../app/views/super_admin/notifications/_form.html.erb:67 #: ../../app/views/super_admin/themes/_form.html.erb:15 msgid "Delete" @@ -3518,8 +3579,12 @@ msgstr "" msgid "Create an account with any email address" msgstr "" +#: ../../app/views/paginable/api_clients/_index.html.erb:9 +msgid "Org" +msgstr "" + #: ../../app/views/paginable/api_clients/_index.html.erb:12 -#: ../../app/views/super_admin/api_clients/_form.html.erb:14 +#: ../../app/views/super_admin/api_clients/_form.html.erb:15 msgid "Homepage" msgstr "" @@ -3528,30 +3593,21 @@ msgid "Contact" msgstr "" #: ../../app/views/paginable/api_clients/_index.html.erb:18 -msgid "Client_id" -msgstr "" - -#: ../../app/views/paginable/api_clients/_index.html.erb:21 -#: ../../app/views/super_admin/api_clients/_form.html.erb:42 -msgid "Client Secret" -msgstr "" - -#: ../../app/views/paginable/api_clients/_index.html.erb:24 msgid "Last Accessed" msgstr "" -#: ../../app/views/paginable/api_clients/_index.html.erb:38 -#: ../../app/views/super_admin/api_clients/_form.html.erb:50 +#: ../../app/views/paginable/api_clients/_index.html.erb:30 +#: ../../app/views/super_admin/api_clients/_form.html.erb:57 msgid "Never" msgstr "" -#: ../../app/views/paginable/api_clients/_index.html.erb:52 +#: ../../app/views/paginable/api_clients/_index.html.erb:44 msgid "" "You are about to delete '%{client_name}'. They will no longer be able to acces" "s the API. Are you sure?" msgstr "" -#: ../../app/views/paginable/contributors/_index.html.erb:63 +#: ../../app/views/paginable/contributors/_index.html.erb:57 msgid "You are about to delete '%{contributor_name}'. Are you sure?" msgstr "" @@ -3901,75 +3957,75 @@ msgstr "" msgid "Instructions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:2 +#: ../../app/views/plans/_download_form.html.erb:3 +msgid "Format" +msgstr "" + +#: ../../app/views/plans/_download_form.html.erb:12 msgid "Download settings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:6 +#: ../../app/views/plans/_download_form.html.erb:16 msgid "Select phase to download" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:13 +#: ../../app/views/plans/_download_form.html.erb:23 msgid "Optional plan components" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:17 +#: ../../app/views/plans/_download_form.html.erb:27 msgid "project details coversheet" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:23 +#: ../../app/views/plans/_download_form.html.erb:33 msgid "question text and section headings" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:29 +#: ../../app/views/plans/_download_form.html.erb:39 msgid "unanswered questions" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:36 +#: ../../app/views/plans/_download_form.html.erb:46 msgid "supplementary section(s) not requested by funding organisation" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:42 -msgid "Format" -msgstr "" - -#: ../../app/views/plans/_download_form.html.erb:51 +#: ../../app/views/plans/_download_form.html.erb:54 msgid "PDF formatting" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:54 +#: ../../app/views/plans/_download_form.html.erb:57 msgid "Font" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:57 +#: ../../app/views/plans/_download_form.html.erb:60 msgid "Margin (mm)" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:62 +#: ../../app/views/plans/_download_form.html.erb:65 msgid "Face" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:70 +#: ../../app/views/plans/_download_form.html.erb:73 msgid "Size" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:78 +#: ../../app/views/plans/_download_form.html.erb:81 msgid "Top" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:87 +#: ../../app/views/plans/_download_form.html.erb:90 msgid "Bottom" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:96 +#: ../../app/views/plans/_download_form.html.erb:99 msgid "Left" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:105 +#: ../../app/views/plans/_download_form.html.erb:108 msgid "Right" msgstr "" -#: ../../app/views/plans/_download_form.html.erb:116 +#: ../../app/views/plans/_download_form.html.erb:119 msgid "" "Download Plan (new window)%{open_in_new_window_text}" @@ -4823,31 +4879,35 @@ msgid "" " terms and conditions." msgstr "" -#: ../../app/views/super_admin/api_clients/_form.html.erb:26 +#: ../../app/views/super_admin/api_clients/_form.html.erb:27 msgid "Contact Name" msgstr "" -#: ../../app/views/super_admin/api_clients/_form.html.erb:30 +#: ../../app/views/super_admin/api_clients/_form.html.erb:31 msgid "Contact Email" msgstr "" -#: ../../app/views/super_admin/api_clients/_form.html.erb:38 +#: ../../app/views/super_admin/api_clients/_form.html.erb:45 msgid "Client ID" msgstr "" #: ../../app/views/super_admin/api_clients/_form.html.erb:49 +msgid "Client Secret" +msgstr "" + +#: ../../app/views/super_admin/api_clients/_form.html.erb:56 msgid "Last accessed on" msgstr "" -#: ../../app/views/super_admin/api_clients/_form.html.erb:61 +#: ../../app/views/super_admin/api_clients/_form.html.erb:68 msgid "Refresh client ID and secret" msgstr "" -#: ../../app/views/super_admin/api_clients/_form.html.erb:65 +#: ../../app/views/super_admin/api_clients/_form.html.erb:72 msgid "Email credentials to contact" msgstr "" -#: ../../app/views/super_admin/api_clients/_form.html.erb:74 +#: ../../app/views/super_admin/api_clients/_form.html.erb:81 msgid "Are you sure you want to delete the API client: \"%{name}\"" msgstr "" @@ -4886,7 +4946,11 @@ msgid "New API Client" msgstr "" #: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1 -msgid "Successsfully refreshed the client credentials." +msgid "Successfully regenerated the client credentials." +msgstr "" + +#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1 +msgid "Unable to regenerate the client credentials." msgstr "" #: ../../app/views/super_admin/notifications/_form.html.erb:20 @@ -5361,6 +5425,14 @@ msgstr "" msgid "Download users" msgstr "" +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Successfully regenerate your API token." +msgstr "" + +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "" + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "" diff --git a/config/locale/en_US/LC_MESSAGES/app.mo b/config/locale/en_US/LC_MESSAGES/app.mo index 15292dda3e51af87e0bb3e8620d3627e813947ce..8259c2b27864d52802a2c984d9b274be63edc522 100644 GIT binary patch delta 43 ucmdnKlyUn~#tn*kTt>Qv77B)@Rt5%>we{q9AzU*n14C^C!_8rOi7EgG!wU5P delta 43 tcmdnKlyUn~#tn*kTn4&^Mhb?;RtA=nwe{q9AzV`+SKGj7bC_PD3IGQ)3iJQ~ diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index 61bd227e6..05d525419 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: app 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2020-10-12 13:09+0000\n" -"PO-Revision-Date: 2020-10-12 15:09+0200\n" +"POT-Creation-Date: 2020-12-18 15:00+0000\n" +"PO-Revision-Date: 2020-12-18 16:01+0100\n" "Last-Translator: FULL NAMEaCfFU2qvbME?^aF+^_9Gp}8@`R4tMMD6}JQNLWSM)i0DYU=i)PQXK`j$Ou7cn8Ph
z1N;mV7MSy-`a;uzo~Zl#VF|teu|%}?@1Uk;6>5#v+w>OHR3}@%L>){QP!GO`y8neO
z&$7srdr@m&6?McnL)Ghunu!Pu)cYSxB!G-zsDoo9Y7;I(eW+|jP2mk}j~U)IzuEM}
z;iRY8bgK8vSF_5fkL_uwCHMgKz`dxBA3?Q$0YmiuKO&;34qj{;Zj74hc+^2O0kx?X
zp*GbT)b8JcdOHrI>R-i=@F9MRE0^$FG)BB{?hjgO-lFoTnQMjqwnTam(bTU)J?JCr
zCpek(G1S_2TxMpfD{2$=unt3Y^c~dNuE!wUit6ZTRQos3-K?ngQZMKI*8>BWn<>j<
zt%TZKtx*m4vyR5%r01X-O2%S%0`sUvlW@s;JW-{I|9cqR;
zf|F3M^&G5^TT$)&h8gw!zsOBRL>qz*VFpiL$aDp4U&`x>67Qz_9
zWb!lU3?9wRuaS68&{diAZbBm}jkOI|CO?%ecPsIutSwWz3i0C9-$VR;98c&;ycGG5
ziR;>AaGsD}Zu5@oJ9q}Bv>X-tQ(=m&G=luhFFmj*@p+UDB8;&QUQOO^>Lrtx-`
alXcJQ?0c2W}2h?=0LtgW>hY6SgJ
z4NgKmXg;RL9jGr9*KGNB)Qcr
uegG!
znfVrFUe$@WnVHCmn%M%V87zr94Gp(({xwx@GBkx_Q6pT4`EeU+vpvV_m}a|a;1gtC&3F8_fzqstsFqv2rBE^MxKw2pC
F9bK;$==6_U1FgrWPUz(7l&?WoPi(v=kp<7Bc-)MYfiP5GG*3w&J2EjQ
z%){)*`?S8R+n#x&QxCr2a=B7Z4RQ@k?`Ns J4@Xb=;m}Sxm6V)T@g1NH@YbxC+&g^{Bmd
z67{}t|4u|7i`%G?eYO=6Ew+ETgvH6Pjm2;b>J4}hRo`ccS@S?tN6Vs4MP1ZVwy}0c
z&$k0LQ!`Dz+u1;*H5q$RFAV>sW;69fjc@>dz$G{dXD>4y%D&vZ7ecTt`O{DxeUI8x
zc~_VvDux
JdiKcmjF1Z2nBrmC0{LXhK|@egpUaP5k3khsa)nHul$)J)*8I&*6`Jz2pB31~*J1
zQirgDIN#I%*EOD0CvKch{@3`i{WJ`5R@-1|;t#2p41LI(L>NH*jZ|JkyfyO6$n*RA
zJn`9j20kLVYw{mm`V7@oi^4lL?^kZlLnuR@&eKHVRdh4gdg2XjoIff!?d?6)DBDk{
zLO4TMZR-$q;uR-!A>3AmmfB