- <%= f.label(:text, sanitize(question.text), class: 'control-label') %>
+ <%= sanitize(question.text) %>
diff --git a/app/views/shared/export/_plan.erb b/app/views/shared/export/_plan.erb
index dac27560f2..aae3b9b705 100644
--- a/app/views/shared/export/_plan.erb
+++ b/app/views/shared/export/_plan.erb
@@ -18,7 +18,7 @@
<% @hash[:phases].each do |phase| %>
<%# Only render selected phase %>
- <% if phase[:title] == @selected_phase.title %>
+ <% if @hash[:all_phases] || (@selected_phase.present? && phase[:title] == @selected_phase.title) %>
<%# Page break before each phase %>
<%= download_plan_page_title(@plan, phase, @hash) %>
diff --git a/app/views/shared/export/_plan_txt.erb b/app/views/shared/export/_plan_txt.erb
index 7a9c42b87f..ff8570c785 100644
--- a/app/views/shared/export/_plan_txt.erb
+++ b/app/views/shared/export/_plan_txt.erb
@@ -38,7 +38,7 @@
<% @hash[:phases].each do |phase| %>
<%# Only render selected phase %>
-<% if phase[:title] == @selected_phase.title %>
+<% if @hash[:all_phases] || (@selected_phase.present? && phase[:title] == @selected_phase.title) %>
<%= (@hash[:phases].length > 1 ? "#{phase[:title]}" : "") %>
<% phase[:sections].each do |section| %>
<% if display_section?(@hash[:customization], section, @show_custom_sections) && num_section_questions(@plan, section, phase) > 0 %>
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index 391bbbe2fe..e83ca4eafb 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-4FSsri29cvN40KDVEm8UzDbpxpjQB0dGq7k9VBDzrg3ItEAcz5NZ3/L0wt+IhEHa2dfZCGO3d49GpjWxVXNIVxxhYirRl/ow5j46el9QDE4rwuy5111HrD5LJQgmE2RldkdkrjxCy31ZGHUD1LAyqmDz4Gv1Am7CCtpSatuUFNg/sIMMagRftj+yayJo2+5m2n7lSffKm91+c00OeMs6GB7ND88lXgRd4x7IcIfq5Plb3X+0ZI5vBZ/A757g4Sg+dF1JzNrfqBpWAOsyjOCsjXNQC3FQfCcITvWxp2V6JKgbNlBUTvW1+O4j5SGa5CoM9PDzAGC1Ea311ovckaJe3fHKMWXGE8jDXYZvaSyWPLSGEMxsS6YYvE0xdb1zVfupZGkBkvDXkcER6rqZHL5Cv5fjlaKB3mimyzN+lJfRBerNuGoKhILg+hSSXtHNCDElbgCyF4dTXkGxysKCsbU8Kc47hzHzNOg4PWGMBGCrA4yas+yHz+haC7fCcji2oezDSThXEpC9bhC7BfcnjJssolNfAIjGS5V/Mjc8t5BLLWyzGjPZkd8xDS8SqjAUoZtSyA0N3hI3u4ORIN+FuKPzyhC3i/h5iNMs7yl9146d+OJPDP7Q6B7tMu+iQqEdds+rtdVcshW+XBnWpuNEfnKWfBsxCsBM8H1jtMOmFt8Qa2jFaur+/n1JbmCWR13Awq4DddlaUZVQWRqJfdEy5a/hJxBWbnXTDtPvuZoVURkhfT2K/sIE6cC8w3666t7I7ivDhtBPe7ITDbc0nz2/wvQ8bJEDO2+YyGFUDJvtARBhnZd6bmTA0gnoEMa/PqFw2yNFVgEUGBOk4EYGXF6sPGQagRGTW9Y22d69FKt65pXDHzjaXluGvnER--BJS+WE67bWvOYcFo--v91cp8ZTRV08WEfy3YzsGA==
\ No newline at end of file
+sx6LH1olJpf4RqFKIx26Se+OJdsxRXioa2WNy2MsZHzMJnKaH7/cPBVEZXSaymth09QlioRPAS9MZDZpg335SEaVan4O77ljiTX+yXzJ4b7MitpXuu0smlxi2nJWtMjtu2MJchebWio9/F3xinkfMjz/sTt2pXdybjaf/Z2qgkZNPm9gkilMd9u1+6hxUEavVmXvZQfnL/t4dmoTLHuFxFLIWymcAhx2qE/osSUhL+e8VHxGbIvVXtxWvPZV+GfXbz+Xa+X0GnAOOSG9yh41ltysjqhPivS399px15WA1quafCb6qPatRw6JfAXIk6iPM6bKkw0lQQj+GYrL00hC8j8kvhoPEk0mSw506PMdOVkvslHnF7JIVc+78eCD6T01cebYhH+dU829r4BztoOLo//hhSVjNY8vW2cKas2XFX9HZM7Pbmirihrmrml+vM+KulV0im6fJkYj0CJFK76j3kmUDCQGarmGaHvnQj23xbQspUCaX8O4kO6A58p16yetfSiyfkOw3JJokuErKuwiopFbBY16dOlWQSCYbKZtMFbmEpRqmAZazTJAUY0x/w5TKkRvRhFAiKbdCohjuV1ii5bxsvayh650o9n3qJ7Wnf/O489yQ+T6SVgZAHrvgM3RrgWnFMJsvcGHBdxSKfj0FrYKChTin+p3+syP4ko3nRnTdp5ru7n1VpnUWcjPjcjOpFiDSsbW7SSzi46NhVkDRgq1Lcy40SBLgjrccMfBZMiRdLa32hTRMU0CBxM7VRQbx5a550TiC3DqOqUQfUb1M1LPvyuM+a54qjzZdKdUn8BfNqYrjDGuw01Rzs+Fmx/2WMRxFeFjueOGlcrYYJ64Bdu+ZbVhAYlQGcD30PWOUmbrsIXFkNKa--l3PdVT6XYlwDCXti--SjRGYTMR1xjaaekhHUZ/zQ==
\ No newline at end of file
diff --git a/config/initializers/_dmproadmap.rb b/config/initializers/_dmproadmap.rb
index da1661be5b..bfadba90cf 100644
--- a/config/initializers/_dmproadmap.rb
+++ b/config/initializers/_dmproadmap.rb
@@ -200,7 +200,7 @@ class Application < Rails::Application
# Whether or not Super adminis can read all of the user's plans regardless of
# the plans visibility and whether or not the plan has been shared
- config.x.plans.org_admins_read_all = true
+ config.x.plans.org_admins_read_all = false
# Whether or not Organisational administrators can read all of the user's plans
# regardless of the plans visibility and whether or not the plan has been shared
config.x.plans.super_admins_read_all = true
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index bd4c6cb22a..ed78d115f4 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -14,3 +14,16 @@
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
# Rails.application.config.assets.precompile += %w( admin.js admin.css )
+
+# Bootstrap and TinyMCE expect their files to live in a specific place, so copy them over
+puts "Copying Bootstrap glyphicons to the public directory ..."
+source_dir = Dir.glob(Rails.root.join('node_modules', 'bootstrap', 'fonts', 'glyphicons-halflings-regular.*'))
+destination_dir = Rails.root.join('public', 'fonts', 'bootstrap')
+FileUtils.mkdir_p(destination_dir)
+FileUtils.cp_r(source_dir, destination_dir)
+
+puts "Copying TinyMCE skins to the public directory ..."
+source_dir = Dir.glob(Rails.root.join('node_modules', 'tinymce', 'skins', 'ui', 'oxide'))
+destination_dir = Rails.root.join('public', 'tinymce', 'skins')
+FileUtils.mkdir_p(destination_dir)
+FileUtils.cp_r(source_dir, destination_dir)
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 333a3bb4f5..6a26816d6f 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -1,101 +1,25 @@
# frozen_string_literal: true
-# IPs to allow outright
-Rack::Attack.safelist_ip('127.0.0.1')
-Rack::Attack.safelist_ip('::1')
+# NB: `req` is a Rack::Request object (basically an env hash with friendly accessor methods)
-# Set a long block period for any client that is explicitly looking for security holes
-Rack::Attack.blocklist('malicious_clients') do |req|
- Rack::Attack::Fail2Ban.filter("fail2ban_malicious_#{req.ip}", maxretry: 1, findtime: 1.day, bantime: 1.day) do
- CGI.unescape(req.query_string) =~ %r{/etc/passwd} ||
- req.path.include?('/etc/passwd') ||
- req.path.include?('wp-admin') ||
- req.path.include?('wp-login') ||
- /\S+\.php/.match?(req.path)
- end
-end
-
-### Configure Cache ###
-
-# If you don't want to use Rails.cache (Rack::Attack's default), then
-# configure it here.
-#
-# Note: The store is only used for throttling (not blocklisting and
-# safelisting). It must implement .increment and .write like
-# ActiveSupport::Cache::Store
-
-# Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new
-
-### Throttle Spammy Clients ###
+# Enable/disable Rack::Attack
+Rack::Attack.enabled = true
-# If any single client IP is making tons of requests, then they're
-# probably malicious or a poorly-configured scraper. Either way, they
-# don't deserve to hog all of the app server's CPU. Cut them off!
-#
-# Note: If you're serving assets through rack, those requests may be
-# counted by rack-attack and this throttle may be activated too
-# quickly. If so, enable the condition to exclude them from tracking.
+# Cache store required to work.
+Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new # defaults to Rails.cache
-# Throttle all requests by IP (60rpm)
-#
-# Key: "rack::attack:#{Time.now.to_i/:period}:req/ip:#{req.ip}"
-Rack::Attack.throttle('req/ip', limit: 100, period: 1.minute) do |req|
- req.ip unless req.path.start_with?('/assets')
+# Throttle should send a 429 Error responsec code and display public/429.html
+Rack::Attack.throttled_responder = lambda do |_env|
+ html = ActionView::Base.empty.render(file: 'public/429.html')
+ [429, { 'Content-Type' => 'text/html' }, [html]]
end
-### Prevent Brute-Force Login Attacks ###
-
-# The most common brute-force login attack is a brute-force password
-# attack where an attacker simply tries a large number of emails and
-# passwords to see if any credentials match.
-#
-# Another common method of attack is to use a swarm of computers with
-# different IPs to try brute-forcing a password for a specific account.
-
-# Throttle POST requests to /login by IP address
-#
-# Key: "rack::attack:#{Time.now.to_i/:period}:logins/ip:#{req.ip}"
-Rack::Attack.throttle('logins/ip', limit: 5, period: 20.seconds) do |req|
- secure_paths = %w[/oauth/authorize /oauth/token /users/sign_in /users/auth/shibboleth
- /users/auth/orcid /users/password /users]
- req.ip if secure_paths.include?(req.path) && req.post?
+# Throttle attempts to a particular path. 2 POSTs to /users/password every 30 seconds
+Rack::Attack.throttle "password_resets/ip", limit: 2, period: 30.seconds do |req|
+ req.post? && req.path == "/users/password" && req.ip
end
-# Throttle POST requests to /login by email param
-#
-# Key: "rack::attack:#{Time.now.to_i/:period}:logins/email:#{normalized_email}"
-#
-# Note: This creates a problem where a malicious user could intentionally
-# throttle logins for another user and force their login requests to be
-# denied, but that's not very common and shouldn't happen to you. (Knock
-# on wood!)
-# throttle('logins/email', limit: 5, period: 20.seconds) do |req|
-# if req.path == '/login' && req.post?
-# # Normalize the email, using the same logic as your authentication process, to
-# # protect against rate limit bypasses. Return the normalized email if present, nil otherwise.
-# req.params['email'].to_s.downcase.gsub(/\s+/, "").presence
-# end
-# end
-
-### Custom Throttle Response ###
-
-# By default, Rack::Attack returns an HTTP 429 for throttled responses,
-# which is just fine.
-#
-# If you want to return 503 so that the attacker might be fooled into
-# believing that they've successfully broken your app (or you just want to
-# customize the response), then uncomment these lines.
-# self.throttled_response = lambda do |env|
-# [ 503, # status
-# {}, # headers
-# ['']] # body
-# end
-
-# Log the blocked requests
-ActiveSupport::Notifications.subscribe(/rack_attack/) do |name, _start, _finish, _request_id, payload|
- req = payload[:request]
- # rubocop:disable Layout/LineLength
- Rails.logger.info "[Rack::Attack][Blocked] name: #{name}, rule: #{req.env['rack.attack.matched']} remote_ip: #{req.ip}, " \
- "path: #{req.path}, agent: #{req.user_agent}"
- # rubocop:enable Layout/LineLength
+# Throttle attempts to a particular path. 4 POSTs to /users/sign_in every 30 seconds
+Rack::Attack.throttle "logins/ip", limit: 4, period: 30.seconds do |req|
+ req.post? && req.path == "/users/sign_in" && req.ip
end
diff --git a/config/initializers/translation.rb b/config/initializers/translation.rb
index bb19cfd376..4bc772670f 100644
--- a/config/initializers/translation.rb
+++ b/config/initializers/translation.rb
@@ -63,7 +63,7 @@ def default_locale
end
def available_locales
- SUPPORTED_LOCALES.sort { |a, b| a <=> b }
+ SUPPORTED_LOCALES
end
I18n.available_locales = SUPPORTED_LOCALES
diff --git a/config/locale/app.pot b/config/locale/app.pot
index 790362a271..0fdf907f13 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: roadmap 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-02-03 09:02+0100\n"
-"PO-Revision-Date: 2023-02-03 09:02+0100\n"
+"POT-Creation-Date: 2023-04-12 10:30-0700\n"
+"PO-Revision-Date: 2023-04-12 10:30-0700\n"
"Last-Translator: FULL NAME
\n"
"Language-Team: LANGUAGE \n"
"Language: \n"
@@ -47,21 +47,21 @@ msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr ""
@@ -438,7 +438,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:147
#: ../../app/controllers/org_admin/questions_controller.rb:166
#: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:415
+#: ../../app/controllers/plans_controller.rb:416
#: ../../app/controllers/super_admin/api_clients_controller.rb:68
#: ../../app/controllers/super_admin/notifications_controller.rb:52
#: ../../app/controllers/super_admin/themes_controller.rb:39
@@ -450,7 +450,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:149
#: ../../app/controllers/org_admin/questions_controller.rb:169
#: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:418
+#: ../../app/controllers/plans_controller.rb:419
#: ../../app/controllers/super_admin/api_clients_controller.rb:70
#: ../../app/controllers/super_admin/notifications_controller.rb:55
#: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -540,7 +540,7 @@ msgid "Unable to delete this version of the template."
msgstr ""
#: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:394
+#: ../../app/controllers/plans_controller.rb:395
msgid "copy"
msgstr ""
@@ -602,10 +602,14 @@ msgstr ""
msgid "Your organisation does not seem to be properly configured."
msgstr ""
-#: ../../app/controllers/plan_exports_controller.rb:100
+#: ../../app/controllers/plan_exports_controller.rb:106
msgid "Created using %{application_name}. Last modified %{date}"
msgstr ""
+#: ../../app/controllers/plan_exports_controller.rb:111
+msgid "[page] of [topage]"
+msgstr ""
+
#: ../../app/controllers/plans_controller.rb:52
msgid "This is a"
msgstr ""
@@ -639,33 +643,33 @@ msgstr ""
msgid "template with customisations by the"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:392
+#: ../../app/controllers/plans_controller.rb:393
msgid "copied"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:423
+#: ../../app/controllers/plans_controller.rb:424
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:429
+#: ../../app/controllers/plans_controller.rb:430
msgid "Unable to find plan id %{plan_id}"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is now a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is no longer a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:448
+#: ../../app/controllers/plans_controller.rb:449
msgid "Unable to change the plan's test status"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:461
+#: ../../app/controllers/plans_controller.rb:462
msgid "There is no plan associated with id %{s"
msgstr ""
@@ -891,7 +895,7 @@ msgstr ""
msgid "merge"
msgstr ""
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -950,19 +954,19 @@ msgid ""
"ot to duplicate too much text."
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr ""
@@ -1108,7 +1112,7 @@ msgid "Public"
msgstr ""
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr ""
@@ -1121,7 +1125,7 @@ msgid "Public: anyone can view."
msgstr ""
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr ""
@@ -1498,23 +1502,35 @@ msgstr ""
msgid "can't be larger than 500KB"
msgstr ""
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr ""
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr ""
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr ""
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr ""
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr ""
@@ -1570,39 +1586,39 @@ msgstr ""
msgid "Copy of %{template}"
msgstr ""
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr ""
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr ""
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr ""
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr ""
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr ""
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr ""
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr ""
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr ""
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr ""
@@ -1791,11 +1807,11 @@ msgstr ""
msgid "invalid JSON"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1871,7 +1887,7 @@ msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1908,11 +1924,11 @@ msgid " by %{user_name}"
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
+msgid " questions from your plan."
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid " questions from your plan."
+msgid "This answer removes "
msgstr ""
#: ../../app/views/answers/_status.html.erb:21
@@ -2517,7 +2533,7 @@ msgid ""
msgstr ""
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2834,87 +2850,87 @@ msgstr ""
msgid "%{application_name}"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Notice:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Notice:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
"ons."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr ""
@@ -3251,11 +3267,11 @@ msgid "Feedback requested"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
+msgid "Notify the plan owner that I have finished providing feedback"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Notify the plan owner that I have finished providing feedback"
+msgid "Complete"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:39
@@ -3291,11 +3307,11 @@ msgid ""
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "New question:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "New question:"
+msgid "Question %{number}:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:15
@@ -3475,7 +3491,7 @@ msgstr ""
msgid "for internal %{org_name} use only"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:32
+#: ../../app/views/org_admin/templates/_form.html.erb:38
#: ../../app/views/org_admin/templates/_show.html.erb:13
#: ../../app/views/paginable/guidance_groups/_index.html.erb:7
#: ../../app/views/paginable/guidances/_index.html.erb:9
@@ -3485,7 +3501,7 @@ msgstr ""
msgid "Status"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:37
+#: ../../app/views/org_admin/templates/_form.html.erb:43
#: ../../app/views/org_admin/templates/_row.html.erb:16
#: ../../app/views/org_admin/templates/_show.html.erb:26
#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
@@ -3495,17 +3511,17 @@ msgstr ""
msgid "Unpublished"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:39
+#: ../../app/views/org_admin/templates/_form.html.erb:45
#: ../../app/views/paginable/templates/_history.html.erb:19
msgid "Draft"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:46
+#: ../../app/views/org_admin/templates/_form.html.erb:52
#: ../../app/views/org_admin/templates/_show.html.erb:41
msgid "Created at"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:52
+#: ../../app/views/org_admin/templates/_form.html.erb:58
#: ../../app/views/org_admin/templates/_show.html.erb:43
#: ../../app/views/paginable/guidance_groups/_index.html.erb:9
#: ../../app/views/paginable/guidances/_index.html.erb:10
@@ -3513,22 +3529,22 @@ msgstr ""
msgid "Last updated"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:64
+#: ../../app/views/org_admin/templates/_form.html.erb:70
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:10
msgid "Funder Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:67
+#: ../../app/views/org_admin/templates/_form.html.erb:73
msgid ""
"Add links to funder websites that provide additional information about the req"
"uirements for this template"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:73
+#: ../../app/views/org_admin/templates/_form.html.erb:79
msgid "Sample Plan Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:76
+#: ../../app/views/org_admin/templates/_form.html.erb:82
msgid "Add links to sample plans if provided by the funder."
msgstr ""
@@ -4207,11 +4223,11 @@ msgid "Create a new plan"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "Sample Plans"
+msgid "(if available)"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "(if available)"
+msgid "Sample Plans"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:47
@@ -4515,15 +4531,15 @@ msgstr ""
msgid "Funding status"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:181
+#: ../../app/views/plans/_project_details.html.erb:180
msgid "Grant number/url"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:195
+#: ../../app/views/plans/_project_details.html.erb:194
msgid "Grant number:"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:199
+#: ../../app/views/plans/_project_details.html.erb:198
msgid ""
"Provide a URL to the award's landing page if possible, if not please provide t"
"he award/grant number."
@@ -5530,11 +5546,11 @@ msgid "New API Client"
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Successfully regenerated the client credentials."
+msgid "Unable to regenerate the client credentials."
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Unable to regenerate the client credentials."
+msgid "Successfully regenerated the client credentials."
msgstr ""
#: ../../app/views/super_admin/notifications/_form.html.erb:20
@@ -5957,19 +5973,19 @@ msgid "Hello %{recipient_name},"
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " is creating a Data Management Plan and has answered "
+msgid " to "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " to "
+msgid " based on the template "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " in a plan called "
+msgid " is creating a Data Management Plan and has answered "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " based on the template "
+msgid " in a plan called "
msgstr ""
#: ../../app/views/user_mailer/sharing_notification.html.erb:5
@@ -6110,11 +6126,11 @@ msgid "Download users"
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Successfully regenerate your API token."
+msgid "Unable to regenerate your API token."
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Unable to regenerate your API token."
+msgid "Successfully regenerate your API token."
msgstr ""
#: i18n_placeholders.rb:4
diff --git a/config/locale/client.pot b/config/locale/client.pot
index a58f3a9355..cce91f7633 100644
--- a/config/locale/client.pot
+++ b/config/locale/client.pot
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: DMPOPIDoR 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-03-31 08:37+0200\n"
-"PO-Revision-Date: 2023-03-31 08:37+0200\n"
+"POT-Creation-Date: 2023-04-27 16:37+0200\n"
+"PO-Revision-Date: 2023-04-27 16:37+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
"Language: \n"
@@ -264,7 +264,7 @@ msgid "Invalid JSON: "
msgstr ""
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:13
-#: ../../app/controllers/plans_controller.rb:569
+#: ../../app/controllers/plans_controller.rb:570
msgid "There is no plan associated with id %{id}"
msgstr ""
@@ -274,7 +274,7 @@ msgid "Data contact"
msgstr ""
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:45
-#: ../../app/controllers/plans_controller.rb:526
+#: ../../app/controllers/plans_controller.rb:527
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:47
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:52
#: ../../engines/madmp_opidor/app/controllers/super_admin/registry_values_controller.rb:21
@@ -364,10 +364,14 @@ msgstr ""
msgid "Your organisation does not seem to be properly configured."
msgstr ""
-#: ../../app/controllers/plan_exports_controller.rb:114
+#: ../../app/controllers/plan_exports_controller.rb:120
msgid "Created using %{application_name}. Last modified %{date}"
msgstr ""
+#: ../../app/controllers/plan_exports_controller.rb:125
+msgid "[page] of [topage]"
+msgstr ""
+
#: ../../app/controllers/plans_controller.rb:89
msgid "Unable to identify a suitable template for your plan."
msgstr ""
@@ -389,15 +393,15 @@ msgstr ""
msgid "template with customisations by the"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:500
+#: ../../app/controllers/plans_controller.rb:501
msgid "copied"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:502
+#: ../../app/controllers/plans_controller.rb:503
msgid "copy"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:523
+#: ../../app/controllers/plans_controller.rb:524
#: ../../app/controllers/users_controller.rb:123
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:45
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:50
@@ -405,25 +409,25 @@ msgstr ""
msgid "updated"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:531
+#: ../../app/controllers/plans_controller.rb:532
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:537
+#: ../../app/controllers/plans_controller.rb:538
msgid "Unable to find plan id %{plan_id}"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is now a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is no longer a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:556
+#: ../../app/controllers/plans_controller.rb:557
msgid "Unable to change the plan's test status"
msgstr ""
@@ -636,19 +640,19 @@ msgid ""
"ot to duplicate too much text."
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr ""
@@ -803,7 +807,7 @@ msgstr ""
msgid "Public"
msgstr ""
-#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:75
+#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:77
msgid "Administrator"
msgstr ""
@@ -1053,23 +1057,35 @@ msgstr ""
msgid "can't be larger than 500KB"
msgstr ""
-#: ../../app/models/plan.rb:68
+#: ../../app/models/plan.rb:70
msgid "organisational"
msgstr ""
-#: ../../app/models/plan.rb:69
+#: ../../app/models/plan.rb:71
msgid "public"
msgstr ""
-#: ../../app/models/plan.rb:70
+#: ../../app/models/plan.rb:72
msgid "test"
msgstr ""
-#: ../../app/models/plan.rb:79
+#: ../../app/models/plan.rb:81
msgid "private"
msgstr ""
-#: ../../app/models/plan.rb:797
+#: ../../app/models/plan.rb:85
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:86
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:87
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:805
msgid "must be after the start date"
msgstr ""
@@ -1187,7 +1203,7 @@ msgstr ""
#: ../../app/views/branded/plans/_guidance_selection.html.erb:23
#: ../../app/views/branded/plans/_share_form.html.erb:112
#: ../../app/views/branded/plans/_share_third_party.html.erb:93
-#: ../../app/views/branded/research_outputs/_list.html.erb:101
+#: ../../app/views/branded/research_outputs/_list.html.erb:103
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:67
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:59
#: ../../app/views/branded/users/_notification_preferences.html.erb:47
@@ -1246,10 +1262,10 @@ msgid "Question not answered."
msgstr ""
#: ../../app/views/branded/contact_us/contacts/_new_left.html.erb:4
-#: ../../app/views/branded/contributors/index.html.erb:24
#: ../../app/views/branded/org_admin/departments/edit.html.erb:14
#: ../../app/views/branded/org_admin/departments/new.html.erb:14
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:6
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:6
#: ../../app/views/branded/paginable/static_pages/_index.html.erb:5
#: ../../app/views/branded/paginable/users/_index.html.erb:20
#: ../../app/views/branded/shared/export/_plan_coversheet.erb:68
@@ -1346,44 +1362,15 @@ msgid ""
" for other templates."
msgstr ""
-#: ../../app/views/branded/contributors/index.html.erb:25
-#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
-msgid "Affiliation"
-msgstr ""
-
-#: ../../app/views/branded/contributors/index.html.erb:26
-msgid "Attributed roles (Associated research outputs)"
+#: ../../app/views/branded/contributors/index.html.erb:29
+msgid "No contributors have been defined."
msgstr ""
-#: ../../app/views/branded/contributors/index.html.erb:28
-#: ../../app/views/branded/org_admin/plans/index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
-#: ../../app/views/branded/paginable/departments/_index.html.erb:7
-#: ../../app/views/branded/paginable/departments/_index.html.erb:24
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
-#: ../../app/views/branded/paginable/templates/_history.html.erb:10
-#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
-#: ../../app/views/branded/plans/_share_form.html.erb:20
-#: ../../app/views/branded/plans/_share_third_party.html.erb:35
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
-#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
-msgid "Actions"
-msgstr ""
-
-#: ../../app/views/branded/contributors/index.html.erb:46
+#: ../../app/views/branded/contributors/index.html.erb:35
msgid "Add a person"
msgstr ""
-#: ../../app/views/branded/contributors/index.html.erb:59
+#: ../../app/views/branded/contributors/index.html.erb:48
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_list_field.html.erb:45
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_select_field.html.erb:47
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/registry/_multiple_complex.html.erb:59
@@ -1541,7 +1528,7 @@ msgstr ""
#: ../../app/views/branded/org_admin/questions/_form.html.erb:136
#: ../../app/views/branded/plans/_edit_details.html.erb:63
#: ../../app/views/branded/plans/_guidance_selection.html.erb:35
-#: ../../app/views/branded/research_outputs/_list.html.erb:102
+#: ../../app/views/branded/research_outputs/_list.html.erb:104
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:93
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:67
#: ../../app/views/research_outputs/_form.html.erb:183
@@ -1966,6 +1953,30 @@ msgstr ""
msgid "Request Date"
msgstr ""
+#: ../../app/views/branded/org_admin/plans/index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:10
+#: ../../app/views/branded/paginable/departments/_index.html.erb:7
+#: ../../app/views/branded/paginable/departments/_index.html.erb:24
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
+#: ../../app/views/branded/paginable/templates/_history.html.erb:10
+#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
+#: ../../app/views/branded/plans/_share_form.html.erb:20
+#: ../../app/views/branded/plans/_share_third_party.html.erb:35
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
+#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
+msgid "Actions"
+msgstr ""
+
#: ../../app/views/branded/org_admin/plans/index.html.erb:31
msgid "Complete"
msgstr ""
@@ -2048,7 +2059,7 @@ msgid ""
msgstr ""
#: ../../app/views/branded/org_admin/questions/_form.html.erb:133
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:43
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:55
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:82
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:86
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:61
@@ -2128,7 +2139,7 @@ msgstr ""
#: ../../app/views/branded/org_admin/questions/_show.html.erb:226
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:43
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:36
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:48
#: ../../app/views/branded/paginable/departments/_index.html.erb:27
#: ../../app/views/branded/paginable/orgs/_index.html.erb:39
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:59
@@ -2198,7 +2209,7 @@ msgid "Locale"
msgstr ""
#: ../../app/views/branded/org_admin/templates/_form.html.erb:41
-#: ../../app/views/branded/research_outputs/_list.html.erb:54
+#: ../../app/views/branded/research_outputs/_list.html.erb:56
#: ../../app/views/research_outputs/_form.html.erb:14
msgid "Type"
msgstr ""
@@ -2373,7 +2384,7 @@ msgid "Homepage"
msgstr ""
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/branded/research_outputs/_list.html.erb:73
+#: ../../app/views/branded/research_outputs/_list.html.erb:75
#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
msgid "Contact"
msgstr ""
@@ -2411,13 +2422,22 @@ msgid ""
"s the API. Are you sure?"
msgstr ""
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:44
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:7
+#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
+msgid "Affiliation"
+msgstr ""
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:8
+msgid "Attributed roles (Associated research outputs)"
+msgstr ""
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:56
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/contributor/_contributor_list.html.erb:44
#: ../../engines/madmp_opidor/app/views/dynamic_form/linked_fragment/_list.html.erb:46
msgid "Do you want to delete this element?"
msgstr ""
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:62
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:74
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:68
#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:72
#: ../../app/views/branded/paginable/templates/_history.html.erb:56
@@ -2506,7 +2526,7 @@ msgid "Shared"
msgstr ""
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:33
-#: ../../app/views/branded/plans/_share_form.html.erb:152
+#: ../../app/views/branded/plans/_share_form.html.erb:157
msgid "Update"
msgstr ""
@@ -3175,15 +3195,15 @@ msgstr ""
msgid "Organisation: anyone at my organisation can view"
msgstr ""
-#: ../../app/views/branded/plans/_share_form.html.erb:147
-msgid "Public: anyone can view"
-msgstr ""
-
-#: ../../app/views/branded/plans/_share_form.html.erb:154
+#: ../../app/views/branded/plans/_share_form.html.erb:149
msgid ""
"You have chosen to make your plan public. Before confirming, please ensure tha"
"t your plan is complete. This DMP can be used as an example for other, please "
-"fill the different sections. Do you confirm?"
+"fill the different sections. Do you confirm and then update your choice?"
+msgstr ""
+
+#: ../../app/views/branded/plans/_share_form.html.erb:152
+msgid "Public: anyone can view"
msgstr ""
#: ../../app/views/branded/plans/_share_third_party.html.erb:3
@@ -3354,48 +3374,48 @@ msgstr ""
msgid "Research output title"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:34
+#: ../../app/views/branded/research_outputs/_list.html.erb:35
msgid "UUID"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:37
-#: ../../app/views/branded/research_outputs/_list.html.erb:42
+#: ../../app/views/branded/research_outputs/_list.html.erb:38
#: ../../app/views/branded/research_outputs/_list.html.erb:43
+#: ../../app/views/branded/research_outputs/_list.html.erb:44
msgid "Research output unique identifier"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:48
+#: ../../app/views/branded/research_outputs/_list.html.erb:49
msgid "Copy UUID to clipboard"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:67
+#: ../../app/views/branded/research_outputs/_list.html.erb:69
#: ../../app/views/research_outputs/_form.html.erb:27
msgid "Research output type"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:94
+#: ../../app/views/branded/research_outputs/_list.html.erb:96
msgid "Persistent Identifier"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:96
+#: ../../app/views/branded/research_outputs/_list.html.erb:98
msgid "If exists, please fill in the research output persistant identifier."
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:108
+#: ../../app/views/branded/research_outputs/_list.html.erb:110
msgid "Edit research output"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:111
+#: ../../app/views/branded/research_outputs/_list.html.erb:113
msgid "Move research output"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:116
+#: ../../app/views/branded/research_outputs/_list.html.erb:118
msgid ""
"Deleting this research output will remove the associated answers. Do you confi"
"rm ?"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:119
+#: ../../app/views/branded/research_outputs/_list.html.erb:121
msgid "Delete research output"
msgstr ""
diff --git a/config/locale/de/LC_MESSAGES/app.mo b/config/locale/de/LC_MESSAGES/app.mo
index 4b9343d91c..7420fe7b7e 100644
Binary files a/config/locale/de/LC_MESSAGES/app.mo and b/config/locale/de/LC_MESSAGES/app.mo differ
diff --git a/config/locale/de/app.po b/config/locale/de/app.po
index e202df8404..788282a1bb 100644
--- a/config/locale/de/app.po
+++ b/config/locale/de/app.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: roadmap 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-02-03 09:02+0100\n"
-"PO-Revision-Date: 2023-02-03 09:02+0100\n"
+"POT-Creation-Date: 2023-04-12 10:30-0700\n"
+"PO-Revision-Date: 2023-04-12 19:30+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: German\n"
"Language: de\n"
@@ -51,21 +51,21 @@ msgstr "Schlechte Parameter"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Monat"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "Nein. Benutzer sind beigetreten"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Gesamt"
@@ -454,7 +454,7 @@ msgstr "Es kann keine neue Version dieser Vorlage erstellt werden.s"
msgstr "ID %{ ist kein Plan zugeordnet S"
@@ -945,7 +949,7 @@ msgstr "zusammengeführt"
msgid "merge"
msgstr "Verschmelzen"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -1012,19 +1016,19 @@ msgstr ""
"Sie auch Hilfestellungen nach Themen angeben, werden diese mit angezeigt; Sie "
"sollten deshalb möglichst wenig Text kopieren."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Antworten"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "sendet eine E-Mail mit dem Betreff %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "wird die Frage entfernen "
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "wird Fragen entfernen "
@@ -1177,7 +1181,7 @@ msgid "Public"
msgstr "Öffentlichkeit"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Private"
@@ -1190,7 +1194,7 @@ msgid "Public: anyone can view."
msgstr "Öffentlich: Jeder kann sehen."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Privat: beschränkt auf mich und Leute, die ich einlade."
@@ -1578,23 +1582,35 @@ msgstr "muss eines der folgenden Formate sein: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "kann nicht größer als 500KB sein"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organisatorisch"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "öffentlich"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "Test"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "privat"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "muss nach dem Startdatum liegen"
@@ -1650,41 +1666,41 @@ msgstr "generate_copy! erfordert ein Organisationsziel"
msgid "Copy of %{template}"
msgstr "Kopie von %{template}"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "generate_version! benötigt eine veröffentlichte Vorlage"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "customize! erfordert ein Organisationsziel"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "customize! benötigt eine Vorlage von einem Forschungsförderer"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "Sie können keine bereits veröffentlichte Vorlage erneut veröffentlichen."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "Sie können keine veraltete Version dieser Vorlage veröffentlichen."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "Sie können keine Vorlage ohne Phasen veröffentlichen."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr ""
"Sie können keine Vorlage veröffentlichen, deren Phasen keine Abschnitte enthal"
"ten."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "Sie können keine Vorlage veröffentlichen, die Abschnitte ohne Fragen enthält."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "Die Bedingungen in der Vorlage beziehen sich rückwärts"
@@ -1883,11 +1899,11 @@ msgstr ": title ist für jeden: Datensatz erforderlich"
msgid "invalid JSON"
msgstr "Ungültiger JSON"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! erfordert eine benutzerdefinierte Vorlage"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1967,7 +1983,7 @@ msgstr "Bitte warten Sie, die Standards werden geladen"
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -2003,14 +2019,14 @@ msgstr "Beantwortet"
msgid " by %{user_name}"
msgstr " von %{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Diese Antwort wird entfernt"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " Fragen aus Ihrem Plan."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Diese Antwort wird entfernt"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Diese Antwort löst E-Mail (s) an aus"
@@ -2676,7 +2692,7 @@ msgstr ""
"erstellen'-Assistenten auswählen."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -3017,50 +3033,50 @@ msgstr "Abmelden"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Error:"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Beachten:"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Error:"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Laden..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Dieses Feld wird benötigt."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Passwort anzeigen"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Wählen Sie eine Organisation aus der Liste aus."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Meine Organisation ist nicht aufgeführt"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "N / A"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Liste ausblenden"
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Siehe die vollständige Liste der Partnereinrichtungen."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3068,27 +3084,27 @@ msgstr ""
"Es konnte keine geeignete Vorlage für die von Ihnen ausgewählte Forschungsorga"
"nisation und den ausgewählten Geldgeber gefunden werden."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr "Bitte wählen Sie eine Forschungsorganisation und Förderer, um fortzufahren."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Laden ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Der Inhalt des Abschnitts konnte zu diesem Zeitpunkt nicht geladen werden."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Der Inhalt der Frage konnte zu diesem Zeitpunkt nicht geladen werden."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Wird in einem neuen Fenster geöffnet"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3099,11 +3115,11 @@ msgstr ""
"en Vorschlag auszuwählen, oder die Escape-Taste, um die Vorschläge zu schließe"
"n."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "Für Ihren Eintrag sind keine Ergebnisse verfügbar."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Suchen ..."
@@ -3453,16 +3469,16 @@ msgstr "Aktionen"
msgid "Feedback requested"
msgstr "Feedback wurde angefordert."
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Vollständig"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr ""
"Benachrichtigen Sie den Eigentümer des Plans, dass ich mit der Bereitstellung "
"von Feedback fertig bin"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Vollständig"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue.\n"
"Language-Team: English\n"
"Language: en\n"
@@ -49,21 +49,21 @@ msgstr "Bad Parameters"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Month"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "No. Users joined"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Total"
@@ -444,7 +444,7 @@ msgstr "Unable to create a new version of this template.s"
msgstr "There is no plan associated with id %{s"
@@ -924,7 +928,7 @@ msgstr "merged"
msgid "merge"
msgstr "merge"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr "No. Created Plans"
@@ -990,19 +994,19 @@ msgstr ""
"emes too, this will be pulled in based on your selections below so it's best n"
"ot to duplicate too much text."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Answering"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr " will send an email with subject %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr " will remove question "
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr " will remove questions "
@@ -1157,7 +1161,7 @@ msgid "Public"
msgstr "Public"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Private"
@@ -1170,7 +1174,7 @@ msgid "Public: anyone can view."
msgstr "Public: anyone can view."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Private: restricted to me and people I invite."
@@ -1559,23 +1563,35 @@ msgstr "must be one of the following formats: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "can't be larger than 500KB"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organisational"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "public"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "test"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "private"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr "Planned"
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr "Funded"
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr "Denied"
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "must be after the start date"
@@ -1631,39 +1647,39 @@ msgstr "generate_copy! requires an organisation target"
msgid "Copy of %{template}"
msgstr "Copy of %{template}"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "generate_version! requires a published template"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "customize! requires an organisation target"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "customize! requires a template from a funder"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "You can not publish a published template. "
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "You can not publish a historical version of this template. "
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "You can not publish a template without phases. "
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr "You can not publish a template without sections in a phase. "
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "You can not publish a template without questions in a section. "
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "Conditions in the template refer backwards"
@@ -1859,11 +1875,11 @@ msgstr ":title is required for each :dataset"
msgid "invalid JSON"
msgstr "invalid JSON"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! requires a customised template"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1943,7 +1959,7 @@ msgstr "Please wait, Standards are loading"
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1979,14 +1995,14 @@ msgstr "Answered"
msgid " by %{user_name}"
msgstr " by %{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "This answer removes "
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " questions from your plan."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "This answer removes "
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "This answer triggers email(s) to "
@@ -2642,7 +2658,7 @@ msgstr ""
"this subset guidance when answering questions in the 'create plan' wizard."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2977,50 +2993,50 @@ msgstr "Logout"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Error:"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Notice:"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Error:"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Loading..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "This field is required."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Show password"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Select an organisation from the list."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "My organisation isn't listed"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "N/A"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Hide list."
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "See the full list of partner institutions."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3028,27 +3044,27 @@ msgstr ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr "Please select a research organisation and funder to continue."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Loading ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Unable to load the section's content at this time."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Unable to load the question's content at this time."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Opens in a new window"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3058,11 +3074,11 @@ msgstr ""
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
"ons."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "No results are available for your entry."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Searching ..."
@@ -3409,14 +3425,14 @@ msgstr "Actions"
msgid "Feedback requested"
msgstr "Feedback requested"
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Complete"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr "Notify the plan owner that I have finished providing feedback"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Complete"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue.\n"
"Language-Team: English\n"
"Language: en\n"
@@ -266,7 +266,7 @@ msgid "Invalid JSON: "
msgstr "Invalid JSON: "
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:13
-#: ../../app/controllers/plans_controller.rb:569
+#: ../../app/controllers/plans_controller.rb:570
msgid "There is no plan associated with id %{id}"
msgstr "There is no plan associated with id %{id}"
@@ -276,7 +276,7 @@ msgid "Data contact"
msgstr "Data contact"
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:45
-#: ../../app/controllers/plans_controller.rb:526
+#: ../../app/controllers/plans_controller.rb:527
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:47
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:52
#: ../../engines/madmp_opidor/app/controllers/super_admin/registry_values_controller.rb:21
@@ -366,10 +366,14 @@ msgstr "Please choose an organisation"
msgid "Your organisation does not seem to be properly configured."
msgstr "Your organisation does not seem to be properly configured."
-#: ../../app/controllers/plan_exports_controller.rb:114
+#: ../../app/controllers/plan_exports_controller.rb:120
msgid "Created using %{application_name}. Last modified %{date}"
msgstr "Created using %{application_name}. Last modified %{date}"
+#: ../../app/controllers/plan_exports_controller.rb:125
+msgid "[page] of [topage]"
+msgstr "[page] of [topage]"
+
#: ../../app/controllers/plans_controller.rb:89
msgid "Unable to identify a suitable template for your plan."
msgstr "Unable to identify a suitable template for your plan."
@@ -391,15 +395,15 @@ msgstr "This plan is based on the"
msgid "template with customisations by the"
msgstr "template with customisations by the"
-#: ../../app/controllers/plans_controller.rb:500
+#: ../../app/controllers/plans_controller.rb:501
msgid "copied"
msgstr "copied"
-#: ../../app/controllers/plans_controller.rb:502
+#: ../../app/controllers/plans_controller.rb:503
msgid "copy"
msgstr "copy"
-#: ../../app/controllers/plans_controller.rb:523
+#: ../../app/controllers/plans_controller.rb:524
#: ../../app/controllers/users_controller.rb:123
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:45
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:50
@@ -407,7 +411,7 @@ msgstr "copy"
msgid "updated"
msgstr "updated"
-#: ../../app/controllers/plans_controller.rb:531
+#: ../../app/controllers/plans_controller.rb:532
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
@@ -415,19 +419,19 @@ msgstr ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
-#: ../../app/controllers/plans_controller.rb:537
+#: ../../app/controllers/plans_controller.rb:538
msgid "Unable to find plan id %{plan_id}"
msgstr "Unable to find plan id %{plan_id}"
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is now a test."
msgstr "Your project is now a test."
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is no longer a test."
msgstr "Your project is no longer a test."
-#: ../../app/controllers/plans_controller.rb:556
+#: ../../app/controllers/plans_controller.rb:557
msgid "Unable to change the plan's test status"
msgstr "Unable to change the plan's test status"
@@ -666,19 +670,19 @@ msgstr ""
"emes too, this will be pulled in based on your selections below so it's best n"
"ot to duplicate too much text."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Answering"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr " will send an email with subject %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr " will remove question "
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr " will remove questions "
@@ -842,7 +846,7 @@ msgstr "Organisation"
msgid "Public"
msgstr "Public"
-#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:75
+#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:77
msgid "Administrator"
msgstr "Administrator"
@@ -1096,23 +1100,35 @@ msgstr "must be one of the following formats: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "can't be larger than 500KB"
-#: ../../app/models/plan.rb:68
+#: ../../app/models/plan.rb:70
msgid "organisational"
msgstr "organisational"
-#: ../../app/models/plan.rb:69
+#: ../../app/models/plan.rb:71
msgid "public"
msgstr "public"
-#: ../../app/models/plan.rb:70
+#: ../../app/models/plan.rb:72
msgid "test"
msgstr "test"
-#: ../../app/models/plan.rb:79
+#: ../../app/models/plan.rb:81
msgid "private"
msgstr "private"
-#: ../../app/models/plan.rb:797
+#: ../../app/models/plan.rb:85
+msgid "Planned"
+msgstr "Planned"
+
+#: ../../app/models/plan.rb:86
+msgid "Funded"
+msgstr "Funded"
+
+#: ../../app/models/plan.rb:87
+msgid "Denied"
+msgstr "Denied"
+
+#: ../../app/models/plan.rb:805
msgid "must be after the start date"
msgstr "must be after the start date"
@@ -1232,7 +1248,7 @@ msgstr "Please wait, Standards are loading"
#: ../../app/views/branded/plans/_guidance_selection.html.erb:23
#: ../../app/views/branded/plans/_share_form.html.erb:112
#: ../../app/views/branded/plans/_share_third_party.html.erb:93
-#: ../../app/views/branded/research_outputs/_list.html.erb:101
+#: ../../app/views/branded/research_outputs/_list.html.erb:103
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:67
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:59
#: ../../app/views/branded/users/_notification_preferences.html.erb:47
@@ -1291,10 +1307,10 @@ msgid "Question not answered."
msgstr "Question not answered."
#: ../../app/views/branded/contact_us/contacts/_new_left.html.erb:4
-#: ../../app/views/branded/contributors/index.html.erb:24
#: ../../app/views/branded/org_admin/departments/edit.html.erb:14
#: ../../app/views/branded/org_admin/departments/new.html.erb:14
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:6
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:6
#: ../../app/views/branded/paginable/static_pages/_index.html.erb:5
#: ../../app/views/branded/paginable/users/_index.html.erb:20
#: ../../app/views/branded/shared/export/_plan_coversheet.erb:68
@@ -1402,44 +1418,15 @@ msgstr ""
"\"Write Plan\" tab for the structured templates or in the \"Research Outputs\" tab"
" for other templates."
-#: ../../app/views/branded/contributors/index.html.erb:25
-#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
-msgid "Affiliation"
-msgstr "Affiliation"
-
-#: ../../app/views/branded/contributors/index.html.erb:26
-msgid "Attributed roles (Associated research outputs)"
-msgstr "Attributed roles (Associated research outputs)"
-
-#: ../../app/views/branded/contributors/index.html.erb:28
-#: ../../app/views/branded/org_admin/plans/index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
-#: ../../app/views/branded/paginable/departments/_index.html.erb:7
-#: ../../app/views/branded/paginable/departments/_index.html.erb:24
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
-#: ../../app/views/branded/paginable/templates/_history.html.erb:10
-#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
-#: ../../app/views/branded/plans/_share_form.html.erb:20
-#: ../../app/views/branded/plans/_share_third_party.html.erb:35
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
-#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
-msgid "Actions"
-msgstr "Actions"
+#: ../../app/views/branded/contributors/index.html.erb:29
+msgid "No contributors have been defined."
+msgstr "No contributors have been defined."
-#: ../../app/views/branded/contributors/index.html.erb:46
+#: ../../app/views/branded/contributors/index.html.erb:35
msgid "Add a person"
msgstr "Add a person"
-#: ../../app/views/branded/contributors/index.html.erb:59
+#: ../../app/views/branded/contributors/index.html.erb:48
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_list_field.html.erb:45
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_select_field.html.erb:47
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/registry/_multiple_complex.html.erb:59
@@ -1611,7 +1598,7 @@ msgstr "Published?"
#: ../../app/views/branded/org_admin/questions/_form.html.erb:136
#: ../../app/views/branded/plans/_edit_details.html.erb:63
#: ../../app/views/branded/plans/_guidance_selection.html.erb:35
-#: ../../app/views/branded/research_outputs/_list.html.erb:102
+#: ../../app/views/branded/research_outputs/_list.html.erb:104
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:93
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:67
#: ../../app/views/research_outputs/_form.html.erb:183
@@ -2056,6 +2043,30 @@ msgstr "Requestor"
msgid "Request Date"
msgstr "Request Date"
+#: ../../app/views/branded/org_admin/plans/index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:10
+#: ../../app/views/branded/paginable/departments/_index.html.erb:7
+#: ../../app/views/branded/paginable/departments/_index.html.erb:24
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
+#: ../../app/views/branded/paginable/templates/_history.html.erb:10
+#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
+#: ../../app/views/branded/plans/_share_form.html.erb:20
+#: ../../app/views/branded/plans/_share_third_party.html.erb:35
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
+#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
+msgid "Actions"
+msgstr "Actions"
+
#: ../../app/views/branded/org_admin/plans/index.html.erb:31
msgid "Complete"
msgstr "Complete"
@@ -2150,7 +2161,7 @@ msgstr ""
"."
#: ../../app/views/branded/org_admin/questions/_form.html.erb:133
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:43
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:55
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:82
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:86
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:61
@@ -2237,7 +2248,7 @@ msgstr "None provided"
#: ../../app/views/branded/org_admin/questions/_show.html.erb:226
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:43
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:36
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:48
#: ../../app/views/branded/paginable/departments/_index.html.erb:27
#: ../../app/views/branded/paginable/orgs/_index.html.erb:39
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:59
@@ -2311,7 +2322,7 @@ msgid "Locale"
msgstr "Locale"
#: ../../app/views/branded/org_admin/templates/_form.html.erb:41
-#: ../../app/views/branded/research_outputs/_list.html.erb:54
+#: ../../app/views/branded/research_outputs/_list.html.erb:56
#: ../../app/views/research_outputs/_form.html.erb:14
msgid "Type"
msgstr "Type"
@@ -2493,7 +2504,7 @@ msgid "Homepage"
msgstr "Homepage"
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/branded/research_outputs/_list.html.erb:73
+#: ../../app/views/branded/research_outputs/_list.html.erb:75
#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
msgid "Contact"
msgstr "Contact"
@@ -2533,13 +2544,22 @@ msgstr ""
"You are about to delete '%{client_name}'. They will no longer be able to acces"
"s the API. Are you sure?"
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:44
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:7
+#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
+msgid "Affiliation"
+msgstr "Affiliation"
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:8
+msgid "Attributed roles (Associated research outputs)"
+msgstr "Attributed roles (Associated research outputs)"
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:56
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/contributor/_contributor_list.html.erb:44
#: ../../engines/madmp_opidor/app/views/dynamic_form/linked_fragment/_list.html.erb:46
msgid "Do you want to delete this element?"
msgstr "Do you want to delete this element?"
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:62
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:74
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:68
#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:72
#: ../../app/views/branded/paginable/templates/_history.html.erb:56
@@ -2630,7 +2650,7 @@ msgid "Shared"
msgstr "Shared"
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:33
-#: ../../app/views/branded/plans/_share_form.html.erb:152
+#: ../../app/views/branded/plans/_share_form.html.erb:157
msgid "Update"
msgstr "Update"
@@ -3350,19 +3370,19 @@ msgstr ""
msgid "Organisation: anyone at my organisation can view"
msgstr "Organisation: anyone at my organisation can view"
-#: ../../app/views/branded/plans/_share_form.html.erb:147
-msgid "Public: anyone can view"
-msgstr "Public: anyone can view"
-
-#: ../../app/views/branded/plans/_share_form.html.erb:154
+#: ../../app/views/branded/plans/_share_form.html.erb:149
msgid ""
"You have chosen to make your plan public. Before confirming, please ensure tha"
"t your plan is complete. This DMP can be used as an example for other, please "
-"fill the different sections. Do you confirm?"
+"fill the different sections. Do you confirm and then update your choice?"
msgstr ""
"You have chosen to make your plan public. Before confirming, please ensure tha"
"t your plan is complete. This DMP can be used as an example for other, please "
-"fill the different sections. Do you confirm?"
+"fill the different sections. Do you confirm and then update your choice?"
+
+#: ../../app/views/branded/plans/_share_form.html.erb:152
+msgid "Public: anyone can view"
+msgstr "Public: anyone can view"
#: ../../app/views/branded/plans/_share_third_party.html.erb:3
msgid "Select a service you would like to share your plan with."
@@ -3552,42 +3572,42 @@ msgstr "Full Name"
msgid "Research output title"
msgstr "Research output title"
-#: ../../app/views/branded/research_outputs/_list.html.erb:34
+#: ../../app/views/branded/research_outputs/_list.html.erb:35
msgid "UUID"
msgstr "UUID"
-#: ../../app/views/branded/research_outputs/_list.html.erb:37
-#: ../../app/views/branded/research_outputs/_list.html.erb:42
+#: ../../app/views/branded/research_outputs/_list.html.erb:38
#: ../../app/views/branded/research_outputs/_list.html.erb:43
+#: ../../app/views/branded/research_outputs/_list.html.erb:44
msgid "Research output unique identifier"
msgstr "Research output unique identifier"
-#: ../../app/views/branded/research_outputs/_list.html.erb:48
+#: ../../app/views/branded/research_outputs/_list.html.erb:49
msgid "Copy UUID to clipboard"
msgstr "Copy UUID to clipboard"
-#: ../../app/views/branded/research_outputs/_list.html.erb:67
+#: ../../app/views/branded/research_outputs/_list.html.erb:69
#: ../../app/views/research_outputs/_form.html.erb:27
msgid "Research output type"
msgstr "Research output type"
-#: ../../app/views/branded/research_outputs/_list.html.erb:94
+#: ../../app/views/branded/research_outputs/_list.html.erb:96
msgid "Persistent Identifier"
msgstr "Persistent Identifier"
-#: ../../app/views/branded/research_outputs/_list.html.erb:96
+#: ../../app/views/branded/research_outputs/_list.html.erb:98
msgid "If exists, please fill in the research output persistant identifier."
msgstr "If exists, please fill in the research output persistant identifier."
-#: ../../app/views/branded/research_outputs/_list.html.erb:108
+#: ../../app/views/branded/research_outputs/_list.html.erb:110
msgid "Edit research output"
msgstr "Edit research output"
-#: ../../app/views/branded/research_outputs/_list.html.erb:111
+#: ../../app/views/branded/research_outputs/_list.html.erb:113
msgid "Move research output"
msgstr "Move research output"
-#: ../../app/views/branded/research_outputs/_list.html.erb:116
+#: ../../app/views/branded/research_outputs/_list.html.erb:118
msgid ""
"Deleting this research output will remove the associated answers. Do you confi"
"rm ?"
@@ -3595,7 +3615,7 @@ msgstr ""
"Deleting this research output will remove the associated answers. Do you confi"
"rm ?"
-#: ../../app/views/branded/research_outputs/_list.html.erb:119
+#: ../../app/views/branded/research_outputs/_list.html.erb:121
msgid "Delete research output"
msgstr "Delete research output"
diff --git a/config/locale/en_CA/LC_MESSAGES/app.mo b/config/locale/en_CA/LC_MESSAGES/app.mo
index 3930915f25..ddd6935f73 100644
Binary files a/config/locale/en_CA/LC_MESSAGES/app.mo and b/config/locale/en_CA/LC_MESSAGES/app.mo differ
diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po
index d2329a360d..431393e4c9 100644
--- a/config/locale/en_CA/app.po
+++ b/config/locale/en_CA/app.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: roadmap 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-02-03 09:02+0100\n"
-"PO-Revision-Date: 2023-02-03 09:02+0100\n"
+"POT-Creation-Date: 2023-04-12 10:30-0700\n"
+"PO-Revision-Date: 2023-04-12 19:30+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: English\n"
"Language: en_CA\n"
@@ -47,21 +47,21 @@ msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Month"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr ""
@@ -438,7 +438,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:147
#: ../../app/controllers/org_admin/questions_controller.rb:166
#: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:415
+#: ../../app/controllers/plans_controller.rb:416
#: ../../app/controllers/super_admin/api_clients_controller.rb:68
#: ../../app/controllers/super_admin/notifications_controller.rb:52
#: ../../app/controllers/super_admin/themes_controller.rb:39
@@ -450,7 +450,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:149
#: ../../app/controllers/org_admin/questions_controller.rb:169
#: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:418
+#: ../../app/controllers/plans_controller.rb:419
#: ../../app/controllers/super_admin/api_clients_controller.rb:70
#: ../../app/controllers/super_admin/notifications_controller.rb:55
#: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -540,7 +540,7 @@ msgid "Unable to delete this version of the template."
msgstr ""
#: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:394
+#: ../../app/controllers/plans_controller.rb:395
msgid "copy"
msgstr ""
@@ -602,10 +602,14 @@ msgstr ""
msgid "Your organisation does not seem to be properly configured."
msgstr ""
-#: ../../app/controllers/plan_exports_controller.rb:100
+#: ../../app/controllers/plan_exports_controller.rb:106
msgid "Created using %{application_name}. Last modified %{date}"
msgstr ""
+#: ../../app/controllers/plan_exports_controller.rb:111
+msgid "[page] of [topage]"
+msgstr ""
+
#: ../../app/controllers/plans_controller.rb:52
msgid "This is a"
msgstr ""
@@ -639,33 +643,33 @@ msgstr ""
msgid "template with customisations by the"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:392
+#: ../../app/controllers/plans_controller.rb:393
msgid "copied"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:423
+#: ../../app/controllers/plans_controller.rb:424
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:429
+#: ../../app/controllers/plans_controller.rb:430
msgid "Unable to find plan id %{plan_id}"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is now a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is no longer a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:448
+#: ../../app/controllers/plans_controller.rb:449
msgid "Unable to change the plan's test status"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:461
+#: ../../app/controllers/plans_controller.rb:462
msgid "There is no plan associated with id %{s"
msgstr ""
@@ -891,7 +895,7 @@ msgstr ""
msgid "merge"
msgstr ""
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -950,19 +954,19 @@ msgid ""
"ot to duplicate too much text."
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr ""
@@ -1108,7 +1112,7 @@ msgid "Public"
msgstr ""
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr ""
@@ -1121,7 +1125,7 @@ msgid "Public: anyone can view."
msgstr ""
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr ""
@@ -1499,23 +1503,35 @@ msgstr ""
msgid "can't be larger than 500KB"
msgstr ""
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr ""
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr ""
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr ""
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr ""
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr ""
@@ -1571,39 +1587,39 @@ msgstr ""
msgid "Copy of %{template}"
msgstr ""
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr ""
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr ""
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr ""
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr ""
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr ""
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr ""
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr ""
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr ""
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr ""
@@ -1792,11 +1808,11 @@ msgstr ""
msgid "invalid JSON"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1872,7 +1888,7 @@ msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1909,11 +1925,11 @@ msgid " by %{user_name}"
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
+msgid " questions from your plan."
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid " questions from your plan."
+msgid "This answer removes "
msgstr ""
#: ../../app/views/answers/_status.html.erb:21
@@ -2518,7 +2534,7 @@ msgid ""
msgstr ""
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2835,87 +2851,87 @@ msgstr ""
msgid "%{application_name}"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Notice:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Notice:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
"ons."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr ""
@@ -3252,11 +3268,11 @@ msgid "Feedback requested"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
+msgid "Notify the plan owner that I have finished providing feedback"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Notify the plan owner that I have finished providing feedback"
+msgid "Complete"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:39
@@ -3292,11 +3308,11 @@ msgid ""
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "New question:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "New question:"
+msgid "Question %{number}:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:15
@@ -3476,7 +3492,7 @@ msgstr ""
msgid "for internal %{org_name} use only"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:32
+#: ../../app/views/org_admin/templates/_form.html.erb:38
#: ../../app/views/org_admin/templates/_show.html.erb:13
#: ../../app/views/paginable/guidance_groups/_index.html.erb:7
#: ../../app/views/paginable/guidances/_index.html.erb:9
@@ -3486,7 +3502,7 @@ msgstr ""
msgid "Status"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:37
+#: ../../app/views/org_admin/templates/_form.html.erb:43
#: ../../app/views/org_admin/templates/_row.html.erb:16
#: ../../app/views/org_admin/templates/_show.html.erb:26
#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
@@ -3496,17 +3512,17 @@ msgstr ""
msgid "Unpublished"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:39
+#: ../../app/views/org_admin/templates/_form.html.erb:45
#: ../../app/views/paginable/templates/_history.html.erb:19
msgid "Draft"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:46
+#: ../../app/views/org_admin/templates/_form.html.erb:52
#: ../../app/views/org_admin/templates/_show.html.erb:41
msgid "Created at"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:52
+#: ../../app/views/org_admin/templates/_form.html.erb:58
#: ../../app/views/org_admin/templates/_show.html.erb:43
#: ../../app/views/paginable/guidance_groups/_index.html.erb:9
#: ../../app/views/paginable/guidances/_index.html.erb:10
@@ -3514,22 +3530,22 @@ msgstr ""
msgid "Last updated"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:64
+#: ../../app/views/org_admin/templates/_form.html.erb:70
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:10
msgid "Funder Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:67
+#: ../../app/views/org_admin/templates/_form.html.erb:73
msgid ""
"Add links to funder websites that provide additional information about the req"
"uirements for this template"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:73
+#: ../../app/views/org_admin/templates/_form.html.erb:79
msgid "Sample Plan Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:76
+#: ../../app/views/org_admin/templates/_form.html.erb:82
msgid "Add links to sample plans if provided by the funder."
msgstr ""
@@ -4208,11 +4224,11 @@ msgid "Create a new plan"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "Sample Plans"
+msgid "(if available)"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "(if available)"
+msgid "Sample Plans"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:47
@@ -4516,15 +4532,15 @@ msgstr ""
msgid "Funding status"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:181
+#: ../../app/views/plans/_project_details.html.erb:180
msgid "Grant number/url"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:195
+#: ../../app/views/plans/_project_details.html.erb:194
msgid "Grant number:"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:199
+#: ../../app/views/plans/_project_details.html.erb:198
msgid ""
"Provide a URL to the award's landing page if possible, if not please provide t"
"he award/grant number."
@@ -5531,11 +5547,11 @@ msgid "New API Client"
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Successfully regenerated the client credentials."
+msgid "Unable to regenerate the client credentials."
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Unable to regenerate the client credentials."
+msgid "Successfully regenerated the client credentials."
msgstr ""
#: ../../app/views/super_admin/notifications/_form.html.erb:20
@@ -5958,19 +5974,19 @@ msgid "Hello %{recipient_name},"
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " is creating a Data Management Plan and has answered "
+msgid " to "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " to "
+msgid " based on the template "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " in a plan called "
+msgid " is creating a Data Management Plan and has answered "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " based on the template "
+msgid " in a plan called "
msgstr ""
#: ../../app/views/user_mailer/sharing_notification.html.erb:5
@@ -6110,11 +6126,11 @@ msgid "Download users"
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Successfully regenerate your API token."
+msgid "Unable to regenerate your API token."
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Unable to regenerate your API token."
+msgid "Successfully regenerate your API token."
msgstr ""
#: i18n_placeholders.rb:4
diff --git a/config/locale/en_GB/LC_MESSAGES/app.mo b/config/locale/en_GB/LC_MESSAGES/app.mo
index 44a5207f92..3e729083fc 100644
Binary files a/config/locale/en_GB/LC_MESSAGES/app.mo and b/config/locale/en_GB/LC_MESSAGES/app.mo differ
diff --git a/config/locale/en_GB/LC_MESSAGES/client.mo b/config/locale/en_GB/LC_MESSAGES/client.mo
index bf2b9f64b5..facfb4e10e 100644
Binary files a/config/locale/en_GB/LC_MESSAGES/client.mo and b/config/locale/en_GB/LC_MESSAGES/client.mo differ
diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po
index 29ee258673..1d483cdb73 100644
--- a/config/locale/en_GB/app.po
+++ b/config/locale/en_GB/app.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: roadmap 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-02-03 09:02+0100\n"
-"PO-Revision-Date: 2023-02-03 09:02+0100\n"
+"POT-Creation-Date: 2023-04-12 10:30-0700\n"
+"PO-Revision-Date: 2023-04-12 19:30+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: English\n"
"Language: en_GB\n"
@@ -47,21 +47,21 @@ msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Month"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr ""
@@ -438,7 +438,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:147
#: ../../app/controllers/org_admin/questions_controller.rb:166
#: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:415
+#: ../../app/controllers/plans_controller.rb:416
#: ../../app/controllers/super_admin/api_clients_controller.rb:68
#: ../../app/controllers/super_admin/notifications_controller.rb:52
#: ../../app/controllers/super_admin/themes_controller.rb:39
@@ -450,7 +450,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:149
#: ../../app/controllers/org_admin/questions_controller.rb:169
#: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:418
+#: ../../app/controllers/plans_controller.rb:419
#: ../../app/controllers/super_admin/api_clients_controller.rb:70
#: ../../app/controllers/super_admin/notifications_controller.rb:55
#: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -540,7 +540,7 @@ msgid "Unable to delete this version of the template."
msgstr ""
#: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:394
+#: ../../app/controllers/plans_controller.rb:395
msgid "copy"
msgstr ""
@@ -602,10 +602,14 @@ msgstr ""
msgid "Your organisation does not seem to be properly configured."
msgstr ""
-#: ../../app/controllers/plan_exports_controller.rb:100
+#: ../../app/controllers/plan_exports_controller.rb:106
msgid "Created using %{application_name}. Last modified %{date}"
msgstr ""
+#: ../../app/controllers/plan_exports_controller.rb:111
+msgid "[page] of [topage]"
+msgstr ""
+
#: ../../app/controllers/plans_controller.rb:52
msgid "This is a"
msgstr ""
@@ -639,33 +643,33 @@ msgstr ""
msgid "template with customisations by the"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:392
+#: ../../app/controllers/plans_controller.rb:393
msgid "copied"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:423
+#: ../../app/controllers/plans_controller.rb:424
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:429
+#: ../../app/controllers/plans_controller.rb:430
msgid "Unable to find plan id %{plan_id}"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is now a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is no longer a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:448
+#: ../../app/controllers/plans_controller.rb:449
msgid "Unable to change the plan's test status"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:461
+#: ../../app/controllers/plans_controller.rb:462
msgid "There is no plan associated with id %{s"
msgstr ""
@@ -891,7 +895,7 @@ msgstr ""
msgid "merge"
msgstr ""
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -950,19 +954,19 @@ msgid ""
"ot to duplicate too much text."
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr ""
@@ -1108,7 +1112,7 @@ msgid "Public"
msgstr ""
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr ""
@@ -1121,7 +1125,7 @@ msgid "Public: anyone can view."
msgstr ""
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr ""
@@ -1499,23 +1503,35 @@ msgstr ""
msgid "can't be larger than 500KB"
msgstr ""
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr ""
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr ""
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr ""
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr ""
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr ""
@@ -1571,39 +1587,39 @@ msgstr ""
msgid "Copy of %{template}"
msgstr ""
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr ""
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr ""
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr ""
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr ""
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr ""
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr ""
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr ""
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr ""
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr ""
@@ -1792,11 +1808,11 @@ msgstr ""
msgid "invalid JSON"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1872,7 +1888,7 @@ msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1909,11 +1925,11 @@ msgid " by %{user_name}"
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
+msgid " questions from your plan."
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid " questions from your plan."
+msgid "This answer removes "
msgstr ""
#: ../../app/views/answers/_status.html.erb:21
@@ -2518,7 +2534,7 @@ msgid ""
msgstr ""
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2835,87 +2851,87 @@ msgstr ""
msgid "%{application_name}"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Notice:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Notice:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
"ons."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr ""
@@ -3252,11 +3268,11 @@ msgid "Feedback requested"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
+msgid "Notify the plan owner that I have finished providing feedback"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Notify the plan owner that I have finished providing feedback"
+msgid "Complete"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:39
@@ -3292,11 +3308,11 @@ msgid ""
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "New question:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "New question:"
+msgid "Question %{number}:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:15
@@ -3476,7 +3492,7 @@ msgstr ""
msgid "for internal %{org_name} use only"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:32
+#: ../../app/views/org_admin/templates/_form.html.erb:38
#: ../../app/views/org_admin/templates/_show.html.erb:13
#: ../../app/views/paginable/guidance_groups/_index.html.erb:7
#: ../../app/views/paginable/guidances/_index.html.erb:9
@@ -3486,7 +3502,7 @@ msgstr ""
msgid "Status"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:37
+#: ../../app/views/org_admin/templates/_form.html.erb:43
#: ../../app/views/org_admin/templates/_row.html.erb:16
#: ../../app/views/org_admin/templates/_show.html.erb:26
#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
@@ -3496,17 +3512,17 @@ msgstr ""
msgid "Unpublished"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:39
+#: ../../app/views/org_admin/templates/_form.html.erb:45
#: ../../app/views/paginable/templates/_history.html.erb:19
msgid "Draft"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:46
+#: ../../app/views/org_admin/templates/_form.html.erb:52
#: ../../app/views/org_admin/templates/_show.html.erb:41
msgid "Created at"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:52
+#: ../../app/views/org_admin/templates/_form.html.erb:58
#: ../../app/views/org_admin/templates/_show.html.erb:43
#: ../../app/views/paginable/guidance_groups/_index.html.erb:9
#: ../../app/views/paginable/guidances/_index.html.erb:10
@@ -3514,22 +3530,22 @@ msgstr ""
msgid "Last updated"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:64
+#: ../../app/views/org_admin/templates/_form.html.erb:70
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:10
msgid "Funder Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:67
+#: ../../app/views/org_admin/templates/_form.html.erb:73
msgid ""
"Add links to funder websites that provide additional information about the req"
"uirements for this template"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:73
+#: ../../app/views/org_admin/templates/_form.html.erb:79
msgid "Sample Plan Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:76
+#: ../../app/views/org_admin/templates/_form.html.erb:82
msgid "Add links to sample plans if provided by the funder."
msgstr ""
@@ -4210,11 +4226,11 @@ msgid "Create a new plan"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "Sample Plans"
+msgid "(if available)"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "(if available)"
+msgid "Sample Plans"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:47
@@ -4518,15 +4534,15 @@ msgstr ""
msgid "Funding status"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:181
+#: ../../app/views/plans/_project_details.html.erb:180
msgid "Grant number/url"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:195
+#: ../../app/views/plans/_project_details.html.erb:194
msgid "Grant number:"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:199
+#: ../../app/views/plans/_project_details.html.erb:198
msgid ""
"Provide a URL to the award's landing page if possible, if not please provide t"
"he award/grant number."
@@ -5533,11 +5549,11 @@ msgid "New API Client"
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Successfully regenerated the client credentials."
+msgid "Unable to regenerate the client credentials."
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Unable to regenerate the client credentials."
+msgid "Successfully regenerated the client credentials."
msgstr ""
#: ../../app/views/super_admin/notifications/_form.html.erb:20
@@ -5960,19 +5976,19 @@ msgid "Hello %{recipient_name},"
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " is creating a Data Management Plan and has answered "
+msgid " to "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " to "
+msgid " based on the template "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " in a plan called "
+msgid " is creating a Data Management Plan and has answered "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " based on the template "
+msgid " in a plan called "
msgstr ""
#: ../../app/views/user_mailer/sharing_notification.html.erb:5
@@ -6112,11 +6128,11 @@ msgid "Download users"
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Successfully regenerate your API token."
+msgid "Unable to regenerate your API token."
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Unable to regenerate your API token."
+msgid "Successfully regenerate your API token."
msgstr ""
#: i18n_placeholders.rb:4
diff --git a/config/locale/en_GB/client.po b/config/locale/en_GB/client.po
index fe10345761..e628d124f7 100644
--- a/config/locale/en_GB/client.po
+++ b/config/locale/en_GB/client.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: DMPOPIDoR 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-03-31 08:37+0200\n"
-"PO-Revision-Date: 2023-03-31 08:37+0200\n"
+"POT-Creation-Date: 2023-04-27 16:37+0200\n"
+"PO-Revision-Date: 2023-04-27 16:37+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: English\n"
"Language: en_GB\n"
@@ -264,7 +264,7 @@ msgid "Invalid JSON: "
msgstr ""
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:13
-#: ../../app/controllers/plans_controller.rb:569
+#: ../../app/controllers/plans_controller.rb:570
msgid "There is no plan associated with id %{id}"
msgstr ""
@@ -274,7 +274,7 @@ msgid "Data contact"
msgstr ""
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:45
-#: ../../app/controllers/plans_controller.rb:526
+#: ../../app/controllers/plans_controller.rb:527
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:47
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:52
#: ../../engines/madmp_opidor/app/controllers/super_admin/registry_values_controller.rb:21
@@ -364,10 +364,14 @@ msgstr ""
msgid "Your organisation does not seem to be properly configured."
msgstr ""
-#: ../../app/controllers/plan_exports_controller.rb:114
+#: ../../app/controllers/plan_exports_controller.rb:120
msgid "Created using %{application_name}. Last modified %{date}"
msgstr ""
+#: ../../app/controllers/plan_exports_controller.rb:125
+msgid "[page] of [topage]"
+msgstr ""
+
#: ../../app/controllers/plans_controller.rb:89
msgid "Unable to identify a suitable template for your plan."
msgstr ""
@@ -389,15 +393,15 @@ msgstr ""
msgid "template with customisations by the"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:500
+#: ../../app/controllers/plans_controller.rb:501
msgid "copied"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:502
+#: ../../app/controllers/plans_controller.rb:503
msgid "copy"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:523
+#: ../../app/controllers/plans_controller.rb:524
#: ../../app/controllers/users_controller.rb:123
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:45
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:50
@@ -405,25 +409,25 @@ msgstr ""
msgid "updated"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:531
+#: ../../app/controllers/plans_controller.rb:532
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:537
+#: ../../app/controllers/plans_controller.rb:538
msgid "Unable to find plan id %{plan_id}"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is now a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is no longer a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:556
+#: ../../app/controllers/plans_controller.rb:557
msgid "Unable to change the plan's test status"
msgstr ""
@@ -636,19 +640,19 @@ msgid ""
"ot to duplicate too much text."
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr ""
@@ -803,7 +807,7 @@ msgstr ""
msgid "Public"
msgstr ""
-#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:75
+#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:77
msgid "Administrator"
msgstr ""
@@ -1054,23 +1058,35 @@ msgstr ""
msgid "can't be larger than 500KB"
msgstr ""
-#: ../../app/models/plan.rb:68
+#: ../../app/models/plan.rb:70
msgid "organisational"
msgstr ""
-#: ../../app/models/plan.rb:69
+#: ../../app/models/plan.rb:71
msgid "public"
msgstr ""
-#: ../../app/models/plan.rb:70
+#: ../../app/models/plan.rb:72
msgid "test"
msgstr ""
-#: ../../app/models/plan.rb:79
+#: ../../app/models/plan.rb:81
msgid "private"
msgstr ""
-#: ../../app/models/plan.rb:797
+#: ../../app/models/plan.rb:85
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:86
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:87
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:805
msgid "must be after the start date"
msgstr ""
@@ -1188,7 +1204,7 @@ msgstr ""
#: ../../app/views/branded/plans/_guidance_selection.html.erb:23
#: ../../app/views/branded/plans/_share_form.html.erb:112
#: ../../app/views/branded/plans/_share_third_party.html.erb:93
-#: ../../app/views/branded/research_outputs/_list.html.erb:101
+#: ../../app/views/branded/research_outputs/_list.html.erb:103
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:67
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:59
#: ../../app/views/branded/users/_notification_preferences.html.erb:47
@@ -1247,10 +1263,10 @@ msgid "Question not answered."
msgstr ""
#: ../../app/views/branded/contact_us/contacts/_new_left.html.erb:4
-#: ../../app/views/branded/contributors/index.html.erb:24
#: ../../app/views/branded/org_admin/departments/edit.html.erb:14
#: ../../app/views/branded/org_admin/departments/new.html.erb:14
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:6
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:6
#: ../../app/views/branded/paginable/static_pages/_index.html.erb:5
#: ../../app/views/branded/paginable/users/_index.html.erb:20
#: ../../app/views/branded/shared/export/_plan_coversheet.erb:68
@@ -1347,44 +1363,15 @@ msgid ""
" for other templates."
msgstr ""
-#: ../../app/views/branded/contributors/index.html.erb:25
-#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
-msgid "Affiliation"
-msgstr ""
-
-#: ../../app/views/branded/contributors/index.html.erb:26
-msgid "Attributed roles (Associated research outputs)"
+#: ../../app/views/branded/contributors/index.html.erb:29
+msgid "No contributors have been defined."
msgstr ""
-#: ../../app/views/branded/contributors/index.html.erb:28
-#: ../../app/views/branded/org_admin/plans/index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
-#: ../../app/views/branded/paginable/departments/_index.html.erb:7
-#: ../../app/views/branded/paginable/departments/_index.html.erb:24
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
-#: ../../app/views/branded/paginable/templates/_history.html.erb:10
-#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
-#: ../../app/views/branded/plans/_share_form.html.erb:20
-#: ../../app/views/branded/plans/_share_third_party.html.erb:35
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
-#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
-msgid "Actions"
-msgstr ""
-
-#: ../../app/views/branded/contributors/index.html.erb:46
+#: ../../app/views/branded/contributors/index.html.erb:35
msgid "Add a person"
msgstr ""
-#: ../../app/views/branded/contributors/index.html.erb:59
+#: ../../app/views/branded/contributors/index.html.erb:48
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_list_field.html.erb:45
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_select_field.html.erb:47
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/registry/_multiple_complex.html.erb:59
@@ -1542,7 +1529,7 @@ msgstr ""
#: ../../app/views/branded/org_admin/questions/_form.html.erb:136
#: ../../app/views/branded/plans/_edit_details.html.erb:63
#: ../../app/views/branded/plans/_guidance_selection.html.erb:35
-#: ../../app/views/branded/research_outputs/_list.html.erb:102
+#: ../../app/views/branded/research_outputs/_list.html.erb:104
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:93
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:67
#: ../../app/views/research_outputs/_form.html.erb:183
@@ -1967,6 +1954,30 @@ msgstr ""
msgid "Request Date"
msgstr ""
+#: ../../app/views/branded/org_admin/plans/index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:10
+#: ../../app/views/branded/paginable/departments/_index.html.erb:7
+#: ../../app/views/branded/paginable/departments/_index.html.erb:24
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
+#: ../../app/views/branded/paginable/templates/_history.html.erb:10
+#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
+#: ../../app/views/branded/plans/_share_form.html.erb:20
+#: ../../app/views/branded/plans/_share_third_party.html.erb:35
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
+#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
+msgid "Actions"
+msgstr ""
+
#: ../../app/views/branded/org_admin/plans/index.html.erb:31
msgid "Complete"
msgstr ""
@@ -2049,7 +2060,7 @@ msgid ""
msgstr ""
#: ../../app/views/branded/org_admin/questions/_form.html.erb:133
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:43
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:55
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:82
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:86
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:61
@@ -2129,7 +2140,7 @@ msgstr ""
#: ../../app/views/branded/org_admin/questions/_show.html.erb:226
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:43
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:36
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:48
#: ../../app/views/branded/paginable/departments/_index.html.erb:27
#: ../../app/views/branded/paginable/orgs/_index.html.erb:39
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:59
@@ -2199,7 +2210,7 @@ msgid "Locale"
msgstr ""
#: ../../app/views/branded/org_admin/templates/_form.html.erb:41
-#: ../../app/views/branded/research_outputs/_list.html.erb:54
+#: ../../app/views/branded/research_outputs/_list.html.erb:56
#: ../../app/views/research_outputs/_form.html.erb:14
msgid "Type"
msgstr ""
@@ -2374,7 +2385,7 @@ msgid "Homepage"
msgstr ""
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/branded/research_outputs/_list.html.erb:73
+#: ../../app/views/branded/research_outputs/_list.html.erb:75
#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
msgid "Contact"
msgstr ""
@@ -2412,13 +2423,22 @@ msgid ""
"s the API. Are you sure?"
msgstr ""
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:44
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:7
+#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
+msgid "Affiliation"
+msgstr ""
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:8
+msgid "Attributed roles (Associated research outputs)"
+msgstr ""
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:56
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/contributor/_contributor_list.html.erb:44
#: ../../engines/madmp_opidor/app/views/dynamic_form/linked_fragment/_list.html.erb:46
msgid "Do you want to delete this element?"
msgstr ""
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:62
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:74
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:68
#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:72
#: ../../app/views/branded/paginable/templates/_history.html.erb:56
@@ -2507,7 +2527,7 @@ msgid "Shared"
msgstr ""
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:33
-#: ../../app/views/branded/plans/_share_form.html.erb:152
+#: ../../app/views/branded/plans/_share_form.html.erb:157
msgid "Update"
msgstr ""
@@ -3176,15 +3196,15 @@ msgstr ""
msgid "Organisation: anyone at my organisation can view"
msgstr ""
-#: ../../app/views/branded/plans/_share_form.html.erb:147
-msgid "Public: anyone can view"
-msgstr ""
-
-#: ../../app/views/branded/plans/_share_form.html.erb:154
+#: ../../app/views/branded/plans/_share_form.html.erb:149
msgid ""
"You have chosen to make your plan public. Before confirming, please ensure tha"
"t your plan is complete. This DMP can be used as an example for other, please "
-"fill the different sections. Do you confirm?"
+"fill the different sections. Do you confirm and then update your choice?"
+msgstr ""
+
+#: ../../app/views/branded/plans/_share_form.html.erb:152
+msgid "Public: anyone can view"
msgstr ""
#: ../../app/views/branded/plans/_share_third_party.html.erb:3
@@ -3355,48 +3375,48 @@ msgstr ""
msgid "Research output title"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:34
+#: ../../app/views/branded/research_outputs/_list.html.erb:35
msgid "UUID"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:37
-#: ../../app/views/branded/research_outputs/_list.html.erb:42
+#: ../../app/views/branded/research_outputs/_list.html.erb:38
#: ../../app/views/branded/research_outputs/_list.html.erb:43
+#: ../../app/views/branded/research_outputs/_list.html.erb:44
msgid "Research output unique identifier"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:48
+#: ../../app/views/branded/research_outputs/_list.html.erb:49
msgid "Copy UUID to clipboard"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:67
+#: ../../app/views/branded/research_outputs/_list.html.erb:69
#: ../../app/views/research_outputs/_form.html.erb:27
msgid "Research output type"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:94
+#: ../../app/views/branded/research_outputs/_list.html.erb:96
msgid "Persistent Identifier"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:96
+#: ../../app/views/branded/research_outputs/_list.html.erb:98
msgid "If exists, please fill in the research output persistant identifier."
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:108
+#: ../../app/views/branded/research_outputs/_list.html.erb:110
msgid "Edit research output"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:111
+#: ../../app/views/branded/research_outputs/_list.html.erb:113
msgid "Move research output"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:116
+#: ../../app/views/branded/research_outputs/_list.html.erb:118
msgid ""
"Deleting this research output will remove the associated answers. Do you confi"
"rm ?"
msgstr ""
-#: ../../app/views/branded/research_outputs/_list.html.erb:119
+#: ../../app/views/branded/research_outputs/_list.html.erb:121
msgid "Delete research output"
msgstr ""
diff --git a/config/locale/en_US/LC_MESSAGES/app.mo b/config/locale/en_US/LC_MESSAGES/app.mo
index 861e3c45fa..2656778329 100644
Binary files a/config/locale/en_US/LC_MESSAGES/app.mo and b/config/locale/en_US/LC_MESSAGES/app.mo differ
diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po
index 3073707402..1f843a96d0 100644
--- a/config/locale/en_US/app.po
+++ b/config/locale/en_US/app.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: roadmap 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-02-03 09:02+0100\n"
-"PO-Revision-Date: 2023-02-03 09:02+0100\n"
+"POT-Creation-Date: 2023-04-12 10:30-0700\n"
+"PO-Revision-Date: 2023-04-12 19:30+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: English\n"
"Language: en_US\n"
@@ -47,21 +47,21 @@ msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Month"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr ""
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr ""
@@ -438,7 +438,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:147
#: ../../app/controllers/org_admin/questions_controller.rb:166
#: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:415
+#: ../../app/controllers/plans_controller.rb:416
#: ../../app/controllers/super_admin/api_clients_controller.rb:68
#: ../../app/controllers/super_admin/notifications_controller.rb:52
#: ../../app/controllers/super_admin/themes_controller.rb:39
@@ -450,7 +450,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:149
#: ../../app/controllers/org_admin/questions_controller.rb:169
#: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:418
+#: ../../app/controllers/plans_controller.rb:419
#: ../../app/controllers/super_admin/api_clients_controller.rb:70
#: ../../app/controllers/super_admin/notifications_controller.rb:55
#: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -540,7 +540,7 @@ msgid "Unable to delete this version of the template."
msgstr ""
#: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:394
+#: ../../app/controllers/plans_controller.rb:395
msgid "copy"
msgstr ""
@@ -602,10 +602,14 @@ msgstr "Please choose an organization"
msgid "Your organisation does not seem to be properly configured."
msgstr "Your organization does not seem to be properly configured."
-#: ../../app/controllers/plan_exports_controller.rb:100
+#: ../../app/controllers/plan_exports_controller.rb:106
msgid "Created using %{application_name}. Last modified %{date}"
msgstr ""
+#: ../../app/controllers/plan_exports_controller.rb:111
+msgid "[page] of [topage]"
+msgstr ""
+
#: ../../app/controllers/plans_controller.rb:52
msgid "This is a"
msgstr ""
@@ -639,33 +643,33 @@ msgstr ""
msgid "template with customisations by the"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:392
+#: ../../app/controllers/plans_controller.rb:393
msgid "copied"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:423
+#: ../../app/controllers/plans_controller.rb:424
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:429
+#: ../../app/controllers/plans_controller.rb:430
msgid "Unable to find plan id %{plan_id}"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is now a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is no longer a test."
msgstr ""
-#: ../../app/controllers/plans_controller.rb:448
+#: ../../app/controllers/plans_controller.rb:449
msgid "Unable to change the plan's test status"
msgstr ""
-#: ../../app/controllers/plans_controller.rb:461
+#: ../../app/controllers/plans_controller.rb:462
msgid "There is no plan associated with id %{s"
msgstr ""
@@ -683,7 +687,7 @@ msgstr ""
#: ../../app/controllers/registrations_controller.rb:61
msgid "Please select an organisation from the list, or choose Other."
-msgstr ""
+msgstr "Please select an organization from the list, or choose Other."
#: ../../app/controllers/registrations_controller.rb:74
msgid "That email address is already registered."
@@ -863,7 +867,7 @@ msgstr ""
#: ../../app/controllers/super_admin/orgs_controller.rb:137
msgid "An error occurred while trying to merge the Organisations."
-msgstr ""
+msgstr "An error occurred while trying to merge the Organizations."
#: ../../app/controllers/super_admin/orgs_controller.rb:141
msgid "Unable to merge the two Organisations at this time."
@@ -895,7 +899,7 @@ msgstr ""
msgid "merge"
msgstr ""
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -954,19 +958,19 @@ msgid ""
"ot to duplicate too much text."
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr ""
@@ -1082,7 +1086,7 @@ msgstr "Grant API to organizations"
#: ../../app/helpers/perms_helper.rb:17
msgid "Review organisational plans"
-msgstr ""
+msgstr "Review organizational plans"
#: ../../app/helpers/plans_helper.rb:8
#: ../../app/views/paginable/plans/_index.html.erb:8
@@ -1112,7 +1116,7 @@ msgid "Public"
msgstr ""
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr ""
@@ -1125,7 +1129,7 @@ msgid "Public: anyone can view."
msgstr ""
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr ""
@@ -1503,23 +1507,35 @@ msgstr ""
msgid "can't be larger than 500KB"
msgstr ""
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organizational"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr ""
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr ""
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr ""
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr ""
@@ -1575,39 +1591,39 @@ msgstr "generate_copy! requires an organization target"
msgid "Copy of %{template}"
msgstr ""
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr ""
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "customize! requires an organization target"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr ""
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr ""
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr ""
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr ""
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr ""
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr ""
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr ""
@@ -1796,11 +1812,11 @@ msgstr ""
msgid "invalid JSON"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! requires a customized template"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1876,7 +1892,7 @@ msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1913,11 +1929,11 @@ msgid " by %{user_name}"
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
+msgid " questions from your plan."
msgstr ""
#: ../../app/views/answers/_status.html.erb:15
-msgid " questions from your plan."
+msgid "This answer removes "
msgstr ""
#: ../../app/views/answers/_status.html.erb:21
@@ -2424,6 +2440,8 @@ msgid ""
"Changing your organisation will result in the loss of your administrative priv"
"ileges."
msgstr ""
+"Changing your organization will result in the loss of your administrative priv"
+"ileges."
#: ../../app/views/devise/registrations/_personal_details.html.erb:43
#: ../../app/views/org_admin/users/edit.html.erb:31
@@ -2529,7 +2547,7 @@ msgid ""
msgstr ""
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2853,50 +2871,50 @@ msgstr ""
msgid "%{application_name}"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Notice:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Notice:"
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Select an organization from the list."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "My organization isn't listed"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -2904,38 +2922,38 @@ msgstr ""
"Unable to find a suitable template for the research organization and funder yo"
"u selected."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr "Please select a research organization and funder to continue."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr ""
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
"ons."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr ""
@@ -3272,11 +3290,11 @@ msgid "Feedback requested"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
+msgid "Notify the plan owner that I have finished providing feedback"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Notify the plan owner that I have finished providing feedback"
+msgid "Complete"
msgstr ""
#: ../../app/views/org_admin/plans/index.html.erb:39
@@ -3312,11 +3330,11 @@ msgid ""
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "New question:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "New question:"
+msgid "Question %{number}:"
msgstr ""
#: ../../app/views/org_admin/questions/_form.html.erb:15
@@ -3428,6 +3446,8 @@ msgid ""
"Click the links below to view organisational guidance\n"
" related to the themes associated with this question."
msgstr ""
+"Click the links below to view organizational guidance\n"
+" related to the themes associated with this question."
#: ../../app/views/org_admin/questions/_show.html.erb:169
msgid ""
@@ -3441,6 +3461,8 @@ msgid ""
"There is no organisational guidance related to the themes associated with this"
" question."
msgstr ""
+"There is no organizational guidance related to the themes associated with this"
+" question."
#: ../../app/views/org_admin/questions/_show.html.erb:182
#: ../../app/views/org_admin/questions/_show.html.erb:194
@@ -3502,7 +3524,7 @@ msgstr ""
msgid "for internal %{org_name} use only"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:32
+#: ../../app/views/org_admin/templates/_form.html.erb:38
#: ../../app/views/org_admin/templates/_show.html.erb:13
#: ../../app/views/paginable/guidance_groups/_index.html.erb:7
#: ../../app/views/paginable/guidances/_index.html.erb:9
@@ -3512,7 +3534,7 @@ msgstr ""
msgid "Status"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:37
+#: ../../app/views/org_admin/templates/_form.html.erb:43
#: ../../app/views/org_admin/templates/_row.html.erb:16
#: ../../app/views/org_admin/templates/_show.html.erb:26
#: ../../app/views/paginable/guidance_groups/_index.html.erb:24
@@ -3522,17 +3544,17 @@ msgstr ""
msgid "Unpublished"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:39
+#: ../../app/views/org_admin/templates/_form.html.erb:45
#: ../../app/views/paginable/templates/_history.html.erb:19
msgid "Draft"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:46
+#: ../../app/views/org_admin/templates/_form.html.erb:52
#: ../../app/views/org_admin/templates/_show.html.erb:41
msgid "Created at"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:52
+#: ../../app/views/org_admin/templates/_form.html.erb:58
#: ../../app/views/org_admin/templates/_show.html.erb:43
#: ../../app/views/paginable/guidance_groups/_index.html.erb:9
#: ../../app/views/paginable/guidances/_index.html.erb:10
@@ -3540,22 +3562,22 @@ msgstr ""
msgid "Last updated"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:64
+#: ../../app/views/org_admin/templates/_form.html.erb:70
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:10
msgid "Funder Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:67
+#: ../../app/views/org_admin/templates/_form.html.erb:73
msgid ""
"Add links to funder websites that provide additional information about the req"
"uirements for this template"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:73
+#: ../../app/views/org_admin/templates/_form.html.erb:79
msgid "Sample Plan Links"
msgstr ""
-#: ../../app/views/org_admin/templates/_form.html.erb:76
+#: ../../app/views/org_admin/templates/_form.html.erb:82
msgid "Add links to sample plans if provided by the funder."
msgstr ""
@@ -3706,7 +3728,7 @@ msgstr ""
#: ../../app/views/orgs/_external_identifiers.html.erb:50
msgid "Organisation Lookup"
-msgstr ""
+msgstr "Organization Lookup"
#: ../../app/views/orgs/_external_identifiers.html.erb:69
msgid ""
@@ -3737,13 +3759,15 @@ msgstr ""
#: ../../app/views/orgs/_merge_form.html.erb:3
msgid "Merge Organisations"
-msgstr ""
+msgstr "Merge Organizations"
#: ../../app/views/orgs/_merge_form.html.erb:7
msgid ""
"Please select the Organisation that will replace the current organisation: '%{org_name}'."
msgstr ""
+"Please select the Organization that will replace the current organisation: '%{org_name}'."
#: ../../app/views/orgs/_merge_form.html.erb:8
msgid ""
@@ -4245,11 +4269,11 @@ msgid "Create a new plan"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "Sample Plans"
+msgid "(if available)"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:13
-msgid "(if available)"
+msgid "Sample Plans"
msgstr ""
#: ../../app/views/paginable/templates/_publicly_visible.html.erb:47
@@ -4560,15 +4584,15 @@ msgstr ""
msgid "Funding status"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:181
+#: ../../app/views/plans/_project_details.html.erb:180
msgid "Grant number/url"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:195
+#: ../../app/views/plans/_project_details.html.erb:194
msgid "Grant number:"
msgstr ""
-#: ../../app/views/plans/_project_details.html.erb:199
+#: ../../app/views/plans/_project_details.html.erb:198
msgid ""
"Provide a URL to the award's landing page if possible, if not please provide t"
"he award/grant number."
@@ -5143,6 +5167,9 @@ msgid ""
"double check that your organisation does not appear in the list in a slightly "
"different form."
msgstr ""
+"A new entry will be created for the organization you have named above. Please "
+"double check that your organization does not appear in the list in a slightly "
+"different form."
#: ../../app/views/shared/org_selectors/_local_only.html.erb:48
msgid "The name you entered was not one of the listed suggestions!"
@@ -5620,11 +5647,11 @@ msgid "New API Client"
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Successfully regenerated the client credentials."
+msgid "Unable to regenerate the client credentials."
msgstr ""
#: ../../app/views/super_admin/api_clients/refresh_credentials.js.erb:1
-msgid "Unable to regenerate the client credentials."
+msgid "Successfully regenerated the client credentials."
msgstr ""
#: ../../app/views/super_admin/notifications/_form.html.erb:20
@@ -5755,6 +5782,8 @@ msgid ""
"Something went wrong and we were unable to analyze a merge between these two o"
"rganisations."
msgstr ""
+"Something went wrong and we were unable to analyze a merge between these two o"
+"rganizations."
#: ../../app/views/super_admin/orgs/new.html.erb:4
msgid "New organisation"
@@ -5853,6 +5882,8 @@ msgid ""
"The graphs display new users and plans for your organisation over the past yea"
"r. You can download a CSV report for each graph."
msgstr ""
+"The graphs display new users and plans for your organization over the past yea"
+"r. You can download a CSV report for each graph."
#: ../../app/views/usage/_user_statistics.html.erb:12
msgid ""
@@ -6049,19 +6080,19 @@ msgid "Hello %{recipient_name},"
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " is creating a Data Management Plan and has answered "
+msgid " to "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " to "
+msgid " based on the template "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " in a plan called "
+msgid " is creating a Data Management Plan and has answered "
msgstr ""
#: ../../app/views/user_mailer/question_answered.html.erb:5
-msgid " based on the template "
+msgid " in a plan called "
msgstr ""
#: ../../app/views/user_mailer/sharing_notification.html.erb:5
@@ -6129,7 +6160,7 @@ msgstr ""
#: ../../app/views/users/_admin_grant_permissions.html.erb:39
msgid "Allows the user to review plans submitted by organisational users"
-msgstr ""
+msgstr "Allows the user to review plans submitted by organizational users"
#: ../../app/views/users/_admin_grant_permissions.html.erb:41
msgid "Review plans"
@@ -6201,17 +6232,19 @@ msgid ""
"Below is a list of users registered for your organisation. You can\n"
" sort the data by each field."
msgstr ""
+"Below is a list of users registered for your organization. You can\n"
+" sort the data by each field."
#: ../../app/views/users/admin_index.html.erb:22
msgid "Download users"
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Successfully regenerate your API token."
+msgid "Unable to regenerate your API token."
msgstr ""
#: ../../app/views/users/refresh_token.js.erb:1
-msgid "Unable to regenerate your API token."
+msgid "Successfully regenerate your API token."
msgstr ""
#: i18n_placeholders.rb:4
diff --git a/config/locale/es/LC_MESSAGES/app.mo b/config/locale/es/LC_MESSAGES/app.mo
index 8efd84aaa6..40e0c4208a 100644
Binary files a/config/locale/es/LC_MESSAGES/app.mo and b/config/locale/es/LC_MESSAGES/app.mo differ
diff --git a/config/locale/es/app.po b/config/locale/es/app.po
index 93de083a58..2b61dc0ccb 100644
--- a/config/locale/es/app.po
+++ b/config/locale/es/app.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: roadmap 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-02-03 09:02+0100\n"
-"PO-Revision-Date: 2023-02-03 09:02+0100\n"
+"POT-Creation-Date: 2023-04-12 10:30-0700\n"
+"PO-Revision-Date: 2023-04-12 19:30+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: Spanish\n"
"Language: es\n"
@@ -49,21 +49,21 @@ msgstr "Parámetros erróneos"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Mes"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "No. Usuarios unidos"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Total"
@@ -446,7 +446,7 @@ msgstr "No se puede crear una nueva versión de esta plantilla.s"
msgstr "No hay plan asociado con id %{ s"
@@ -932,7 +936,7 @@ msgstr "fusionado"
msgid "merge"
msgstr "Unir"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -999,19 +1003,19 @@ msgstr ""
"as, se eligirán en función de su slección, por lo que es preferible no duplica"
"r mucho texto."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Respondiendo"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "enviará un correo electrónico con asunto %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "eliminará la pregunta"
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "eliminará preguntas"
@@ -1164,7 +1168,7 @@ msgid "Public"
msgstr "Público"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Privado"
@@ -1177,7 +1181,7 @@ msgid "Public: anyone can view."
msgstr "Público: cualquiera puede ver."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Privado: restringido a mí y a las personas que invito."
@@ -1565,23 +1569,35 @@ msgstr "debe ser uno de los siguientes formatos: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "no puede ser más grande que 500KB"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organizativo"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "Público"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "Prueba"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "Privado"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "debe ser posterior a la fecha de inicio"
@@ -1639,39 +1655,39 @@ msgstr "generar_copia! requiere un objetivo de organización"
msgid "Copy of %{template}"
msgstr "Copia de %{template}"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "generar_versión! requiere una plantilla publicada"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "personalizar requiere un objetivo de organización"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "personalizar requiere una plantilla de un financiador"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "No se puede publicar una plantilla publicada."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "No se puede publicar una versión histórica de esta plantilla."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "No puedes publicar una plantilla sin fases."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr "No se puede publicar una plantilla sin secciones en una fase."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "No se puede publicar una plantilla sin preguntas en una sección."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "Las condiciones en la plantilla se refieren al revés"
@@ -1870,11 +1886,11 @@ msgstr ": se requiere título para cada: conjunto de datos"
msgid "invalid JSON"
msgstr "JSON inválido"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "actualización de personalización! requiere una plantilla personalizada"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1954,7 +1970,7 @@ msgstr "Por favor espere, los estándares se están cargando."
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1990,14 +2006,14 @@ msgstr "Contestada"
msgid " by %{user_name}"
msgstr " por %{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Esta respuesta elimina"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " preguntas de tu plan."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Esta respuesta elimina"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Esta respuesta activa los correos electrónicos a"
@@ -2656,7 +2672,7 @@ msgstr ""
"n del plan."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2994,50 +3010,50 @@ msgstr "Cerrar Sesión"
msgid "%{application_name}"
msgstr "DMPonline"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Error:"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Darse cuenta:"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Error:"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Cargando..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Este campo es requerido."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Mostrar contraseña"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Seleccione una organización de la lista."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Mi organización no está en la lista"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "N / A"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Ocultar lista"
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Vea la lista completa de instituciones asociadas."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3045,29 +3061,29 @@ msgstr ""
"No se puede encontrar una plantilla adecuada para la organización de investiga"
"ción y el financiador que seleccionó."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr ""
"Por favor seleccione una organización de investigación y financiador para cont"
"inuar."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Cargando ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "No se puede cargar el contenido de la sección en este momento."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "No se puede cargar el contenido de la pregunta en este momento."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Se abre en una nueva ventana"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3077,11 +3093,11 @@ msgstr ""
" abajo para navegar por las sugerencias. Use la tecla Intro para seleccionar u"
"na sugerencia o la tecla Escape para cerrar las sugerencias."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "No hay resultados disponibles para su entrada."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Buscando ..."
@@ -3427,14 +3443,14 @@ msgstr "Acciones"
msgid "Feedback requested"
msgstr "Feedback solicitado"
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Completar"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr "Notificar al propietario del plan que he terminado de proporcionar comentarios"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Completar"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue.\n"
"Language-Team: Finnish\n"
"Language: fi\n"
@@ -51,21 +51,21 @@ msgstr "Virheelliset parametrit"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Kuukausi"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "Liittyneet käyttäjät"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Yhteensä"
@@ -446,7 +446,7 @@ msgstr "Tästä mallista ei voi luoda uutta versiota.s"
msgstr "Tunnukseen %{ ei liity suunnitelmaa s"
@@ -922,7 +926,7 @@ msgstr "yhdistyivät"
msgid "merge"
msgstr "yhdistää"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -988,19 +992,19 @@ msgstr ""
" lteemojen mukaan, nämä tuodaan esiin valintojesi perusteella, joten ei kannat"
"a toistaa liikaa tekstiä."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Vastaaminen"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "lähettää sähköpostin aiheella %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "poistaa kysymyksen"
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "poistaa kysymyksiä"
@@ -1152,7 +1156,7 @@ msgid "Public"
msgstr "Julkinen"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Yksityinen"
@@ -1165,7 +1169,7 @@ msgid "Public: anyone can view."
msgstr "Avattu: näkyvissä kaikille ilman DMPTuuli-kirjautumista"
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Yksityinen: rajattu minulle ja kutsumilleni henkilöille."
@@ -1552,23 +1556,35 @@ msgstr "täytyy olla yksi seuraavista tiedostomuodoista: jpeg, jpg, png, gif, bm
msgid "can't be larger than 500KB"
msgstr "ei voi olla suurempi kuin 500KB"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organisaatiokohtainen"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "julkinen"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "testi"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "yksityinen"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "on oltava alkamispäivän jälkeen"
@@ -1624,39 +1640,39 @@ msgstr "kopion_tuottaminen! vaatii organisaatiokohteen."
msgid "Copy of %{template}"
msgstr "%{template}:n kopio"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "version_tuottaminen! vaatii julkaistun mallipohjan"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "mukauta! vaatii kohteeksi organisaation"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "mukauta! vaatii rahoittajan mallipohjan"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "Et voi julkaista julkaistua mallia."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "Et voi julkaista tämän mallin historiallista versiota."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "Et voi julkaista mallia ilman vaiheita."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr "Et voi julkaista mallia ilman osioita vaiheessa."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "Et voi julkaista mallipohjaa ilman kysymyksiä."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "Mallin ehdot viittaavat taaksepäin"
@@ -1858,11 +1874,11 @@ msgstr ": otsikko vaaditaan jokaiselle: tietojoukolle"
msgid "invalid JSON"
msgstr "Virheellinen JSON"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! vaatii mukautetun mallipohjan"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1942,7 +1958,7 @@ msgstr "Odota, standardit latautuvat"
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1978,14 +1994,14 @@ msgstr "Vastattu"
msgid " by %{user_name}"
msgstr "%{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Tämä vastaus poistuu"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " kysymyksiä suunnitelmasi."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Tämä vastaus poistuu"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Tämä vastaus laukaisee sähköpostit osoitteeseen"
@@ -2642,7 +2658,7 @@ msgstr ""
"je näkyy, kun he vastaavat kysymyksiin 'Luo suunnitelma' -kohdassa."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2977,50 +2993,50 @@ msgstr "Kirjaudu ulos"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Notice:"
+msgstr "Huom!"
+
+#: ../../app/views/layouts/application.html.erb:92
msgid "Error:"
msgstr "Virhe:"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Notice:"
-msgstr "Hei!"
-
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Ladataan ..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Tämä kenttä on pakollinen."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Näytä salasana"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Valitse organisaatio listalta."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Organisaationi puuttuu listasta"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "Ei käytettävissä"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Piilota lista."
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Katso lista partneri-instituutioista."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3028,27 +3044,27 @@ msgstr ""
"Valitsemallesi tutkimusorganisaatiolle ja rahoittajalle ei löydy sopivaa malli"
"pohjaa."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr "Valitse tutkimusorganisaatio ja rahoittaja ennen kuin jatkat."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Latautuu ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Osion sisällön lataaminen ei onnistu tällä hetkellä."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Kysymyksen sisällön lataaminen ei onnistu tällä hetkellä."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Avautuu uuteen ikkunaan"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3058,11 +3074,11 @@ msgstr ""
"ksiin. Käytä Enter-näppäintä valitaksesi ehdotuksen tai Escape-näppäintä sulke"
"aksesi ehdotukset."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "Tuloillesi ei ole tuloksia."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Etsitään ..."
@@ -3407,14 +3423,14 @@ msgstr "Toiminnot"
msgid "Feedback requested"
msgstr "Pyydetty palautetta"
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Valmis"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr "Ilmoita suunnitelman omistajalle, että olen antanut loppupalautteen"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Valmis"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue.\n"
"Language-Team: French\n"
"Language: fr_CA\n"
@@ -51,21 +51,21 @@ msgstr "Mauvais paramètres"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Mois"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "Nombre d’utilisateurs joints"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Total"
@@ -454,7 +454,7 @@ msgstr ""
#: ../../app/controllers/org_admin/phases_controller.rb:147
#: ../../app/controllers/org_admin/questions_controller.rb:166
#: ../../app/controllers/org_admin/users_controller.rb:30
-#: ../../app/controllers/plans_controller.rb:415
+#: ../../app/controllers/plans_controller.rb:416
#: ../../app/controllers/super_admin/api_clients_controller.rb:68
#: ../../app/controllers/super_admin/notifications_controller.rb:52
#: ../../app/controllers/super_admin/themes_controller.rb:39
@@ -466,7 +466,7 @@ msgstr "mis à jour"
#: ../../app/controllers/org_admin/phases_controller.rb:149
#: ../../app/controllers/org_admin/questions_controller.rb:169
#: ../../app/controllers/org_admin/users_controller.rb:32
-#: ../../app/controllers/plans_controller.rb:418
+#: ../../app/controllers/plans_controller.rb:419
#: ../../app/controllers/super_admin/api_clients_controller.rb:70
#: ../../app/controllers/super_admin/notifications_controller.rb:55
#: ../../app/controllers/super_admin/themes_controller.rb:41
@@ -560,7 +560,7 @@ msgid "Unable to delete this version of the template."
msgstr ""
#: ../../app/controllers/org_admin/template_copies_controller.rb:20
-#: ../../app/controllers/plans_controller.rb:394
+#: ../../app/controllers/plans_controller.rb:395
msgid "copy"
msgstr "copier"
@@ -624,10 +624,14 @@ msgstr "Veuillez choisir un organisme"
msgid "Your organisation does not seem to be properly configured."
msgstr "Votre organisme ne semble pas être correctement configuré."
-#: ../../app/controllers/plan_exports_controller.rb:100
+#: ../../app/controllers/plan_exports_controller.rb:106
msgid "Created using %{application_name}. Last modified %{date}"
msgstr "Créé(e) avec %{application_name}. Dernière modification : %{date}"
+#: ../../app/controllers/plan_exports_controller.rb:111
+msgid "[page] of [topage]"
+msgstr ""
+
#: ../../app/controllers/plans_controller.rb:52
msgid "This is a"
msgstr "Il s’agit d’un(e)"
@@ -661,11 +665,11 @@ msgstr "Ce plan est fondé sur "
msgid "template with customisations by the"
msgstr "modèle avec des personnalisations par le"
-#: ../../app/controllers/plans_controller.rb:392
+#: ../../app/controllers/plans_controller.rb:393
msgid "copied"
msgstr "copié"
-#: ../../app/controllers/plans_controller.rb:423
+#: ../../app/controllers/plans_controller.rb:424
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
@@ -673,23 +677,23 @@ msgstr ""
"Il est impossible de modifier l’état du plan, car il est nécessaire d’obtenir "
"un taux de réponse d’au moins %{percentage}"
-#: ../../app/controllers/plans_controller.rb:429
+#: ../../app/controllers/plans_controller.rb:430
msgid "Unable to find plan id %{plan_id}"
msgstr "Il est impossible de trouver l’ID du plan %{plan_id}"
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is now a test."
msgstr "Votre projet est maintenant à l’état d’essai."
-#: ../../app/controllers/plans_controller.rb:444
+#: ../../app/controllers/plans_controller.rb:445
msgid "Your project is no longer a test."
msgstr "Votre projet n’est plus à l’état d’essai."
-#: ../../app/controllers/plans_controller.rb:448
+#: ../../app/controllers/plans_controller.rb:449
msgid "Unable to change the plan's test status"
msgstr "Il est impossible de modifier l’état d’essai du plan"
-#: ../../app/controllers/plans_controller.rb:461
+#: ../../app/controllers/plans_controller.rb:462
msgid "There is no plan associated with id %{s"
msgstr ""
@@ -928,7 +932,7 @@ msgstr "fusionné"
msgid "merge"
msgstr "fusionner"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -996,19 +1000,19 @@ msgstr ""
"de vos sélections ci-dessous. Il est donc préférable de ne pas dupliquer trop "
"de texte."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Répondre"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr ""
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "supprimera la question"
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "supprimera les questions"
@@ -1161,7 +1165,7 @@ msgid "Public"
msgstr "Public"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Privé"
@@ -1174,7 +1178,7 @@ msgid "Public: anyone can view."
msgstr "Public : Tous peuvent consulter le plan."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Privé : usage réservé à moi et aux personnes que j’invite."
@@ -1562,23 +1566,35 @@ msgstr "doit être dans l’un des formats suivants: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "ne peut pas dépasser 500 Ko"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organisationnel"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "public"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "essai"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "privé"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "doit être postérieur à la date de début"
@@ -1636,43 +1652,43 @@ msgstr "un organisme cible est exigé pour generate_copy!"
msgid "Copy of %{template}"
msgstr "Copie de %{template}"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "un modèle publié est exigé pour generate_version!"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "organisme cible exiger pour personnaliser!"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "un modèle d’un bailleur de fonds est exigé pour personnaliser!"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "Vous ne pouvez pas publier un modèle déjà publié."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "Vous ne pouvez pas publier une version historique de ce modèle."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "Vous ne pouvez pas publier un modèle ne contenant pas de phases."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr ""
"Vous ne pouvez pas publier un modèle dont une phase ne contient pas de section"
"s."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr ""
"Vous ne pouvez pas publier un modèle dont certaines sections ne contiennent pa"
"s de questions."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "Les conditions du modèle sont associées à une référence antérieure"
@@ -1871,11 +1887,11 @@ msgstr ""
msgid "invalid JSON"
msgstr ""
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "un modèle personnalisé est exigé pour upgrade_customization!"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1956,7 +1972,7 @@ msgstr "Veuillez patienter. Le chargement des normes est en cours."
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1992,14 +2008,14 @@ msgstr "Répondu"
msgid " by %{user_name}"
msgstr " par %{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Cette réponse entraîne le retrait de"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " aux questions de votre plan."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Cette réponse entraîne le retrait de"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Cette réponse déclenche l’envoi de courriels à"
@@ -2660,7 +2676,7 @@ msgstr ""
"u’ils répondront aux questions de l’assistant « Créer un plan »."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -3001,50 +3017,50 @@ msgstr "Se déconnecter"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Erreur :"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Remarque :"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Erreur :"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr ""
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Ce champ est requis."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Afficher le mot de passe"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Sélectionnez un organisme dans la liste."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Mon organisme n’est pas répertorié"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "S. o."
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Masquer la liste."
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Consulter la liste complète des établissements partenaires."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3052,29 +3068,29 @@ msgstr ""
"Il est impossible de trouver un modèle approprié pour l’organisme de recherche"
" et le bailleur de fonds que vous avez sélectionnés."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr ""
"Veuillez sélectionner un organisme de recherche et un bailleur de fonds pour c"
"ontinuer."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Chargement en cours..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Il est impossible de charger le contenu de la question pour le moment."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Il est impossible de charger le contenu de la question pour le moment."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "S’ouvre dans une nouvelle fenêtre"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3084,11 +3100,11 @@ msgstr ""
"bas pour parcourir les suggestions. Utilisez la touche Entrée pour sélectionne"
"r une suggestion ou la touche Échap pour fermer les suggestions."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "Votre entrée n’a donné aucun résultat."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr ""
@@ -3437,14 +3453,14 @@ msgstr "Actions"
msgid "Feedback requested"
msgstr "Rétroaction demandée"
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Achevé"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr "Aviser le propriétaire du plan que j’ai terminé de fournir des commentaires"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Achevé"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) \n"
"Language-Team: French\n"
"Language: fr_FR\n"
@@ -52,21 +52,21 @@ msgstr "Paramètres erronés"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Mois"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "Nombre d'utilisateurs inscrits"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Total"
@@ -241,7 +241,7 @@ msgstr "L'espace de recherche n'a aucun élément associé"
#: ../../app/controllers/contact_us/contacts_controller.rb:13
msgid "Captcha verification failed, please retry."
-msgstr "la vérificatio du CAPTCHA a échouée, veuillez réessayer."
+msgstr "la vérification du CAPTCHA a échouée, veuillez réessayer."
#: ../../app/controllers/contact_us/contacts_controller.rb:18
msgid "Contact email was successfully sent."
@@ -453,7 +453,7 @@ msgstr "Impossible de créer une nouvelle version de ce modèle.s"
msgstr "Il n'y a pas de forfait associé à l'identifiant %{ s"
@@ -939,7 +943,7 @@ msgstr "fusionné"
msgid "merge"
msgstr "fusionner"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr "Nombre de plans créés"
@@ -1006,19 +1010,19 @@ msgstr ""
"e que sélectionnez ci-dessous, aussi mieux vaut éviter de dupliquer trop dextr"
"aits."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Répondre"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "enverra un e-mail avec l'objet %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "supprimera la question"
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "supprimera les questions"
@@ -1171,7 +1175,7 @@ msgid "Public"
msgstr "Public"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Privé"
@@ -1184,7 +1188,7 @@ msgid "Public: anyone can view."
msgstr "Public : visible par tous."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Privé : accès restreint aux personnes que j'invite."
@@ -1573,23 +1577,35 @@ msgstr "doit être dans l'un des formats suivants : jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "ne peut peser plus de 500ko"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organisme"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "public"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "test"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "privé"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr "Planifié"
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr "Financé"
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr "Refusé"
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "doit être postérieur à la date de début"
@@ -1647,39 +1663,39 @@ msgstr "generate_copy! nécessite un organisme cible"
msgid "Copy of %{template}"
msgstr "Copie de %{template}"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "generate_version! nécessite un modèle publie"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "customize! nécessite un organisme cible"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "customize! nécessite le modèle d'un financeur"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "Vous ne pouvez pas publier un modèle publié."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "Vous ne pouvez pas publier une ancienne version de ce modèle."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "Vous ne pouvez pas publier un modèle sans phases."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr "Vous ne pouvez pas publier un modèle sans sections dans une phase."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "Vous ne pouvez pas publier un modèle sans questions dans une section."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr ""
"Les conditions du modèle s'appliquent à une question positionnée avant celle-c"
@@ -1878,11 +1894,11 @@ msgstr ":title est requis pour chaque :dataset"
msgid "invalid JSON"
msgstr "JSON non valide"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! nécessite un modèle personnalisé"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1962,7 +1978,7 @@ msgstr "Merci de patienter, les standards sont en cours de chargement"
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1998,14 +2014,14 @@ msgstr "Répondu"
msgid " by %{user_name}"
msgstr " par %{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Cette réponse supprime"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " questions de votre plan."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Cette réponse supprime"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Cette réponse déclenche l'envoi d'e-mail(s) à"
@@ -2665,7 +2681,7 @@ msgstr ""
"lorsqu'ils répondront aux questions dans l'onglet 'créer un plan'."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -3004,50 +3020,50 @@ msgstr "Déconnexion"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Erreur :"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Note :"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Erreur :"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Chargement..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Ce champ est obligatoire."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Afficher le mot de passe"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Sélectionner un organisme dans la liste."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Mon organisme n'est pas dans la liste"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "N/D"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Cacher la liste."
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Voir la liste des institutions partenaires."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3055,29 +3071,29 @@ msgstr ""
"Impossible de trouver un modèle approprié à l'organisme de recherche et au fin"
"anceur que vous avez sélectionnés."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr ""
"Veuillez sélectionner un organisme de recherche et un financeur pour continuer"
"."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Chargement ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Impossible de charger le contenu de la section pour le moment."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Impossible de charger le contenu de la question pour le moment."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Ouvre une nouvelle fenêtre"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3087,11 +3103,11 @@ msgstr ""
"ir les suggestions. Utilisez la touche Entrée pour sélectionner une suggestion"
" ou la touche Échap pour fermer les suggestions."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "Aucun résultat n'est disponible pour votre recherche."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Recherche..."
@@ -3439,16 +3455,16 @@ msgstr "Actions"
msgid "Feedback requested"
msgstr "Demande d'assistance conseil"
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Terminé"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr ""
"Avertir le propriétaire du plan que j'ai fini de fournir une assistance consei"
"l"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Terminé"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue.\n"
"Language-Team: French\n"
"Language: fr_FR\n"
@@ -271,7 +271,7 @@ msgid "Invalid JSON: "
msgstr "JSON non valide :"
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:13
-#: ../../app/controllers/plans_controller.rb:569
+#: ../../app/controllers/plans_controller.rb:570
msgid "There is no plan associated with id %{id}"
msgstr "Il n'existe aucun plan associé à l'identifiant %{id}"
@@ -281,7 +281,7 @@ msgid "Data contact"
msgstr "Personne contact pour les données"
#: ../../app/controllers/dmpopidor/research_outputs_controller.rb:45
-#: ../../app/controllers/plans_controller.rb:526
+#: ../../app/controllers/plans_controller.rb:527
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:47
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:52
#: ../../engines/madmp_opidor/app/controllers/super_admin/registry_values_controller.rb:21
@@ -377,10 +377,14 @@ msgstr "Veuillez choisir un organisme"
msgid "Your organisation does not seem to be properly configured."
msgstr "Votre organisme ne semble pas être correctement configurée."
-#: ../../app/controllers/plan_exports_controller.rb:114
+#: ../../app/controllers/plan_exports_controller.rb:120
msgid "Created using %{application_name}. Last modified %{date}"
msgstr "Créé avec %{application_name}. Dernière modification %{date}"
+#: ../../app/controllers/plan_exports_controller.rb:125
+msgid "[page] of [topage]"
+msgstr "[page] de [topage]"
+
#: ../../app/controllers/plans_controller.rb:89
msgid "Unable to identify a suitable template for your plan."
msgstr "Impossible d'identifier un modèle approprié à votre plan."
@@ -402,15 +406,15 @@ msgstr "Ce plan est basé sur le"
msgid "template with customisations by the"
msgstr "modèle personnalisé par"
-#: ../../app/controllers/plans_controller.rb:500
+#: ../../app/controllers/plans_controller.rb:501
msgid "copied"
msgstr "copié"
-#: ../../app/controllers/plans_controller.rb:502
+#: ../../app/controllers/plans_controller.rb:503
msgid "copy"
msgstr "copier"
-#: ../../app/controllers/plans_controller.rb:523
+#: ../../app/controllers/plans_controller.rb:524
#: ../../app/controllers/users_controller.rb:123
#: ../../engines/madmp_opidor/app/controllers/super_admin/madmp_schemas_controller.rb:45
#: ../../engines/madmp_opidor/app/controllers/super_admin/registries_controller.rb:50
@@ -418,7 +422,7 @@ msgstr "copier"
msgid "updated"
msgstr "mis à jour"
-#: ../../app/controllers/plans_controller.rb:531
+#: ../../app/controllers/plans_controller.rb:532
msgid ""
"Unable to change the plan's status since it is needed at least %{percentage} p"
"ercentage responded"
@@ -426,19 +430,19 @@ msgstr ""
"Impossible de changer le statut du plan, au moins %{percentage} % de questions"
" répondues sont nécessaires"
-#: ../../app/controllers/plans_controller.rb:537
+#: ../../app/controllers/plans_controller.rb:538
msgid "Unable to find plan id %{plan_id}"
msgstr "Impossible de trouver le plan avec l'identifiant %{plan_id}"
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is now a test."
msgstr "Votre projet est maintenant un test."
-#: ../../app/controllers/plans_controller.rb:552
+#: ../../app/controllers/plans_controller.rb:553
msgid "Your project is no longer a test."
msgstr "Votre projet n'est plus un test."
-#: ../../app/controllers/plans_controller.rb:556
+#: ../../app/controllers/plans_controller.rb:557
msgid "Unable to change the plan's test status"
msgstr "Impossible de changer le statut du plan"
@@ -676,19 +680,19 @@ msgstr ""
"e que sélectionnez ci-dessous, aussi mieux vaut éviter de dupliquer trop dextr"
"aits."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Répondre"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "enverra un e-mail avec l'objet %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "supprimera la question"
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "supprimera les questions"
@@ -850,7 +854,7 @@ msgstr "Organisme"
msgid "Public"
msgstr "Public"
-#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:75
+#: ../../app/helpers/plans_helper.rb:41 ../../app/models/plan.rb:77
msgid "Administrator"
msgstr "Administrateur"
@@ -1105,23 +1109,35 @@ msgstr "doit être dans l'un des formats suivants : jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "ne peut peser plus de 500ko"
-#: ../../app/models/plan.rb:68
+#: ../../app/models/plan.rb:70
msgid "organisational"
msgstr "organisme"
-#: ../../app/models/plan.rb:69
+#: ../../app/models/plan.rb:71
msgid "public"
msgstr "public"
-#: ../../app/models/plan.rb:70
+#: ../../app/models/plan.rb:72
msgid "test"
msgstr "test"
-#: ../../app/models/plan.rb:79
+#: ../../app/models/plan.rb:81
msgid "private"
msgstr "privé"
-#: ../../app/models/plan.rb:797
+#: ../../app/models/plan.rb:85
+msgid "Planned"
+msgstr "Planifié"
+
+#: ../../app/models/plan.rb:86
+msgid "Funded"
+msgstr "Financé"
+
+#: ../../app/models/plan.rb:87
+msgid "Denied"
+msgstr "Refusé"
+
+#: ../../app/models/plan.rb:805
msgid "must be after the start date"
msgstr "doit être postérieur à la date de début"
@@ -1243,7 +1259,7 @@ msgstr "Merci de patienter, les standards sont en cours de chargement"
#: ../../app/views/branded/plans/_guidance_selection.html.erb:23
#: ../../app/views/branded/plans/_share_form.html.erb:112
#: ../../app/views/branded/plans/_share_third_party.html.erb:93
-#: ../../app/views/branded/research_outputs/_list.html.erb:101
+#: ../../app/views/branded/research_outputs/_list.html.erb:103
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:67
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:59
#: ../../app/views/branded/users/_notification_preferences.html.erb:47
@@ -1302,10 +1318,10 @@ msgid "Question not answered."
msgstr "Question sans réponse."
#: ../../app/views/branded/contact_us/contacts/_new_left.html.erb:4
-#: ../../app/views/branded/contributors/index.html.erb:24
#: ../../app/views/branded/org_admin/departments/edit.html.erb:14
#: ../../app/views/branded/org_admin/departments/new.html.erb:14
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:6
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:6
#: ../../app/views/branded/paginable/static_pages/_index.html.erb:5
#: ../../app/views/branded/paginable/users/_index.html.erb:20
#: ../../app/views/branded/shared/export/_plan_coversheet.erb:68
@@ -1415,44 +1431,15 @@ msgstr ""
"érales\", dans l'onglet \"Rédiger\" pour les modèles structurés ou dans l'onglet "
"\"Produits de recherche\" pour les autres modèles."
-#: ../../app/views/branded/contributors/index.html.erb:25
-#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
-msgid "Affiliation"
-msgstr "Affiliation"
-
-#: ../../app/views/branded/contributors/index.html.erb:26
-msgid "Attributed roles (Associated research outputs)"
-msgstr "Rôles attribués (Produits de recherche associés)"
-
-#: ../../app/views/branded/contributors/index.html.erb:28
-#: ../../app/views/branded/org_admin/plans/index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
-#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
-#: ../../app/views/branded/paginable/departments/_index.html.erb:7
-#: ../../app/views/branded/paginable/departments/_index.html.erb:24
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
-#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
-#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
-#: ../../app/views/branded/paginable/templates/_history.html.erb:10
-#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
-#: ../../app/views/branded/plans/_share_form.html.erb:20
-#: ../../app/views/branded/plans/_share_third_party.html.erb:35
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
-#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
-#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
-#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
-msgid "Actions"
-msgstr "Actions"
+#: ../../app/views/branded/contributors/index.html.erb:29
+msgid "No contributors have been defined."
+msgstr "Aucun contributeur n'a été défini."
-#: ../../app/views/branded/contributors/index.html.erb:46
+#: ../../app/views/branded/contributors/index.html.erb:35
msgid "Add a person"
msgstr "Ajouter une personne"
-#: ../../app/views/branded/contributors/index.html.erb:59
+#: ../../app/views/branded/contributors/index.html.erb:48
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_list_field.html.erb:45
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/_fragment_select_field.html.erb:47
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/registry/_multiple_complex.html.erb:59
@@ -1629,7 +1616,7 @@ msgstr "Publié ?"
#: ../../app/views/branded/org_admin/questions/_form.html.erb:136
#: ../../app/views/branded/plans/_edit_details.html.erb:63
#: ../../app/views/branded/plans/_guidance_selection.html.erb:35
-#: ../../app/views/branded/research_outputs/_list.html.erb:102
+#: ../../app/views/branded/research_outputs/_list.html.erb:104
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:93
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:67
#: ../../app/views/research_outputs/_form.html.erb:183
@@ -2083,6 +2070,30 @@ msgstr "Demandeur"
msgid "Request Date"
msgstr "Date de la demande"
+#: ../../app/views/branded/org_admin/plans/index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:20
+#: ../../app/views/branded/paginable/api_clients/_index.html.erb:40
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:10
+#: ../../app/views/branded/paginable/departments/_index.html.erb:7
+#: ../../app/views/branded/paginable/departments/_index.html.erb:24
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:12
+#: ../../app/views/branded/paginable/orgs/_index.html.erb:36
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:54
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:14
+#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:58
+#: ../../app/views/branded/paginable/templates/_history.html.erb:10
+#: ../../app/views/branded/paginable/templates/_organisational.html.erb:57
+#: ../../app/views/branded/plans/_share_form.html.erb:20
+#: ../../app/views/branded/plans/_share_third_party.html.erb:35
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:10
+#: ../../engines/madmp_opidor/app/views/paginable/madmp_schemas/_index.html.erb:30
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:9
+#: ../../engines/madmp_opidor/app/views/paginable/registries/_index.html.erb:28
+#: ../../engines/madmp_opidor/app/views/paginable/registry_values/_index.html.erb:6
+msgid "Actions"
+msgstr "Actions"
+
#: ../../app/views/branded/org_admin/plans/index.html.erb:31
msgid "Complete"
msgstr "Terminer"
@@ -2181,7 +2192,7 @@ msgstr ""
"question."
#: ../../app/views/branded/org_admin/questions/_form.html.erb:133
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:43
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:55
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:82
#: ../../app/views/branded/super_admin/api_clients/_form.html.erb:86
#: ../../app/views/branded/super_admin/static_pages/_form.html.erb:61
@@ -2274,7 +2285,7 @@ msgstr "Aucun fourni"
#: ../../app/views/branded/org_admin/questions/_show.html.erb:226
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:43
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:36
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:48
#: ../../app/views/branded/paginable/departments/_index.html.erb:27
#: ../../app/views/branded/paginable/orgs/_index.html.erb:39
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:59
@@ -2348,7 +2359,7 @@ msgid "Locale"
msgstr "Langue"
#: ../../app/views/branded/org_admin/templates/_form.html.erb:41
-#: ../../app/views/branded/research_outputs/_list.html.erb:54
+#: ../../app/views/branded/research_outputs/_list.html.erb:56
#: ../../app/views/research_outputs/_form.html.erb:14
msgid "Type"
msgstr "Type"
@@ -2534,7 +2545,7 @@ msgid "Homepage"
msgstr "Page d'accueil"
#: ../../app/views/branded/paginable/api_clients/_index.html.erb:15
-#: ../../app/views/branded/research_outputs/_list.html.erb:73
+#: ../../app/views/branded/research_outputs/_list.html.erb:75
#: ../../app/views/research_outputs/repositories/_search_result.html.erb:42
msgid "Contact"
msgstr "Personne contact"
@@ -2574,13 +2585,22 @@ msgstr ""
"Vous êtes sur le point de supprimer '%{client_name}'. Ils ne pourront plus acc"
"éder à l'API. Êtes-vous sûr?"
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:44
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:7
+#: ../../app/views/branded/shared/export/_plan_coversheet.erb:69
+msgid "Affiliation"
+msgstr "Affiliation"
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:8
+msgid "Attributed roles (Associated research outputs)"
+msgstr "Rôles attribués (Produits de recherche associés)"
+
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:56
#: ../../engines/madmp_opidor/app/views/dynamic_form/fields/contributor/_contributor_list.html.erb:44
#: ../../engines/madmp_opidor/app/views/dynamic_form/linked_fragment/_list.html.erb:46
msgid "Do you want to delete this element?"
msgstr "Voulez-vous vraiment supprimer cet élément ?"
-#: ../../app/views/branded/paginable/contributors/_index.html.erb:62
+#: ../../app/views/branded/paginable/contributors/_index.html.erb:74
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:68
#: ../../app/views/branded/paginable/plans/_privately_visible.html.erb:72
#: ../../app/views/branded/paginable/templates/_history.html.erb:56
@@ -2671,7 +2691,7 @@ msgid "Shared"
msgstr "Partagé"
#: ../../app/views/branded/paginable/plans/_administrator_visible.html.erb:33
-#: ../../app/views/branded/plans/_share_form.html.erb:152
+#: ../../app/views/branded/plans/_share_form.html.erb:157
msgid "Update"
msgstr "Mettre à jour"
@@ -3406,19 +3426,20 @@ msgstr ""
msgid "Organisation: anyone at my organisation can view"
msgstr "Organisme : toute personne de mon organisme peut consulter mon plan"
-#: ../../app/views/branded/plans/_share_form.html.erb:147
-msgid "Public: anyone can view"
-msgstr "Public : visible par tous"
-
-#: ../../app/views/branded/plans/_share_form.html.erb:154
+#: ../../app/views/branded/plans/_share_form.html.erb:149
msgid ""
"You have chosen to make your plan public. Before confirming, please ensure tha"
"t your plan is complete. This DMP can be used as an example for other, please "
-"fill the different sections. Do you confirm?"
+"fill the different sections. Do you confirm and then update your choice?"
msgstr ""
"Vous avez choisi de rendre votre plan public. Avant de confirmer, assurez-vous"
" que la version de ce plan est complète. Ce DMP peut servir d'exemple pour d'a"
-"utres, veillez à remplir les différentes sections. Vous confirmez ?"
+"utres, veillez à remplir les différentes sections. Vous confirmez puis merci d"
+"e mettre à jour votre choix ?"
+
+#: ../../app/views/branded/plans/_share_form.html.erb:152
+msgid "Public: anyone can view"
+msgstr "Public : visible par tous"
#: ../../app/views/branded/plans/_share_third_party.html.erb:3
msgid "Select a service you would like to share your plan with."
@@ -3610,42 +3631,42 @@ msgstr "Nom complet"
msgid "Research output title"
msgstr "Titre du produit de recherche"
-#: ../../app/views/branded/research_outputs/_list.html.erb:34
+#: ../../app/views/branded/research_outputs/_list.html.erb:35
msgid "UUID"
msgstr "UUID"
-#: ../../app/views/branded/research_outputs/_list.html.erb:37
-#: ../../app/views/branded/research_outputs/_list.html.erb:42
+#: ../../app/views/branded/research_outputs/_list.html.erb:38
#: ../../app/views/branded/research_outputs/_list.html.erb:43
+#: ../../app/views/branded/research_outputs/_list.html.erb:44
msgid "Research output unique identifier"
msgstr "Identifiant unique du produit de recherche"
-#: ../../app/views/branded/research_outputs/_list.html.erb:48
+#: ../../app/views/branded/research_outputs/_list.html.erb:49
msgid "Copy UUID to clipboard"
msgstr "Copier l'UUID dans le presse-papiers"
-#: ../../app/views/branded/research_outputs/_list.html.erb:67
+#: ../../app/views/branded/research_outputs/_list.html.erb:69
#: ../../app/views/research_outputs/_form.html.erb:27
msgid "Research output type"
msgstr "Type de résultat de la recherche"
-#: ../../app/views/branded/research_outputs/_list.html.erb:94
+#: ../../app/views/branded/research_outputs/_list.html.erb:96
msgid "Persistent Identifier"
msgstr "Identifiant Pérenne"
-#: ../../app/views/branded/research_outputs/_list.html.erb:96
+#: ../../app/views/branded/research_outputs/_list.html.erb:98
msgid "If exists, please fill in the research output persistant identifier."
msgstr "Renseigner l’identifiant pérenne du produit de recherche s’il existe."
-#: ../../app/views/branded/research_outputs/_list.html.erb:108
+#: ../../app/views/branded/research_outputs/_list.html.erb:110
msgid "Edit research output"
msgstr "Modifier le produit de recherche"
-#: ../../app/views/branded/research_outputs/_list.html.erb:111
+#: ../../app/views/branded/research_outputs/_list.html.erb:113
msgid "Move research output"
msgstr "Déplacer le produit de recherche"
-#: ../../app/views/branded/research_outputs/_list.html.erb:116
+#: ../../app/views/branded/research_outputs/_list.html.erb:118
msgid ""
"Deleting this research output will remove the associated answers. Do you confi"
"rm ?"
@@ -3653,7 +3674,7 @@ msgstr ""
"En supprimant ce produit de recherche, les réponses associées seront également"
" supprimées. Confirmez-vous la suppression ?"
-#: ../../app/views/branded/research_outputs/_list.html.erb:119
+#: ../../app/views/branded/research_outputs/_list.html.erb:121
msgid "Delete research output"
msgstr "Supprimer le produit de recherche"
diff --git a/config/locale/pt_BR/LC_MESSAGES/app.mo b/config/locale/pt_BR/LC_MESSAGES/app.mo
index 8f2969b89a..4dc298a37a 100644
Binary files a/config/locale/pt_BR/LC_MESSAGES/app.mo and b/config/locale/pt_BR/LC_MESSAGES/app.mo differ
diff --git a/config/locale/pt_BR/app.po b/config/locale/pt_BR/app.po
index aea40ecce0..0059bc5e01 100644
--- a/config/locale/pt_BR/app.po
+++ b/config/locale/pt_BR/app.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: roadmap 1.0\n"
"Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2023-02-03 09:02+0100\n"
-"PO-Revision-Date: 2023-02-03 09:02+0100\n"
+"POT-Creation-Date: 2023-04-12 10:30-0700\n"
+"PO-Revision-Date: 2023-04-12 19:30+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: Portuguese\n"
"Language: pt_BR\n"
@@ -49,21 +49,21 @@ msgstr "Parâmetros Inválidos"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Mês"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "Núm. usuários ingressados"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Total"
@@ -450,7 +450,7 @@ msgstr "Não foi possível criar uma nova versão deste modelo.s"
msgstr "Não há plano associado ao id %{ s"
@@ -928,9 +932,9 @@ msgstr "mesclado"
msgid "merge"
msgstr "mesclar"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
-msgstr ""
+msgstr "Núm. Planos"
#: ../../app/controllers/users/invitations_controller.rb:33
msgid ""
@@ -995,19 +999,19 @@ msgstr ""
"m instruções por tema, elas serão incluídas com base na sua seleção abaixo; po"
"r isso, é melhor não duplicar muito texto."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Respondendo"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "enviará um e-mail com o assunto %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "irá remover a pergunta"
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "irá remover perguntas"
@@ -1129,7 +1133,7 @@ msgstr "Autorizar API para organizações"
#: ../../app/helpers/perms_helper.rb:17
msgid "Review organisational plans"
-msgstr ""
+msgstr "Revise os planos organizacionais"
#: ../../app/helpers/plans_helper.rb:8
#: ../../app/views/paginable/plans/_index.html.erb:8
@@ -1159,7 +1163,7 @@ msgid "Public"
msgstr "Público"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Privado"
@@ -1172,7 +1176,7 @@ msgid "Public: anyone can view."
msgstr "Público: qualquer pessoa pode ver."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Privado: restrito a mim e a meus convidados."
@@ -1479,7 +1483,7 @@ msgstr ""
#: ../../app/models/concerns/exportable_plan.rb:221
msgid "Research Outputs: "
-msgstr ""
+msgstr "Resultados da pesquisa:"
#: ../../app/models/concerns/exportable_plan.rb:244
msgid "Not Answered"
@@ -1560,23 +1564,35 @@ msgstr "deve ser um dos seguintes formatos: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "não pode ser maior que 500KB"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organizacional"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "público"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "teste"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "privado"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr "Planejado"
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr "Financiado"
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr "Negado"
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "deve ser posterior à data de início"
@@ -1634,39 +1650,39 @@ msgstr "generate_copy! requer uma meta de organização"
msgid "Copy of %{template}"
msgstr "Cópia do %{template}"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "generate_version! requer um modelo publicado"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "customizar! requer uma meta de organização"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "customizar! requer um modelo de um financiador"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "Você não pode publicar um modelo publicado."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "Você não pode publicar uma versão histórica deste modelo."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "Você não pode publicar um modelo sem fases."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr "Você não pode publicar um modelo sem seções em uma fase."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "Você não pode publicar um modelo sem perguntas em uma seção."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "As condições no modelo se referem ao contrário"
@@ -1862,11 +1878,11 @@ msgstr ": o título é necessário para cada: conjunto de dados"
msgid "invalid JSON"
msgstr "JSON inválido"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! requer um modelo customizado"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1946,7 +1962,7 @@ msgstr "Por favor, espere enquanto os Padrões são carregados."
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1982,14 +1998,14 @@ msgstr "Respondido"
msgid " by %{user_name}"
msgstr " por %{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Esta resposta remove"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " perguntas do seu plano."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Esta resposta remove"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Esta resposta aciona email(s) para"
@@ -2647,7 +2663,7 @@ msgstr ""
"o as questões no wizard 'criar plano'."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2984,50 +3000,50 @@ msgstr "Sair"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Erro"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Nota:"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Erro"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Carregando..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Este campo é obrigatório."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Mostrar senha"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Selecione uma organização da lista."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Minha organização não está listada"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "N/A"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Esconder lista."
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Veja a lista completa de instituições parceiras"
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3035,29 +3051,29 @@ msgstr ""
"Não conseguimos encontrar um modelo adequado para a instituição de pesquisa e "
"o órgão financiador que você selecionou."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr ""
"Por favor, selecione uma instituição de pesquisa e um órgão financiador para c"
"ontinuar."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Carregando ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Não carregar o conteúdo da seção neste momento."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Não foi carregar o conteúdo da pergunta no momento."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Abre em uma nova janela"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3067,11 +3083,11 @@ msgstr ""
" navegar pelas sugestões. Use a tecla Enter para selecionar uma sugestão ou a "
"tecla Escape para fechar as sugestões."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "Nenhum resultado está disponível para sua entrada."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Procurando ..."
@@ -3418,14 +3434,14 @@ msgstr "Ações"
msgid "Feedback requested"
msgstr "Feedback solicitado"
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Completar"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr "Notificar o proprietário do plano de que eu acabei de dar feedback"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Completar"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue.\n"
"Language-Team: Swedish\n"
"Language: sv_FI\n"
@@ -49,21 +49,21 @@ msgstr "Felaktiga parametern"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Månad"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "Nej. Användare gick med"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Total"
@@ -448,7 +448,7 @@ msgstr "Det gick inte att skapa en ny version av den här mallen.s"
msgstr "Det finns ingen plan kopplad till id %{ s"
@@ -920,7 +924,7 @@ msgstr "fusione"
msgid "merge"
msgstr "sammanfoga"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -986,19 +990,19 @@ msgstr ""
" av teman kommer det att dras in baserat på dina val nedan, så det är bäst att"
" du inte duplicerar för mycket text."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "svara"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "kommer att skicka ett e-postmeddelande med ämne %{subject_name}"
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "kommer att ta bort frågan"
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "tar bort frågor"
@@ -1150,7 +1154,7 @@ msgid "Public"
msgstr "offentlig"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Privat"
@@ -1163,7 +1167,7 @@ msgid "Public: anyone can view."
msgstr "Offentlig: alla kan visa."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Privat: begränsad till mig och personer jag bjuder in."
@@ -1551,23 +1555,35 @@ msgstr "måste vara ett av följande format: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "kan inte vara större än 500 kB"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "organisatoriska"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "offentlig"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "Testa"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "Privat"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "måste vara efter startdatumet"
@@ -1623,39 +1639,39 @@ msgstr "generate_copy! kräver ett organisationsmål"
msgid "Copy of %{template}"
msgstr "Kopia av %{template}"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "generate_version! kräver en publicerad mall"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "skräddarsy! kräver ett organisationsmål"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "skräddarsy! kräver en mall från en funderare"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "Du kan inte publicera en publicerad mall."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "Du kan inte publicera en historisk version av denna mall."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "Du kan inte publicera en mall utan faser."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr "Du kan inte publicera en mall utan sektioner i en fas."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "Du kan inte publicera en mall utan frågor i en sektion."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "Förhållandena i mallen hänvisar bakåt"
@@ -1852,11 +1868,11 @@ msgstr ": title krävs för varje: dataset"
msgid "invalid JSON"
msgstr "Ogiltig JSON"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! kräver en anpassad mall"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1936,7 +1952,7 @@ msgstr "Vänligen vänta, Standarder laddas"
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1972,14 +1988,14 @@ msgstr "svarade"
msgid " by %{user_name}"
msgstr "av %{user_name}"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Detta svar tas bort"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " frågor från din plan."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Detta svar tas bort"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Detta svar utlöser e-post (er) till"
@@ -2632,7 +2648,7 @@ msgstr ""
" \"skapa plan\"."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2969,50 +2985,50 @@ msgstr "Logga ut"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Fel:"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Lägga märke till:"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Fel:"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Läser in..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Detta fält är obligatoriskt."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Visa lösenord"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Välj en organisation från listan."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Min organisation är inte listad"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "N / A"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Dölj lista."
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Se hela listan över partnerinstitut."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3020,27 +3036,27 @@ msgstr ""
"Det gick inte att hitta en lämplig mall för forskningsorganisationen och funde"
"raren du valt."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr "Vänligen välj en forskningsorganisation och funderare att fortsätta."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Läser in ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Det går inte att läsa in sektionens innehåll just nu."
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Det gick inte att läsa in innehållets innehåll just nu."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Öppnar i nytt fönster"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3050,11 +3066,11 @@ msgstr ""
"örslag. Använd Enter-knappen för att välja ett förslag eller Escape-knappen fö"
"r att stänga förslagen."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "Inga resultat är tillgängliga för din post."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Söker ..."
@@ -3400,14 +3416,14 @@ msgstr "Åtgärder"
msgid "Feedback requested"
msgstr "Be om feedback"
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Komplett"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr "Meddela planägaren att jag är klar med att ge feedback"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Komplett"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue.\n"
"Language-Team: Turkish\n"
"Language: tr_TR\n"
@@ -49,21 +49,21 @@ msgstr "Hatalı Parametreler"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
#: ../../app/controllers/api/v0/statistics_controller.rb:89
#: ../../app/controllers/api/v0/statistics_controller.rb:136
-#: ../../app/controllers/usage_controller.rb:66
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:67
+#: ../../app/controllers/usage_controller.rb:88
msgid "Month"
msgstr "Ay"
#: ../../app/controllers/api/v0/statistics_controller.rb:41
-#: ../../app/controllers/usage_controller.rb:66
+#: ../../app/controllers/usage_controller.rb:67
msgid "No. Users joined"
msgstr "Katılan kullanıcı sayısı"
#: ../../app/controllers/api/v0/statistics_controller.rb:47
#: ../../app/controllers/api/v0/statistics_controller.rb:95
#: ../../app/controllers/api/v0/statistics_controller.rb:142
-#: ../../app/controllers/usage_controller.rb:72
-#: ../../app/controllers/usage_controller.rb:93
+#: ../../app/controllers/usage_controller.rb:73
+#: ../../app/controllers/usage_controller.rb:94
msgid "Total"
msgstr "Toplam"
@@ -442,7 +442,7 @@ msgstr "Bu şablonun yeni bir sürümü oluşturulamıyor.s"
msgstr "%{ kimliğiyle ilişkilendirilmiş bir plan yok s"
@@ -915,7 +919,7 @@ msgstr "birleştirildi"
msgid "merge"
msgstr "birleştir"
-#: ../../app/controllers/usage_controller.rb:87
+#: ../../app/controllers/usage_controller.rb:88
msgid "No. Created Plans"
msgstr ""
@@ -982,19 +986,19 @@ msgstr ""
"sa, bu, aşağıdaki seçimlerinize göre çekilecektir, bu nedenle çok fazla metin "
"kopyalanarak çoğaltılmamalıdır."
-#: ../../app/helpers/conditions_helper.rb:193
+#: ../../app/helpers/conditions_helper.rb:191
msgid "Answering"
msgstr "Cevaplıyor"
-#: ../../app/helpers/conditions_helper.rb:197
+#: ../../app/helpers/conditions_helper.rb:195
msgid " will send an email with subject %{subject_name}"
msgstr "%{subject_name} konulu bir e-posta gönderecek "
-#: ../../app/helpers/conditions_helper.rb:203
+#: ../../app/helpers/conditions_helper.rb:201
msgid " will remove question "
msgstr "soruyu kaldıracak "
-#: ../../app/helpers/conditions_helper.rb:204
+#: ../../app/helpers/conditions_helper.rb:202
msgid " will remove questions "
msgstr "soruları kaldıracak "
@@ -1146,7 +1150,7 @@ msgid "Public"
msgstr "Herkese Açık"
#: ../../app/helpers/plans_helper.rb:26 ../../app/helpers/plans_helper.rb:28
-#: ../../app/views/layouts/application.html.erb:128
+#: ../../app/views/layouts/application.html.erb:129
msgid "Private"
msgstr "Özel"
@@ -1159,7 +1163,7 @@ msgid "Public: anyone can view."
msgstr "Herkese açık: herkes görüntüleyebilir."
#: ../../app/helpers/plans_helper.rb:39
-#: ../../app/views/layouts/application.html.erb:129
+#: ../../app/views/layouts/application.html.erb:130
msgid "Private: restricted to me and people I invite."
msgstr "Özel: benimle ve davet ettiğim kişilerle sınırlı."
@@ -1543,23 +1547,35 @@ msgstr "şu biçimlerden biri olmalıdır: jpeg, jpg, png, gif, bmp"
msgid "can't be larger than 500KB"
msgstr "500KB'den büyük olamaz"
-#: ../../app/models/plan.rb:60
+#: ../../app/models/plan.rb:62
msgid "organisational"
msgstr "kuruluşla ilgili"
-#: ../../app/models/plan.rb:61
+#: ../../app/models/plan.rb:63
msgid "public"
msgstr "herkese açık"
-#: ../../app/models/plan.rb:62
+#: ../../app/models/plan.rb:64
msgid "test"
msgstr "test"
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:65
msgid "private"
msgstr "özel"
-#: ../../app/models/plan.rb:615
+#: ../../app/models/plan.rb:69
+msgid "Planned"
+msgstr ""
+
+#: ../../app/models/plan.rb:70
+msgid "Funded"
+msgstr ""
+
+#: ../../app/models/plan.rb:71
+msgid "Denied"
+msgstr ""
+
+#: ../../app/models/plan.rb:623
msgid "must be after the start date"
msgstr "başlangıç tarihinden sonra olmalıdır"
@@ -1615,39 +1631,39 @@ msgstr "generate_copy! bir kuruluş hedefi gerektirir"
msgid "Copy of %{template}"
msgstr "%{template} şablonunun kopyası"
-#: ../../app/models/template.rb:391
+#: ../../app/models/template.rb:392
msgid "generate_version! requires a published template"
msgstr "generate_version! yayınlanmış bir şablon gerektirir"
-#: ../../app/models/template.rb:405
+#: ../../app/models/template.rb:407
msgid "customize! requires an organisation target"
msgstr "customize! bir kuruluş hedefi gerektirir"
-#: ../../app/models/template.rb:408
+#: ../../app/models/template.rb:410
msgid "customize! requires a template from a funder"
msgstr "customize! bir fon sağlayıcıdan bir şablon gerektirir"
-#: ../../app/models/template.rb:444
+#: ../../app/models/template.rb:447
msgid "You can not publish a published template. "
msgstr "Yayınlanmış bir şablonu yayınlayamazsınız."
-#: ../../app/models/template.rb:448
+#: ../../app/models/template.rb:451
msgid "You can not publish a historical version of this template. "
msgstr "Bu şablonun geçmiş bir sürümünü yayınlayamazsınız."
-#: ../../app/models/template.rb:453
+#: ../../app/models/template.rb:456
msgid "You can not publish a template without phases. "
msgstr "Aşamaları olmayan bir şablonu yayınlayamazsınız."
-#: ../../app/models/template.rb:458
+#: ../../app/models/template.rb:461
msgid "You can not publish a template without sections in a phase. "
msgstr "Bir aşamasında bölüm yer almayan bir şablonu yayınlayamazsınız."
-#: ../../app/models/template.rb:463
+#: ../../app/models/template.rb:466
msgid "You can not publish a template without questions in a section. "
msgstr "Bir bölümünde soru bulunmayan bir şablonu yayınlayamazsınız."
-#: ../../app/models/template.rb:467
+#: ../../app/models/template.rb:470
msgid "Conditions in the template refer backwards"
msgstr "Şablondaki koşullar geriye dönük"
@@ -1844,11 +1860,11 @@ msgstr "Her :dataset için :title zorunludur"
msgid "invalid JSON"
msgstr "Geçersiz JSON"
-#: ../../app/services/template/upgrade_customization_service.rb:67
+#: ../../app/services/template/upgrade_customization_service.rb:66
msgid "upgrade_customization! requires a customised template"
msgstr "upgrade_customization! özelleştirilmiş bir şablon gerektirir"
-#: ../../app/services/template/upgrade_customization_service.rb:71
+#: ../../app/services/template/upgrade_customization_service.rb:70
msgid ""
"upgrade cannot be carried out since there is no published template of its curr"
"ent funder"
@@ -1928,7 +1944,7 @@ msgstr "Lütfen bekleyin, Standartlar yükleniyor"
#: ../../app/views/org_admin/questions/_form.html.erb:99
#: ../../app/views/org_admin/questions/_show.html.erb:209
#: ../../app/views/org_admin/sections/_form.html.erb:17
-#: ../../app/views/org_admin/templates/_form.html.erb:82
+#: ../../app/views/org_admin/templates/_form.html.erb:88
#: ../../app/views/org_admin/users/edit.html.erb:54
#: ../../app/views/orgs/_feedback_form.html.erb:38
#: ../../app/views/orgs/_profile_form.html.erb:197
@@ -1964,14 +1980,14 @@ msgstr "Cevaplandı"
msgid " by %{user_name}"
msgstr " %{user_name} tarafından"
-#: ../../app/views/answers/_status.html.erb:15
-msgid "This answer removes "
-msgstr "Bu cevap şunu kaldırır:"
-
#: ../../app/views/answers/_status.html.erb:15
msgid " questions from your plan."
msgstr " planınızdan sorular."
+#: ../../app/views/answers/_status.html.erb:15
+msgid "This answer removes "
+msgstr "Bu cevap şunu kaldırır:"
+
#: ../../app/views/answers/_status.html.erb:21
msgid "This answer triggers email(s) to "
msgstr "Bu yanıt, e-postaları şu adreslere gitmesine neden olur:"
@@ -2633,7 +2649,7 @@ msgstr ""
" seçebileceklerdir."
#: ../../app/views/guidance_groups/_guidance_group_form.html.erb:15
-#: ../../app/views/org_admin/templates/_form.html.erb:35
+#: ../../app/views/org_admin/templates/_form.html.erb:41
#: ../../app/views/org_admin/templates/_row.html.erb:10
#: ../../app/views/org_admin/templates/_row.html.erb:13
#: ../../app/views/org_admin/templates/_show.html.erb:19
@@ -2969,50 +2985,50 @@ msgstr "Çıkış Yap"
msgid "%{application_name}"
msgstr "%{application_name}"
-#: ../../app/views/layouts/application.html.erb:91
-msgid "Error:"
-msgstr "Hata:"
-
-#: ../../app/views/layouts/application.html.erb:91
+#: ../../app/views/layouts/application.html.erb:92
msgid "Notice:"
msgstr "Bildiri:"
-#: ../../app/views/layouts/application.html.erb:102
+#: ../../app/views/layouts/application.html.erb:92
+msgid "Error:"
+msgstr "Hata:"
+
+#: ../../app/views/layouts/application.html.erb:103
msgid "Loading..."
msgstr "Yükleniyor..."
-#: ../../app/views/layouts/application.html.erb:121
+#: ../../app/views/layouts/application.html.erb:122
#: ../../app/views/plans/new.html.erb:2
msgid "This field is required."
msgstr "Bu alan zorunludur."
-#: ../../app/views/layouts/application.html.erb:123
+#: ../../app/views/layouts/application.html.erb:124
#: ../../app/views/shared/_create_account_form.html.erb:31
msgid "Show password"
msgstr "Şifreyi göster"
-#: ../../app/views/layouts/application.html.erb:124
+#: ../../app/views/layouts/application.html.erb:125
msgid "Select an organisation from the list."
msgstr "Listeden bir kuruluş seçin."
-#: ../../app/views/layouts/application.html.erb:125
+#: ../../app/views/layouts/application.html.erb:126
msgid "My organisation isn't listed"
msgstr "Kuruluşum listelenmedi"
-#: ../../app/views/layouts/application.html.erb:127
+#: ../../app/views/layouts/application.html.erb:128
#: ../../app/views/paginable/plans/_privately_visible.html.erb:42
msgid "N/A"
msgstr "Erişilebilir değil"
-#: ../../app/views/layouts/application.html.erb:131
+#: ../../app/views/layouts/application.html.erb:132
msgid "Hide list."
msgstr "Listeyi gizle."
-#: ../../app/views/layouts/application.html.erb:132
+#: ../../app/views/layouts/application.html.erb:133
msgid "See the full list of partner institutions."
msgstr "Ortak kurumların tam listesine bakın."
-#: ../../app/views/layouts/application.html.erb:134
+#: ../../app/views/layouts/application.html.erb:135
msgid ""
"Unable to find a suitable template for the research organisation and funder yo"
"u selected."
@@ -3020,27 +3036,27 @@ msgstr ""
"Seçtiğiniz araştırma kuruluşu ve fon sağlayıcı için uygun bir şablon bulunamad"
"ı."
-#: ../../app/views/layouts/application.html.erb:135
+#: ../../app/views/layouts/application.html.erb:136
msgid "Please select a research organisation and funder to continue."
msgstr "Devam etmek için lütfen bir araştırma kuruluşu ve fon sağlayıcı seçin."
-#: ../../app/views/layouts/application.html.erb:137
+#: ../../app/views/layouts/application.html.erb:138
msgid "Loading ..."
msgstr "Yükleniyor ..."
-#: ../../app/views/layouts/application.html.erb:138
+#: ../../app/views/layouts/application.html.erb:139
msgid "Unable to load the section's content at this time."
msgstr "Bölümün içeriği şu anda yüklenemiyor"
-#: ../../app/views/layouts/application.html.erb:139
+#: ../../app/views/layouts/application.html.erb:140
msgid "Unable to load the question's content at this time."
msgstr "Sorunun içeriği şu anda yüklenemiyor."
-#: ../../app/views/layouts/application.html.erb:140
+#: ../../app/views/layouts/application.html.erb:141
msgid "Opens in a new window"
msgstr "Yeni bir pencerede açılır"
-#: ../../app/views/layouts/application.html.erb:142
+#: ../../app/views/layouts/application.html.erb:143
msgid ""
"%{n} results are available, use up and down arrows to navigate suggestions. Us"
"e the Enter key to select a suggestion or the Escape key to close the suggesti"
@@ -3050,11 +3066,11 @@ msgstr ""
" Bir öneri seçmek için Enter tuşunu veya önerileri kapatmak için Çıkış tuşunu "
"kullanın."
-#: ../../app/views/layouts/application.html.erb:143
+#: ../../app/views/layouts/application.html.erb:144
msgid "No results are available for your entry."
msgstr "Girişiniz için sonuç bulunamadı."
-#: ../../app/views/layouts/application.html.erb:144
+#: ../../app/views/layouts/application.html.erb:145
msgid "Searching ..."
msgstr "Aranıyor ..."
@@ -3401,14 +3417,14 @@ msgstr "Eylemler"
msgid "Feedback requested"
msgstr "Geri bildirim istendi."
-#: ../../app/views/org_admin/plans/index.html.erb:29
-msgid "Complete"
-msgstr "Tamamlanmış"
-
#: ../../app/views/org_admin/plans/index.html.erb:29
msgid "Notify the plan owner that I have finished providing feedback"
msgstr "Plan sahibine, geri bildirim sağlamayı tamamladığımı bildir"
+#: ../../app/views/org_admin/plans/index.html.erb:29
+msgid "Complete"
+msgstr "Tamamlanmış"
+
#: ../../app/views/org_admin/plans/index.html.erb:39
msgid ""
"Download plans (new window) Info: Simple information message, displayed in blue. 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.1.7.2)
- actionpack (= 6.1.7.2)
- activejob (= 6.1.7.2)
- activerecord (= 6.1.7.2)
- activestorage (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ actionmailbox (6.1.7.3)
+ actionpack (= 6.1.7.3)
+ activejob (= 6.1.7.3)
+ activerecord (= 6.1.7.3)
+ activestorage (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
mail (>= 2.7.1)
- actionmailer (6.1.7.2)
- actionpack (= 6.1.7.2)
- actionview (= 6.1.7.2)
- activejob (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ actionmailer (6.1.7.3)
+ actionpack (= 6.1.7.3)
+ actionview (= 6.1.7.3)
+ activejob (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (6.1.7.2)
- actionview (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ actionpack (6.1.7.3)
+ actionview (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.1.7.2)
- actionpack (= 6.1.7.2)
- activerecord (= 6.1.7.2)
- activestorage (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ actiontext (6.1.7.3)
+ actionpack (= 6.1.7.3)
+ activerecord (= 6.1.7.3)
+ activestorage (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
nokogiri (>= 1.8.5)
- actionview (6.1.7.2)
- activesupport (= 6.1.7.2)
+ actionview (6.1.7.3)
+ activesupport (= 6.1.7.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (6.1.7.2)
- activesupport (= 6.1.7.2)
+ activejob (6.1.7.3)
+ activesupport (= 6.1.7.3)
globalid (>= 0.3.6)
- activemodel (6.1.7.2)
- activesupport (= 6.1.7.2)
- activerecord (6.1.7.2)
- activemodel (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ activemodel (6.1.7.3)
+ activesupport (= 6.1.7.3)
+ activerecord (6.1.7.3)
+ activemodel (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
activerecord-import (1.4.1)
activerecord (>= 4.2)
- activestorage (6.1.7.2)
- actionpack (= 6.1.7.2)
- activejob (= 6.1.7.2)
- activerecord (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ activestorage (6.1.7.3)
+ actionpack (= 6.1.7.3)
+ activejob (= 6.1.7.3)
+ activerecord (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
- activesupport (6.1.7.2)
+ activesupport (6.1.7.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
ast (2.4.2)
- brakeman (5.4.0)
+ brakeman (6.0.0)
builder (3.2.4)
bundle-audit (0.1.0)
bundler-audit
bundler-audit (0.9.1)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
- concurrent-ruby (1.2.0)
+ concurrent-ruby (1.2.2)
crass (1.0.6)
date (3.3.3)
erubi (1.12.0)
globalid (1.1.0)
activesupport (>= 5.0)
- i18n (1.12.0)
+ i18n (1.13.0)
concurrent-ruby (~> 1.0)
json (2.6.3)
- jsonpath (1.1.2)
+ jsonpath (1.1.3)
multi_json
- loofah (2.19.1)
+ loofah (2.21.3)
crass (~> 1.0.2)
- nokogiri (>= 1.5.9)
- mail (2.8.0.1)
+ nokogiri (>= 1.12.0)
+ mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
@@ -101,7 +101,7 @@ GEM
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.2)
- minitest (5.17.0)
+ minitest (5.18.0)
multi_json (1.15.0)
net-imap (0.3.4)
date
@@ -112,79 +112,82 @@ GEM
timeout
net-smtp (0.3.3)
net-protocol
- nio4r (2.5.8)
- nokogiri (1.14.1-x86_64-linux)
+ nio4r (2.5.9)
+ nokogiri (1.15.2-x86_64-linux)
racc (~> 1.4)
- parallel (1.22.1)
- parser (3.2.0.0)
+ parallel (1.23.0)
+ parser (3.2.2.1)
ast (~> 2.4.1)
pundit (2.2.0)
activesupport (>= 3.0.0)
racc (1.6.2)
- rack (2.2.6.2)
- rack-test (2.0.2)
+ rack (2.2.7)
+ rack-test (2.1.0)
rack (>= 1.3)
- rails (6.1.7.2)
- actioncable (= 6.1.7.2)
- actionmailbox (= 6.1.7.2)
- actionmailer (= 6.1.7.2)
- actionpack (= 6.1.7.2)
- actiontext (= 6.1.7.2)
- actionview (= 6.1.7.2)
- activejob (= 6.1.7.2)
- activemodel (= 6.1.7.2)
- activerecord (= 6.1.7.2)
- activestorage (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ rails (6.1.7.3)
+ actioncable (= 6.1.7.3)
+ actionmailbox (= 6.1.7.3)
+ actionmailer (= 6.1.7.3)
+ actionpack (= 6.1.7.3)
+ actiontext (= 6.1.7.3)
+ actionview (= 6.1.7.3)
+ activejob (= 6.1.7.3)
+ activemodel (= 6.1.7.3)
+ activerecord (= 6.1.7.3)
+ activestorage (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
bundler (>= 1.15.0)
- railties (= 6.1.7.2)
+ railties (= 6.1.7.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
- railties (6.1.7.2)
- actionpack (= 6.1.7.2)
- activesupport (= 6.1.7.2)
+ railties (6.1.7.3)
+ actionpack (= 6.1.7.3)
+ activesupport (= 6.1.7.3)
method_source
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
- regexp_parser (2.6.2)
+ regexp_parser (2.8.0)
rexml (3.2.5)
- rubocop (1.44.1)
+ rubocop (1.51.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
- rubocop-ast (>= 1.24.1, < 2.0)
+ rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.24.1)
- parser (>= 3.1.1.0)
- rubocop-capybara (2.17.0)
+ rubocop-ast (1.28.1)
+ parser (>= 3.2.1.0)
+ rubocop-capybara (2.18.0)
rubocop (~> 1.41)
+ rubocop-factory_bot (2.23.1)
+ rubocop (~> 1.33)
rubocop-i18n (3.0.0)
rubocop (~> 1.0)
- rubocop-performance (1.15.2)
+ rubocop-performance (1.18.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
- rubocop-rails (2.17.4)
+ rubocop-rails (2.19.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
- rubocop-rspec (2.18.1)
+ rubocop-rspec (2.22.0)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
- rubocop-thread_safety (0.4.4)
- rubocop (>= 0.53.0)
- ruby-progressbar (1.11.0)
+ rubocop-factory_bot (~> 2.22)
+ rubocop-thread_safety (0.5.1)
+ rubocop (>= 0.90.0)
+ ruby-progressbar (1.13.0)
sprockets (4.2.0)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
@@ -192,15 +195,15 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
- thor (1.2.1)
- timeout (0.3.1)
+ thor (1.2.2)
+ timeout (0.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
- zeitwerk (2.6.6)
+ zeitwerk (2.6.8)
PLATFORMS
x86_64-linux
@@ -218,4 +221,4 @@ DEPENDENCIES
rubocop-thread_safety
BUNDLED WITH
- 2.4.3
+ 2.4.8
diff --git a/engines/madmp_opidor/app/views/dynamic_form/_linked_fragment.js.erb b/engines/madmp_opidor/app/views/dynamic_form/_linked_fragment.js.erb
index 636d91f2d2..0f7467a510 100644
--- a/engines/madmp_opidor/app/views/dynamic_form/_linked_fragment.js.erb
+++ b/engines/madmp_opidor/app/views/dynamic_form/_linked_fragment.js.erb
@@ -23,7 +23,7 @@ $(() => {
}).on('ajax:error', (e)=> {
const target = $(e.target);
const data = e.detail[0];
- target.find('.message-area').html(data.error).addClass('alert-danger');
+ target.parents('.modal').find('.message-area').html(data.error).addClass('alert-danger');
});
$('#modal-window form :input').on('change', () => {
diff --git a/lib/org_date_rangeable.rb b/lib/org_date_rangeable.rb
index c3ea448ecc..8fac6248ca 100644
--- a/lib/org_date_rangeable.rb
+++ b/lib/org_date_rangeable.rb
@@ -21,15 +21,10 @@ class << self
def split_months_from_creation(org, &block)
starts_at = org.created_at
ends_at = starts_at.end_of_month
- callable = if block.nil?
- proc {}
- else
- ->(start_date, end_date) { block.call(start_date, end_date) }
- end
enumerable = []
until starts_at.future? || ends_at.future?
- callable.call(starts_at, ends_at)
+ yield(starts_at, ends_at) if block
enumerable << { start_date: starts_at, end_date: ends_at }
starts_at = starts_at.next_month.beginning_of_month
ends_at = starts_at.end_of_month
diff --git a/lib/tasks/data_cleanup.rake b/lib/tasks/data_cleanup.rake
index 81cbad941a..e4aa5eebd6 100644
--- a/lib/tasks/data_cleanup.rake
+++ b/lib/tasks/data_cleanup.rake
@@ -230,8 +230,9 @@ namespace :data_cleanup do
def check_length(klass, filter)
ids = []
shoulda = ''
+ skippable = %i[password logo]
filter.attributes.each do |attr|
- next if %i[password logo].include?(attr)
+ next if skippable.include?(attr)
qry = ''
if filter.options[:minimum].present?
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index 5bc08a9af3..8fac08aabf 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -301,7 +301,7 @@ namespace :migrate do
unless scheme.nil?
users.each do |u|
- next unless u.orcid_id.gsub('orcid.org/', '').match(/^[\d-]+/)
+ next unless u.orcid_id.gsub('orcid.org/', '').match?(/^[\d-]+/)
schemes = u.user_identifiers.collect(&:identifier_scheme_id)
diff --git a/lib/tasks/upgrade.rake b/lib/tasks/upgrade.rake
index 55528d3f7c..4d63b9bfbd 100644
--- a/lib/tasks/upgrade.rake
+++ b/lib/tasks/upgrade.rake
@@ -217,7 +217,7 @@ namespace :upgrade do
puts "\t adding option answers.last.question_options.first.text"
end
end
- answers.reverse.each do |answer|
+ answers.reverse_each do |answer|
if num_text.zero? && answer.text.present? # case first present text
new_answer.text = answer.text
num_text += 1
@@ -832,9 +832,9 @@ namespace :upgrade do
Parallel.map(identifiers, in_threads: 8) do |ui|
# Parallel has trouble with ActiveRecord lazy loading
- require 'org' unless Object.const_defined?('Org')
- require 'identifier' unless Object.const_defined?('Identifier')
- require 'identifier_scheme' unless Object.const_defined?('IdentifierScheme')
+ require 'org' unless Object.const_defined?(:Org)
+ require 'identifier' unless Object.const_defined?(:Identifier)
+ require 'identifier_scheme' unless Object.const_defined?(:IdentifierScheme)
@reconnected ||= Identifier.connection.reconnect! || true
lookup = Identifier.where(identifiable_id: ui.user_id,
@@ -870,9 +870,9 @@ namespace :upgrade do
Parallel.map(identifiers, in_threads: 8) do |oi|
# Parallel has trouble with ActiveRecord lazy loading
- require 'org' unless Object.const_defined?('Org')
- require 'identifier' unless Object.const_defined?('Identifier')
- require 'identifier_scheme' unless Object.const_defined?('IdentifierScheme')
+ require 'org' unless Object.const_defined?(:Org)
+ require 'identifier' unless Object.const_defined?(:Identifier)
+ require 'identifier_scheme' unless Object.const_defined?(:IdentifierScheme)
@reconnected ||= Identifier.connection.reconnect! || true
lookup = Identifier.where(identifiable_id: oi.org_id,
@@ -933,7 +933,7 @@ namespace :upgrade do
next unless rslts.any?
# Just use the first match that contains the search term
- rslt = rslts.select { |r| r[:weight] <= 1 }.first
+ rslt = rslts.find { |r| r[:weight] <= 1 }
next unless rslt.present?
ror_id = rslt[:ror]
@@ -986,11 +986,12 @@ namespace :upgrade do
# Unfortunately can't use the Parallel gem here because we can have collisions
# when creating Orgs
+ common_domains = %w[gmail.com yahoo.com msn.com]
users.each do |user|
# First lookup by email domain
term = user.email.split('@').last
- unless %w[gmail.com yahoo.com msn.com].include?(term)
+ unless common_domains.include?(term)
# Search the local Org table by its URL
matches = Org.where('orgs.target_url LIKE ?', "%#{term}%")
org = matches.first if matches.any?
@@ -1116,10 +1117,10 @@ namespace :upgrade do
next if plan.org_id.present?
# Parallel has trouble with ActiveRecord lazy loading
- require 'plan' unless Object.const_defined?('Plan')
- require 'role' unless Object.const_defined?('Role')
- require 'perm' unless Object.const_defined?('Perm')
- require 'user' unless Object.const_defined?('User')
+ require 'plan' unless Object.const_defined?(:Plan)
+ require 'role' unless Object.const_defined?(:Role)
+ require 'perm' unless Object.const_defined?(:Perm)
+ require 'user' unless Object.const_defined?(:User)
@reconnected ||= Plan.connection.reconnect! || true
next unless plan.owner.present? && plan.owner.org.present?
@@ -1132,9 +1133,9 @@ namespace :upgrade do
next if plan.funder_id.present?
# Parallel has trouble with ActiveRecord lazy loading
- require 'plan' unless Object.const_defined?('Plan')
- require 'template' unless Object.const_defined?('Template')
- require 'org' unless Object.const_defined?('Org')
+ require 'plan' unless Object.const_defined?(:Plan)
+ require 'template' unless Object.const_defined?(:Template)
+ require 'org' unless Object.const_defined?(:Org)
@reconnected ||= Plan.connection.reconnect! || true
next unless plan.funder_name.present? || plan.template.org.funder?
@@ -1166,7 +1167,7 @@ namespace :upgrade do
# Parallel.map(plans, in_threads: 8) do |plan|
plans.each do |plan|
# Parallel has trouble with ActiveRecord lazy loading
- require 'plan' unless Object.const_defined?('Plan')
+ require 'plan' unless Object.const_defined?(:Plan)
@reconnected ||= Plan.connection.reconnect! || true
identifier = Identifier.find_or_create_by(
@@ -1299,7 +1300,7 @@ namespace :upgrade do
org = user.org_id unless org.present?
unless identifier.present?
- ident = user.identifiers.select { |i| i.identifier_scheme == orcid }.first
+ ident = user.identifiers.find { |i| i.identifier_scheme == orcid }
identifier = ident.value if ident.present?
end
end
diff --git a/lib/tasks/utils/update.rake b/lib/tasks/utils/update.rake
new file mode 100644
index 0000000000..0ffe56ec39
--- /dev/null
+++ b/lib/tasks/utils/update.rake
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+namespace :update do
+ desc 'Updates all dependencies'
+ task all: :environment do
+ Rake::Task['update:gems'].execute
+ Rake::Task['update:js'].execute
+ end
+
+ desc 'Updates all Gem dependencies'
+ task gems: :environment do
+ puts 'Updating Gems'
+ system('bundle update')
+ puts 'Ensuring that the x86_65 platform is enabled for CI'
+ system('bundle lock --add-platform x86_64-linux')
+ end
+
+ desc 'Updates all JS dependencies'
+ task js: :environment do
+ puts 'Updating JS'
+ system('yarn upgrade')
+ end
+end
diff --git a/package.json b/package.json
index 2c464ed23a..c2b7ed4646 100644
--- a/package.json
+++ b/package.json
@@ -45,12 +45,12 @@
"bootstrap-3-typeahead": "^4.0.2",
"bootstrap-sass": "3.4.1",
"bootstrap-select": "^1.13.18",
- "chart.js": "^3.8.0",
+ "chart.js": "^4.2.1",
"core-js": "^3.6.5",
"eslint": "^8.18.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.26.0",
- "eslint-webpack-plugin": "^2.6.0",
+ "eslint-webpack-plugin": "^4.0.0",
"jquery": "^3.5.1",
"jquery-ui": "^1.12.1",
"jquery-ui-sass": "^0.0.1",
@@ -64,7 +64,7 @@
"select2-bootstrap-theme": "^0.1.0-beta.10",
"sweetalert2": "^11.7.3",
"timeago.js": "^4.0.2",
- "tinymce": "^5.10.0",
+ "tinymce": "^6.4.1",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1"
},
diff --git a/public/429.html b/public/429.html
new file mode 100644
index 0000000000..33324d5b6b
--- /dev/null
+++ b/public/429.html
@@ -0,0 +1,29 @@
+
+
+
+ We're sorry, but something went wrong (500)
+
+
+
+
+
+
+
Too Many Requests
+
+
You have exceeded the number of requests for this resource. For security reasons access is limited to a fixed number in a given period. Retry later.
+
+
+