From 494931c51754fc6673a29fd3562f98366a54daa6 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Thu, 7 Oct 2021 15:20:12 -0700
Subject: [PATCH 01/43] updated PDF coversheet to always show the creator of
 the DMP

---
 app/helpers/exports_helper.rb                | 6 ------
 app/models/concerns/exportable_plan.rb       | 9 ++++-----
 app/views/shared/export/_plan_coversheet.erb | 4 +---
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb
index 10cdfc9405..021d222944 100644
--- a/app/helpers/exports_helper.rb
+++ b/app/helpers/exports_helper.rb
@@ -33,12 +33,6 @@ def margin_right
     get_margin_value_for_side(:right)
   end
 
-  def plan_attribution(attribution)
-    attribution = Array(attribution)
-    prefix = attribution.many? ? _("Creators:") : _("Creator:")
-    "<strong>#{prefix}</strong> #{attribution.join(', ')}"
-  end
-
   private
 
   def get_margin_value_for_side(side)
diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index 5d8d66a1b8..c3189c3309 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -95,11 +95,10 @@ def prepare(user, coversheet = false)
   # rubocop:disable Metrics/AbcSize
   def prepare_coversheet
     hash = {}
-    # name of owner and any co-owners
-    attribution = owner.present? ? [owner.name(false)] : []
-    roles.administrator.not_creator.each do |role|
-      attribution << role.user.name(false)
-    end
+    # Use the name of the DMP owner/creator OR the first Co-owner if there is no
+    # owner for some reason
+    attribution = roles.creator.first&.user&.name(false)
+    roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
     # Org name of plan owner's org
diff --git a/app/views/shared/export/_plan_coversheet.erb b/app/views/shared/export/_plan_coversheet.erb
index df16331646..370fdf2338 100644
--- a/app/views/shared/export/_plan_coversheet.erb
+++ b/app/views/shared/export/_plan_coversheet.erb
@@ -3,9 +3,7 @@
 <p><em><%= _("A Data Management Plan created using %{application_name}") % { application_name: ApplicationService.application_name } %></em></p>
 <br/>
 <div class="cover-page">
-  <%# Using <b> tags as the htmltoword gem does not recognise css styles defined %>
-  <%# Allow raw html (==) for plan_attribution as it has <b> tags %>
-  <p><%== plan_attribution(@hash[:attribution]) %></p><br>
+  <p><strong><%= _("Creator:") %></strong><%= @hash[:attribution] %></p><br>
 
   <p><b><%= _("Affiliation: ") %></b><%= @hash[:affiliation] %></p><br>
 

From 66b48667546c86755d00b96e654549b6ec1f73b1 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 26 Oct 2021 08:31:40 -0700
Subject: [PATCH 02/43] minor fix for issue generating PDF when no options were
 specified

---
 app/views/shared/export/_plan.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/export/_plan.erb b/app/views/shared/export/_plan.erb
index f5c2e45e83..9e38de461f 100644
--- a/app/views/shared/export/_plan.erb
+++ b/app/views/shared/export/_plan.erb
@@ -57,7 +57,7 @@
                 <% else %>
 
                   <%# case where Question has options %>
-                  <% if options.any? %>
+                  <% if options.present? && options.any? %>
                     <ul>
                       <% options.each do |opt| %>
                         <li><%= opt.text %></li>

From 2d3fc80fe8fec3a1b0ca85f967b3bcac59208ede Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Wed, 17 Nov 2021 13:00:08 +0000
Subject: [PATCH 03/43] Issue #2941 - Make the display of the phome number in
 the Plan contributor form configurable.

Fix for #2941

Changes:
  - Added a property a boolean valued property config.x.application.display_contributor_phone_number to config/initializers/_dmproadmap.rb.
  - Wrapped the phone number field in
app/views/contributors/_form.html.erb in a if Rails.configuration.x.application.display_contributor_phone_number statement.
---
 app/views/contributors/_form.html.erb | 26 ++++++++++++++------------
 config/initializers/_dmproadmap.rb    |  2 ++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/views/contributors/_form.html.erb b/app/views/contributors/_form.html.erb
index 3dcd50d396..b502e756b4 100644
--- a/app/views/contributors/_form.html.erb
+++ b/app/views/contributors/_form.html.erb
@@ -38,19 +38,21 @@ roles_tooltip = _("Select each role that applies to the contributor.")
   <% end %>
 </div>
 
-<div class="form-group row"><!-- phone -->
-  <div class="col-md-12">
-    <%= form.label(:phone, _("Phone number"), class: "control-label") %>
-  </div>
-  <div class="col-md-3">
-    <em class="sr-only"><%= phone_tooltip %></em>
-    <%= form.phone_field :phone, class: "form-control",
-                                 title: phone_tooltip,
-                                 data: { toggle: "tooltip" },
-                                 pattern: "[0-9\-\.\(\)\+]+",
-                                 placeholder: "123-123-1234" %>
+<% if Rails.configuration.x.application.display_contributor_phone_number %><!-- phone: only show if property set true -->
+  <div class="form-group row">
+    <div class="col-md-12">
+      <%= form.label(:phone, _("Phone number"), class: "control-label") %>
+    </div>
+    <div class="col-md-3">
+      <em class="sr-only"><%= phone_tooltip %></em>
+      <%= form.phone_field :phone, class: "form-control",
+                                   title: phone_tooltip,
+                                   data: { toggle: "tooltip" },
+                                   pattern: "[0-9\-\.\(\)\+]+",
+                                   placeholder: "123-123-1234" %>
+    </div>
   </div>
-</div>
+<% end %>
 
 <div class="form-group row" id="contributor-org-controls"><!-- org -->
   <div class="col-md-8">
diff --git a/config/initializers/_dmproadmap.rb b/config/initializers/_dmproadmap.rb
index 0d44e72c5f..207d09e4ac 100644
--- a/config/initializers/_dmproadmap.rb
+++ b/config/initializers/_dmproadmap.rb
@@ -115,6 +115,8 @@ class Application < Rails::Application
     }
     # Setting to only take orgs from local and not allow on-the-fly creation
     config.x.application.restrict_orgs = false
+    # Setting to display phone number in contributor form
+    config.x.application.display_contributor_phone_number = false
 
     # ------------------- #
     # SHIBBOLETH SETTINGS #

From db783fc2aad5bcca5eb688ad09914a4952a2c2bc Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Tue, 23 Nov 2021 13:28:11 +0000
Subject: [PATCH 04/43] Issue#dcc2983 - Fix for preventing adding a Contributor
 via Contributor form for Plan based on whether email and/or name are
 required.

Fix for DCC bug https://github.com/DMPRoadmap/roadmap/issues/2983

Changes:
 - Added two new properties to config/initializers/_dmproadmap.rb
   (both devault to false):
   config.x.application.require_contributor_name = false
   config.x.application.require_contributor_email = false
 -In Contributor model the private method name_or_email_presence()
  has been updated to take account of the above mentioned property
settings.
---
 app/models/contributor.rb          | 33 ++++++++++++++++++++++++++----
 config/initializers/_dmproadmap.rb |  4 ++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index f177935ad9..bdcce6c10b 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -130,11 +130,36 @@ def merge(other)
 
   private
 
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength
   def name_or_email_presence
-    return true unless name.blank? && email.blank?
-
-    errors.add(:name, _("can't be blank if no email is provided"))
-    errors.add(:email, _("can't be blank if no name is provided"))
+    return true unless (name.blank? && email.blank?) ||
+                        (!!Rails.configuration.x.application.require_contributor_name &&
+                        name.blank?) ||
+                        (!!Rails.configuration.x.application.require_contributor_email &&
+                        email.blank?)
+
+    # Error messages for case where name.blank? and email.blank? and
+    # properties Rails.configuration.x.application.require_contributor_name and
+    # Rails.configuration.x.application.require_contributor_email both not set (i.e, nil) or false.
+    if (name.blank? && email.blank?) &&
+       !Rails.configuration.x.application.require_contributor_name &&
+       !Rails.configuration.x.application.require_contributor_email
+      errors.add(:name, _("can't be blank if no email is provided."))
+      errors.add(:email, _("can't be blank if no name is provided."))
+    else
+
+      # Error messages cases where enither ame.blank? or email.blank?
+      if name.blank? && !!Rails.configuration.x.application.require_contributor_name
+        errors.add(:name, _("can't be blank."))
+      end
+
+      if email.blank? && !!Rails.configuration.x.application.require_contributor_email
+        errors.add(:email, _("can't be blank."))
+      end
+    end
   end
+  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 
 end
diff --git a/config/initializers/_dmproadmap.rb b/config/initializers/_dmproadmap.rb
index 0d44e72c5f..a084149670 100644
--- a/config/initializers/_dmproadmap.rb
+++ b/config/initializers/_dmproadmap.rb
@@ -116,6 +116,10 @@ class Application < Rails::Application
     # Setting to only take orgs from local and not allow on-the-fly creation
     config.x.application.restrict_orgs = false
 
+    # Setting require contributor requirement of contributor name and email
+    config.x.application.require_contributor_name = false
+    config.x.application.require_contributor_email = false
+
     # ------------------- #
     # SHIBBOLETH SETTINGS #
     # ------------------- #

From 2c00cde8a1fb917aaa38eb810f70e6a1fa178dbe Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 23 Dec 2021 16:47:00 +0000
Subject: [PATCH 05/43]  Issue#3069 - (DCC Issue 675) - Org Admin and Super
 Admin searches and     pagination of user's plans broken.

    Fix for issue #3069 and DCC issue
    https://github.com/DigitalCurationCentre/DMPonline-Service/issues/675.

    Changes:
      - Replaced view files /paginable/plans/org_admin_other_user with /paginable/plans/_index.html.erb
        with extra checks for plan.owner.present? as missing plan.owner broke a DCC user's plans being render by org_admin.
      - Replaced partial with '/paginable/plans/org_admin_other_user'  with '/paginable/plans/index',
         replaced action'org_admin_other_user' with 'index' in paginable_renderiser() method in views
        /org_admin/users/edit.html.erb. /org_admin/users/plans.html.erb and /super_admin/users/edit.html.erb.
      - In Paginable::PlansController replaced -
        # GET /paginable/plans/org_admin/:page  with # GET /paginable/users/:id/plans
        associated with method org_admin_other_user()  renamed index()
      - Routes replaced
        get "org_admin_other_user/:page", action: :org_admin_other_user,
                                        on: :collection, as: :org_admin_other_user
        # Paginable actions for users
        resources :users, only: [] do
          get "index/:page", action: :index, on: :collection, as: :index

        with

        resources :users, only: %i[index] do
           member do
             resources :plans, only: %(index)
           end
        end
---
 app/controllers/paginable/plans_controller.rb          |  9 +++++----
 app/views/org_admin/users/edit.html.erb                |  4 ++--
 app/views/org_admin/users/plans.html.erb               |  4 ++--
 ...{_org_admin_other_user.html.erb => _index.html.erb} |  4 ++--
 app/views/super_admin/users/edit.html.erb              |  4 ++--
 config/routes.rb                                       | 10 +++++-----
 6 files changed, 18 insertions(+), 17 deletions(-)
 rename app/views/paginable/plans/{_org_admin_other_user.html.erb => _index.html.erb} (90%)

diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb
index e29d26bdf9..be737e91e8 100644
--- a/app/controllers/paginable/plans_controller.rb
+++ b/app/controllers/paginable/plans_controller.rb
@@ -59,8 +59,8 @@ def org_admin
     )
   end
 
-  # GET /paginable/plans/org_admin/:page
-  def org_admin_other_user
+  # GET /paginable/users/:id/plans
+  def index
     @user = User.find(params[:id])
     authorize @user
     unless current_user.present? && current_user.can_org_admin? && @user.present?
@@ -68,9 +68,10 @@ def org_admin_other_user
     end
 
     paginable_renderise(
-      partial: "org_admin_other_user",
+      partial: "index",
       scope: Plan.active(@user),
-      query_params: { sort_field: "plans.updated_at", sort_direction: :desc }
+      query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
+      format: :json
     )
   end
 
diff --git a/app/views/org_admin/users/edit.html.erb b/app/views/org_admin/users/edit.html.erb
index 5c294ab297..e144293b34 100644
--- a/app/views/org_admin/users/edit.html.erb
+++ b/app/views/org_admin/users/edit.html.erb
@@ -75,9 +75,9 @@
 <div class="row">
   <div class="col-md-12">
     <%= paginable_renderise(
-      partial: '/paginable/plans/org_admin_other_user',
+      partial: '/paginable/plans/index',
       controller: 'paginable/plans',
-      action: 'org_admin_other_user',
+      action: 'index',
       scope: @plans,
       query_params: { sort_field: 'plans.updated_at', sort_direction: 'desc' }) %>
   </div>
diff --git a/app/views/org_admin/users/plans.html.erb b/app/views/org_admin/users/plans.html.erb
index 25f05671a3..1381e16f34 100644
--- a/app/views/org_admin/users/plans.html.erb
+++ b/app/views/org_admin/users/plans.html.erb
@@ -7,9 +7,9 @@
 <div class="row">
   <div class="col-md-12">
     <%= paginable_renderise(
-      partial: '/paginable/plans/org_admin_other_user',
+      partial: '/paginable/plans/index',
       controller: 'paginable/plans',
-      action: 'org_admin_other_user',
+      action: 'index',
       remote: true,
       scope: @plans,
       query_params: { sort_field: 'plans.updated_at', sort_direction: 'desc' }) %>
diff --git a/app/views/paginable/plans/_org_admin_other_user.html.erb b/app/views/paginable/plans/_index.html.erb
similarity index 90%
rename from app/views/paginable/plans/_org_admin_other_user.html.erb
rename to app/views/paginable/plans/_index.html.erb
index 1ea1cd663b..aff6854691 100644
--- a/app/views/paginable/plans/_org_admin_other_user.html.erb
+++ b/app/views/paginable/plans/_index.html.erb
@@ -21,8 +21,8 @@
             <% end %>
           </td>
           <td><%= plan.template.title %></td>
-          <td><%= plan.owner.org.name %></td>
-          <td><%= plan.owner.name(false) %></td>
+          <td><%= plan.owner.org.name if plan.owner.present? %></td>
+          <td><%= plan.owner.name(false) if plan.owner.present? %></td>
           <td><%= l(plan.updated_at.to_date, formats: :short) %></td>
           <td class="plan-visibility">
             <%= plan.visibility === 'is_test' ? _('Test') : sanitize(display_visibility(plan.visibility)) %>
diff --git a/app/views/super_admin/users/edit.html.erb b/app/views/super_admin/users/edit.html.erb
index abc4870e33..098af7517a 100644
--- a/app/views/super_admin/users/edit.html.erb
+++ b/app/views/super_admin/users/edit.html.erb
@@ -109,9 +109,9 @@
 <div class="row">
   <div class="col-md-12">
     <%= paginable_renderise(
-      partial: '/paginable/plans/org_admin_other_user',
+      partial: '/paginable/plans/index',
       controller: 'paginable/plans',
-      action: 'org_admin_other_user',
+      action: 'index',
       scope: @plans,
       query_params: { sort_field: 'plans.updated_at', sort_direction: 'desc' }) %>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index 1960a85ec2..15fbd98452 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -210,17 +210,17 @@
 
       get "org_admin/:page", action: :org_admin, on: :collection, as: :org_admin
 
-      get "org_admin_other_user/:page", action: :org_admin_other_user,
-                                        on: :collection, as: :org_admin_other_user
-
       # Paginable actions for contributors
       resources :contributors, only: %i[index] do
         get "index/:page", action: :index, on: :collection, as: :index
       end
     end
+
     # Paginable actions for users
-    resources :users, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+    resources :users, only: %i[index] do
+      member do
+        resources :plans, only: %(index)
+      end
     end
     # Paginable actions for themes
     resources :themes, only: [] do

From 1173d60b58f6e3f167233f2a45c782f0d622f297 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Tue, 11 Jan 2022 11:58:03 +0000
Subject: [PATCH 06/43] Bug DCC Issues 592, 645 - Fix for Org Admins seeing
 deleted Plans for Org.

Fixes issues:
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/592
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/645
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/641

The reason we are seeing deleted (de-activated) Plans is that there is
no filter for plans with Roles active in the Org model's
org_admin_plans() method.

Change added .where(roles: { active: true }) to filter plans in
org_admin_plans() method of Org model.
---
 app/models/org.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/org.rb b/app/models/org.rb
index de2526de38..07358d5a90 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -287,10 +287,12 @@ def org_admin_plans
 
     if Rails.configuration.x.plans.org_admins_read_all
       Plan.includes(:template, :phases, :roles, :users).where(id: combined_plan_ids)
+          .where(roles: { active: true })
     else
       Plan.includes(:template, :phases, :roles, :users).where(id: combined_plan_ids)
           .where.not(visibility: Plan.visibilities[:privately_visible])
           .where.not(visibility: Plan.visibilities[:is_test])
+          .where(roles: { active: true })
     end
   end
 

From b2cded74ae8d9bc40b4dedf95069517f9a4ae3c4 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Mon, 10 Jan 2022 11:03:45 +0000
Subject: [PATCH 07/43] Issue DCC-674: Fix for broken CSV Download noticed
 because a nil exception occuring for an answer with question options selected
 but text nil. Link to issue
 https://github.com/DigitalCurationCentre/DMPonline-Service/issues/674

Change to app/models/concerns/exportable_plan.rb,
we replaced line
   answer_text += answer.text if answer.answered?
with answer.text present check
   answer_text += answer.text if answer.answered? && answer.text.present?
---
 app/models/concerns/exportable_plan.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index 5d8d66a1b8..4e4c72e73a 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -170,7 +170,7 @@ def show_section_for_csv(csv, phase, section, headings, unanswered, hash)
         if answer.question_options.any?
           answer_text += answer.question_options.pluck(:text).join(", ")
         end
-        answer_text += answer.text if answer.answered?
+        answer_text += answer.text if answer.answered? && answer.text.present?
       elsif unanswered
         answer_text += _("Not Answered")
       end

From d5144d93907e39415517f9f9d9c534bcd45502fa Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 13 Jan 2022 12:13:19 +0000
Subject: [PATCH 08/43] DCC Issue 679 - Fix for issue that Super Admins unable
 to create new Orgs.

Fix for DCC issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/679

Changes:
- in app/controllers/super_admin/orgs_controller.rb added missing params
to orgs_params method
     :funder, :institution, :organisation
- in app/models/org.rb removed (as it is never set on Org creation)
      validates :abbreviation, presence: { message: PRESENCE_MESSAGE }
- in app/views/orgs/_profile_form.html.erb removed :abbreviation required
      "aria-required": true
- in app/views/shared/org_selectors/_external_only.html.erb renamed wrongly named text field :org_name to :name
      <%= form.label :name, label %>
      <%= form.text_field :name, class: "form-control autocomplete",
---
 app/controllers/super_admin/orgs_controller.rb         | 3 ++-
 app/models/org.rb                                      | 2 --
 app/views/orgs/_profile_form.html.erb                  | 2 +-
 app/views/shared/org_selectors/_external_only.html.erb | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/super_admin/orgs_controller.rb b/app/controllers/super_admin/orgs_controller.rb
index 6e2c49634b..fd427143f9 100644
--- a/app/controllers/super_admin/orgs_controller.rb
+++ b/app/controllers/super_admin/orgs_controller.rb
@@ -150,7 +150,8 @@ def org_params
       params.require(:org).permit(:name, :abbreviation, :logo, :managed,
                                   :contact_email, :contact_name,
                                   :remove_logo, :feedback_enabled, :feedback_msg,
-                                  :org_id, :org_name, :org_crosswalk)
+                                  :org_id, :org_name, :org_crosswalk,
+                                  :funder, :institution, :organisation)
     end
 
     def merge_params
diff --git a/app/models/org.rb b/app/models/org.rb
index de2526de38..666096684e 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -93,8 +93,6 @@ class Org < ApplicationRecord
   validates :name, presence: { message: PRESENCE_MESSAGE },
                    uniqueness: { message: UNIQUENESS_MESSAGE }
 
-  validates :abbreviation, presence: { message: PRESENCE_MESSAGE }
-
   validates :is_other, inclusion: { in: BOOLEAN_VALUES,
                                     message: PRESENCE_MESSAGE }
 
diff --git a/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb
index 15971d2c3c..5226143c6d 100644
--- a/app/views/orgs/_profile_form.html.erb
+++ b/app/views/orgs/_profile_form.html.erb
@@ -25,7 +25,7 @@
     <div class="row">
       <div class="form-group col-xs-8">
         <%= f.label :abbreviation, _('Organisation abbreviated name'), class: "control-label" %>
-        <%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control", "aria-required": true %>
+        <%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control" %>
       </div>
     </div>
   <% end %>
diff --git a/app/views/shared/org_selectors/_external_only.html.erb b/app/views/shared/org_selectors/_external_only.html.erb
index daf0ef3456..9353e1c05a 100644
--- a/app/views/shared/org_selectors/_external_only.html.erb
+++ b/app/views/shared/org_selectors/_external_only.html.erb
@@ -13,8 +13,8 @@ presenter = OrgSelectionPresenter.new(orgs: [default_org],
 placeholder = _("Begin typing to see a list of suggestions.")
 %>
 
-<%= form.label :org_name, label %>
-<%= form.text_field :org_name, class: "form-control autocomplete",
+<%= form.label :name, label %>
+<%= form.text_field :name, class: "form-control autocomplete",
                             placeholder: placeholder,
                             value: presenter.name,
                             spellcheck: true,

From 1512944d9e6b10f18b9490f6b9112b7a92fff2ee Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Tue, 18 Jan 2022 11:11:06 +0000
Subject: [PATCH 09/43] TEMP CHANGE FOR DCC 453 BUG

---
 app/views/api/v0/statistics/plans.json.jbuilder | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder
index bfef9c9061..3106111efc 100644
--- a/app/views/api/v0/statistics/plans.json.jbuilder
+++ b/app/views/api/v0/statistics/plans.json.jbuilder
@@ -21,6 +21,10 @@ json.plans @org_plans.each do |plan|
     json.name         plan.contributors.investigation.first&.name
   end
 
+  json.owners plan.owner_and_coowners.each do |owner|
+    json.email owner.email
+  end
+
   json.data_contact do
     json.info         plan.contributors.data_curation.first&.name
   end

From 8df635f124d08cd5e7067cdd51c1844b7a804072 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Wed, 19 Jan 2022 09:26:54 +0000
Subject: [PATCH 10/43] DCC bug 453 - Unlike in previous version of the DMP
 Roadmap a API user pointed oout that the Plan Owner email was missing in call
 /api/v0/statistics/plans.

DCC issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/453

Changed app/views/api/v0/statistics/plans.json.jbuilder to include owner
of Plan. So extra fragment of json in each Plan now includes

"owner": {
        "email": "abc@test.com"
      },
as in previous version of Roadmap.
---
 app/views/api/v0/statistics/plans.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder
index 3106111efc..813d7114e4 100644
--- a/app/views/api/v0/statistics/plans.json.jbuilder
+++ b/app/views/api/v0/statistics/plans.json.jbuilder
@@ -21,8 +21,8 @@ json.plans @org_plans.each do |plan|
     json.name         plan.contributors.investigation.first&.name
   end
 
-  json.owners plan.owner_and_coowners.each do |owner|
-    json.email owner.email
+  json.owner  do
+    json.email plan.owner.present? ?  plan.owner.email : ""
   end
 
   json.data_contact do

From b2eff34800afbc2afcc1da2b00e91951c125c301 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 20 Jan 2022 13:11:24 +0000
Subject: [PATCH 11/43] DCC Bug 668 - Fix for issue of roles in a plan that
 does not have a user_id set. This has proved in several cases.

Fix for DCC bug https://github.com/DigitalCurationCentre/DMPonline-Service/issues/688

Change in the Plan model method owner_and_coowners() we check that each
role we currently get also has associated user that is not nil.
---
 app/models/plan.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/plan.rb b/app/models/plan.rb
index ddbf275cd8..42f52e42ac 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -482,7 +482,7 @@ def shared?
   def owner_and_coowners
     # We only need to search for :administrator in the bitflag
     # since :creator includes :administrator rights
-    roles.select { |r| r.active && r.administrator }.map(&:user).uniq
+    roles.select { |r| r.active && r.administrator && !r.user.nil? }.map(&:user).uniq
   end
 
   # The creator, administrator and editors

From 0ddec3d2369e4a756af29df613f349cd17730765 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Thu, 7 Oct 2021 15:20:12 -0700
Subject: [PATCH 12/43] updated PDF coversheet to always show the creator of
 the DMP

---
 app/models/concerns/exportable_plan.rb       | 9 ++++-----
 app/views/shared/export/_plan_coversheet.erb | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index d805df2b02..69159c16b0 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -104,11 +104,10 @@ def prepare(user, coversheet = false)
   # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def prepare_coversheet
     hash = {}
-    # name of owner and any co-owners
-    attribution = owner.present? ? [owner.name(false)] : []
-    roles.administrator.not_creator.each do |role|
-      attribution << role.user.name(false)
-    end
+    # Use the name of the DMP owner/creator OR the first Co-owner if there is no
+    # owner for some reason
+    attribution = roles.creator.first&.user&.name(false)
+    roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
     # Org name of plan owner's org
diff --git a/app/views/shared/export/_plan_coversheet.erb b/app/views/shared/export/_plan_coversheet.erb
index df16331646..370fdf2338 100644
--- a/app/views/shared/export/_plan_coversheet.erb
+++ b/app/views/shared/export/_plan_coversheet.erb
@@ -3,9 +3,7 @@
 <p><em><%= _("A Data Management Plan created using %{application_name}") % { application_name: ApplicationService.application_name } %></em></p>
 <br/>
 <div class="cover-page">
-  <%# Using <b> tags as the htmltoword gem does not recognise css styles defined %>
-  <%# Allow raw html (==) for plan_attribution as it has <b> tags %>
-  <p><%== plan_attribution(@hash[:attribution]) %></p><br>
+  <p><strong><%= _("Creator:") %></strong><%= @hash[:attribution] %></p><br>
 
   <p><b><%= _("Affiliation: ") %></b><%= @hash[:affiliation] %></p><br>
 

From c9b2f8f14fa40822ad485756e819ffbeb78589d8 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Tue, 26 Oct 2021 08:31:40 -0700
Subject: [PATCH 13/43] minor fix for issue generating PDF when no options were
 specified

---
 app/views/shared/export/_plan.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/export/_plan.erb b/app/views/shared/export/_plan.erb
index f5c2e45e83..9e38de461f 100644
--- a/app/views/shared/export/_plan.erb
+++ b/app/views/shared/export/_plan.erb
@@ -57,7 +57,7 @@
                 <% else %>
 
                   <%# case where Question has options %>
-                  <% if options.any? %>
+                  <% if options.present? && options.any? %>
                     <ul>
                       <% options.each do |opt| %>
                         <li><%= opt.text %></li>

From 53012c38f088430ab5977acac5ae553a655078a5 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Mon, 31 Jan 2022 12:52:46 +0000
Subject: [PATCH 14/43] update Gemfile.lock

---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c0e95e3b9b..81eca25817 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.10.2)
       msgpack (~> 1.2)
-    brakeman (5.2.0)
+    brakeman (5.2.1)
     builder (3.2.4)
     bullet (7.0.1)
       activesupport (>= 3.0.0)
@@ -218,7 +218,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     jbuilder (2.11.5)
@@ -317,7 +317,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.6.0)
+    puma (5.6.1)
       nio4r (~> 2.0)
     pundit (2.1.1)
       activesupport (>= 3.0.0)
@@ -380,12 +380,12 @@ GEM
       rspec-mocks (~> 3.10.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-rails (5.1.0)

From 816f1273507e7b91fb5bbd4671745e77ac45a315 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Thu, 7 Oct 2021 15:20:12 -0700
Subject: [PATCH 15/43] updated PDF coversheet to always show the creator of
 the DMP

---
 app/models/concerns/exportable_plan.rb       | 9 ++++-----
 app/views/shared/export/_plan_coversheet.erb | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index d805df2b02..69159c16b0 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -104,11 +104,10 @@ def prepare(user, coversheet = false)
   # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def prepare_coversheet
     hash = {}
-    # name of owner and any co-owners
-    attribution = owner.present? ? [owner.name(false)] : []
-    roles.administrator.not_creator.each do |role|
-      attribution << role.user.name(false)
-    end
+    # Use the name of the DMP owner/creator OR the first Co-owner if there is no
+    # owner for some reason
+    attribution = roles.creator.first&.user&.name(false)
+    roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
     # Org name of plan owner's org
diff --git a/app/views/shared/export/_plan_coversheet.erb b/app/views/shared/export/_plan_coversheet.erb
index df16331646..370fdf2338 100644
--- a/app/views/shared/export/_plan_coversheet.erb
+++ b/app/views/shared/export/_plan_coversheet.erb
@@ -3,9 +3,7 @@
 <p><em><%= _("A Data Management Plan created using %{application_name}") % { application_name: ApplicationService.application_name } %></em></p>
 <br/>
 <div class="cover-page">
-  <%# Using <b> tags as the htmltoword gem does not recognise css styles defined %>
-  <%# Allow raw html (==) for plan_attribution as it has <b> tags %>
-  <p><%== plan_attribution(@hash[:attribution]) %></p><br>
+  <p><strong><%= _("Creator:") %></strong><%= @hash[:attribution] %></p><br>
 
   <p><b><%= _("Affiliation: ") %></b><%= @hash[:affiliation] %></p><br>
 

From 6adaf461f0a6d05f25ab7db100e2164e6b4e020c Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 20 Jan 2022 13:11:24 +0000
Subject: [PATCH 16/43] DCC Bug 668 - Fix for issue of roles in a plan that
 does not have a user_id set. This has proved in several cases.

Fix for DCC bug https://github.com/DigitalCurationCentre/DMPonline-Service/issues/688

Change in the Plan model method owner_and_coowners() we check that each
role we currently get also has associated user that is not nil.
---
 app/models/plan.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/plan.rb b/app/models/plan.rb
index 69c59d50ce..2884d28581 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -487,7 +487,7 @@ def shared?
   def owner_and_coowners
     # We only need to search for :administrator in the bitflag
     # since :creator includes :administrator rights
-    roles.select { |r| r.active && r.administrator }.map(&:user).uniq
+    roles.select { |r| r.active && r.administrator && !r.user.nil? }.map(&:user).uniq
   end
 
   # The creator, administrator and editors

From 98b941bfa52db462a9380b21f07c9c3051f4b3f0 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Tue, 18 Jan 2022 11:11:06 +0000
Subject: [PATCH 17/43] TEMP CHANGE FOR DCC 453 BUG

---
 app/views/api/v0/statistics/plans.json.jbuilder | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder
index 0a975e7d14..00bd9cde09 100644
--- a/app/views/api/v0/statistics/plans.json.jbuilder
+++ b/app/views/api/v0/statistics/plans.json.jbuilder
@@ -21,6 +21,10 @@ json.plans @org_plans.each do |plan|
     json.name         plan.contributors.investigation.first&.name
   end
 
+  json.owners plan.owner_and_coowners.each do |owner|
+    json.email owner.email
+  end
+
   json.data_contact do
     json.info         plan.contributors.data_curation.first&.name
   end

From 52350999c76488b4b751bdca3f5aa8ff2d96d112 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Wed, 19 Jan 2022 09:26:54 +0000
Subject: [PATCH 18/43] DCC bug 453 - Unlike in previous version of the DMP
 Roadmap a API user pointed oout that the Plan Owner email was missing in call
 /api/v0/statistics/plans.

DCC issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/453

Changed app/views/api/v0/statistics/plans.json.jbuilder to include owner
of Plan. So extra fragment of json in each Plan now includes

"owner": {
        "email": "abc@test.com"
      },
as in previous version of Roadmap.
---
 app/views/api/v0/statistics/plans.json.jbuilder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder
index 00bd9cde09..d933d333f0 100644
--- a/app/views/api/v0/statistics/plans.json.jbuilder
+++ b/app/views/api/v0/statistics/plans.json.jbuilder
@@ -21,8 +21,8 @@ json.plans @org_plans.each do |plan|
     json.name         plan.contributors.investigation.first&.name
   end
 
-  json.owners plan.owner_and_coowners.each do |owner|
-    json.email owner.email
+  json.owner  do
+    json.email plan.owner.present? ?  plan.owner.email : ""
   end
 
   json.data_contact do

From 147ea322c1c547b86d0381c6ed319182f4bad851 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Mon, 31 Jan 2022 13:59:35 +0000
Subject: [PATCH 19/43] rubocop fixes

various minor rubocop fixes
---
 app/views/api/v0/statistics/plans.json.jbuilder | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder
index d933d333f0..c76e9ea751 100644
--- a/app/views/api/v0/statistics/plans.json.jbuilder
+++ b/app/views/api/v0/statistics/plans.json.jbuilder
@@ -2,6 +2,7 @@
 
 json.prettify!
 
+# rubocop:disable Metrics/BlockLength
 json.plans @org_plans.each do |plan|
   json.id             plan.id
   json.grant_number   plan.grant&.value
@@ -21,12 +22,12 @@ json.plans @org_plans.each do |plan|
     json.name         plan.contributors.investigation.first&.name
   end
 
-  json.owner  do
-    json.email plan.owner.present? ?  plan.owner.email : ""
+  json.owner do
+    json.email plan.owner.present? ? plan.owner.email : ""
   end
 
   json.data_contact do
-    json.info         plan.contributors.data_curation.first&.name
+    json.info plan.contributors.data_curation.first&.name
   end
 
   json.description    plan.description
@@ -39,3 +40,4 @@ json.plans @org_plans.each do |plan|
     json.answered_questions  plan.answers.count
   end
 end
+# rubocop:enable Metrics/BlockLength

From b419b18a1c10f15eb779230bc7a2f807d48a1098 Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 13 Jan 2022 12:13:19 +0000
Subject: [PATCH 20/43] DCC Issue 679 - Fix for issue that Super Admins unable
 to create new Orgs.

Fix for DCC issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/679

Changes:
- in app/controllers/super_admin/orgs_controller.rb added missing params
to orgs_params method
     :funder, :institution, :organisation
- in app/models/org.rb removed (as it is never set on Org creation)
      validates :abbreviation, presence: { message: PRESENCE_MESSAGE }
- in app/views/orgs/_profile_form.html.erb removed :abbreviation required
      "aria-required": true
- in app/views/shared/org_selectors/_external_only.html.erb renamed wrongly named text field :org_name to :name
      <%= form.label :name, label %>
      <%= form.text_field :name, class: "form-control autocomplete",
---
 app/controllers/super_admin/orgs_controller.rb         | 3 ++-
 app/models/org.rb                                      | 2 --
 app/views/orgs/_profile_form.html.erb                  | 2 +-
 app/views/shared/org_selectors/_external_only.html.erb | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/super_admin/orgs_controller.rb b/app/controllers/super_admin/orgs_controller.rb
index a2cd2fe183..50ff0b421b 100644
--- a/app/controllers/super_admin/orgs_controller.rb
+++ b/app/controllers/super_admin/orgs_controller.rb
@@ -153,7 +153,8 @@ def org_params
       params.require(:org).permit(:name, :abbreviation, :logo, :managed,
                                   :contact_email, :contact_name,
                                   :remove_logo, :feedback_enabled, :feedback_msg,
-                                  :org_id, :org_name, :org_crosswalk)
+                                  :org_id, :org_name, :org_crosswalk,
+                                  :funder, :institution, :organisation)
     end
 
     def merge_params
diff --git a/app/models/org.rb b/app/models/org.rb
index 147f64348a..5a7466f6f7 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -94,8 +94,6 @@ class Org < ApplicationRecord
   validates :name, presence: { message: PRESENCE_MESSAGE },
                    uniqueness: { message: UNIQUENESS_MESSAGE }
 
-  validates :abbreviation, presence: { message: PRESENCE_MESSAGE }
-
   validates :is_other, inclusion: { in: BOOLEAN_VALUES,
                                     message: PRESENCE_MESSAGE }
 
diff --git a/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb
index 15971d2c3c..5226143c6d 100644
--- a/app/views/orgs/_profile_form.html.erb
+++ b/app/views/orgs/_profile_form.html.erb
@@ -25,7 +25,7 @@
     <div class="row">
       <div class="form-group col-xs-8">
         <%= f.label :abbreviation, _('Organisation abbreviated name'), class: "control-label" %>
-        <%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control", "aria-required": true %>
+        <%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control" %>
       </div>
     </div>
   <% end %>
diff --git a/app/views/shared/org_selectors/_external_only.html.erb b/app/views/shared/org_selectors/_external_only.html.erb
index daf0ef3456..9353e1c05a 100644
--- a/app/views/shared/org_selectors/_external_only.html.erb
+++ b/app/views/shared/org_selectors/_external_only.html.erb
@@ -13,8 +13,8 @@ presenter = OrgSelectionPresenter.new(orgs: [default_org],
 placeholder = _("Begin typing to see a list of suggestions.")
 %>
 
-<%= form.label :org_name, label %>
-<%= form.text_field :org_name, class: "form-control autocomplete",
+<%= form.label :name, label %>
+<%= form.text_field :name, class: "form-control autocomplete",
                             placeholder: placeholder,
                             value: presenter.name,
                             spellcheck: true,

From 7e0f2e286bdc207ce17b44bec5b4138eef056fa7 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 10:59:36 +0000
Subject: [PATCH 21/43] debugging

look at what comes out of safe_save
---
 spec/services/api/v1/persistence_service_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/services/api/v1/persistence_service_spec.rb b/spec/services/api/v1/persistence_service_spec.rb
index d39b65c852..12e6ac47ad 100644
--- a/spec/services/api/v1/persistence_service_spec.rb
+++ b/spec/services/api/v1/persistence_service_spec.rb
@@ -43,6 +43,8 @@
       plan.contributors << contributor
       plan.contributors << contributor2
       result = described_class.safe_save(plan: plan)
+      pp "CONTRIBUTORS:"
+      pp result.contributors
       expect(result.contributors.length).to eql(2)
       expect(result.contributors.first.org).to eql(result.contributors.last.org)
     end

From ce359956fbbc75c31010294e07668d01876a473b Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 11:09:51 +0000
Subject: [PATCH 22/43] undo debug - now working

Schrodinger's cat, it seems
---
 spec/services/api/v1/persistence_service_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/services/api/v1/persistence_service_spec.rb b/spec/services/api/v1/persistence_service_spec.rb
index 12e6ac47ad..d39b65c852 100644
--- a/spec/services/api/v1/persistence_service_spec.rb
+++ b/spec/services/api/v1/persistence_service_spec.rb
@@ -43,8 +43,6 @@
       plan.contributors << contributor
       plan.contributors << contributor2
       result = described_class.safe_save(plan: plan)
-      pp "CONTRIBUTORS:"
-      pp result.contributors
       expect(result.contributors.length).to eql(2)
       expect(result.contributors.first.org).to eql(result.contributors.last.org)
     end

From 60a88be6eb75cf96ffdb460deda685fdbc54ac0a Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 11:31:56 +0000
Subject: [PATCH 23/43] debugging failure

in org model spec
---
 spec/models/org_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index 5e412f74d6..eb8622645a 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -11,7 +11,8 @@
       is_expected.to validate_uniqueness_of(:name)
         .with_message('must be unique')
     }
-
+    pp "ORG:"
+    pp subject
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it { is_expected.to allow_values(true, false).for(:is_other) }

From 1be3a6047f4ac585809be14e2053a88802f64101 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 11:38:26 +0000
Subject: [PATCH 24/43] once more to debug

org spec failing with no abbrev for some reason.
---
 spec/models/org_spec.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index eb8622645a..366b0d84eb 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -11,9 +11,12 @@
       is_expected.to validate_uniqueness_of(:name)
         .with_message('must be unique')
     }
-    pp "ORG:"
-    pp subject
-    it { is_expected.to validate_presence_of(:abbreviation) }
+
+    it "is expected to have an abbeviation" do
+      pp "ORG:"
+      pp subject
+      is_expected.to validate_presence_of(:abbreviation)
+    end
 
     it { is_expected.to allow_values(true, false).for(:is_other) }
 

From e2c49142e7d8ffcbcf8ffb5cc9e63d1692b8a427 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 12:02:00 +0000
Subject: [PATCH 25/43] Remove prg has to have abbrev test

Used to be that org had to have an abbrev. That stopped the Super Admin creating the org so was removed. Remove check from this test.
---
 spec/models/org_spec.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index 366b0d84eb..1fbe9c8e8f 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -12,12 +12,6 @@
         .with_message('must be unique')
     }
 
-    it "is expected to have an abbeviation" do
-      pp "ORG:"
-      pp subject
-      is_expected.to validate_presence_of(:abbreviation)
-    end
-
     it { is_expected.to allow_values(true, false).for(:is_other) }
 
     it { is_expected.not_to allow_value(nil).for(:is_other) }

From 1edafec90f6f7a80bbeb76859589570bb1ec9d5a Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Tue, 11 Jan 2022 11:58:03 +0000
Subject: [PATCH 26/43] Bug DCC Issues 592, 645 - Fix for Org Admins seeing
 deleted Plans for Org.

Fixes issues:
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/592
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/645
https://github.com/DigitalCurationCentre/DMPonline-Service/issues/641

The reason we are seeing deleted (de-activated) Plans is that there is
no filter for plans with Roles active in the Org model's
org_admin_plans() method.

Change added .where(roles: { active: true }) to filter plans in
org_admin_plans() method of Org model.
---
 app/models/org.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/org.rb b/app/models/org.rb
index 5a7466f6f7..8f25d00e79 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -288,10 +288,12 @@ def org_admin_plans
 
     if Rails.configuration.x.plans.org_admins_read_all
       Plan.includes(:template, :phases, :roles, :users).where(id: combined_plan_ids)
+          .where(roles: { active: true })
     else
       Plan.includes(:template, :phases, :roles, :users).where(id: combined_plan_ids)
           .where.not(visibility: Plan.visibilities[:privately_visible])
           .where.not(visibility: Plan.visibilities[:is_test])
+          .where(roles: { active: true })
     end
   end
   # rubocop:enable Metrics/AbcSize

From 7d9bd5740fa37e329f0dbd6b4475b8dbb963bf43 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 13:12:23 +0000
Subject: [PATCH 27/43] needs active role for org_admin_plans to work

---
 spec/models/org_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index 1fbe9c8e8f..1310c8afe1 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -399,6 +399,7 @@
         @perm = build(:perm)
         @perm.name = 'grant_permissions'
         user.perms << @perm
+        plan.add_user!(user.id, :reviewer)
         plan.privately_visible!
       end
 
@@ -411,6 +412,7 @@
         @perm = build(:perm)
         @perm.name = 'grant_permissions'
         user.perms << @perm
+        plan.add_user!(user.id, :reviewer)
         plan.publicly_visible!
       end
 

From 230aa8db1985e955bcf732e03f4febeb6b3c95e3 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 13:23:13 +0000
Subject: [PATCH 28/43] fix merge conflict

---
 app/models/concerns/exportable_plan.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index 69159c16b0..7a7584c794 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -173,8 +173,10 @@ def show_section_for_csv(csv, phase, section, headings, unanswered, hash)
       answer = self.answer(question[:id], false)
       answer_text = ''
       if answer.present?
-        answer_text += answer.question_options.pluck(:text).join(', ') if answer.question_options.any?
-        answer_text += answer.text if answer.answered?
+        if answer.question_options.any?
+          answer_text += answer.question_options.pluck(:text).join(", ")
+        end
+        answer_text += answer.text if answer.answered? && answer.text.present?
       elsif unanswered
         answer_text += _('Not Answered')
       end

From 6bcc6a26fb2e95f69c21e21616333dec2c8df8fa Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Tue, 1 Feb 2022 13:38:02 +0000
Subject: [PATCH 29/43] rubocop fixes

---
 app/models/concerns/exportable_plan.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index 7a7584c794..2838098aa7 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -173,9 +173,7 @@ def show_section_for_csv(csv, phase, section, headings, unanswered, hash)
       answer = self.answer(question[:id], false)
       answer_text = ''
       if answer.present?
-        if answer.question_options.any?
-          answer_text += answer.question_options.pluck(:text).join(", ")
-        end
+        answer_text += answer.question_options.pluck(:text).join(', ') if answer.question_options.any?
         answer_text += answer.text if answer.answered? && answer.text.present?
       elsif unanswered
         answer_text += _('Not Answered')

From 61e6d1959cbe95333bc3e4b7d1a97c3c46dcac3e Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 23 Dec 2021 16:47:00 +0000
Subject: [PATCH 30/43]  Issue#3069 - (DCC Issue 675) - Org Admin and Super
 Admin searches and     pagination of user's plans broken.

    Fix for issue #3069 and DCC issue
    https://github.com/DigitalCurationCentre/DMPonline-Service/issues/675.

    Changes:
      - Replaced view files /paginable/plans/org_admin_other_user with /paginable/plans/_index.html.erb
        with extra checks for plan.owner.present? as missing plan.owner broke a DCC user's plans being render by org_admin.
      - Replaced partial with '/paginable/plans/org_admin_other_user'  with '/paginable/plans/index',
         replaced action'org_admin_other_user' with 'index' in paginable_renderiser() method in views
        /org_admin/users/edit.html.erb. /org_admin/users/plans.html.erb and /super_admin/users/edit.html.erb.
      - In Paginable::PlansController replaced -
        # GET /paginable/plans/org_admin/:page  with # GET /paginable/users/:id/plans
        associated with method org_admin_other_user()  renamed index()
      - Routes replaced
        get "org_admin_other_user/:page", action: :org_admin_other_user,
                                        on: :collection, as: :org_admin_other_user
        # Paginable actions for users
        resources :users, only: [] do
          get "index/:page", action: :index, on: :collection, as: :index

        with

        resources :users, only: %i[index] do
           member do
             resources :plans, only: %(index)
           end
        end
---
 app/controllers/paginable/plans_controller.rb | 24 ++++++++++---------
 app/views/org_admin/users/edit.html.erb       |  4 ++--
 app/views/org_admin/users/plans.html.erb      |  4 ++--
 ...in_other_user.html.erb => _index.html.erb} |  5 ++++
 app/views/super_admin/users/edit.html.erb     |  4 ++--
 config/routes.rb                              | 10 ++++----
 6 files changed, 29 insertions(+), 22 deletions(-)
 rename app/views/paginable/plans/{_org_admin_other_user.html.erb => _index.html.erb} (80%)

diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb
index c0c5667f63..16b761d062 100644
--- a/app/controllers/paginable/plans_controller.rb
+++ b/app/controllers/paginable/plans_controller.rb
@@ -58,17 +58,19 @@ def org_admin
     end
     # rubocop:enable Metrics/AbcSize
 
-    # GET /paginable/plans/org_admin/:page
-    def org_admin_other_user
-      @user = User.find(params[:id])
-      authorize @user
-      raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin? && @user.present?
-
-      paginable_renderise(
-        partial: 'org_admin_other_user',
-        scope: Plan.active(@user),
-        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc }
-      )
+  # GET /paginable/users/:id/plans
+  def index
+    @user = User.find(params[:id])
+    authorize @user
+    unless current_user.present? && current_user.can_org_admin? && @user.present?
+      raise Pundit::NotAuthorizedError
     end
+
+    paginable_renderise(
+      partial: "index",
+      scope: Plan.active(@user),
+      query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
+      format: :json
+    )
   end
 end
diff --git a/app/views/org_admin/users/edit.html.erb b/app/views/org_admin/users/edit.html.erb
index 5c294ab297..e144293b34 100644
--- a/app/views/org_admin/users/edit.html.erb
+++ b/app/views/org_admin/users/edit.html.erb
@@ -75,9 +75,9 @@
 <div class="row">
   <div class="col-md-12">
     <%= paginable_renderise(
-      partial: '/paginable/plans/org_admin_other_user',
+      partial: '/paginable/plans/index',
       controller: 'paginable/plans',
-      action: 'org_admin_other_user',
+      action: 'index',
       scope: @plans,
       query_params: { sort_field: 'plans.updated_at', sort_direction: 'desc' }) %>
   </div>
diff --git a/app/views/org_admin/users/plans.html.erb b/app/views/org_admin/users/plans.html.erb
index 25f05671a3..1381e16f34 100644
--- a/app/views/org_admin/users/plans.html.erb
+++ b/app/views/org_admin/users/plans.html.erb
@@ -7,9 +7,9 @@
 <div class="row">
   <div class="col-md-12">
     <%= paginable_renderise(
-      partial: '/paginable/plans/org_admin_other_user',
+      partial: '/paginable/plans/index',
       controller: 'paginable/plans',
-      action: 'org_admin_other_user',
+      action: 'index',
       remote: true,
       scope: @plans,
       query_params: { sort_field: 'plans.updated_at', sort_direction: 'desc' }) %>
diff --git a/app/views/paginable/plans/_org_admin_other_user.html.erb b/app/views/paginable/plans/_index.html.erb
similarity index 80%
rename from app/views/paginable/plans/_org_admin_other_user.html.erb
rename to app/views/paginable/plans/_index.html.erb
index e4ddfcbde6..b706479ac2 100644
--- a/app/views/paginable/plans/_org_admin_other_user.html.erb
+++ b/app/views/paginable/plans/_index.html.erb
@@ -21,8 +21,13 @@
             <% end %>
           </td>
           <td><%= plan.template.title %></td>
+<<<<<<< HEAD:app/views/paginable/plans/_org_admin_other_user.html.erb
           <td><%= plan.owner&.org&.name %></td>
           <td><%= plan.owner&.name(false) %></td>
+=======
+          <td><%= plan.owner.org.name if plan.owner.present? %></td>
+          <td><%= plan.owner.name(false) if plan.owner.present? %></td>
+>>>>>>>  Issue#3069 - (DCC Issue 675) - Org Admin and Super Admin searches and:app/views/paginable/plans/_index.html.erb
           <td><%= l(plan.updated_at.to_date, formats: :short) %></td>
           <td class="plan-visibility">
             <%= plan.visibility === 'is_test' ? _('Test') : sanitize(display_visibility(plan.visibility)) %>
diff --git a/app/views/super_admin/users/edit.html.erb b/app/views/super_admin/users/edit.html.erb
index abc4870e33..098af7517a 100644
--- a/app/views/super_admin/users/edit.html.erb
+++ b/app/views/super_admin/users/edit.html.erb
@@ -109,9 +109,9 @@
 <div class="row">
   <div class="col-md-12">
     <%= paginable_renderise(
-      partial: '/paginable/plans/org_admin_other_user',
+      partial: '/paginable/plans/index',
       controller: 'paginable/plans',
-      action: 'org_admin_other_user',
+      action: 'index',
       scope: @plans,
       query_params: { sort_field: 'plans.updated_at', sort_direction: 'desc' }) %>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index e715b99f32..61209f2be4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -210,17 +210,17 @@
 
       get 'org_admin/:page', action: :org_admin, on: :collection, as: :org_admin
 
-      get 'org_admin_other_user/:page', action: :org_admin_other_user,
-                                        on: :collection, as: :org_admin_other_user
-
       # Paginable actions for contributors
       resources :contributors, only: %i[index] do
         get 'index/:page', action: :index, on: :collection, as: :index
       end
     end
+
     # Paginable actions for users
-    resources :users, only: [] do
-      get 'index/:page', action: :index, on: :collection, as: :index
+    resources :users, only: %i[index] do
+      member do
+        resources :plans, only: %(index)
+      end
     end
     # Paginable actions for themes
     resources :themes, only: [] do

From 1c3b679fb8b35d548d1874e6b5a631977961a6d6 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Wed, 2 Feb 2022 10:15:05 +0000
Subject: [PATCH 31/43] bad indenting and missing end

---
 app/controllers/paginable/plans_controller.rb | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb
index 16b761d062..c2ee243814 100644
--- a/app/controllers/paginable/plans_controller.rb
+++ b/app/controllers/paginable/plans_controller.rb
@@ -58,19 +58,20 @@ def org_admin
     end
     # rubocop:enable Metrics/AbcSize
 
-  # GET /paginable/users/:id/plans
-  def index
-    @user = User.find(params[:id])
-    authorize @user
-    unless current_user.present? && current_user.can_org_admin? && @user.present?
-      raise Pundit::NotAuthorizedError
-    end
+    # GET /paginable/users/:id/plans
+    def index
+      @user = User.find(params[:id])
+      authorize @user
+      unless current_user.present? && current_user.can_org_admin? && @user.present?
+        raise Pundit::NotAuthorizedError
+      end
 
-    paginable_renderise(
-      partial: "index",
-      scope: Plan.active(@user),
-      query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
-      format: :json
-    )
+      paginable_renderise(
+        partial: "index",
+        scope: Plan.active(@user),
+        query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
+        format: :json
+      )
+    end
   end
 end

From fb19b910ae5aa0ff3c42b88e942bf80513e4ebeb Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Wed, 2 Feb 2022 10:21:12 +0000
Subject: [PATCH 32/43] rubocop clean up

---
 app/controllers/paginable/plans_controller.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb
index c2ee243814..b4ddbae87f 100644
--- a/app/controllers/paginable/plans_controller.rb
+++ b/app/controllers/paginable/plans_controller.rb
@@ -62,14 +62,12 @@ def org_admin
     def index
       @user = User.find(params[:id])
       authorize @user
-      unless current_user.present? && current_user.can_org_admin? && @user.present?
-        raise Pundit::NotAuthorizedError
-      end
+      raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin? && @user.present?
 
       paginable_renderise(
-        partial: "index",
+        partial: 'index',
         scope: Plan.active(@user),
-        query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
+        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc },
         format: :json
       )
     end

From 35fa59531b6cec3a8f119e72541a0a0a641ce81a Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Tue, 23 Nov 2021 13:28:11 +0000
Subject: [PATCH 33/43] Issue#dcc2983 - Fix for preventing adding a Contributor
 via Contributor form for Plan based on whether email and/or name are
 required.

Fix for DCC bug https://github.com/DMPRoadmap/roadmap/issues/2983

Changes:
 - Added two new properties to config/initializers/_dmproadmap.rb
   (both devault to false):
   config.x.application.require_contributor_name = false
   config.x.application.require_contributor_email = false
 -In Contributor model the private method name_or_email_presence()
  has been updated to take account of the above mentioned property
settings.
---
 app/models/contributor.rb          | 33 ++++++++++++++++++++++++++----
 config/initializers/_dmproadmap.rb |  4 ++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index de5e03eea6..2d316a8fce 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -130,10 +130,35 @@ def merge(other)
 
   private
 
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength
   def name_or_email_presence
-    return true unless name.blank? && email.blank?
-
-    errors.add(:name, _("can't be blank if no email is provided"))
-    errors.add(:email, _("can't be blank if no name is provided"))
+    return true unless (name.blank? && email.blank?) ||
+                        (!!Rails.configuration.x.application.require_contributor_name &&
+                        name.blank?) ||
+                        (!!Rails.configuration.x.application.require_contributor_email &&
+                        email.blank?)
+
+    # Error messages for case where name.blank? and email.blank? and
+    # properties Rails.configuration.x.application.require_contributor_name and
+    # Rails.configuration.x.application.require_contributor_email both not set (i.e, nil) or false.
+    if (name.blank? && email.blank?) &&
+       !Rails.configuration.x.application.require_contributor_name &&
+       !Rails.configuration.x.application.require_contributor_email
+      errors.add(:name, _("can't be blank if no email is provided."))
+      errors.add(:email, _("can't be blank if no name is provided."))
+    else
+
+      # Error messages cases where enither ame.blank? or email.blank?
+      if name.blank? && !!Rails.configuration.x.application.require_contributor_name
+        errors.add(:name, _("can't be blank."))
+      end
+
+      if email.blank? && !!Rails.configuration.x.application.require_contributor_email
+        errors.add(:email, _("can't be blank."))
+      end
+    end
   end
+  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/config/initializers/_dmproadmap.rb b/config/initializers/_dmproadmap.rb
index 25518abeae..06c664419a 100644
--- a/config/initializers/_dmproadmap.rb
+++ b/config/initializers/_dmproadmap.rb
@@ -118,6 +118,10 @@ class Application < Rails::Application
     # Setting to display phone number in contributor form
     config.x.application.display_contributor_phone_number = false
 
+    # Setting require contributor requirement of contributor name and email
+    config.x.application.require_contributor_name = false
+    config.x.application.require_contributor_email = false
+
     # ------------------- #
     # SHIBBOLETH SETTINGS #
     # ------------------- #

From d0f301be3c7bff8f1c02632432124a5eba89ed94 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Wed, 2 Feb 2022 11:17:52 +0000
Subject: [PATCH 34/43] clean up name_or_email_presence

---
 app/models/contributor.rb | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index 2d316a8fce..5e5e19f85f 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -130,35 +130,20 @@ def merge(other)
 
   private
 
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
   def name_or_email_presence
-    return true unless (name.blank? && email.blank?) ||
-                        (!!Rails.configuration.x.application.require_contributor_name &&
-                        name.blank?) ||
-                        (!!Rails.configuration.x.application.require_contributor_email &&
-                        email.blank?)
-
-    # Error messages for case where name.blank? and email.blank? and
-    # properties Rails.configuration.x.application.require_contributor_name and
-    # Rails.configuration.x.application.require_contributor_email both not set (i.e, nil) or false.
-    if (name.blank? && email.blank?) &&
-       !Rails.configuration.x.application.require_contributor_name &&
-       !Rails.configuration.x.application.require_contributor_email
+    if name.blank? && Rails.configuration.x.application.require_contributor_name
+      errors.add(:name, _("can't be blank."))
+    end
+    
+    if email.blank? && Rails.configuration.x.application.require_contributor_email
+      errors.add(:email, _("can't be blank."))
+    end
+    
+    if name.blank? && email.blank? && errors.length == 0
       errors.add(:name, _("can't be blank if no email is provided."))
       errors.add(:email, _("can't be blank if no name is provided."))
-    else
-
-      # Error messages cases where enither ame.blank? or email.blank?
-      if name.blank? && !!Rails.configuration.x.application.require_contributor_name
-        errors.add(:name, _("can't be blank."))
-      end
-
-      if email.blank? && !!Rails.configuration.x.application.require_contributor_email
-        errors.add(:email, _("can't be blank."))
-      end
     end
-  end
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/AbcSize
+
+    return errors.length == 0
+end
 end

From b3822920b728af3b23d390c4e194784f9f8a50e8 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Wed, 2 Feb 2022 11:18:30 +0000
Subject: [PATCH 35/43] Typo

typo
---
 app/models/contributor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index 5e5e19f85f..212863c4ae 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -145,5 +145,5 @@ def name_or_email_presence
     end
 
     return errors.length == 0
-end
+  end
 end

From f4920cf2c2201d48a6c254a144f5fb0af0f96239 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Wed, 2 Feb 2022 11:25:12 +0000
Subject: [PATCH 36/43] rubocop

rubocop stuff. Single line ifs and use of zero?
---
 app/models/contributor.rb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index 212863c4ae..db1a0293cc 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -130,20 +130,17 @@ def merge(other)
 
   private
 
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
   def name_or_email_presence
-    if name.blank? && Rails.configuration.x.application.require_contributor_name
-      errors.add(:name, _("can't be blank."))
-    end
-    
-    if email.blank? && Rails.configuration.x.application.require_contributor_email
-      errors.add(:email, _("can't be blank."))
-    end
-    
-    if name.blank? && email.blank? && errors.length == 0
+    errors.add(:name, _("can't be blank.")) if name.blank? && Rails.configuration.x.application.require_contributor_name
+    errors.add(:email, _("can't be blank.")) if email.blank? && Rails.configuration.x.application.require_contributor_email
+  
+    if name.blank? && email.blank? && errors.length.zero?
       errors.add(:name, _("can't be blank if no email is provided."))
       errors.add(:email, _("can't be blank if no name is provided."))
     end
 
-    return errors.length == 0
+    return errors.length.zero?
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 end

From 477b9817473706a5aaf7559ca74be69bb84241c8 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Wed, 2 Feb 2022 11:29:28 +0000
Subject: [PATCH 37/43] more rubcocop stuff

---
 app/models/contributor.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index db1a0293cc..fee9cc3f29 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -133,14 +133,17 @@ def merge(other)
   # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
   def name_or_email_presence
     errors.add(:name, _("can't be blank.")) if name.blank? && Rails.configuration.x.application.require_contributor_name
-    errors.add(:email, _("can't be blank.")) if email.blank? && Rails.configuration.x.application.require_contributor_email
-  
+    if email.blank? && Rails.configuration.x.application.require_contributor_email
+      errors.add(:email,
+                 _("can't be blank."))
+    end
+
     if name.blank? && email.blank? && errors.length.zero?
       errors.add(:name, _("can't be blank if no email is provided."))
       errors.add(:email, _("can't be blank if no name is provided."))
     end
 
-    return errors.length.zero?
+    errors.length.zero?
   end
   # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 end

From 3df80e650fc4583b92e13a1d466b0054c9b959d8 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Wed, 2 Feb 2022 12:19:45 +0000
Subject: [PATCH 38/43] fix errors

---
 app/models/contributor.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index fee9cc3f29..5cb2d9094d 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -138,12 +138,12 @@ def name_or_email_presence
                  _("can't be blank."))
     end
 
-    if name.blank? && email.blank? && errors.length.zero?
+    if name.blank? && email.blank? && errors.size.zero?
       errors.add(:name, _("can't be blank if no email is provided."))
       errors.add(:email, _("can't be blank if no name is provided."))
     end
 
-    errors.length.zero?
+    errors.size.zero?
   end
   # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 end

From 93c914f1bcaca9a7ee6e9c0a3f5e1c88d4183108 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Wed, 2 Feb 2022 09:53:25 -0800
Subject: [PATCH 39/43] fixed merge conflict in paginable/plans_controller.rb

---
 app/controllers/paginable/plans_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb
index c0c5667f63..6b9e56e472 100644
--- a/app/controllers/paginable/plans_controller.rb
+++ b/app/controllers/paginable/plans_controller.rb
@@ -67,7 +67,8 @@ def org_admin_other_user
       paginable_renderise(
         partial: 'org_admin_other_user',
         scope: Plan.active(@user),
-        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc }
+        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc },
+        format: :json
       )
     end
   end

From 6238ca9c8fe4dc9532374f44487d1a2205e87496 Mon Sep 17 00:00:00 2001
From: Ray Carrick <ray.carrick@ed.ac.uk>
Date: Thu, 10 Feb 2022 08:51:45 +0000
Subject: [PATCH 40/43] translation.io sync

---
 config/locale/app.pot                  | 1418 +++++++++--------
 config/locale/de/LC_MESSAGES/app.mo    |  Bin 144745 -> 146799 bytes
 config/locale/de/app.po                | 1925 ++++++++++++-----------
 config/locale/en_CA/LC_MESSAGES/app.mo |  Bin 630 -> 630 bytes
 config/locale/en_CA/app.po             | 1419 +++++++++--------
 config/locale/en_GB/LC_MESSAGES/app.mo |  Bin 1916 -> 1916 bytes
 config/locale/en_GB/app.po             | 1423 +++++++++--------
 config/locale/en_US/LC_MESSAGES/app.mo |  Bin 21173 -> 20973 bytes
 config/locale/en_US/app.po             | 1445 +++++++++--------
 config/locale/es/LC_MESSAGES/app.mo    |  Bin 141384 -> 143576 bytes
 config/locale/es/app.po                | 1921 ++++++++++++-----------
 config/locale/fi/LC_MESSAGES/app.mo    |  Bin 137216 -> 138723 bytes
 config/locale/fi/app.po                | 1938 ++++++++++++-----------
 config/locale/fr_CA/LC_MESSAGES/app.mo |  Bin 139298 -> 122826 bytes
 config/locale/fr_CA/app.po             | 1833 +++++++++++-----------
 config/locale/fr_FR/LC_MESSAGES/app.mo |  Bin 144558 -> 146804 bytes
 config/locale/fr_FR/app.po             | 1984 ++++++++++++------------
 config/locale/pt_BR/LC_MESSAGES/app.mo |  Bin 139922 -> 142200 bytes
 config/locale/pt_BR/app.po             | 1913 ++++++++++++-----------
 config/locale/sv_FI/LC_MESSAGES/app.mo |  Bin 136464 -> 138591 bytes
 config/locale/sv_FI/app.po             | 1915 ++++++++++++-----------
 config/locale/tr_TR/LC_MESSAGES/app.mo |  Bin 137161 -> 125610 bytes
 config/locale/tr_TR/app.po             | 1942 ++++++++++++-----------
 config/locales/.translation_io         |    2 +-
 config/locales/translation.de.yml      |    9 +
 config/locales/translation.en-CA.yml   |    3 +
 config/locales/translation.en-GB.yml   |    3 +
 config/locales/translation.en-US.yml   |    3 +
 config/locales/translation.es.yml      |   10 +
 config/locales/translation.fi.yml      |    9 +-
 config/locales/translation.fr-CA.yml   |   11 +
 config/locales/translation.fr-FR.yml   |   27 +-
 config/locales/translation.pt-BR.yml   |   12 +
 config/locales/translation.sv-FI.yml   |   10 +
 config/locales/translation.tr-TR.yml   |   22 +-
 35 files changed, 10968 insertions(+), 10229 deletions(-)

diff --git a/config/locale/app.pot b/config/locale/app.pot
index bc5ca09dfb..8fbf5ca3ff 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 11:19+0000\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 08:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,25 +18,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr ""
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr ""
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr ""
 
@@ -44,28 +44,28 @@ msgstr ""
 msgid "Bad Parameters"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr ""
 
@@ -78,137 +78,141 @@ msgstr ""
 msgid "completed_plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr ""
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr ""
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
 msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr ""
 
@@ -216,28 +220,28 @@ msgstr ""
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -251,60 +255,60 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr ""
 
@@ -316,93 +320,93 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
@@ -410,8 +414,8 @@ msgstr ""
 msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -421,70 +425,72 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -495,63 +501,66 @@ msgstr ""
 msgid "Organisation"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr ""
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr ""
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr ""
@@ -560,100 +569,102 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
+#: ../../app/controllers/orgs_controller.rb:127
+msgid "Please choose an organisation"
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:142
-msgid "Please choose an organisation"
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
 msgstr ""
 
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
+#: ../../app/controllers/plans_controller.rb:84
+msgid "My Plan (%<title>s)"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
@@ -661,115 +672,119 @@ msgid ""
 "                       institutional credentials."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
 "                You must enter a unique email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr ""
 
@@ -787,11 +802,11 @@ msgid ""
 "ou will now be able to sign in with them."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
@@ -799,71 +814,71 @@ msgstr ""
 msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr ""
 
@@ -873,39 +888,39 @@ msgid ""
 "itation."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr ""
 
@@ -922,12 +937,12 @@ msgid ""
 "ot to duplicate too much text."
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
 msgstr ""
 
 #: ../../app/helpers/conditions_helper.rb:203
@@ -938,19 +953,15 @@ msgstr ""
 msgid " will <b>remove</b> questions "
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr ""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr ""
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr ""
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr ""
 
@@ -959,7 +970,8 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr ""
@@ -970,8 +982,8 @@ msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
@@ -1052,8 +1064,8 @@ msgid "Grant API to organisations"
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1096,231 +1108,227 @@ msgstr ""
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1334,7 +1342,7 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr ""
 
@@ -1344,7 +1352,7 @@ msgid "can't be blank"
 msgstr ""
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr ""
 
@@ -1364,41 +1372,39 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr ""
+
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr ""
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid "Question not answered.\\n"
 msgstr ""
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr ""
 
@@ -1406,35 +1412,35 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr ""
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr ""
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr ""
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr ""
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr ""
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr ""
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr ""
 
@@ -1442,35 +1448,35 @@ msgstr ""
 msgid "can't be less than zero"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr ""
 
@@ -1478,155 +1484,157 @@ msgstr ""
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
 msgstr ""
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr ""
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr ""
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr ""
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
 " the data itself) for initial use and later re-use."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1641,25 +1649,25 @@ msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr ""
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr ""
+
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1688,14 +1696,14 @@ msgid "Please wait, Standards are loading"
 msgstr ""
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1706,11 +1714,11 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1734,7 +1742,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
+msgid " by %{user_name}"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1791,12 +1799,13 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr ""
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr ""
@@ -1812,11 +1821,11 @@ msgstr ""
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1852,21 +1861,21 @@ msgstr ""
 msgid "ORCID"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1886,19 +1895,19 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -1962,14 +1971,14 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -1978,7 +1987,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
+msgid "Welcome to %{application_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -1997,21 +2006,27 @@ msgstr ""
 msgid "into your browser"
 msgstr ""
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr ""
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
+msgid "Hello %{user_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2031,7 +2046,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
+msgid "The %{tool_name} team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2043,17 +2058,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
+msgid "Hello %{user_email}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2068,8 +2083,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2138,15 +2153,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2305,7 +2320,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
+msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2321,7 +2336,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
+msgid "No %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2380,7 +2395,7 @@ msgstr ""
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr ""
@@ -2451,7 +2466,7 @@ msgstr ""
 msgid "Enter your guidance here. You can include links where needed."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2459,21 +2474,21 @@ msgid ""
 "he corresponding theme tags."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2660,7 +2675,8 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2734,7 +2750,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
@@ -2787,7 +2803,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
+msgid "%{org} Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2934,7 +2950,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -2994,7 +3010,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
+msgid "%{org_name} Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3046,7 +3062,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3074,7 +3090,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
+msgid "Question %{number}:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3132,14 +3148,14 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3229,7 +3245,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3255,7 +3271,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
+msgid "for internal %{org_name} use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3407,27 +3423,31 @@ msgid ""
 "s below."
 msgstr ""
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr ""
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
+msgid "All (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
+msgid "Published (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
+msgid "Unpublished (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
+msgid "Not customised (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
@@ -3437,7 +3457,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
+msgid "Editing profile for %{username}"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3446,7 +3466,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
+msgid "Plans of %{username}"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3505,7 +3525,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3674,18 +3694,18 @@ msgid "Last Accessed"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3699,7 +3719,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3741,12 +3761,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3783,7 +3803,22 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3804,25 +3839,10 @@ msgid ""
 " 'Jun 2013'."
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr ""
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr ""
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -3933,7 +3953,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
 
@@ -3951,7 +3971,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4103,17 +4123,17 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
 
@@ -4135,7 +4155,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
@@ -4162,16 +4182,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4190,59 +4210,102 @@ msgstr[1] ""
 msgid "answered"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr ""
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4275,7 +4338,7 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 
@@ -4357,7 +4420,7 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
+msgid "%{org_title} Plans"
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:36
@@ -4429,7 +4492,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4479,7 +4542,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4531,41 +4594,46 @@ msgstr ""
 msgid "Filter plans"
 msgstr ""
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr ""
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4581,21 +4649,21 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
+msgid "About %{application_name}"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4651,7 +4719,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4671,7 +4739,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
+msgid "If you do not have a %{application_name} account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4705,9 +4773,9 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:13
@@ -4827,7 +4895,7 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:10
@@ -4836,33 +4904,33 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4873,20 +4941,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -4898,28 +4966,25 @@ msgid ""
 "or. "
 msgstr ""
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr ""
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -4950,11 +5015,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -4970,36 +5036,36 @@ msgid ""
 " terms and conditions.</p>"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5016,7 +5082,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
+msgid "The credentials have been sent to %{email}."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5060,8 +5126,8 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5087,7 +5153,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5096,7 +5162,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5106,11 +5172,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
+msgid "'%{to_org_name}' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
+msgid "'%{to_org_name}' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5120,17 +5186,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
+msgid "%{from_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
+msgid "%{to_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5155,7 +5221,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5178,7 +5244,7 @@ msgid "New organisation"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5206,7 +5272,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5303,78 +5369,77 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
+msgid "Hello %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
+msgid "Hello %{name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
+msgid "Hello %{recipient_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
+msgid "Hello %{user_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5388,21 +5453,25 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
+msgid "Section name: %{section_title}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr ""
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5418,7 +5487,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5436,11 +5505,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5461,19 +5530,18 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-m%<tool_name>s
+msgid ""
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
+"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5481,7 +5549,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admi%<username>smissions.html.erb:9
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/de/LC_MESSAGES/app.mo b/config/locale/de/LC_MESSAGES/app.mo
index c63521277b70516679738d3b554754ac7b4103d1..026e9cd0bf441932e16c2f41dd28c1841850747e 100644
GIT binary patch
delta 31228
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
D6M7b_

delta 29242
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

diff --git a/config/locale/de/app.po b/config/locale/de/app.po
index f8ad67ba3c..342ff566ac 100644
--- a/config/locale/de/app.po
+++ b/config/locale/de/app.po
@@ -1,14 +1,14 @@
 # German translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -18,29 +18,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"Es gibt keine Frage mit der ID %<question_id>s, die der Plan-ID %<plan_id>s zuge"
-"ordnet ist, für die eine Antwort erstellt oder aktualisiert werden soll"
+"Es gibt keine Frage mit ID %<question_id> s mit Plan-ID % verknüpft<plan_id> s"
+", für die eine Antwort erstellt oder aktualisiert werden soll"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
-"Es gibt keinen Plan mit der ID %<id>s, für den eine Antwort erstellt oder aktua"
-"lisiert werden soll"
+"Es gibt keinen Plan mit der ID %<id> s, für die eine Antwort erstellt oder akt"
+"ualisiert werden soll"
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr "Schlechte Referenzen"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "Code und Name der Abteilungen müssen eindeutig sein"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "der/die Nutzer/in muss in Ihrer Organisation sein"
 
@@ -48,28 +48,28 @@ msgstr "der/die Nutzer/in muss in Ihrer Organisation sein"
 msgid "Bad Parameters"
 msgstr "Schlechte Parameter"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Monat"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "Nein. Benutzer sind beigetreten"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Gesamt"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "users_joined"
 
@@ -82,35 +82,35 @@ msgstr "Nein. Abgeschlossene Pläne"
 msgid "completed_plans"
 msgstr "fertige_Pläne"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Keine Pläne"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "Pläne"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "Fehlender oder ungültiger JSON"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Ungültiges JSON-Format"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Plan nicht gefunden"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr "DMP kann nicht erstellt werden"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "Plan existiert bereits. Senden Sie stattdessen ein Update."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
@@ -118,103 +118,107 @@ msgstr ""
 "Der Besitz des DMP konnte nicht festgestellt werden. Bitte fügen Sie eine\n"
 "                          : Zugehörigkeit zum: Kontakt"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr "Ungültiger JSON!"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "Ungültiger JSON"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "Keine Pläne gefunden"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Sie sind nicht berechtigt, diese Aktion durchzuführen."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Bitte melden Sie sich an oder registrieren Sie sich bevor Sie fortfahren."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr "Kann nicht %<action>s die %<object>s. %<errors>s"
+msgstr "Unfähig zu %<action> ist der %<object> S.%<errors> S"
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "Erfolgreich %<action>s das %<object>s."
+msgstr "Erfolgreich %<action> ist der %<object> S."
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "API-Client"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "Plan"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "Hinweisgruppe"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "Organisation"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "Berechtigung"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "Einstellungen"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "Profil"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "Nutzer/in"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "Frage Option"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr "Aufnahme nicht gefunden"
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "Der Bereich sollte ein ActiveRecord :: Relation-Objekt sein"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params sollte ein Hash-Objekt sein"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params sollte ein Hash-Objekt sein"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "Einheimische sollten ein Hash-Objekt sein"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Eingeschränkter Zugriff auf Alle Datensätze anzeigen"
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "Sortieren nach %<sort_field>s"
+msgstr "Sortiere nach %<sort_field> S"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "Anpassung"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "Vorlage"
 
@@ -224,28 +228,28 @@ msgstr ""
 "obj sollte eine Vorlage, eine Phase, ein Abschnitt, eine Frage oder eine Anmer"
 "kung sein"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "obj sollte eine Phase, ein Abschnitt, eine Frage oder eine Anmerkung sein"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "Der Suchbereich reagiert nicht auf jeden"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "Dem Suchbereich sind keine Elemente zugeordnet"
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Die Captcha-Überprüfung ist fehlgeschlagen. Versuchen Sie es erneut."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Die Nachricht wurde erfolgreich versendet."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Ihre Anfrage konnte nicht gesendet werden"
 
@@ -259,60 +263,60 @@ msgid "added"
 msgstr "Hinzugefügt"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "gespeichert"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "Speichern"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "entfernt"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "entfernen"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "Plan nicht gefunden"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "Mitwirkender nicht gefunden"
 
@@ -324,108 +328,108 @@ msgstr "Ihre Anfrage zum Feedback kann derzeit nicht gesendet werden."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Bei der Anforderung von Feedback für diesen Plan ist ein Fehler aufgetreten."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "Erstellt"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "Erstellen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Ihre Hinweisgruppe wurde veröffentlicht und steht nun Nutzer/innen zur Verfügu"
 "ng."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "veröffentlichen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Ihre Beratungsgruppe wird nicht mehr veröffentlicht und steht Nutzer/innen nic"
 "ht mehr zur Verfügung."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "Veröffentlichung zurückziehen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "Gelöscht"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "Löschen"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr "Ihre Anleitung wurde veröffentlicht und steht nun Nutzer/innen zur Verfügung."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Ihre Anleitung wird nicht mehr veröffentlicht und steht Benutzern nicht mehr z"
 "ur Verfügung."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Ihr Konto wurde erfolgreich von %<is>s getrennt."
+msgstr "Ihr Konto wurde erfolgreich von % getrennt<is> S."
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "Das Aufheben der Verknüpfung Ihres Kontos von %<is>s ist nicht möglich."
+msgstr "Die Verknüpfung Ihres Kontos mit % kann nicht aufgehoben werden<is> S."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -437,74 +441,76 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "Sie können einer historischen Version einer Vorlage keine Phase hinzufügen."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "Es konnte keine neue Version dieser Vorlage erstellt werden."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr "Es kann keine neue Version dieser Vorlage erstellt werden.<br>"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "aktualisiert"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "Aktualisierung"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "Es konnte keine neue Version dieser Vorlage erstellt werden."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
-"%<plan_owner>s wurde informiert, dass Sie Ihre Rückmeldungen abgeschlossen habe"
-"n."
+"%<plan_owner> s wurde benachrichtigt, dass Sie Ihr Feedback abgeschlossen habe"
+"n"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr ""
 "Der Benutzer kann nicht benachrichtigt werden, dass Sie die Rückmeldung abgesc"
 "hlossen haben."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Projekttitel"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Template"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -515,65 +521,68 @@ msgstr "Template"
 msgid "Organisation"
 msgstr "Organisation"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Besitzername"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "E-Mail des Besitzers"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "aktualisiert"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Sichtweite"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr ""
 "Es konnte kein neuer Abschnitt erstellt werden. Die von Ihnen angegebene Phase"
 " existiert nicht."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr "Diese Version der Vorlage kann nicht gelöscht werden."
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "Kopieren"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Diese Vorlage ist nicht mehr anpassbar."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Diese Vorlage kann nicht angepasst werden."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Diese Vorlage ist nicht anpassbar."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Alle Vorlagen"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "Vorlagen der/des %<org_name>s "
+msgstr "%<org_name> s Vorlagen"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Eigene Vorlagen"
@@ -582,154 +591,155 @@ msgstr "Eigene Vorlagen"
 msgid "Customizable Templates"
 msgstr "Anpassbare Vorlagen"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "Fehler beim Analysieren von Links für eine %<template>s"
+msgstr "Fehler beim Analysieren von Links für ein %<template> S"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
-msgstr ""
-"Vorlage, die mit dem Service %<application_name>s erstellt wurde. Zuletzt geänd"
-"ert %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
+msgstr "Vorlage erstellt mit %<application_name> s Dienst. Zuletzt geändert %<date> S"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Die DMP-Vorlage kann zu diesem Zeitpunkt nicht heruntergeladen werden."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "Derzeit sind keine Organisationen registriert."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Ihre Organisation scheint nicht ordnungsgemäß konfiguriert zu sein."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Bitte wählen Sie eine Organisation"
 
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
+msgstr "Ihre Organisation scheint nicht ordnungsgemäß konfiguriert zu sein."
+
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "Erstellt mit %<application_name>s. Zuletzt geändert am %<date>s"
+msgstr "Erstellt mit %<application_name> S. Zuletzt geändert %<date> S"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "Das ist ein"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "Versuchsplan"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "Es konnte keine geeignete Vorlage für Ihren Plan ermittelt werden."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Mein Plan"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr " Planen"
+msgid "My Plan (%<title>s)"
+msgstr "<html>Mein Plan (%<title> s)</html>"
+
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr "%<user_name> s Plan"
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Dieser Plan basiert auf der Standardvorlage."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Dieser Plan basiert auf dem"
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "Vorlage mit Anpassungen durch die"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "Kopiert"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
-"Der Status des Plans konnte nicht geändert werden, da mindestens %<percentage>s"
-" Prozentsatz angefordert wurde"
+"Status des Plans kann nicht geändert werden, da er zu mindestens % benötigt wi"
+"rd<percentage}> s Prozentsatz antwortete"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "Plan-ID konnte nicht gefunden werden %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr "Plan-ID %{ kann nicht gefunden werden<plan_id> S"
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Ihr Projekt ist jetzt ein Test."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Ihr Projekt ist kein Test mehr."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr "Der Teststatus des Plans konnte nicht geändert werden"
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "Es ist kein Plan mit id %<id>s verbunden"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr "ID %{ ist kein Plan zugeordnet<id}> S"
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Bitte treffen Sie unten eine Auswahl. Nach dem Verlinken Ihres\n"
-"                       Details zu einem %<application_name>s-Konto,\n"
-"                       Sie können sich direkt mit Ihrem anmelden\n"
-"                       institutionelle Referenzen."
+"Bitte treffen Sie unten eine Auswahl. Nachdem Sie Ihre Daten mit einem % verkn"
+"üpft haben<application_name> s-Konto können Sie sich direkt mit Ihren institut"
+"ionellen Anmeldeinformationen anmelden."
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr ""
 "Sie müssen die allgemeinen Geschäftsbedingungen akzeptieren, um sich zu regist"
 "rieren."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr "Bitte wählen Sie eine Organisation aus der Liste oder wählen Sie Andere."
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "Diese E-Mailadresse ist bereits registriert."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
-"Herzlich willkommen! Sie haben sich erfolgreich mit Ihren institutionellen Ref"
-"erenzen registriert. Sie können nun mit ihnen auf Ihr Konto zugreifen."
+"Herzlich willkommen! Sie haben sich erfolgreich mit Ihren institutionellen Zug"
+"angsdaten angemeldet. Sie können jetzt mit ihnen auf Ihr Konto zugreifen."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Nicht erfolgreich speichern."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Bitte geben Sie eine E-mail-Adresse ein."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "Bitte geben Sie einen Vornamen ein."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "Bitte geben Sie einen Nachnamen ein."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
@@ -737,11 +747,11 @@ msgstr ""
 "Bitte wählen Sie eine Organisation aus der Liste oder geben Sie den Namen Ihre"
 "r Organisation ein."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr "Bitte geben Sie Ihr Passwort ein, um die E-Mail-Adresse zu ändern."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -750,70 +760,72 @@ msgstr ""
 "Speichern nicht erfolgreich. \\ Diese E-Mailadresse ist bereits registriert. \\ "
 "Sie müssen eine eindeutige E-Mail-Adresse angeben."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Bitte geben Sie Ihr aktuelles Passwort ein"
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Bitte geben Sie eine Passwortbestätigung ein"
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "Passwort und Bestätigung müssen übereinstimmen"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"Plan kann nicht mit %<email>s geteilt werden, da diese E-Mail mit dem Eigentüme"
-"r des Plans übereinstimmt."
+"Plan kann nicht mit % geteilt werden<email> s da diese E-Mail mit dem Eigentüm"
+"er des Plans übereinstimmt."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "Der Plan wurde bereits mit %<email>s geteilt."
+msgstr "Plan wird bereits mit % geteilt<email> S."
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "Vorname"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Nachname"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "Einladung zu %<email>s erfolgreich ausgestellt."
+msgstr "Einladung an %<email> s erfolgreich ausgestellt."
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Plan geteilt mit %<email>s."
+msgstr "Plan geteilt mit %<email> S."
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
 "Sie müssen eine gültige E-Mail-Adresse angeben und eine Berechtigungsstufe aus"
 "wählen."
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Bitte geben Sie eine E-mail-Adresse ein"
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
-"Die Berechtigungen für %<email>s wurden erfolgreich geändert. Sie wurden per E-"
-"Mail benachrichtigt."
+"Berechtigungen für % erfolgreich geändert<email> . Sie wurden per E-Mail benac"
+"hrichtigt."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Zugriffsrecht entzogen"
 
@@ -833,11 +845,11 @@ msgstr ""
 "Ihr Konto wurde erfolgreich mit Ihren institutionellen Anmeldeinformationen ve"
 "rknüpft. Sie können sich jetzt mit ihnen anmelden."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Exporteinstellungen erfolgreich aktualisiert"
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 "Beim Speichern / Zurücksetzen der Exporteinstellungen ist ein Fehler aufgetret"
@@ -845,59 +857,59 @@ msgstr ""
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
-msgstr ". Die API-Anmeldeinformationen wurden per E-Mail an %<email>s gesendet."
+msgstr ". Die API-Anmeldeinformationen wurden per E-Mail an % gesendet<email> S"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Ihre Benachrichtigung ist jetzt aktiv."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Ihre Benachrichtigung ist nicht mehr aktiv."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "Der aktive Status der Benachrichtigung kann nicht geändert werden"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "Mit der ID %<id>s ist keine Benachrichtigung verknüpft"
+msgstr "ID % ist keine Benachrichtigung zugeordnet<id> S"
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
 "Ihre Organisationszugehörigkeit wurde geändert. Sie können jetzt Vorlagen für "
-"%<org_name>s bearbeiten."
+"% bearbeiten<org_name> S."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Die Organisationszugehörigkeit kann zu diesem Zeitpunkt nicht geändert werden."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Unbekannte Organisation"
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Es scheint ein Problem mit unserem Logo zu sein. Bitte laden Sie es erneut."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr "Beim Versuch, die Organisationen zusammenzuführen, ist ein Fehler aufgetreten."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr "Die beiden Organisationen können derzeit nicht zusammengeführt werden."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr ""
 "Es kann nicht bestimmt werden, welche Datensätze zusammengeführt werden müssen"
 "."
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
@@ -905,19 +917,19 @@ msgstr ""
 "Sie haben versucht, 2 Konten mit derselben E-Mail-Adresse zusammenzuführen.\n"
 "           Bitte mit einer anderen E-Mail-Adresse zusammenführen."
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "Archiviert"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "Archivieren"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "zusammengeführt"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "Verschmelzen"
 
@@ -929,39 +941,39 @@ msgstr ""
 "Sie sind bereits als ein anderer Benutzer angemeldet. Bitte loggen Sie sich au"
 "s, um Ihre Einladung zu aktivieren."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Erfolgreich angemeldet"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Ihr Konto wurde erfolgreich mit %<scheme>s verknüpft."
+msgstr "Ihr Konto wurde erfolgreich mit % verknüpft<scheme> S."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "Ihr Konto konnte nicht mit %<scheme>s verknüpft werden."
+msgstr "Ihr Konto kann nicht mit % verknüpft werden<scheme> S."
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "Erfolgreich %<action>s %<username>s Konto."
+msgstr "Erfolgreich %<action> S %<username> das Konto von s."
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "Aktiviert"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "Deaktiviert"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr "Kann nicht zu %<action>s %<username>s"
+msgstr "Unfähig zu %<action> S %<username> S"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "Aktivieren"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "Deaktivieren"
 
@@ -984,13 +996,13 @@ msgstr ""
 "Sie auch Hilfestellungen nach Themen angeben, werden diese mit angezeigt; Sie "
 "sollten deshalb möglichst wenig Text kopieren."
 
-#: ../../app/helpers/conditions_helper.rb:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "Antworten"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "wird <b>eine E-Mail</b> mit Betreff <b>senden</b>"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr "<b>sendet eine E-Mail</b> mit Betreff %<subject_name> S"
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
@@ -1000,19 +1012,15 @@ msgstr "wird <b>die</b> Frage <b>entfernen</b>"
 msgid " will <b>remove</b> questions "
 msgstr "wird Fragen <b>entfernen</b>"
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\"\""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Übertragen Sie die Anpassung"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Anpassbarkeit bearbeiten"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Anpassen"
 
@@ -1021,27 +1029,28 @@ msgid "Creators:"
 msgstr "Erzeuger:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Erzeuger:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s: Ihr Plan wurde für eine Rückmeldung abgeschickt"
+msgstr "%<application_name> s: Ihr Plan wurde zur Rückmeldung eingereicht"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Hallo %<user_name>s, </p><p> Ihr Plan \"%<plan_name>s\" wurde zur Kommentierung"
-" an einen Administrator in Ihrer Organisation übermittelt. Wenn Sie diesbezügl"
-"ich Fragen haben sollten, kontaktieren Sie uns bitte über %{organisation_email"
-"}. </p>"
+"<p>Hallo %<user_name> S.</p><p> Dein Plan \"%<plan_name> s\" wurde für Feedback "
+"von einem Administrator in Ihrer Organisation eingereicht. Wenn Sie Fragen zu "
+"dieser Aktion haben, kontaktieren Sie uns bitte unter %<organisation_email> S."
+"</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1079,9 +1088,9 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Ein Daten-Experte vom %<org_name>s wird innerhalb von 48 Stunden auf Ihre An"
-"frage antworten. Wenn Sie diesbezüglich Fragen haben sollten, kontaktieren Sie"
-" uns bitte über %<organisation_email>s. </p>"
+"<p>Ein Datenbibliothekar aus %<org_name> s wird Ihre Anfrage innerhalb von 48 "
+"Stunden beantworten. Wenn Sie Fragen zu dieser Aktion haben, kontaktieren Sie "
+"uns bitte unter %<organisation_email> S.</p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1121,8 +1130,8 @@ msgid "Grant API to organisations"
 msgstr "Gewähren Sie API für Organisationen"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1165,231 +1174,227 @@ msgstr "Öffentlich: Jeder kann sehen."
 msgid "Private: restricted to me and people I invite."
 msgstr "Privat: beschränkt auf mich und Leute, die ich einlade."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Unbekannter Spaltenname."
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Planenname"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "Planenbezeichner"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr "Grantnummer"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Principal Investigator / Forscher"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Kontakt für Planen"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Beschreibung"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Funder"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "Ihre ORCID"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr "Keiner"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
-msgstr "Anleitung für: %<themes>s"
+msgstr "Anleitung für: %<themes> S"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr "Nichts zu verschmelzen"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
-msgstr "<p>Die folgenden %<object_types>s werden in '%<org_name>s' verschoben:</p>"
+msgstr "<p>Die folgende %<object_types> s werden nach '% verschoben<org_name> S':</p>"
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Plan erstellen"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "Letzter Monat"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "Letzte 3 Monate"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "Letzte 6 Monate"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "Letzte 9 Monate"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "Letzte 12 Monate"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "Abfrage oder Feedback zu %<tool_name>s"
+msgstr "Anfrage oder Feedback zu %<tool_name> S"
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "Willkommen bei %<tool_name>s"
+msgstr "Willkommen zu %<tool_name> S"
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "Ein Datenverwaltungsplan in %<tool_name>s wurde mit Ihnen geteilt"
+msgstr "Ein Datenmanagementplan in %<tool_name> s wurde mit Ihnen geteilt"
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
-msgstr "Berechtigungen für einen Datenverwaltungsplan in %<tool_name>s geändert"
+msgstr "Geänderte Berechtigungen für einen Datenmanagementplan in %<tool_name> S"
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "Berechtigungen für ein DMP in %<tool_name>s entfernt"
+msgstr "Auf einem DMP entfernte Berechtigungen in %<tool_name> S"
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
-msgstr "%<user_name>s hat um Feedback zu einem %<tool_name>s-Plan gebeten"
+msgstr "%<user_name> s hat Feedback zu einem % angefordert<tool_name> s Plan"
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
-msgstr "%<tool_name>s: Es wurde Experten-Feedback für %<plan_title>s gegeben."
+msgstr "%<tool_name> s: Expertenfeedback wurde bereitgestellt für %<plan_title> S"
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "DMP-Sichtbarkeit geändert: %<plan_title>s"
+msgstr "DMP-Sichtbarkeit geändert: %<plan_title> S"
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: Ein neuer Kommentar wurde zu %<plan_title>s hinzugefügt."
+msgstr "%<tool_name> s: Ein neuer Kommentar wurde zu % hinzugefügt<plan_title> S"
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "Administratorrechte in erteilt %<tool_name>s"
+msgstr "Gewährte Administratorrechte in %<tool_name> S"
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "%<tool_name>s API-Änderungen"
+msgstr "%<tool_name> s-API-Änderungen"
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Phase"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Abschnitt"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Frage"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "Antwort"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Angepasst von:"
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Erzeuger:"
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr "%<authors> S"
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "%<affiliation>s"
+msgstr "%<affiliation> S"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Vorlage:"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr "%<funder> S"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr "%<template> S"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr "Grant Nummer:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr "%<grant_number> S"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Projekt Zusammenfassung:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr "%<description> S"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Zuletzt bearbeitet:"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr "%<date> S"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Informationen zu Urheberrechten:"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1413,7 +1418,7 @@ msgstr ""
 "             bedeutet nicht, dass der (die) Schöpfer (s) sich mit\n"
 "             Ihr Projekt oder Vorschlag"
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Nicht beantwortet"
 
@@ -1423,7 +1428,7 @@ msgid "can't be blank"
 msgstr "darf nicht leer sein"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "muss eindeutig sein"
 
@@ -1443,41 +1448,40 @@ msgstr "'Fragetext' muss ausgefüllt werden."
 msgid "You must specify at least one role."
 msgstr "Sie müssen mindestens eine Rolle angeben."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "kann nicht leer sein, wenn keine E-Mail bereitgestellt wird"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr "darf nicht leer sein."
+
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr "darf nicht leer sein, wenn keine E-Mail-Adresse angegeben ist."
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "kann nicht leer sein, wenn kein Name angegeben ist"
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr "darf nicht leer sein, wenn kein Name angegeben ist."
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Ausgewählte Option (en)"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Beantwortet von"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Beantwortet bei"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "Details"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
 msgstr "Frage nicht beantwortet."
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "bereits einen Wert zugewiesen"
 
@@ -1485,35 +1489,35 @@ msgstr "bereits einen Wert zugewiesen"
 msgid "Feedback email message"
 msgstr "Feedback-Nachricht"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "muss eines der folgenden Formate sein: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "kann nicht größer als 500KB sein"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organisatorisch"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "öffentlich"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "Test"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "privat"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "muss nach dem Startdatum liegen"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "Hinweise zu"
 
@@ -1521,35 +1525,35 @@ msgstr "Hinweise zu"
 msgid "can't be less than zero"
 msgstr "kann nicht kleiner als Null sein"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "Eine benötigte Einstellung wurde nicht vorgenommen"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "Randwert ist ungültig"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "Rand darf nicht negativ sein"
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr "Unbekannter Rand. Kann nur 'oben', 'unten', 'links' oder 'rechts' sein"
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Ungültige Schriftgröße"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Ungültige Schriftart"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Unbekannte Formatierungseinstellung"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Ungültige maximale Anzahl von Seiten"
 
@@ -1557,85 +1561,87 @@ msgstr "Ungültige maximale Anzahl von Seiten"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Eine alte Vorlage kann nicht zur Bearbeitung wiederhergestellt werden"
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! erfordert ein Organisationsziel"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "Kopie von %<template>s"
+msgstr "Kopie von %<template> S"
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "generate_version! benötigt eine veröffentlichte Vorlage"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "customize! erfordert ein Organisationsziel"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr "customize! benötigt eine Vorlage von einem Forschungsförderer"
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "Sie können keine bereits veröffentlichte Vorlage erneut veröffentlichen."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr "Sie können keine Vorlage ohne Phasen veröffentlichen."
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 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:465
+#: ../../app/models/template.rb:461
 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:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "Die Bedingungen in der Vorlage beziehen sich rückwärts"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
-msgstr "Ein Datenmanagementplan in %<application_name>s wurde für Sie freigegeben"
-
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "muss angemeldet sein"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+msgstr "Ein Datenmanagementplan in %<application_name> s wurde mit Ihnen geteilt"
+
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "muss Zugang zu Leitfäden API haben"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "muss Zugriff auf Pläne api haben"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "sind nicht berechtigt, diesen Plan zu sehen"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr "muss Zugriff auf die Vorlagen-API haben"
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr "Datenmanager"
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr "Projektleiter"
+
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr "Principal Investigator"
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr "Andere"
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1646,7 +1652,7 @@ msgstr ""
 "rn dies für die Interpretation der Daten selbst erforderlich ist) zur erstmali"
 "gen Verwendung und späteren Wiederverwendung."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1654,7 +1660,7 @@ msgstr ""
 "Durchführung eines Forschungs- und Untersuchungsprozesses, gezielte Durchführu"
 "ng der Experimente oder Daten- / Beweiserhebung."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1662,62 +1668,62 @@ msgstr ""
 "Management- und Koordinationsverantwortung für die Planung und Durchführung de"
 "r Forschungstätigkeit."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Ungültiger Zuschusstyp"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "Ungültige Anmeldeinformationen"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Ungültiger Token"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Token abgelaufen"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Fehlender Token"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ": title und die: mbox des Kontakts sind Pflichtfelder"
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ": type und: identifier sind für alle IDs erforderlich"
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ": Name wird für jede: Zugehörigkeit und: Finanzierung benötigt"
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ""
 ": role und entweder der: name oder: email sind für jeden: Contributor erforder"
 "lich"
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ": name ,: funder_id oder: grant_id sind für jede Finanzierung erforderlich"
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ": title ist für jeden: Datensatz erforderlich"
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr "Ungültiger JSON"
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "upgrade_customization! erfordert eine benutzerdefinierte Vorlage"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1727,24 +1733,24 @@ msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "muss nach dem %<date>s erfolgen"
+msgstr "muss nach % sein<date> S"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "Ein Schlüssel \"org\" wird für den Link-Hash erwartet"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Für Links wird ein Hash erwartet"
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "Für den Link-Hash wird ein Schlüssel %<key>s erwartet"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "Der Schlüssel %<key>s hat keinen gültigen Satz von Objektverknüpfungen"
+msgstr "Der Schlüssel %<key> s hat keinen gültigen Satz von Objektverknüpfungen"
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr "Ein Schlüssel %<key> s wird für Links-Hash erwartet"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1752,10 +1758,10 @@ msgstr "Die folgende Antwort kann nicht gespeichert werden"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"da %<name>s die unten aufgeführte Antwort speicherte, während Sie editiert habe"
+"da %{name} die unten aufgeführte Antwort speicherte, während Sie editiert habe"
 "n. Bitte kombinieren Sie Ihre Änderungen und speichern Sie die Antwort erneut."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1783,14 +1789,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Bitte warten Sie, die Standards werden geladen"
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1801,11 +1807,11 @@ msgstr "Bitte warten Sie, die Standards werden geladen"
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1829,8 +1835,8 @@ msgid "Answered"
 msgstr "Beantwortet"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr " von %<user_name>s"
+msgid " by %{user_name}"
+msgstr " von %{user_name}"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1886,12 +1892,13 @@ msgstr "Betreff"
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Sicherheitskontrolle"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Abschicken"
@@ -1907,18 +1914,18 @@ msgstr "Kontaktieren Sie uns"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s wird von %<organisation_name>s bereitgestellt. <br /> Mehr "
-"über uns erfahren Sie auf unserer <a href=\"%<organisation_url>s\" class=\"has-new"
+"%{application_name} wird von %{organisation_name} bereitgestellt. <br /> Mehr "
+"über uns erfahren Sie auf unserer <a href=\"%{organisation_url}\" class=\"has-new"
 "-window-popup-info\" target=\"_blank\">Website <em class=\"sr-only\">(neues Fenster"
-")</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></"
-"a> . Wenn Sie uns wegen %<application_name>s kontaktieren möchten, füllen Sie b"
+")</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></"
+"a> . Wenn Sie uns wegen %{application_name} kontaktieren möchten, füllen Sie b"
 "itte das folgende Formular aus."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
@@ -1953,21 +1960,21 @@ msgstr "Wählen Sie jede Rolle aus, die für den Mitwirkenden gilt."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Zugehörigkeit"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "Rollen"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1987,19 +1994,19 @@ msgstr "Rollen"
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2067,14 +2074,14 @@ msgstr "Passwort bestätigen"
 msgid "First name"
 msgstr "Vorname"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Nachname"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2083,8 +2090,8 @@ msgid "Create account"
 msgstr "Registrieren"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "Welcome to %<application_name>s"
+msgid "Welcome to %{application_name}"
+msgstr "Welcome to %{application_name}"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2102,26 +2109,32 @@ msgstr "oder kopieren"
 msgid "into your browser"
 msgstr "in Ihren Browser"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "Abfrage oder Feedback zu %{tool_name}"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Hallo %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Hallo %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Ihr Kollege %<inviter_name>s hat Sie eingeladen, einen Beitrag zu seinem Datenv"
-"erwaltungsplan in %<tool_name>s zu leisten."
+"Ihr Kollege %{inviter_name} hat Sie eingeladen, einen Beitrag zu seinem Datenv"
+"erwaltungsplan in %{tool_name} zu leisten."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%<click_here>s, um die Einladung anzunehmen (oder kopieren Sie %<link>s in Ihren"
+"%{click_here}, um die Einladung anzunehmen (oder kopieren Sie %{link} in Ihren"
 " Browser). Wenn Sie die Einladung nicht annehmen möchten, ignorieren Sie bitte"
 " diese E-Mail."
 
@@ -2141,8 +2154,8 @@ msgstr "Viele Grüße"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "Das %<tool_name>s -Team"
+msgid "The %{tool_name} team"
+msgstr "Das %{tool_name} -Team"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2153,22 +2166,22 @@ msgstr "Bitte antworten Sie nicht auf diese Email."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 "Wenn Sie Fragen haben oder Hilfe benötigen, wenden Sie sich bitte an %{helpdes"
-"k_email} oder gehen Sie auf %<contact_us_url>s."
+"k_email} oder gehen Sie auf %{contact_us_url}."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Hallo %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Hallo %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"Jemand hat einen Link angefordert, um das %<tool_name>s Passwort zu ändern. Sie"
+"Jemand hat einen Link angefordert, um das %{tool_name} Passwort zu ändern. Sie"
 " können dies über den folgenden Link tun."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2182,11 +2195,11 @@ msgstr "Wenn Sie nicht angefordert haben hierzu bitte diese E-Mail ignorieren."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 "Wenn Sie Fragen haben oder Hilfe benötigen, kontaktieren Sie uns bitte unter %"
-"{helpdesk_email} oder besuchen Sie %<contact_us>s"
+"{helpdesk_email} oder besuchen Sie %{contact_us}"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2258,7 +2271,7 @@ msgstr "Dokumentation"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
@@ -2269,13 +2282,13 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Weitere Informationen zur API, die den <a href=\"%<rda_standard_url>s\">allgemein"
+"Weitere Informationen zur API, die den <a href=\"%{rda_standard_url}\">allgemein"
 "en RDA-Metadatenstandard für DMPs</a> unterstützt, finden Sie in der <a href=\""
-"%<api_v1_wiki>s\">Dokumentation</a> <a href=\"%<rda_standard_url>s\">zu Version 1.<"
+"%{api_v1_wiki}\">Dokumentation</a> <a href=\"%{rda_standard_url}\">zu Version 1.<"
 "/a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2453,8 +2466,8 @@ msgid "Sign in or Create account"
 msgstr "Anmelden oder Konto erstellen"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "Hast du einen %<application_name>s-Account?"
+msgid "Do you have a %{application_name} account?"
+msgstr "Hast du einen %{application_name}-Account?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2469,8 +2482,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Dadurch wird Ihr vorhandenes Konto mit Ihren Anmeldeinformationen verknüpft."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "Nein %<application_name>s Konto?"
+msgid "No %{application_name} account?"
+msgstr "Nein %{application_name} Konto?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2538,7 +2551,7 @@ msgstr "Alles zusammenklappen"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Hilfestellungsgruppe"
@@ -2625,7 +2638,7 @@ msgstr ""
 "Hilfestellung hier eingeben; Verweise auf andere Web-Seiten können integriert "
 "werden."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2637,26 +2650,26 @@ msgstr ""
 "ulen / Abteilungen, für die Sie Beratungsgruppen erstellen, in allen Vorlagen "
 "angezeigt, die Fragen mit den entsprechenden Themen-Tags enthalten."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Wählen Sie die Gruppe aus, für die diese Hilfestellung relevant ist."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 "Aktivieren Sie dieses Kontrollkästchen, wenn Sie bereit sind, diese Anleitung "
 "auf den Plänen des Benutzers anzuzeigen."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "Veröffentlicht?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %<application_name>s wurde vom <strong>%<organisation_name>s</strong> entwic"
+"<p> %{application_name} wurde vom <strong>%{organisation_name}</strong> entwic"
 "kelt, um Sie beim Erstellen vonDatenmanagementplänen zu unterstützen. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2842,8 +2855,9 @@ msgid "Logout"
 msgstr "Abmelden"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
-msgstr "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
+msgstr "%{application_name}"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2918,11 +2932,11 @@ msgstr "Wird in einem neuen Fenster geöffnet"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"%<n>s Ergebnisse sind verfügbar. Verwenden Sie die Aufwärts- und Abwärtspfeile,"
+"%{n} Ergebnisse sind verfügbar. Verwenden Sie die Aufwärts- und Abwärtspfeile,"
 " um durch die Vorschläge zu navigieren. Verwenden Sie die Eingabetaste, um ein"
 "en Vorschlag auszuwählen, oder die Escape-Taste, um die Vorschläge zu schließe"
 "n."
@@ -2975,8 +2989,8 @@ msgid "Example answer"
 msgstr "Beispiel Antwort"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr "%<org>s Beispiel-Antwort"
+msgid "%{org} Example Answer"
+msgstr "%{org} Beispiel-Antwort"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3134,10 +3148,10 @@ msgstr "Phase löschen"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Sie sind dabei, die Phase \"%<phase_title>s\" zu löschen. Dadurch werden alle unt"
+"Sie sind dabei, die Phase \"%{phase_title}\" zu löschen. Dadurch werden alle unt"
 "en aufgeführten Abschnitte und Fragen entfernt. Sind Sie sicher?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3196,8 +3210,8 @@ msgid "Write plan"
 msgstr "Schreiben Sie einen Plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "Pläne der/des %<org_name>s "
+msgid "%{org_name} Plans"
+msgstr "Pläne der/des %{org_name} "
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3250,10 +3264,10 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Pläne herunterladen <em class=\"sr-only\">(neues Fenster)</em> <span class=\"new-"
-"window-popup-info\">%<open_in_new_window_text>s</span>"
+"window-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3283,8 +3297,8 @@ msgstr ""
 "diese Formatart hier angeben."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Frage %<number>s:"
+msgid "Question %{number}:"
+msgstr "Frage %{number}:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3352,15 +3366,15 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "Löschen"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
-msgstr "Sie sind dabei, die Frage #%<question_number>s zu löschen. Sind Sie sicher?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgstr "Sie sind dabei, die Frage #%{question_number} zu löschen. Sind Sie sicher?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3460,10 +3474,10 @@ msgstr "Geben Sie einen Titel für den Abschnitt ein"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Sie sind dabei '%<section_title>s' zu entfernen. Das wird Auswirkungen auf die "
+"Sie sind dabei '%{section_title}' zu entfernen. Das wird Auswirkungen auf die "
 "Fragen haben, die mit diesem Abschnitt verbunden sind. Sind Sie sicher?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3494,8 +3508,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "nur für interne Nutzung bei %<org_name>s "
+msgid "for internal %{org_name} use only"
+msgstr "nur für interne Nutzung bei %{org_name} "
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3665,28 +3679,32 @@ msgstr ""
 "keine Finanzvorlagen gelten. Wenn Sie Fragen zu Vorlagevorlagen hinzufügen möc"
 "hten, verwenden Sie die Optionen \"Vorlage anpassen\" unten."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "Vorlagen der/des %{org_name} "
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Anpassbare Vorlagen"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Alle (%<count>s)"
+msgid "All (%{count})"
+msgstr "Alle (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "Veröffentlicht (%<count>s)"
+msgid "Published (%{count})"
+msgstr "Veröffentlicht (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "Unveröffentlicht (%<count>s)"
+msgid "Unpublished (%{count})"
+msgstr "Unveröffentlicht (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "Nicht angepasst (%<count>s)"
+msgid "Not customised (%{count})"
+msgstr "Nicht angepasst (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3695,8 +3713,8 @@ msgstr "Vorlage erstellen"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "Profil für %<username>s bearbeiten"
+msgid "Editing profile for %{username}"
+msgstr "Profil für %{username} bearbeiten"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3704,8 +3722,8 @@ msgid "View all users"
 msgstr "Alle Benutzer anzeigen"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "Pläne von %<username>s"
+msgid "Plans of %{username}"
+msgstr "Pläne von %{username}"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3767,10 +3785,10 @@ msgstr "Organisationen zusammenführen"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 "Bitte wählen Sie die Organisation aus, die die aktuelle Organisation ersetzen "
-"soll: ' <strong>%<org_name>s</strong> '."
+"soll: ' <strong>%{org_name}</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3947,21 +3965,21 @@ msgid "Last Accessed"
 msgstr "Zuletzt aufgerufen"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Nie"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Sie sind dabei, '%<client_name>s' zu löschen. Sie können nicht mehr auf die API"
+"Sie sind dabei, '%{client_name}' zu löschen. Sie können nicht mehr auf die API"
 " zugreifen. Bist du sicher?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
-msgstr "Du bist dabei '%<contributor_name>s' zu löschen. Bist du sicher?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgstr "Du bist dabei '%{contributor_name}' zu löschen. Bist du sicher?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3974,10 +3992,10 @@ msgstr "Namenskürzel oder Code"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Sie möchten '%<department_name>s' löschen. Dies wirkt sich auf die Erläuterunge"
+"Sie möchten '%{department_name}' löschen. Dies wirkt sich auf die Erläuterunge"
 "n aus. Sind Sie sicher?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -4018,15 +4036,15 @@ msgstr "Veröffentlichen"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Sie sind dabei '%<guidance_group_name>s' zu löschen. Das wird Auswirkungen auf "
+"Sie sind dabei '%{guidance_group_name}' zu löschen. Das wird Auswirkungen auf "
 "die Hilfetexte haben. Sind Sie sicher?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
-msgstr "Sie sind dabei, '%<guidance_summary>s' zu löschen. Sind Sie sicher?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgstr "Sie sind dabei, '%{guidance_summary}' zu löschen. Sind Sie sicher?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4062,8 +4080,23 @@ msgid "Managed"
 msgstr "Gelang es"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
-msgstr "Sie sind dabei, '%<org_name>s' zu löschen. Sind Sie sicher?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr "Sie sind dabei, '%{org_name}' zu löschen. Sind Sie sicher?"
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Projekttitel"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Test"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4094,25 +4127,10 @@ msgstr ""
 " Monatsabkürzung und ein vierstelliges Jahr in das Suchfeld oben ein. <br> Zum"
 " Beispiel: 'Okt 2019' oder 'Jun 2013'."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Projekttitel"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "Erstellt"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Test"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4232,10 +4250,10 @@ msgstr "Änderungen veröffentlichen"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Sind Sie sicher, dass Sie Ihre Anpassung von \"%<template_title>s\" entfernen möc"
+"Sind Sie sicher, dass Sie Ihre Anpassung von \"%{template_title}\" entfernen möc"
 "hten? Alle veröffentlichten Versionen sind für Benutzer nicht mehr verfügbar."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4252,10 +4270,10 @@ msgstr "Anzeigen von Anpassungen"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Möchten Sie \"%<template_title>s\" wirklich entfernen? Alle veröffentlichten Vers"
+"Möchten Sie \"%{template_title}\" wirklich entfernen? Alle veröffentlichten Vers"
 "ionen sind für Benutzer nicht mehr verfügbar."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4421,22 +4439,22 @@ msgstr "Rechts"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Download Plan <em class=\"sr-only\">(neues Fenster)</em> <span class=\"new-window"
-"-popup-info\">%<open_in_new_window_text>s</span>"
+"-popup-info\">%{open_in_new_window_text}</span>"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr "Wählen Sie Führung"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %<application_name>s "
+"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %{application_name} "
 "Anleitungen von verschiedenen Organisationen geben."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4457,11 +4475,11 @@ msgstr "Für diese Vorlage gibt gibt es keine spezifischen Anleitungen ."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %<application_name>s "
+"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %{application_name} "
 "Anleitungen von verschiedenen Organisationen geben. Bitte wählen Sie bis zu 6 "
 "Organisationen der folgenden Organisationen aus, die für Ihren Plan relevante "
 "Leitlinien anbieten."
@@ -4490,17 +4508,17 @@ msgstr "Schreiben Sie einen Plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
-msgstr "Dieser Plan basiert auf der Vorlage [%<template_title>s] von %<org_name>s."
+msgstr "Dieser Plan basiert auf der Vorlage [%{template_title}] von %{org_name}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
-msgstr "Vorlagen-Version %<template_version>s, veröffentlicht am %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
+msgstr "Vorlagen-Version %{template_version}, veröffentlicht am %{published_date}"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4518,13 +4536,13 @@ msgstr[1] "Fragen"
 msgid "answered"
 msgstr "Beantwortet"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 "Falls Sie einen Förderantrag stellen, geben Sie bitte den Namen exakt genau so"
 " an, wie im Förderantrag."
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4532,49 +4550,94 @@ msgstr ""
 "Fassen Sie Ihr Forschungsprojekt kurz zusammen, um anderen zu helfen, die Zwec"
 "ke zu verstehen, für die die Daten gesammelt oder erstellt werden."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr "Eine relevante ID, wie vom Geldgeber und / oder der Organisation vergeben."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+"Ob es potenzielle ethische Probleme im Zusammenhang mit den in diesem DMP besc"
+"hriebenen Daten gibt"
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr "Beschreibung der ethischen Probleme"
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr "Link zu einem Protokoll eines Treffens mit einer Ethikkommission"
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr "Testprojekt für Test-, Übungs- oder Bildungszwecke"
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Projekt Zusammenfassung"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr "Forschungsdomäne"
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr "- Bitte wählen Sie eine aus -"
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Projektstart"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "Das voraussichtliche Datum, an dem Sie mit diesem Projekt beginnen."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Projektende"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "Das voraussichtliche Datum, an dem Sie dieses Projekt abschließen werden."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "Zielseite"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "ID"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr "Forschungsergebnisse können ethische Bedenken haben"
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr "Beschreiben Sie alle ethischen Bedenken"
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr "Ethische Protokolle"
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr "Finanzierungsstatus"
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr "Bewilligungsnummer / URL"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr "Fördernummer:"
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4614,11 +4677,11 @@ msgstr "Plansicht festlegen"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Öffentliche oder organisatorische Sichtbarkeit ist für fertige Pläne vorgesehe"
-"n. Sie müssen mindestens %<percentage>s %% der Fragen beantworten, um diese Opt"
+"n. Sie müssen mindestens %{percentage} %% der Fragen beantworten, um diese Opt"
 "ionen zu aktivieren. Hinweis: Testpläne sind standardmäßig auf private Sichtba"
 "rkeit eingestellt."
 
@@ -4709,8 +4772,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Klicken Sie auf die Schaltfläche \"Plan erstellen\", um zu beginnen."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "%<org_title>s Pläne"
+msgid "%{org_title} Plans"
+msgstr "%{org_title} Pläne"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4797,11 +4860,11 @@ msgstr "Wir haben mehrere DMP-Vorlagen gefunden, die Ihrem Geldgeber entsprechen
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Öffentliche DMPs sind Pläne, die mit dem Dienst %<application_name>s erstellt u"
+"Öffentliche DMPs sind Pläne, die mit dem Dienst %{application_name} erstellt u"
 "nd öffentlich von ihren Eigentümern freigegeben werden. Sie werden nicht auf Q"
 "ualität, Vollständigkeit oder Einhaltung der Richtlinien überprüft."
 
@@ -4852,8 +4915,8 @@ msgid "terms and conditions"
 msgstr "Geschäftsbedingungen"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "Möchten Sie einen Plan basierend auf der Vorlage \"%<name>s\" erstellen?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Möchten Sie einen Plan basierend auf der Vorlage \"%{name}\" erstellen?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4904,41 +4967,46 @@ msgstr "Entferne den Filter"
 msgid "Filter plans"
 msgstr "Filterung der Pläne"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Frage nicht beantwortet."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
-msgstr "Ein Datenmanagementplan, der mit %<application_name>s erstellt wurde."
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
+msgstr "Ein Datenmanagementplan, der mit %{application_name} erstellt wurde."
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Zugehörigkeit:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr "Geldgeber:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "ORCIDID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr "ICH WÜRDE:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr "Anfangsdatum:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr "Endtermin:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr "Grant-Nummer / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4960,8 +5028,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Beginnen Sie mit der Eingabe, um eine Liste mit Vorschlägen anzuzeigen."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -4971,14 +5039,14 @@ msgstr ""
 "prüfen Sie, ob Ihre Organisation nicht in einer etwas anderen Form in der List"
 "e angezeigt wird."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Der von Ihnen eingegebene Name war keiner der aufgeführten Vorschläge!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "Über %<application_name>s"
+msgid "About %{application_name}"
+msgstr "Über %{application_name}"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5059,10 +5127,10 @@ msgstr "Wir laden Sie ein, das DMPRoadmap GitHub Wiki zu lesen, um zu lernen, wi
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "<span class=\"new-window-popup-info\">mach</span> mit <em class=\"sr-only\">(neues"
-" Fenster)</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s<"
+" Fenster)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}<"
 "/span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -5084,8 +5152,8 @@ msgstr ""
 "ng oder Bearbeitung Ihres DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "Wenn Sie kein %<application_name>s Konto haben, klicken Sie auf"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "Wenn Sie kein %{application_name} Konto haben, klicken Sie auf"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5124,14 +5192,14 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"Wenn Sie sich bei DMPRoadmap anmelden, werden Sie auf die Seite \"My Dashboard\""
-" geleitet. Von hier aus können Sie Ihre Pläne bearbeiten, teilen, herunterlade"
-"n, kopieren oder löschen. Sie sehen auch Pläne, die von anderen geteilt wurden"
-"."
+"Wenn Sie sich bei %{application_name} anmelden, werden Sie zur Seite „Mein Das"
+"hboard“ weitergeleitet. Von hier aus können Sie Ihre Pläne bearbeiten, teilen,"
+" herunterladen, kopieren oder entfernen. Sie sehen auch Pläne, die von anderen"
+" mit Ihnen geteilt wurden."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5292,14 +5360,14 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
-"Von hier aus können Sie Ihren Plan in verschiedenen Formaten herunterladen. Di"
-"es kann nützlich sein, wenn Sie Ihren Plan als Teil eines Zuschussantrags einr"
-"eichen müssen. Wählen Sie, in welchem ​​Format Sie Ihren Plan anzeigen / herun"
-"terladen möchten, und klicken Sie auf Herunterladen. Sie können auch die Forma"
-"tierung (Schriftart, Größe und Ränder) für PDF-Dateien anpassen, was hilfreich"
-" sein kann, wenn Sie mit Seitenlimits arbeiten. </p>"
+"Hier können Sie Ihren Plan in verschiedenen Formaten herunterladen. Dies kann "
+"nützlich sein, wenn Sie Ihren Plan als Teil eines Förderantrags einreichen müs"
+"sen. Wählen Sie das Format aus, in dem Sie Ihren Plan anzeigen/herunterladen m"
+"öchten, und klicken Sie zum Herunterladen. Sie können auch die Formatierung (S"
+"chriftart, Größe und Ränder) für PDF-Dateien anpassen, was hilfreich sein kann"
+", wenn Sie mit Seitenbegrenzungen arbeiten."
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5307,48 +5375,48 @@ msgstr "Informationen über Sie: Wie wir es nutzen und mit wem wir es teilen"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"Die von Ihnen angegebenen Informationen werden von %<org_name>s verwendet, um I"
-"hnen den Zugriff auf und die Personalisierung des %<application_name>s -Dienste"
+"Die von Ihnen angegebenen Informationen werden von %{org_name} verwendet, um I"
+"hnen den Zugriff auf und die Personalisierung des %{application_name} -Dienste"
 "s zu ermöglichen."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"Die %<org_name>s verarbeitet die persönlichen Daten von %<application_name>s Ben"
-"utzern, um den %<application_name>s Dienst in angepasster Weise bereitzustellen"
+"Die %{org_name} verarbeitet die persönlichen Daten von %{application_name} Ben"
+"utzern, um den %{application_name} Dienst in angepasster Weise bereitzustellen"
 " und zu verbessern und sicherzustellen, dass jeder Benutzer relevante Informat"
 "ionen erhält."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Die Verarbeitung Ihrer personenbezogenen Daten durch die %<org_name>s ist notwe"
+"Die Verarbeitung Ihrer personenbezogenen Daten durch die %{org_name} ist notwe"
 "ndig, um die folgenden legitimen Interessen zu verfolgen:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Um Zugriff auf den Service %<application_name>s und die Personalisierung Ihrer "
+"Um Zugriff auf den Service %{application_name} und die Personalisierung Ihrer "
 "Benutzererfahrung zu ermöglichen, z. Bereitstellung von relevanten Vorlagen un"
 "d Anleitungen für Ihre Organisation."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Um Sie über Neuigkeiten zu %<application_name>s auf dem Laufenden zu halten, wi"
+"Um Sie über Neuigkeiten zu %{application_name} auf dem Laufenden zu halten, wi"
 "e z. B. neue Funktionen oder Verbesserungen oder Änderungen unserer Datenschut"
 "zrichtlinie."
 
@@ -5359,29 +5427,29 @@ msgstr "Für Netzwerk- und Informationssicherheitszwecke."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 "Wir speichern die personenbezogenen Daten, die Sie uns zur Verfügung gestellt "
-"haben, solange Sie den Service %<application_name>s weiterhin nutzen. Ihre pers"
+"haben, solange Sie den Service %{application_name} weiterhin nutzen. Ihre pers"
 "önlichen Daten können innerhalb von 30 Tagen auf Anfrage vom %{application_nam"
 "e} -Team von diesem Service entfernt werden."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
-"Wenn Sie Fragen haben, wenden Sie sich bitte an das %<application_name>s Team u"
-"nter: <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"Wenn Sie Fragen haben, wenden Sie sich bitte an das %{application_name} Team u"
+"nter: <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Diese Erklärung wurde zuletzt am %<revdate>s überarbeitet und kann jederzeit mi"
+"Diese Erklärung wurde zuletzt am %{revdate} überarbeitet und kann jederzeit mi"
 "t vorheriger Ankündigung geändert werden."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5396,31 +5464,28 @@ msgstr ""
 "liche Community. Wir bieten Dienstleistungen für den britischen, US-amerikanis"
 "chen und internationalen Hochschulsektor an."
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMMPoadmap"
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"DMPRoadmap (\"das Tool\", \"das System\") ist ein Tool, das von DCC und CDL als ge"
-"meinsame Ressource für die Forschungsgemeinschaft entwickelt wurde. Es wird be"
-"i CDL von der University of California Curation Center gehostet."
+"%{application_name} („das Tool“, „das System“) ist ein Tool, das von DCC und C"
+"DL als gemeinsame Ressource für die Forschungsgemeinschaft entwickelt wurde. E"
+"s wird vom University of California Curation Center am CDL gehostet."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5451,11 +5516,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5470,79 +5536,79 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3> Ihre persönlichen Daten und Einverständniserklärung </h3><p> Um Ihr Konto"
-" mit DMPRoadmap identifizieren und verwalten zu können, müssen wir Ihren Namen"
-" und Ihre E-Mail-Adresse speichern. Wir können es auch verwenden, um Sie zu ko"
-"ntaktieren, um Feedback zu Ihrer Verwendung des Tools zu erhalten oder um Sie "
-"über die neuesten Entwicklungen oder Releases zu informieren. Die Informatione"
-"n dürfen zwischen DCC und CDL übertragen werden, jedoch nur für die folgenden "
-"legitimen DCC- und CDL-Zwecke: Marketing, Verbesserung unserer Dienste und Inf"
-"ormation über relevante Inhalte und Ereignisse. Wir werden keine persönlichen "
-"Daten verkaufen, vermieten oder handeln, die Sie uns zur Verfügung stellen. Du"
-"rch die Nutzung dieses Systems stimmen Sie der Erfassung, Speicherung und Verw"
-"endung Ihrer persönlichen Daten gemäß den vorstehenden Bestimmungen zu. Sie ha"
-"ben das Recht, uns zu bitten, Ihre persönlichen Daten nicht für Marketingzweck"
-"e zu verarbeiten. </p><h3> Datenschutz-Bestimmungen </h3><p> Die Informationen"
-", die Sie in dieses System eingeben, können von Ihnen, Personen, für die Sie d"
-"en Zugriff freigegeben haben, und - ausschließlich zum Zwecke der Wartung des "
-"Dienstes - Systemadministratoren bei DCC und CDL angezeigt werden. Wir stellen"
-" anonymisierte, automatisierte und aggregierte Informationen aus Plänen zusamm"
-"en, werden jedoch ohne Ihre Erlaubnis nicht direkt auf Ihre Inhalte zugreifen,"
-" diese nutzen oder mit anderen teilen. Autorisierte Mitarbeiter Ihrer Heimorga"
-"nisation können für bestimmte Zwecke auf Ihre Pläne zugreifen, z. B. um die Ei"
-"nhaltung der Anforderungen des Geldgebers / der Organisation zu verfolgen, die"
-" Speicheranforderungen zu berechnen oder die Nachfrage nach Datenverwaltungsdi"
-"ensten in verschiedenen Disziplinen zu bewerten. </p><h3> Informationsfreiheit"
-" </h3><p> DCC und CDL halten Ihre Pläne in Ihrem Namen, aber sie sind Ihr Eige"
-"ntum und Ihre Verantwortung. Alle FOIA-Antragsteller werden an Ihre Heimatorga"
-"nisation zurücküberwiesen. </p><h3> Passwörter </h3><p> Ihr Passwort wird vers"
-"chlüsselt gespeichert und kann nicht abgerufen werden. Wenn es vergessen wird,"
-" muss es zurückgesetzt werden. </p><h3> Kekse </h3><p> Bitte beachten Sie, das"
-"s DMPRoadmap Cookies verwendet. Weitere Informationen zu Cookies und deren Ver"
-"wendung finden Sie auf der <a target='_blank' href='http://www.dcc.ac.uk/about"
-"-us/about-site/website-terms-use/cookies' class=\"has-new-window-popup-info\">Ha"
-"upt-DCC-Website <em class=\"sr-only\">(neues Fenster)</em> <span class=\"new-wind"
-"ow-popup-info\">%<open_in_new_window_text>s</span></a> . </p><h3> APIs von Dritt"
-"anbietern </h3><p> Bestimmte Funktionen auf dieser Website verwenden Dienste u"
-"nd APIs von Drittanbietern wie InCommon / Shibboleth oder das Hosting gängiger"
-" JavaScript-Bibliotheken oder Web-Schriftarten durch Drittanbieter. Informatio"
-"nen, die von einem externen Dienst verwendet werden, unterliegen den Datenschu"
-"tzbestimmungen dieses Dienstes. </p><h3> Überarbeitungen </h3><p> Diese Erklär"
-"ung wurde zuletzt am 5. Oktober 2017 überarbeitet und kann jederzeit überarbei"
-"tet werden. Die Verwendung des Tools bedeutet, dass Sie diese Allgemeinen Gesc"
-"häftsbedingungen verstehen und ihnen zustimmen. </p>"
-
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+"<h3>Ihre persönlichen Daten und Einwilligungserklärung</h3><p> Um Ihr Konto be"
+"i %{application_name} identifizieren und verwalten zu können, müssen wir Ihren"
+" Namen und Ihre E-Mail-Adresse speichern. Wir können es auch verwenden, um Sie"
+" zu kontaktieren, um Feedback zu Ihrer Nutzung des Tools zu erhalten oder um S"
+"ie über die neuesten Entwicklungen oder Veröffentlichungen zu informieren. Die"
+" Informationen können zwischen DCC und CDL übertragen werden, jedoch nur für d"
+"ie folgenden legitimen DCC- und CDL-Zwecke: Marketing, Verbesserung unserer Di"
+"enste und Benachrichtigung über relevante Inhalte und Ereignisse. Wir werden k"
+"eine personenbezogenen Daten, die Sie uns zur Verfügung stellen, verkaufen, ve"
+"rmieten oder damit handeln. Durch die Nutzung dieses Systems stimmen Sie der E"
+"rfassung, Speicherung und Nutzung Ihrer personenbezogenen Daten gemäß dem oben"
+" Gesagten zu. Sie haben das Recht, uns aufzufordern, Ihre personenbezogenen Da"
+"ten nicht für Marketingzwecke zu verarbeiten.</p><h3> Datenschutz-Bestimmungen"
+"</h3><p> Die Informationen, die Sie in dieses System eingeben, können von Ihne"
+"n, Personen, mit denen Sie den Zugriff teilen möchten, und – ausschließlich zu"
+"m Zweck der Wartung des Dienstes – Systemadministratoren bei DCC und CDL geseh"
+"en werden. Wir stellen anonymisierte, automatisierte und aggregierte Informati"
+"onen aus Plänen zusammen, aber wir werden ohne Ihre Erlaubnis nicht direkt auf"
+" Ihre Inhalte zugreifen, sie verwenden oder mit anderen teilen. Bevollmächtigt"
+"e Ihrer Heimatorganisation können für bestimmte Zwecke auf Ihre Pläne zugreife"
+"n – zum Beispiel, um die Einhaltung von Anforderungen des Geldgebers/der Organ"
+"isation nachzuverfolgen, Speicheranforderungen zu berechnen oder die Nachfrage"
+" nach Datenverwaltungsdiensten in allen Disziplinen zu bewerten.</p><h3> Infor"
+"mationsfreiheit</h3><p> DCC und CDL halten Ihre Pläne in Ihrem Namen, aber sie"
+" sind Ihr Eigentum und Ihre Verantwortung. Alle FOIA-Antragsteller werden an I"
+"hre Heimatorganisation zurückverwiesen.</p><h3> Passwörter</h3><p> Ihr Passwor"
+"t wird verschlüsselt gespeichert und kann nicht abgerufen werden. Wenn es verg"
+"essen wird, muss es zurückgesetzt werden.</p><h3> Kekse</h3><p> Bitte beachten"
+" Sie, dass %{application_name} Cookies verwendet. Weitere Informationen über C"
+"ookies und wie wir sie verwenden, finden Sie auf der <a target='_blank' href='"
+"http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has"
+"-new-window-popup-info\">Haupt-DCC-Website <em class=\"sr-only\">(neues Fenster)<"
+"/em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>"
+" .</p><h3> APIs von Drittanbietern</h3><p> Bestimmte Funktionen auf dieser Web"
+"site nutzen Dienste und APIs von Drittanbietern wie InCommon/Shibboleth oder D"
+"rittanbieter-Hosting gängiger JavaScript-Bibliotheken oder Webfonts. Informati"
+"onen, die von einem externen Dienst verwendet werden, unterliegen der Datensch"
+"utzrichtlinie dieses Dienstes.</p><h3> Revisionen</h3><p> Diese Erklärung wurd"
+"e zuletzt am 5. Oktober 2017 überarbeitet und kann jederzeit geändert werden. "
+"Die Nutzung des Tools bedeutet, dass Sie diese Bedingungen verstehen und ihnen"
+" zustimmen.</p>"
+
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Kontaktname"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "Kontakt E-mail"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr "Kunden ID"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr "Kundengeheimnis"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Letzter Zugriff am"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "Aktualisieren Sie die Client-ID und das Geheimnis"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "E-Mail-Anmeldeinformationen zu kontaktieren"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr "Möchten Sie den API-Client wirklich löschen: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr "Möchten Sie den API-Client wirklich löschen: \"%{name}\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5558,8 +5624,8 @@ msgid "View all API clients"
 msgstr "Alle API-Clients anzeigen"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "Die Anmeldeinformationen wurden an %<email>s gesendet."
+msgid "The credentials have been sent to %{email}."
+msgstr "Die Anmeldeinformationen wurden an %{email} gesendet."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5606,9 +5672,9 @@ msgstr "Kann verworfen werden"
 msgid "Body"
 msgstr "Körper"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "Möchten Sie die Benachrichtigung \"%<title>s\" wirklich löschen?"
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "Möchten Sie die Benachrichtigung \"%{title}\" wirklich löschen?"
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5633,8 +5699,8 @@ msgid "New Notification"
 msgstr "Neue Benachrichtigung"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
-msgstr "Zusammenführen von '%<from_org_name>s' in '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgstr "Zusammenführen von '%{from_org_name}' in '%{to_org_name}'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5642,11 +5708,11 @@ msgstr "Zusammenfassung:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Anzahl der '%<to_org_name>s'-Datensätze vor und nach einer Zusammenführung mit "
-"%<from_org_name>s."
+"Anzahl der '%{to_org_name}'-Datensätze vor und nach einer Zusammenführung mit "
+"%{from_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:44
@@ -5654,12 +5720,12 @@ msgid "Record Type"
 msgstr "Aufnahmetyp"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
-msgstr "'%<to_org_name>s' Anzahl - vor der Zusammenführung"
+msgid "'%{to_org_name}' Count - before merge"
+msgstr "'%{to_org_name}' Anzahl - vor der Zusammenführung"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
-msgstr "'%<to_org_name>s' Anzahl - nach der Zusammenführung"
+msgid "'%{to_org_name}' Count - after merge"
+msgstr "'%{to_org_name}' Anzahl - nach der Zusammenführung"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5668,23 +5734,23 @@ msgstr "Details:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Die folgende Tabelle zeigt die spezifischen Änderungen, die während des Zusamm"
 "enführungsprozesses auftreten. Sobald die Zusammenführung abgeschlossen ist, w"
-"ird '%<from_org_name>s' gelöscht. Sie können dann alle Zusammenführungsprobleme"
+"ird '%{from_org_name}' gelöscht. Sie können dann alle Zusammenführungsprobleme"
 " konsolidieren/korrigieren (z. B. alle Abteilungen entfernen, die dupliziert w"
 "urden)."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
-msgstr "%<from_org_name>s - Vorher"
+msgid "%{from_org_name} - Before"
+msgstr "%{from_org_name} - Vorher"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
-msgstr "%<to_org_name>s - Vorher"
+msgid "%{to_org_name} - Before"
+msgstr "%{to_org_name} - Vorher"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5696,7 +5762,7 @@ msgid ""
 "name}' will then be deleted."
 msgstr ""
 "Warnung: Die oben vorgeschlagenen Änderungen werden in die Datenbank übernomme"
-"n. '%<org_name>s' wird dann gelöscht."
+"n. '%{org_name}' wird dann gelöscht."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
 msgid "These changes cannot be undone! Do not proceed unless you are certain."
@@ -5714,10 +5780,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Warnung: '%<from_org_name>s' hat Pläne, die sich derzeit im Überprüfungsprozess"
+"Warnung: '%{from_org_name}' hat Pläne, die sich derzeit im Überprüfungsprozess"
 " befinden. Die Organisationsadministratoren können diese Pläne nach der Zusamm"
 "enführung möglicherweise nicht sehen!"
 
@@ -5742,8 +5808,8 @@ msgid "New organisation"
 msgstr "Neue Organisation"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "Möchtest du das Thema \"%<title>s\" wirklich löschen?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "Möchtest du das Thema \"%{title}\" wirklich löschen?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5772,11 +5838,11 @@ msgstr "Archivieren"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Sie sind dabei, %<user_name>s zu archivieren. Dadurch werden ihre persönlichen "
+"Sie sind dabei, %{user_name} zu archivieren. Dadurch werden ihre persönlichen "
 "Daten entfernt, ihre Pläne, Antworten und Kommentare bleiben jedoch erhalten. "
 "Sie können sich nicht anmelden. Bist du sicher?"
 
@@ -5880,101 +5946,100 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr "Sie können Ihre Benachrichtigungseinstellungen auf Ihrer Profilseite ändern."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Hallo %<username>s"
+msgid "Hello %{username}"
+msgstr "Hallo %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
-msgstr "Ihnen wurden Administratorrechte in %<tool_name>s erteilt:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
+msgstr "Ihnen wurden Administratorrechte in %{tool_name} erteilt:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
-msgstr "Ihnen wurden Administratorrechte in %<tool_name>s entzogen."
+msgid "You have been revoked administrator privileges in %{tool_name}."
+msgstr "Ihnen wurden Administratorrechte in %{tool_name} entzogen."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
-"Weitere Informationen zum Verwalten von %<tool_name>s für Benutzer in Ihrer Org"
-"anisation finden Sie unter %<help_url>s."
+"Weitere Informationen zum Verwalten von %{tool_name} für Benutzer in Ihrer Org"
+"anisation finden Sie unter %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Hallo %<name>s,"
+msgid "Hello %{name},"
+msgstr "Hallo %{name},"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
 msgstr ""
 "Bitte verwenden Sie die folgenden Anmeldeinformationen, wenn Sie auf die %{too"
 "l_name} -API zugreifen."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
 msgstr ""
 "Weitere Informationen finden Sie in der API-Dokumentation unter: %{api_documen"
 "tation_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 "Teilen Sie diese Anmeldeinformationen nicht. Sie zur Verwendung mit der Anwend"
-"ung %<external_application>s. Wenn Sie Ihre Anmeldeinformationen mit einer ande"
+"ung %{external_application}. Wenn Sie Ihre Anmeldeinformationen mit einer ande"
 "ren Anwendung teilen, behalten wir uns das Recht vor, Ihren Zugriff auf die AP"
 "I zu widerrufen."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"Wenn Sie keinen Zugriff auf die %<tool_name>s -API angefordert oder die Erneuer"
+"Wenn Sie keinen Zugriff auf die %{tool_name} -API angefordert oder die Erneuer"
 "ung Ihrer Anmeldeinformationen nicht beantragt haben, kontaktieren Sie uns bit"
-"te unter %<helpdesk_email>s."
+"te unter %{helpdesk_email}."
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Hallo %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Hallo %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s hat die Rückmeldung zum Plan \"%<link_html>s\" abgeschlossen. Die Ko"
+"%{commenter} hat die Rückmeldung zum Plan \"%{link_html}\" abgeschlossen. Die Ko"
 "mmentare finden Sie im Tab \"Plan schreiben\" auf der rechten Seite (Anleitung /"
 " Kommentare)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Hallo %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Hallo %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s hat Feedback zu einem Plan angefordert %<link_html>s. Um Kommentar"
+"%{requestor} hat Feedback zu einem Plan angefordert %{link_html}. Um Kommentar"
 "e hinzuzufügen, besuchen Sie die Seite \"Pläne\" unter dem Menü \"Admin\" in %{too"
 "l_name} und öffnen Sie den Plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s hat Ihren Plan %<plan_title>s kommentiert. Um die Kommentare "
+"%{commenter_name} hat Ihren Plan %{plan_title} kommentiert. Um die Kommentare "
 "anzuzeigen, folgen Sie dem untenstehenden Link zum DMP oder navigieren Sie übe"
-"r die Seite Mein Dashboard in %<tool_name>s zum Plan."
+"r die Seite Mein Dashboard in %{tool_name} zum Plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5991,24 +6056,28 @@ msgstr ""
 "terungen zu jeder Frage sehen."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "DMP: %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Abschnittsname: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Abschnittsname: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Frage: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Frage: %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr "Hallo %{recepientname}"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"Ihre Berechtigungen für %<plan_title>s haben sich geändert. Sie haben jetzt %{t"
-"ype} Zugriff. Dies bedeutet, dass Sie %<placeholder1>s %<placeholder2>s"
+"Ihre Berechtigungen für %{plan_title} haben sich geändert. Sie haben jetzt %{t"
+"ype} Zugriff. Dies bedeutet, dass Sie %{placeholder1} %{placeholder2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -6023,8 +6092,8 @@ msgid " has been removed by "
 msgstr " wurde entfernt von"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "Der Plan %<plan_title>s wurde in %<plan_visibility>s geändert."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "Der Plan %{plan_title} wurde in %{plan_visibility} geändert."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -6041,14 +6110,14 @@ msgstr "Öffentlich: Jeder kann im Internet sehen"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 "Wenn Sie Fragen zu dieser Aktion haben, besuchen Sie bitte die My Dashboard-Se"
-"ite in %<tool_name>s"
+"ite in %{tool_name}"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Hallo %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
+msgstr "Hallo %{recipient_name},"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6068,35 +6137,33 @@ msgstr " basierend auf der Vorlage"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"
-"          their Data Management Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"          their Data Management Plan in %{tool_name}"
 msgstr ""
-"Ihr Kollege %<inviter_name>s hat Sie eingeladen, einen Beitrag zu leisten
-\n"
-"          ihren Datenverwaltungsplan in %<tool_name>s"
+"Ihr Kollege %{inviter_name} hat Sie eingeladen, einen Beitrag zu leisten
\n"
+"          ihren Datenverwaltungsplan in %{tool_name}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:2
-msgid "Welcome to %<tool_name>s, %<username>s"
-msgstr "Willkommen bei %<tool_name>s, %<username>s"
+msgid "Welcome to %{tool_name}, %{username}"
+msgstr "Willkommen bei %{tool_name}, %{username}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%<tool_name>s will help you to develop your Data Management Plan. If you have a"
+"%{tool_name} will help you to develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"ail} or visit %<contact_us>s"
+"ail} or visit %{contact_us}"
 msgstr ""
-"%<tool_name>s hilft Ihnen bei der Entwicklung Ihres Datenmanagementplans. Wenn "
+"%{tool_name} hilft Ihnen bei der Entwicklung Ihres Datenmanagementplans. Wenn "
 "Sie zum Verwenden des Tools Fragen haben oder Feedback geben möchten, kontakti"
-"eren Sie uns bitte über %<helpdesk_email>s oder gehen Sie auf %<contact_us>s."
+"eren Sie uns bitte über %{helpdesk_email} oder gehen Sie auf %{contact_us}."
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Sie können Ihre Benachrichtigungseinstellungen auf Ihrer Profilseite ändern."
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:9
-msgid "Editing privileges for %<username>s"
-msgstr "Bearbeitungsrechte für %<username>s"
+msgid "Editing privileges for %{username}"
+msgstr "Bearbeitungsrechte für %{username}"
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:19
 msgid ""
diff --git a/config/locale/en_CA/LC_MESSAGES/app.mo b/config/locale/en_CA/LC_MESSAGES/app.mo
index b3f8a5b1c799aa55d169bbfbc55be62fa4810755..0f011e8dbc47054e9bbb64ff386fecb31f2c5432 100644
GIT binary patch
delta 47
ucmeyy@{MJKJR`4>u7Q!Rp@D*dg_WtnWF1Cn0l0`IP(<6naC11LJR<-Ug$iK+

delta 47
ucmeyy@{MJKJR`56uAzahfuVw-p_QTKWF1Cn0l0`UP(<6nXmdEDJR<-T*9u(#

diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po
index 1a5e29f726..0d16b746b4 100644
--- a/config/locale/en_CA/app.po
+++ b/config/locale/en_CA/app.po
@@ -1,14 +1,14 @@
 # English translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en_CA\n"
@@ -18,25 +18,25 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr ""
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr ""
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr ""
 
@@ -44,28 +44,28 @@ msgstr ""
 msgid "Bad Parameters"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Month"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr ""
 
@@ -78,137 +78,141 @@ msgstr ""
 msgid "completed_plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr ""
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr ""
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
 msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr ""
 
@@ -216,28 +220,28 @@ msgstr ""
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -251,60 +255,60 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr ""
 
@@ -316,93 +320,93 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
@@ -410,8 +414,8 @@ msgstr ""
 msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -421,70 +425,72 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -495,63 +501,66 @@ msgstr ""
 msgid "Organisation"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr ""
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr ""
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr ""
@@ -560,100 +569,102 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
+#: ../../app/controllers/orgs_controller.rb:127
+msgid "Please choose an organisation"
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:142
-msgid "Please choose an organisation"
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
 msgstr ""
 
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
+#: ../../app/controllers/plans_controller.rb:84
+msgid "My Plan (%<title>s)"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
@@ -661,115 +672,119 @@ msgid ""
 "                       institutional credentials."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
 "                You must enter a unique email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr ""
 
@@ -787,11 +802,11 @@ msgid ""
 "ou will now be able to sign in with them."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
@@ -799,71 +814,71 @@ msgstr ""
 msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr ""
 
@@ -873,39 +888,39 @@ msgid ""
 "itation."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr ""
 
@@ -922,12 +937,12 @@ msgid ""
 "ot to duplicate too much text."
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
 msgstr ""
 
 #: ../../app/helpers/conditions_helper.rb:203
@@ -938,19 +953,15 @@ msgstr ""
 msgid " will <b>remove</b> questions "
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr ""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr ""
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr ""
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr ""
 
@@ -959,7 +970,8 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr ""
@@ -970,8 +982,8 @@ msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
@@ -1052,8 +1064,8 @@ msgid "Grant API to organisations"
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1096,231 +1108,227 @@ msgstr ""
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1334,7 +1342,7 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr ""
 
@@ -1344,7 +1352,7 @@ msgid "can't be blank"
 msgstr "can't be blank"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr ""
 
@@ -1364,41 +1372,40 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr ""
+
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr ""
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
 msgstr ""
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr ""
 
@@ -1406,35 +1413,35 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr ""
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr ""
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr ""
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr ""
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr ""
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr ""
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr ""
 
@@ -1442,35 +1449,35 @@ msgstr ""
 msgid "can't be less than zero"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr ""
 
@@ -1478,155 +1485,157 @@ msgstr ""
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
 msgstr ""
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr ""
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr ""
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr ""
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
 " the data itself) for initial use and later re-use."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1641,25 +1650,25 @@ msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr ""
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr ""
+
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1688,14 +1697,14 @@ msgid "Please wait, Standards are loading"
 msgstr ""
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1706,11 +1715,11 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1734,7 +1743,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
+msgid " by %{user_name}"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1791,12 +1800,13 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr ""
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr ""
@@ -1812,11 +1822,11 @@ msgstr ""
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1852,21 +1862,21 @@ msgstr ""
 msgid "ORCID"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1886,19 +1896,19 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -1962,14 +1972,14 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -1978,7 +1988,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
+msgid "Welcome to %{application_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -1997,21 +2007,27 @@ msgstr ""
 msgid "into your browser"
 msgstr ""
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr ""
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
+msgid "Hello %{user_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2031,7 +2047,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
+msgid "The %{tool_name} team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2043,17 +2059,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
+msgid "Hello %{user_email}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2068,8 +2084,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2138,15 +2154,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2305,7 +2321,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
+msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2321,7 +2337,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
+msgid "No %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2380,7 +2396,7 @@ msgstr ""
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr ""
@@ -2451,7 +2467,7 @@ msgstr ""
 msgid "Enter your guidance here. You can include links where needed."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2459,21 +2475,21 @@ msgid ""
 "he corresponding theme tags."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2660,7 +2676,8 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2734,7 +2751,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
@@ -2787,7 +2804,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
+msgid "%{org} Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2934,7 +2951,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -2994,7 +3011,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
+msgid "%{org_name} Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3046,7 +3063,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3074,7 +3091,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
+msgid "Question %{number}:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3132,14 +3149,14 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3229,7 +3246,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3255,7 +3272,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
+msgid "for internal %{org_name} use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3407,27 +3424,31 @@ msgid ""
 "s below."
 msgstr ""
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr ""
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
+msgid "All (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
+msgid "Published (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
+msgid "Unpublished (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
+msgid "Not customised (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
@@ -3437,7 +3458,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
+msgid "Editing profile for %{username}"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3446,7 +3467,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
+msgid "Plans of %{username}"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3505,7 +3526,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3674,18 +3695,18 @@ msgid "Last Accessed"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3699,7 +3720,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3741,12 +3762,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3783,7 +3804,22 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3804,25 +3840,10 @@ msgid ""
 " 'Jun 2013'."
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr ""
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr ""
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -3933,7 +3954,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
 
@@ -3951,7 +3972,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4103,17 +4124,17 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
 
@@ -4135,7 +4156,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
@@ -4162,16 +4183,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4190,59 +4211,102 @@ msgstr[1] ""
 msgid "answered"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr ""
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4275,7 +4339,7 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 
@@ -4357,7 +4421,7 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
+msgid "%{org_title} Plans"
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:36
@@ -4429,7 +4493,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4479,7 +4543,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4531,41 +4595,46 @@ msgstr ""
 msgid "Filter plans"
 msgstr ""
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr ""
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4581,21 +4650,21 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
+msgid "About %{application_name}"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4651,7 +4720,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4671,7 +4740,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
+msgid "If you do not have a %{application_name} account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4705,9 +4774,9 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:13
@@ -4827,7 +4896,7 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:10
@@ -4836,33 +4905,33 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4873,20 +4942,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -4898,28 +4967,25 @@ msgid ""
 "or. "
 msgstr ""
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr ""
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -4950,11 +5016,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -4970,36 +5037,36 @@ msgid ""
 " terms and conditions.</p>"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5016,7 +5083,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
+msgid "The credentials have been sent to %{email}."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5060,8 +5127,8 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5087,7 +5154,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5096,7 +5163,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5106,11 +5173,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
+msgid "'%{to_org_name}' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
+msgid "'%{to_org_name}' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5120,17 +5187,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
+msgid "%{from_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
+msgid "%{to_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5155,7 +5222,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5178,7 +5245,7 @@ msgid "New organisation"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5206,7 +5273,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5303,78 +5370,77 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
+msgid "Hello %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
+msgid "Hello %{name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
+msgid "Hello %{recipient_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
+msgid "Hello %{user_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5388,21 +5454,25 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
+msgid "Section name: %{section_title}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr ""
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5418,7 +5488,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5436,11 +5506,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5461,19 +5531,18 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-m%<tool_name>s
+msgid ""
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
+"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5481,7 +5550,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admi%<username>smissions.html.erb:9
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/en_GB/LC_MESSAGES/app.mo b/config/locale/en_GB/LC_MESSAGES/app.mo
index 901223596af3f1935be627c64cfc1e8f0d61b282..feea1ce128f4d4347e1f5367d33a9caf96b968bd 100644
GIT binary patch
delta 47
ucmeyv_lIvo5(}@9u7Q!Rp@D*dg_Wtn<a`!s0l0`IP(<6naPusdM@#@O84MQy

delta 47
ucmeyv_lIvo5(}@PuAzahfuVw-p_QTK<a`!s0l0`UP(<6nX!9(VM@#@NYYY<r

diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po
index eec706a1e5..4dc9e61c46 100644
--- a/config/locale/en_GB/app.po
+++ b/config/locale/en_GB/app.po
@@ -1,14 +1,14 @@
 # English translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en_GB\n"
@@ -18,25 +18,25 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr ""
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr ""
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr ""
 
@@ -44,28 +44,28 @@ msgstr ""
 msgid "Bad Parameters"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Month"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr ""
 
@@ -78,137 +78,141 @@ msgstr ""
 msgid "completed_plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr ""
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr ""
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
 msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr ""
 
@@ -216,28 +220,28 @@ msgstr ""
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Contact email was successfully sent."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -251,60 +255,60 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr ""
 
@@ -316,93 +320,93 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
@@ -410,8 +414,8 @@ msgstr ""
 msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -421,70 +425,72 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -495,63 +501,66 @@ msgstr ""
 msgid "Organisation"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr ""
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr ""
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "That template is no longer customisable."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Unable to customise that template"
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "That template is not customisable"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr ""
@@ -560,100 +569,102 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr "Customisable Templates"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
+#: ../../app/controllers/orgs_controller.rb:127
+msgid "Please choose an organisation"
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:142
-msgid "Please choose an organisation"
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
 msgstr ""
 
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
+#: ../../app/controllers/plans_controller.rb:84
+msgid "My Plan (%<title>s)"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
@@ -661,115 +672,119 @@ msgid ""
 "                       institutional credentials."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
 "                You must enter a unique email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr ""
 
@@ -787,11 +802,11 @@ msgid ""
 "ou will now be able to sign in with them."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
@@ -799,71 +814,71 @@ msgstr ""
 msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr ""
 
@@ -873,39 +888,39 @@ msgid ""
 "itation."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr ""
 
@@ -922,12 +937,12 @@ msgid ""
 "ot to duplicate too much text."
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
 msgstr ""
 
 #: ../../app/helpers/conditions_helper.rb:203
@@ -938,19 +953,15 @@ msgstr ""
 msgid " will <b>remove</b> questions "
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr ""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr ""
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr ""
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr ""
 
@@ -959,7 +970,8 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr ""
@@ -970,8 +982,8 @@ msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
@@ -1052,8 +1064,8 @@ msgid "Grant API to organisations"
 msgstr ""
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1096,231 +1108,227 @@ msgstr ""
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1334,7 +1342,7 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr ""
 
@@ -1344,7 +1352,7 @@ msgid "can't be blank"
 msgstr "can't be blank"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr ""
 
@@ -1364,41 +1372,40 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
 msgstr ""
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr ""
+
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr ""
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
 msgstr ""
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr ""
 
@@ -1406,35 +1413,35 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr ""
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr ""
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr ""
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr ""
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr ""
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr ""
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr ""
 
@@ -1442,35 +1449,35 @@ msgstr ""
 msgid "can't be less than zero"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr ""
 
@@ -1478,155 +1485,157 @@ msgstr ""
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
 msgstr ""
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr ""
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr ""
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr ""
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr ""
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
 " the data itself) for initial use and later re-use."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1641,25 +1650,25 @@ msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr ""
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr ""
+
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1688,14 +1697,14 @@ msgid "Please wait, Standards are loading"
 msgstr ""
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1706,11 +1715,11 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1734,7 +1743,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
+msgid " by %{user_name}"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1791,12 +1800,13 @@ msgstr "Subject"
 msgid "Message"
 msgstr "Message"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr ""
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Submit"
@@ -1812,11 +1822,11 @@ msgstr "Contact Us"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1852,21 +1862,21 @@ msgstr ""
 msgid "ORCID"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1886,19 +1896,19 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -1962,14 +1972,14 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -1978,7 +1988,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
+msgid "Welcome to %{application_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -1997,21 +2007,27 @@ msgstr ""
 msgid "into your browser"
 msgstr ""
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr ""
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
+msgid "Hello %{user_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2031,7 +2047,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
+msgid "The %{tool_name} team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2043,17 +2059,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
+msgid "Hello %{user_email}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2068,8 +2084,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2138,15 +2154,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2305,7 +2321,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
+msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2321,7 +2337,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
+msgid "No %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2380,7 +2396,7 @@ msgstr ""
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr ""
@@ -2451,7 +2467,7 @@ msgstr ""
 msgid "Enter your guidance here. You can include links where needed."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2459,21 +2475,21 @@ msgid ""
 "he corresponding theme tags."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2660,7 +2676,8 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2734,7 +2751,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
@@ -2787,7 +2804,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
+msgid "%{org} Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2934,7 +2951,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -2994,7 +3011,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
+msgid "%{org_name} Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3046,7 +3063,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3074,7 +3091,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
+msgid "Question %{number}:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3132,14 +3149,14 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3229,7 +3246,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3255,7 +3272,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
+msgid "for internal %{org_name} use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3407,27 +3424,31 @@ msgid ""
 "s below."
 msgstr ""
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr ""
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
+msgid "All (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
+msgid "Published (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
+msgid "Unpublished (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
+msgid "Not customised (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
@@ -3437,7 +3458,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
+msgid "Editing profile for %{username}"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3446,7 +3467,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
+msgid "Plans of %{username}"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3505,7 +3526,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3674,18 +3695,18 @@ msgid "Last Accessed"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3699,7 +3720,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3741,12 +3762,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3783,7 +3804,22 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3804,25 +3840,10 @@ msgid ""
 " 'Jun 2013'."
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr ""
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr ""
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -3933,10 +3954,10 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Are you sure you want to remove your customisation of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customisation of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -3953,7 +3974,7 @@ msgstr "View customisations"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4105,17 +4126,17 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
 
@@ -4137,7 +4158,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
@@ -4164,16 +4185,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4192,59 +4213,102 @@ msgstr[1] ""
 msgid "answered"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr ""
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4277,7 +4341,7 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 
@@ -4359,8 +4423,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "%<org_title>s's Plans"
+msgid "%{org_title} Plans"
+msgstr "%{org_title}'s Plans"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4431,7 +4495,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4481,7 +4545,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4533,41 +4597,46 @@ msgstr ""
 msgid "Filter plans"
 msgstr ""
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr ""
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4583,21 +4652,21 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
+msgid "About %{application_name}"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4653,7 +4722,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4673,7 +4742,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
+msgid "If you do not have a %{application_name} account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4707,9 +4776,9 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:13
@@ -4829,7 +4898,7 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:10
@@ -4838,33 +4907,33 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4875,20 +4944,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -4900,28 +4969,25 @@ msgid ""
 "or. "
 msgstr ""
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr ""
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -4952,11 +5018,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -4972,36 +5039,36 @@ msgid ""
 " terms and conditions.</p>"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5018,7 +5085,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
+msgid "The credentials have been sent to %{email}."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5062,8 +5129,8 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5089,7 +5156,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5098,7 +5165,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5108,11 +5175,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
+msgid "'%{to_org_name}' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
+msgid "'%{to_org_name}' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5122,17 +5189,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
+msgid "%{from_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
+msgid "%{to_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5157,7 +5224,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5180,7 +5247,7 @@ msgid "New organisation"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5208,7 +5275,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5305,78 +5372,77 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
+msgid "Hello %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
+msgid "Hello %{name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
+msgid "Hello %{recipient_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
+msgid "Hello %{user_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5390,21 +5456,25 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
+msgid "Section name: %{section_title}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr ""
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5420,7 +5490,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5438,11 +5508,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5463,19 +5533,18 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-m%<tool_name>s
+msgid ""
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
+"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5483,7 +5552,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admi%<username>smissions.html.erb:9
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/en_US/LC_MESSAGES/app.mo b/config/locale/en_US/LC_MESSAGES/app.mo
index 36978e85ed0bfd18671d8fda3486cc3e59d65d27..345286a01220051b1a803c9d7d5520e8efeeea6a 100644
GIT binary patch
delta 2099
zcmX}reN2{B7{~GJMo1n7<Sl|g5DXQ0>3K-x)iMJy!Hf*Da&y`mV<Qj|v6?(%&UCa~
zdXM-AUCi0SY${Zn6|GU(3pxh`OKa(*Km0?i)mpF1zQ68gu|0gwIrq8mbIx_0>)jL1
z>~SafeSCPY@wbOx8o%%6m>tLdx%}gA**vpY%)vIttPCHZe`>y29Nxsw@t;ute3V%e
z{crFfu8H>gW0*_7D25+y!$Py5_0i~H;48cfS1&N@#?3f`SCBRBBX)5Qeu)Wq3zIO6
zU1;Men2syahxN#-wiPq66*d1b#^alq!20$9jR*!V;TTR~00)?*7bkH7f5p4;3syfw
zBxbOg{?0qiO7JRb1IetCfyJ1LPoRR?j#}qM)PcJ(jrHv}8sV78@fGS6T#n0e3)W)_
z4k1CZ3rKYBTV$_x0~7I2WRJEW*&ENoh4fdTo<D{xWsRZnE)42HKMg;gMV<UQYCMru
zmFpZNeb$7XoV*jY@Q;Ke8y$|Rg_hzftin><hh;c|8}WCn$93du9FL_D|MfI>@ODKQ
zslbbxNc{BS^NY;xV8NSsl>RT|V<{fa;$q@CybrIVLY%ai`IwGMMK-R(O4R&Ukg4__
zPUGdp#J`8e8E)1Tma}Rf3&t(s)bs~gtq~{jYdz;HgBZ(0h4Ou@z;V=vW60Z+7(lLr
zy^J+DfSNyxy1e0(LM<i-X(;5+VgvS}LUs$4>zq6<^d-o<wiXMp4WsaN)V#Oxe*6%N
z@Gm4-7RWbi;Xs>EcWacFRmPL3)CQ|aydLaFMc_45ZkyRv6L#TCcq7zrE%fU6GHRg+
z;!o4cu>)I>duTskH~x(?*tNnd<L$hpGJXydRR2e4C^T=N>Uac|yDR9!KTvf%XQg+d
z1l0T@)NQXtK4e=_<<*X(_&l;_t0?x~YrzTnucFHMnG%&T`R}69%s@18r)e*sHZY9b
zLz_S@uKkR<WHII5LP^*`KMl3<Bd9Vyjf&_ysFZz%Tkt2OaBKq?Mk#B=DAu>#G~#d{
zs_c4ECp#G$A3+MkE`^@YViNtZRo-|C>b+tldsd4&`QFg@X;iL1#b^xYqNt4HF{p)m
zc&c*i$AvhG%(ZK%I!<5hUCPa<I(D%hXK)-#AGH6<c>Wr%j2rMG<8Gz*-ECD~86Uu-
zj2~L-m2qA*`Bz;&UhUQKUQ~$BqU!h@Dit52>i8;Z{xUi$w>q50UD$&)4||t*8db)p
z)_Y}KS?iT?3#yE#aS-3y5cEP>|A<$|&8QC#qU!hpDzr;Db`6%JLVo~t>5d`avLRH+
zZ({=n9`z!25M$_nf(rcv>P}q40-T>y=hbl;YGO5#7HdE*zV%`zj@7v*=RW1Mxe<{W
z&Mr4Q@@c2t?WVok9f)j<>(nd!w8lgH%uVs7I(ytA-$tj^-S5kAI@}Y!d!3!`l&{>`
zF&sDVcII$%-jEYrnC~yl5BL}POUjD;Zf-$p?EfRBjO6+Q!wm&zvWB<UZF2qvF|rF?

delta 2246
zcmbu;`%jlu9Ki9<gBpAhP_ACMJt!E6eC3OgTs29wfP|R15UOE*`@-UWiKx}LY?;H&
zW>2hU;|E3#-CUDc3%5#TWh;g)HHLJLY(X`bRBMf(_lM`Z{(%_qI_Es+c|PZS&iVY>
zZ@hid@O~Y(v`6^q;xC53AC`#p;~9Vc@skxOvJ$hg#SkgN?eyPWE)t4!_z{K#+5K^>
zqyG~g!SZ0c{{^PfFANdM#1_mD@yY;=4hAN16_%|Kc@ArF3TKd*a+y^m;&lwid5pp^
zR-p?|!8qK74s;{0N)sla7j=FghT$-V6JJJYEMwps9K{>x!a-)~i&J<7ml1U>PT(;z
zF^l!|4@HtCyotJiWTM35Zj43`YBHZkjdK)r!^bg(_~OsDmtrDns#9<y=3q6taSe_j
zNs=#-?8?u`TIDZ{z`)h^&f-zWGcXo+qCP)>#FS3o_%ZbAgEKVJ@gnNZZ=sGS5>?MS
z8#zAd!cKPnB5HsI(vgIrY*Pbm#eA&5Y_u>3$FLLwIHwAH06)VwW5|CIjc0i~&yV!u
zm`*h950B$*1f0WO#+R%UxgGm389&A?cndYf8`d))ov25ViTB`M)cL*0RJnxXIK7_y
zchk7Q&H5aR+0Ls3OxVCN&_72s4^H7Vea=@-qsc=}<tLbj-=Tguj&rNT9msW%*RdD}
zQRn}ITpNj?6iP7JOG8uMf%|X(t8gAQb^ABjXWoN)1aBbUkhjo@UttgirP=e=;5Pcn
zn28=tz+P-*W9L!tm~*pT&fe`b^o$3&0Q%rJ)J*uXDm~)~tiu^RjC(VD^^B}h3dz3)
zYC(o%06TCJxtCIQhp(J*ivA1+;$>bU>0Y@`Bb<SG)D(r?>8od4tY>sE?#9J>M%|GY
zqp%Oda2WMFqqtbkI70shvUWMO)qZahuh5^vwOaq5X4&;TgY`V<BJVWiN7Mzx=i2qW
z4Y|nj5b9-n5;f2v)Eyr|F1F00mUA>0Lo;fk9+?ZPu^K5LIfo&{m#Z}N48KQB`Av*K
zBj4Ux6zX^i#$qn&^Gb}uM&I}gzVUwK6lEB7=hMFNXfB2xbvg!PGkUe2pP``v{^Y6F
zbHH78ASd#!l%UpgH|nMQ0JWYMumVeW*!6r8i|BV2*yTKeV>)lA{oS!byPRjSm+`-M
zk$);nUfXTg=LO{6$Ta$6EXAw!oP=?>3Hg;`{w3opsAcyaj^nr3jqluRU*ZB*qvgE1
z*e>U@C3ZPa;x*<K+(-UT(^$2~PUS@;`!a$0;YhZr^_+#8@|Tfs$pC8VXHhR*V3}Rd
zai}SO4EJF#R^jicnJc^BF4Lo^M{pvW#zq>a(1}-3?}A^sJ#htcIueHzh&+f1Xq8(h
z{P!EJ)*t@yMu!y{P-V1REdlXHr*%BQ6Z!;GG`_~To4>~`ha=kPvXUI7Mzhu7h&P(7
z9>->*&HB)hYqSg*feQ)N`ytEo&Dxqa^MKpkXg*R~)97&@befe-9cDvKm)Y3VX}S;A
zwVUnkhUWU3c6XckXj7}1^i)%;=i$bh2KUoLzocF=f?a8@^t5!B>2l?`vaR!J(JTKO
b*}_O_ddAR9+Szs1OM8Oy{#UfaWgg>S4i7^)

diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po
index 7b51b62882..97e1c815d6 100644
--- a/config/locale/en_US/app.po
+++ b/config/locale/en_US/app.po
@@ -1,14 +1,14 @@
 # English translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -18,25 +18,25 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr ""
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr ""
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "user must be in your organization"
 
@@ -44,28 +44,28 @@ msgstr "user must be in your organization"
 msgid "Bad Parameters"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Month"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr ""
 
@@ -78,137 +78,141 @@ msgstr ""
 msgid "completed_plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr ""
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr ""
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "organization"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr ""
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr ""
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr ""
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
 msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "customization"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr ""
 
@@ -216,28 +220,28 @@ msgstr ""
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr ""
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr ""
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Contact email was successfully sent."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr ""
 
@@ -251,60 +255,60 @@ msgid "added"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr ""
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr ""
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr ""
 
@@ -316,93 +320,93 @@ msgstr ""
 msgid "An error occurred when requesting feedback for this plan."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr ""
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
@@ -410,8 +414,8 @@ msgstr ""
 msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -421,70 +425,72 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -495,63 +501,66 @@ msgstr ""
 msgid "Organisation"
 msgstr "Organization"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr ""
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr ""
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr ""
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "That template is no longer customizable."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Unable to customize that template."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "That template is not customizable."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr ""
@@ -560,100 +569,102 @@ msgstr ""
 msgid "Customizable Templates"
 msgstr "Customizable Templates"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr ""
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "No organizations are currently registered."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Your organization does not seem to be properly configured."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Please choose an organization"
 
+#: ../../app/controllers/orgs_controller.rb:136
+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:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
+#: ../../app/controllers/plans_controller.rb:84
+msgid "My Plan (%<title>s)"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
@@ -661,41 +672,43 @@ msgid ""
 "                       institutional credentials."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
@@ -703,75 +716,77 @@ msgstr ""
 "Please select an organization from the list, or enter your organization's name"
 "."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
 "                You must enter a unique email address."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr ""
 
@@ -789,11 +804,11 @@ msgid ""
 "ou will now be able to sign in with them."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr ""
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
@@ -801,73 +816,71 @@ msgstr ""
 msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"Your organization affiliation has been changed. You may now edit templates for"
-" %<org_name>s."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Unable to change your organization affiliation at this time."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Unknown organization"
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr ""
 
@@ -877,39 +890,39 @@ msgid ""
 "itation."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr ""
 
@@ -926,12 +939,12 @@ msgid ""
 "ot to duplicate too much text."
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
 msgstr ""
 
 #: ../../app/helpers/conditions_helper.rb:203
@@ -942,19 +955,15 @@ msgstr ""
 msgid " will <b>remove</b> questions "
 msgstr ""
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr ""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Transfer customization"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Edit customization"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Customize"
 
@@ -963,7 +972,8 @@ msgid "Creators:"
 msgstr ""
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr ""
@@ -974,8 +984,8 @@ msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
@@ -1056,8 +1066,8 @@ msgid "Grant API to organisations"
 msgstr "Grant API to organizations"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1100,231 +1110,227 @@ msgstr ""
 msgid "Private: restricted to me and people I invite."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr ""
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr ""
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Customized By: "
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1338,7 +1344,7 @@ msgid ""
 "             your project or proposal"
 msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr ""
 
@@ -1348,7 +1354,7 @@ msgid "can't be blank"
 msgstr "can't be blank"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr ""
 
@@ -1368,41 +1374,40 @@ msgstr ""
 msgid "You must specify at least one role."
 msgstr ""
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr ""
+
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
 msgstr ""
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr ""
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr ""
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
 msgstr ""
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr ""
 
@@ -1410,35 +1415,35 @@ msgstr ""
 msgid "Feedback email message"
 msgstr ""
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr ""
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr ""
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organizational"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr ""
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr ""
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr ""
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr ""
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr ""
 
@@ -1446,35 +1451,35 @@ msgstr ""
 msgid "can't be less than zero"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr ""
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr ""
 
@@ -1482,155 +1487,157 @@ msgstr ""
 msgid "A historical template cannot be retrieved for being modified"
 msgstr ""
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! requires an organization target"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
 msgstr ""
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr ""
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "customize! requires an organization target"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr ""
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 msgid "You can not publish a historical version of this template.  "
 msgstr ""
 
-#: ../../app/models/template.rb:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr ""
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without sections in a phase.  "
 msgstr ""
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without questions in a section.  "
 msgstr ""
 
-#: ../../app/models/template.rb:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr ""
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr ""
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr ""
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr ""
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
 " the data itself) for initial use and later re-use."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
 msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr ""
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "upgrade_customization! requires a customized template"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1645,25 +1652,25 @@ msgid "A key \"org\" is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr ""
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr ""
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr ""
+
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1692,14 +1699,14 @@ msgid "Please wait, Standards are loading"
 msgstr ""
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1710,11 +1717,11 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1738,7 +1745,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
+msgid " by %{user_name}"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1795,12 +1802,13 @@ msgstr "Subject"
 msgid "Message"
 msgstr "Message"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr ""
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Submit"
@@ -1816,11 +1824,11 @@ msgstr "Contact Us"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1856,21 +1864,21 @@ msgstr ""
 msgid "ORCID"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1890,19 +1898,19 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -1966,14 +1974,14 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr ""
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -1982,7 +1990,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
+msgid "Welcome to %{application_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -2001,21 +2009,27 @@ msgstr ""
 msgid "into your browser"
 msgstr ""
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr ""
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
+msgid "Hello %{user_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2035,7 +2049,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
+msgid "The %{tool_name} team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2047,17 +2061,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
+msgid "Hello %{user_email}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2072,8 +2086,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2142,15 +2156,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2313,7 +2327,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
+msgid "Do you have a %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2329,7 +2343,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
+msgid "No %{application_name} account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2391,7 +2405,7 @@ msgstr ""
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr ""
@@ -2465,7 +2479,7 @@ msgstr ""
 msgid "Enter your guidance here. You can include links where needed."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2477,21 +2491,21 @@ msgstr ""
 "ch you create guidance groups, across all templates that have questions with t"
 "he corresponding theme tags."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2678,7 +2692,8 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2754,7 +2769,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
@@ -2807,7 +2822,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
+msgid "%{org} Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2954,7 +2969,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -3014,7 +3029,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
+msgid "%{org_name} Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3066,7 +3081,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3094,7 +3109,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
+msgid "Question %{number}:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3155,14 +3170,14 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3255,7 +3270,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3281,7 +3296,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
+msgid "for internal %{org_name} use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3441,28 +3456,32 @@ msgstr ""
 " want to add questions to funder templates use the 'customize template' option"
 "s below."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr ""
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Customizable Templates"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
+msgid "All (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
+msgid "Published (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
+msgid "Unpublished (%{count})"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "Not customized (%<count>s)"
+msgid "Not customised (%{count})"
+msgstr "Not customized (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3471,7 +3490,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
+msgid "Editing profile for %{username}"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3480,7 +3499,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
+msgid "Plans of %{username}"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3539,7 +3558,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3708,18 +3727,18 @@ msgid "Last Accessed"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3733,7 +3752,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3775,12 +3794,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3817,7 +3836,22 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr ""
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3838,25 +3872,10 @@ msgid ""
 " 'Jun 2013'."
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr ""
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr ""
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr ""
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -3970,7 +3989,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
 
@@ -3988,7 +4007,7 @@ msgstr "View customizations"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4140,20 +4159,20 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organizations."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4174,11 +4193,11 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organizations. Please choose up to 6 organizations of the following"
 " organizations who offer guidance relevant to your plan."
 
@@ -4204,16 +4223,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4232,11 +4251,11 @@ msgstr[1] ""
 msgid "answered"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4244,49 +4263,92 @@ msgstr ""
 "Briefly summarize your research project to help others understand the purposes"
 " for which the data are being collected or created."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr "A pertinent ID as determined by the funder and/or organization."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr ""
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr ""
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4319,11 +4381,11 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Public or organizational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 
 #: ../../app/views/plans/_share_form.html.erb:19
@@ -4406,7 +4468,7 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
+msgid "%{org_title} Plans"
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:36
@@ -4483,7 +4545,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4533,7 +4595,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4585,41 +4647,46 @@ msgstr ""
 msgid "Filter plans"
 msgstr ""
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr ""
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4640,21 +4707,21 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
+msgid "About %{application_name}"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4718,7 +4785,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4738,7 +4805,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
+msgid "If you do not have a %{application_name} account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4777,9 +4844,9 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:13
@@ -4908,7 +4975,7 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:10
@@ -4917,41 +4984,41 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalization of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalization of the %{application_name} service."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customized man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customized man"
 "ner and to ensure each user receives relevant information."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"To provide access to the %<application_name>s service and personalization of yo"
+"To provide access to the %{application_name} service and personalization of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organization."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4962,20 +5029,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -4987,28 +5054,25 @@ msgid ""
 "or. "
 msgstr ""
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr ""
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5039,11 +5103,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5059,36 +5124,36 @@ msgid ""
 " terms and conditions.</p>"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr ""
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5105,7 +5170,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
+msgid "The credentials have been sent to %{email}."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5149,8 +5214,8 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5176,7 +5241,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5185,7 +5250,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5195,11 +5260,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
+msgid "'%{to_org_name}' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
+msgid "'%{to_org_name}' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5209,17 +5274,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
+msgid "%{from_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
+msgid "%{to_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5244,7 +5309,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5267,7 +5332,7 @@ msgid "New organisation"
 msgstr "New organization"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5295,7 +5360,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5392,80 +5457,79 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
+msgid "Hello %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
-"More information about administering the %<tool_name>s for users at your organi"
-"zation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"zation is available at the %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
+msgid "Hello %{name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
+msgid "Hello %{recipient_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
+msgid "Hello %{user_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5479,21 +5543,25 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
+msgid "Section name: %{section_title}"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr ""
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5509,7 +5577,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5527,11 +5595,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5552,19 +5620,18 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-m%<tool_name>s
+msgid ""
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
+"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5572,7 +5639,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admi%<username>smissions.html.erb:9
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/es/LC_MESSAGES/app.mo b/config/locale/es/LC_MESSAGES/app.mo
index 1c12ec9d9035bf6ed01e218825ca8a5a8a8ae915..940999e8f22eb356ca27529f803f9ea39a1d6a35 100644
GIT binary patch
delta 30407
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
IzSc4S2SkG3V*mgE

delta 28443
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

diff --git a/config/locale/es/app.po b/config/locale/es/app.po
index d4bea332c4..2c6314d911 100644
--- a/config/locale/es/app.po
+++ b/config/locale/es/app.po
@@ -1,14 +1,14 @@
 # Spanish translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"No hay preguntas con la identificación %<question_id>s asociada a la identifica"
-"ción del plan %<plan_id>s para la cual crear o actualizar una respuesta"
+"No hay pregunta con id%<question_id> s asociado al id del plan %<plan_id> s pa"
+"ra los que crear o actualizar una respuesta"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
-msgstr "No hay un plan con id %<id>s para el cual crear o actualizar una respuesta"
+msgstr "No hay plan con id %<id> s para los que crear o actualizar una respuesta"
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr "Malas credenciales"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "El código y el nombre del departamento deben ser únicos"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "el usuario debe estar en su organización"
 
@@ -46,28 +46,28 @@ msgstr "el usuario debe estar en su organización"
 msgid "Bad Parameters"
 msgstr "Parámetros erróneos"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Mes"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "No. Usuarios unidos"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Total"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "usuarios_ unidos"
 
@@ -80,35 +80,35 @@ msgstr "No. Planes completados"
 msgid "completed_plans"
 msgstr "planes_completados"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Sin planes"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "Planes"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "JSON faltante o inválido"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Formato JSON no válido"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Plan no encontrado"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr "No se puede crear su DMP"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "El plan ya existe. Enviar una actualización en su lugar."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
@@ -116,103 +116,107 @@ msgstr ""
 "No se pudo determinar la propiedad del DMP. Por favor agregue un\n"
 "                          : afiliación al: contacto"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr "JSON no válido"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "JSON inválido"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "No se encontraron planes"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Usted no está autorizado para realizar esta acción."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Necesita iniciar sesión o registrarse para continuar."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr "No se puede %<action>s el %<object>s. %<errors>s"
+msgstr "Incapaz de %<action> es el %<object> s.%<errors> s"
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "Con éxito %<action>s el %<object>s."
+msgstr "Exitosamente %<action> es el %<object> s."
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "Cliente API"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "Plan"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "grupo de orientación"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "Comentario"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "organización"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "permiso"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "Preferencias"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "Perfil"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "user"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "opción de pregunta"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr "Registro no encontrado"
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "el alcance debe ser un objeto ActiveRecord :: Relation"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params debe ser un objeto Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params debe ser un objeto Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "los locales deberían ser un objeto Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Acceso restringido a Ver todos los registros."
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "Ordenar por %<sort_field>s"
+msgstr "Ordenar por %<sort_field> s"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "personalización"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "Modelo"
 
@@ -220,28 +224,28 @@ msgstr "Modelo"
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr "obj debe ser una Plantilla, Fase, Sección, Pregunta o Anotación"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "obj debe ser una Fase, Sección, Pregunta o Anotación"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "El espacio_búsqueda no responde a cada uno"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "El espacio de búsqueda no tiene elementos asociados."
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Error en la verificación del captcha, por favor vuelva a intentarlo."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "El correo electrónico de contacto fue enviado con éxito."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "No se puede enviar su solicitud"
 
@@ -255,60 +259,60 @@ msgid "added"
 msgstr "Adicional"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "Guardado"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "Guardar"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "remoto"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "Quitar"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "Plan no encontrado"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "contribuyente no encontrado"
 
@@ -320,106 +324,106 @@ msgstr "No se puede enviar su solicitud de comentarios en este momento."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Se produjo un error al solicitar comentarios para este plan."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "creado"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "Crear"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Su grupo de orientación ha sido publicado y ahora está disponible para los usu"
 "arios."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "Publicar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Su grupo de orientación ya no se publica y no estará disponible para los usuar"
 "ios."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "Despublicar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "Suprimido"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "Borrar"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr "Su guía ha sido publicada y ahora está disponible para los usuarios."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Su guía ya no se publica y no estará disponible para los usuarios."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Desenlazó con éxito su cuenta de %<is>s."
+msgstr "Desvinculó con éxito su cuenta de %<is> s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "No se puede desvincular su cuenta de %<is>s."
+msgstr "No se puede desvincular su cuenta de %<is> s."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -429,72 +433,74 @@ msgstr "Estás viendo una versión histórica de esta plantilla. No podrás hace
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "No puede agregar una fase a una versión histórica de una plantilla."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "No se puede crear una nueva versión de esta plantilla."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr "No se puede crear una nueva versión de esta plantilla.<br>"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "Actualizado"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "Actualización"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "No se puede crear una nueva versión de esta plantilla."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
-"%<plan_owner>s ha sido notificado de que ha terminado de proporcionar comentari"
-"os"
+"%<plan_owner> s ha sido notificado de que ha terminado de proporcionar comenta"
+"rios"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr "No se puede notificar al usuario que ha terminado de proporcionar comentarios."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Título del Proyecto"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Modelo"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -505,63 +511,66 @@ msgstr "Modelo"
 msgid "Organisation"
 msgstr "Organización"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Nombre del propietario"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "Email del propietario"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Visibilidad"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr "No se puede crear una nueva sección. La fase especificada no existe."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr "No se puede eliminar esta versión de la plantilla."
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "Dupdo"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Esa plantilla ya no es personalizable."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "No se puede personalizar esa plantilla."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Esa plantilla no es personalizable."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Todas las plantillas"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "%<org_name>s Plantillas"
+msgstr "%<org_name> Plantillas"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Plantillas propias"
@@ -570,152 +579,155 @@ msgstr "Plantillas propias"
 msgid "Customizable Templates"
 msgstr "Plantillas personalizables"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "Error al analizar los enlaces para un %<template>s"
+msgstr "Error al analizar enlaces para un %<template> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
-"Plantilla creada utilizando el servicio %<application_name>s. Última modificaci"
-"ón %<date>s"
+"Plantilla creada usando el %<application_name> servicio de s. Última modificac"
+"ión %<date> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "No se puede descargar la plantilla DMP en este momento."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "No hay organizaciones actualmente registradas."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Su organización no parece estar correctamente configurada."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Por favor elige una organización"
 
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
+msgstr "Su organización no parece estar correctamente configurada."
+
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "Creado usando %<application_name>s. Última modificación %<date>s"
+msgstr "Creado usando %<application_name> s. Última modificación %<date> s"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "Esto es un"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "Plan de prueba"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "No se puede identificar una plantilla adecuada para su plan."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Mi plan"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr " Plan"
+msgid "My Plan (%<title>s)"
+msgstr "<html>Mi plan (%<title> s)</html>"
+
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr "%<user_name> Plan de s"
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Este plan se basa en la plantilla predeterminada."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Este plan se basa en el"
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "plantilla con personalizaciones por el"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "copiado"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
-"No se puede cambiar el estado del plan ya que se necesita al menos el porcenta"
-"je %<percentage>s respondido"
+"No se puede cambiar el estado del plan porque se necesita al menos %<percentag"
+"e}> s porcentaje respondió"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "No se puede encontrar la identificación del plan %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr "No se puede encontrar el ID del plan %{<plan_id> s"
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Tu proyecto es ahora una prueba."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Tu proyecto ya no es una prueba."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr "No se puede cambiar el estado de prueba del plan"
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "No hay un plan asociado con la identificación %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr "No hay plan asociado con id %{<id}> s"
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Por favor, elija a continuación. Después de vincular su\n"
-"                       detalles a una cuenta %<application_name>s,\n"
-"                       podrá iniciar sesión directamente con su\n"
-"                       credenciales institucionales."
+"Por favor, haga una elección a continuación. Después de vincular sus datos a u"
+"n %<application_name> s cuenta, podrá iniciar sesión directamente con sus cred"
+"enciales institucionales."
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr "Debes aceptar los términos y condiciones para registrarte."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr "Seleccione una organización de la lista o elija Otro."
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "Esa dirección de correo electrónico ya está registrada."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
-"¡Bienvenido! Te has registrado con éxito con tus credenciales institucionales."
-" Ahora podrás acceder a tu cuenta con ellos."
+"¡Bienvenidos! Te has registrado exitosamente con tus credenciales instituciona"
+"les. Ahora podrá acceder a su cuenta con ellos."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Guardar sin éxito."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Por favor introduzca una dirección de correo eléctronico."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "Por favor, introduzca un nombre."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "Por favor, introduzca un apellido."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
@@ -723,13 +735,13 @@ msgstr ""
 "Seleccione una organización de la lista o ingrese el nombre de su organización"
 "."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr ""
 "Por favor, introduzca su contraseña para cambiar la dirección de correo electr"
 "ónico."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -739,70 +751,72 @@ msgstr ""
 "                Esa dirección de correo electrónico ya está registrada. \\\n"
 "                Debe introducir una dirección de correo electrónico única."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Contraseña invalida"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Por favor ingrese su contraseña actual"
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Por favor ingrese una confirmación de contraseña"
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "La contraseña y la confirmación deben coincidir"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"No se puede compartir el plan con %<email>s ya que ese correo electrónico coinc"
-"ide con el propietario del plan."
+"No se puede compartir el plan con %<email> s ya que ese correo electrónico coi"
+"ncide con el propietario del plan."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "El plan ya está compartido con %<email>s."
+msgstr "El plan ya está compartido con %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "Nombre de pila"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Apellido"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "Invitación a %<email>s emitida con éxito."
+msgstr "Invitación a %<email> s emitido con éxito."
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Plan compartido con %<email>s."
+msgstr "Plan compartido con %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
 "Debe proporcionar una dirección de correo electrónico válida y seleccionar un "
 "nivel de permiso."
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Por favor introduzca una dirección de correo eléctronico"
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
-"Cambió exitosamente los permisos para %<email>s. Han sido notificados por corre"
-"o electrónico."
+"Se cambiaron con éxito los permisos para %<email> . Han sido notificados por c"
+"orreo electrónico."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Acceso eliminado"
 
@@ -822,11 +836,11 @@ msgstr ""
 "Su cuenta se ha vinculado con éxito a sus credenciales institucionales. Ahora "
 "podrás iniciar sesión con ellos."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Ajustes de exportación actualizados con éxito."
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 "Se ha producido un error al guardar / restablecer la configuración de exportac"
@@ -834,57 +848,59 @@ msgstr ""
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
-msgstr ". Las credenciales de API se han enviado por correo electrónico a %<email>s"
+msgstr ""
+". Las credenciales de la API se han enviado por correo electrónico a %<email> "
+"s"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Su notificación ya está activa."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Su notificación ya no está activa."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "No se puede cambiar el estado activo de la notificación"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "No hay ninguna notificación asociada con la identificación %<id>s"
+msgstr "No hay notificación asociada con id %<id> s"
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"La afiliación de su organización ha sido cambiada. Ahora puede editar plantill"
-"as para %<org_name>s."
+"Se ha cambiado la afiliación de su organización. Ahora puede editar plantillas"
+" para %<org_name> s."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "No se puede cambiar la afiliación de su organización en este momento."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Organización desconocida"
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Parece que hay un problema con su logotipo. Por favor subirlo de nuevo."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr "Se produjo un error al intentar fusionar las organizaciones."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr "No se pueden fusionar las dos organizaciones en este momento."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr "No se puede determinar qué registros deben fusionarse."
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
@@ -892,19 +908,19 @@ msgstr ""
 "Intentó fusionar 2 cuentas con la misma dirección de correo electrónico.\n"
 "           Combínelo con una dirección de correo electrónico diferente."
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "archivado"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "Archivo"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "fusionado"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "Unir"
 
@@ -916,39 +932,39 @@ msgstr ""
 "Ya has iniciado sesión como otro usuario. Por favor, cierre la sesión para act"
 "ivar su invitación."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Ha iniciado sesión correctamente"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Su cuenta se ha vinculado con éxito a %<scheme>s."
+msgstr "Su cuenta se ha vinculado con éxito a %<scheme> s."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "No se puede vincular su cuenta a %<scheme>s."
+msgstr "No se puede vincular su cuenta a %<scheme> s."
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "Con éxito la cuenta de %<action>s %<username>s."
+msgstr "Exitosamente %<action> s %<username> la cuenta de s."
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "activado"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "Desactivado"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr "No se puede %<action>s %<username>s"
+msgstr "Incapaz de %<action> s %<username> s"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "Activar"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "Desactivar"
 
@@ -971,13 +987,13 @@ 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:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "Respondiendo"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "<b>enviará un correo electrónico</b> con el asunto"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr "<b>enviará un correo electrónico</b> con el asunto %<subject_name> s"
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
@@ -987,19 +1003,15 @@ msgstr "<b>eliminará la</b> pregunta"
 msgid " will <b>remove</b> questions "
 msgstr "<b>eliminará</b> preguntas"
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Personalización de la transferencia"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Editar la personalización"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Personalizar"
 
@@ -1008,27 +1020,28 @@ msgid "Creators:"
 msgstr "Creadores:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Creador:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s: su plan ha sido enviado para recibir comentarios"
+msgstr "%<application_name> s: Su plan ha sido enviado para comentarios"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Hola %<user_name>s. </p><p> Su plan \"%<plan_name>s\" se ha enviado para recib"
-"ir comentarios de un administrador de su organización. Si tiene preguntas rela"
-"cionadas con esta acción, comuníquese con nosotros al %<organisation_email>s. <"
-"/p>"
+"<p>Hola %<user_name> s.</p><p> Tu plan \"%<plan_name> s\" se ha enviado para rec"
+"ibir comentarios de un administrador de su organización. Si tiene preguntas re"
+"lacionadas con esta acción, comuníquese con nosotros al %<organisation_email> "
+"s.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1066,9 +1079,9 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Un bibliotecario de datos de %<org_name>s responderá a su solicitud dentro "
-"de las 48 horas. Si tiene preguntas relacionadas con esta acción, comuníquese "
-"con nosotros al %<organisation_email>s. </p>"
+"<p>Un bibliotecario de datos de %<org_name> s responderá a su solicitud dentro"
+" de las 48 horas. Si tiene preguntas relacionadas con esta acción, comuníquese"
+" con nosotros al %<organisation_email> s.</p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1108,8 +1121,8 @@ msgid "Grant API to organisations"
 msgstr "Otorgar API a organizaciones"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1152,231 +1165,229 @@ msgstr "Público: cualquiera puede ver."
 msgid "Private: restricted to me and people I invite."
 msgstr "Privado: restringido a mí y a las personas que invito."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Nombre de columna desconocido."
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Nombre del Proyecto"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "Identificador del Proyecto"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr "Título de subvención"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Principal Investigador / Científico"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Datos de contacto del proyecto"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Descripción"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Financiador"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "Su ORCID"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr "Ninguna"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
-msgstr "Orientación para: %<themes>s"
+msgstr "Orientación para: %<themes> s"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr "Nada para fusionar"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
-msgstr "<p>El siguiente %<object_types>s se moverá a '%<org_name>s':</p>"
+msgstr "<p>La siguiente %<object_types> s se moverá a '%<org_name> s':</p>"
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Crear un plan"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "El mes pasado"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "Últimos 3 meses"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "Últimos 6 meses"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "Últimos 9 meses"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "Últimos 12 meses"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "Consulta o feedback relacionado con %<tool_name>s"
+msgstr "Consulta o comentario relacionado con %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "Bienvenido a %<tool_name>s"
+msgstr "Bienvenido a %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "Se ha compartido con usted un Plan de gestión de datos en %<tool_name>s"
+msgstr "Un plan de gestión de datos en %<tool_name> s ha sido compartido con usted"
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
-msgstr "Cambios de permisos en un plan de gestión de datos en %<tool_name>s"
+msgstr "Permisos modificados en un plan de gestión de datos en %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "Permisos eliminados en un DMP en %<tool_name>s"
+msgstr "Permisos eliminados en una DMP en %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
-msgstr "%<user_name>s ha solicitado comentarios sobre un plan %<tool_name>s"
+msgstr "%<user_name> s ha solicitado comentarios sobre un %<tool_name> plan de s"
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
-msgstr "%<tool_name>s: Se han proporcionado comentarios de expertos para %<plan_title>s"
+msgstr ""
+"%<tool_name> s: Se han proporcionado comentarios de expertos para %<plan_title"
+"> s"
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "Se modificó la visibilidad de DMP: %<plan_title>s"
+msgstr "Visibilidad de DMP cambiada: %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: Se agregó un nuevo comentario a %<plan_title>s"
+msgstr "%<tool_name> s: Se agregó un nuevo comentario a %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "Privilegios de administrador otorgados en %<tool_name>s"
+msgstr "Privilegios de administrador otorgados en %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "%<tool_name>s Cambios de API"
+msgstr "%<tool_name> cambios en la API"
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Fase"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Sección"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Pregunta"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "responder"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Personalizado por:"
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Creadores:"
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr "%<authors> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "%<affiliation>s"
+msgstr "%<affiliation> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Modelo:"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr "%<funder> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr "%<template> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr "Conceder número:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr "%<grant_number> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Resumen del proyecto:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr "%<description> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Última modificación:"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr "%<date> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Informacion registrada:"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1400,7 +1411,7 @@ msgstr ""
 "alguna con\n"
 "             tu proyecto o propuesta"
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Sin respuesta"
 
@@ -1410,7 +1421,7 @@ msgid "can't be blank"
 msgstr "no puede estar en blanco"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "debe ser único"
 
@@ -1430,41 +1441,40 @@ msgstr "para 'Texto de la pregunta' no puede estar en blanco."
 msgid "You must specify at least one role."
 msgstr "Debe especificar al menos un rol."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "no puede estar en blanco si no se proporciona correo electrónico"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr "no puede estar en blanco."
+
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr "no puede estar en blanco si no se proporciona un correo electrónico."
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "no puede estar en blanco si no se proporciona ningún nombre"
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr "no puede estar en blanco si no se proporciona ningún nombre."
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Opción (es) seleccionada (s)"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Respondida por"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Respondido en"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "Detalles"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
 msgstr "Pregunta no respondida."
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "ya asignado un valor"
 
@@ -1472,35 +1482,35 @@ msgstr "ya asignado un valor"
 msgid "Feedback email message"
 msgstr "Mensaje de correo electrónico de comentarios"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "debe ser uno de los siguientes formatos: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "no puede ser más grande que 500KB"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organizativo"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "Público"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "Prueba"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "Privado"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "debe ser posterior a la fecha de inicio"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "orientación sobre"
 
@@ -1508,37 +1518,37 @@ msgstr "orientación sobre"
 msgid "can't be less than zero"
 msgstr "no puede ser menor que cero"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "No se ha indicado un valor obligatorio"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "El valor del margen no es válido"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "El margen no puede ser negativo"
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 "Margen desconocido. Sólo puede ser 'superior', 'inferior', 'izquierdo' or 'der"
 "echo'"
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Tamaño de fuente inválido"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Estilo de fuente inválido"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Valores de formato desconocidos"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Número de páginas inválido"
 
@@ -1546,83 +1556,87 @@ msgstr "Número de páginas inválido"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "No se puede recuperar una plantilla histórica para modificarla."
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "generar_copia! requiere un objetivo de organización"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "Copia de %<template>s"
+msgstr "Copia de %<template> s"
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "generar_versión! requiere una plantilla publicada"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "personalizar requiere un objetivo de organización"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr "personalizar requiere una plantilla de un financiador"
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "No se puede publicar una plantilla publicada."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr "No puedes publicar una plantilla sin fases."
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 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:465
+#: ../../app/models/template.rb:461
 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:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "Las condiciones en la plantilla se refieren al revés"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
-msgstr "Se ha compartido un plan de gestión de datos en %<application_name>s con usted"
-
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "debe estar conectado"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+msgstr ""
+"Un plan de gestión de datos en %<application_name> s ha sido compartido con us"
+"ted"
+
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "debe tener acceso a las guías api"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "debe tener acceso a los planes api"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "no están autorizados para ver ese plan"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr "debe tener acceso a las plantillas api"
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr "Administrador de datos"
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr "Administrador de Proyectos"
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr "Investigador principal"
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr "Otro"
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1633,7 +1647,7 @@ msgstr ""
 "o para interpretar los datos en sí) para su uso inicial y reutilización poster"
 "ior."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1641,7 +1655,7 @@ msgstr ""
 "Realizar un proceso de investigación e investigación, específicamente realizar"
 " los experimentos o la recopilación de datos / pruebas."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1649,62 +1663,62 @@ msgstr ""
 "Responsabilidad de gestión y coordinación de la planificación y ejecución de l"
 "a actividad investigadora."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Tipo de subvención inválido"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "Credenciales no válidas"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Simbolo no valido"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Token caducado"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Ficha faltante"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ": título y: mbox del contacto son campos obligatorios"
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ": tipo y: identificador son obligatorios para todos los ID"
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ": se requiere el nombre para cada: afiliación y: financiación"
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ""
 ": rol y el: nombre o: correo electrónico son obligatorios para cada: colaborad"
 "or"
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ": name,: funder_id o: grant_id son obligatorios para cada financiación"
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ": se requiere título para cada: conjunto de datos"
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr "JSON inválido"
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "actualización de personalización! requiere una plantilla personalizada"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1714,24 +1728,24 @@ msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "debe ser después de %<date>s"
+msgstr "debe estar después de %<date> s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "Se espera una clave \"org\" para hash de enlaces"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Se espera un hash para enlaces."
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "Se espera una clave %<key>s para el hash de enlaces"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "La clave %<key>s no tiene un conjunto válido de enlaces de objetos"
+msgstr "La clave %<key> s no tiene un conjunto válido de enlaces de objetos"
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr "Una llave %<key> s se espera para enlaces hash"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1739,10 +1753,10 @@ msgstr "La siguiente respuesta no puede ser guardada"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"ya que %<name>s guardó la respuesta a continuación mientras estaba editando. Po"
+"ya que %{name} guardó la respuesta a continuación mientras estaba editando. Po"
 "r favor, combine sus cambios y luego vuelva a guardar la respuesta."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1770,14 +1784,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Por favor espere, los estándares se están cargando."
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1788,11 +1802,11 @@ msgstr "Por favor espere, los estándares se están cargando."
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1816,8 +1830,8 @@ msgid "Answered"
 msgstr "Contestada"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr " por %<user_name>s"
+msgid " by %{user_name}"
+msgstr " por %{user_name}"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1873,12 +1887,13 @@ msgstr "Tema"
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Control de seguridad"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Enviar"
@@ -1894,15 +1909,15 @@ msgstr "Contactanos"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s es proporcionado por %<organisation_name>s. <br /> Puede en"
-"contrar más información sobre nosotros en nuestro <a href=\"%<organisation_url>s"
+"%{application_name} es proporcionado por %{organisation_name}. <br /> Puede en"
+"contrar más información sobre nosotros en nuestro <a href=\"%{organisation_url}"
 "\" class=\"has-new-window-popup-info\" target=\"_blank\">sitio web <em class=\"sr-on"
 "ly\">(nueva ventana)</em> <span class=\"new-window-popup-info\">%{open_in_new_win"
 "dow_text}</span></a> . Si desea ponerse en contacto con nosotros acerca de %{a"
@@ -1940,21 +1955,21 @@ msgstr "Seleccione cada rol que se aplique al contribuyente."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Afiliación"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "Roles"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1974,19 +1989,19 @@ msgstr "Roles"
 msgid "Remove"
 msgstr "Borrar"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2054,14 +2069,14 @@ msgstr "Confirmación de clave"
 msgid "First name"
 msgstr "Nombre"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Apellidos"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2070,8 +2085,8 @@ msgid "Create account"
 msgstr "Registrarse"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "Bienvenido a %<application_name>s"
+msgid "Welcome to %{application_name}"
+msgstr "Bienvenido a %{application_name}"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2089,26 +2104,32 @@ msgstr "o copia"
 msgid "into your browser"
 msgstr "en tu navegador"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "Consulta o feedback relacionado con %{tool_name}"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Hola %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Hola %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Su colega %<inviter_name>s lo invitó a contribuir a su Plan de gestión de datos"
-" en %<tool_name>s"
+"Su colega %{inviter_name} lo invitó a contribuir a su Plan de gestión de datos"
+" en %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%<click_here>s para aceptar la invitación, (o copiar %<link>s en su navegador). "
+"%{click_here} para aceptar la invitación, (o copiar %{link} en su navegador). "
 "Si no desea aceptar la invitación, ignore este correo electrónico."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2127,8 +2148,8 @@ msgstr "Todo lo mejor"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "El equipo %<tool_name>s"
+msgid "The %{tool_name} team"
+msgstr "El equipo %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2139,22 +2160,22 @@ msgstr "Por favor no responder a este email."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
-"Si tiene alguna pregunta o necesita ayuda, contáctenos en %<helpdesk_email>s o "
-"visite %<contact_us_url>s"
+"Si tiene alguna pregunta o necesita ayuda, contáctenos en %{helpdesk_email} o "
+"visite %{contact_us_url}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Hola %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Hola %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"Alguien ha solicitado un enlace para cambiar su contraseña %<tool_name>s. Puede"
+"Alguien ha solicitado un enlace para cambiar su contraseña %{tool_name}. Puede"
 " hacerlo a través del siguiente enlace."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2168,11 +2189,11 @@ msgstr "Si usted no ha solicitado este, por favor, ignora este mensaje."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
-"Si tiene alguna pregunta o necesita ayuda, contáctenos en %<helpdesk_email>s o "
-"visite %<contact_us>s"
+"Si tiene alguna pregunta o necesita ayuda, contáctenos en %{helpdesk_email} o "
+"visite %{contact_us}"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2244,23 +2265,23 @@ msgstr "Documentación"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Consulte la <a href=\"%<api_v0_wiki>s\">documentación de v0</a> para obtener más "
+"Consulte la <a href=\"%{api_v0_wiki}\">documentación de v0</a> para obtener más "
 "detalles sobre la API original, que incluye acceso a estadísticas, el texto co"
 "mpleto de los planes y la capacidad de conectar a los usuarios con los departa"
 "mentos."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Consulte la <a href=\"%<api_v1_wiki>s\">documentación de v1</a> para obtener más "
-"detalles sobre la API que admite el <a href=\"%<rda_standard_url>s\">estándar de "
+"Consulte la <a href=\"%{api_v1_wiki}\">documentación de v1</a> para obtener más "
+"detalles sobre la API que admite el <a href=\"%{rda_standard_url}\">estándar de "
 "metadatos común RDA para DMP.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2434,8 +2455,8 @@ msgid "Sign in or Create account"
 msgstr "Iniciar sesión o crear cuenta"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "¿Tienes una cuenta %<application_name>s?"
+msgid "Do you have a %{application_name} account?"
+msgstr "¿Tienes una cuenta %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2450,8 +2471,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Esto vinculará su cuenta existente a sus credenciales."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "No cuenta %<application_name>s?"
+msgid "No %{application_name} account?"
+msgstr "No cuenta %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2518,7 +2539,7 @@ msgstr "desplegar todo"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Grupo de orientación"
@@ -2602,7 +2623,7 @@ msgstr "Crear orientación"
 msgid "Enter your guidance here. You can include links where needed."
 msgstr "Introduzca sus orientaciones aquí. Puede incluir enlaces si lo cree necesario."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2614,26 +2635,26 @@ msgstr ""
 "ra el cual cree grupos de guía, en todas las plantillas que tengan preguntas c"
 "on las etiquetas de tema correspondientes."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Seleccione a que grupo pertenece esta guía."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 "Marque esta casilla cuando esté listo para que esta guía aparezca en los plane"
 "s del usuario."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "¿Publicado?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %<application_name>s ha sido desarrollado por <strong>%<organisation_name>s<"
+"<p> %{application_name} ha sido desarrollado por <strong>%{organisation_name}<"
 "/strong> para ayudarlo a escribir planes de administración de datos. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2819,7 +2840,8 @@ msgid "Logout"
 msgstr "Cerrar Sesión"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
 msgstr "DMPonline"
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2897,11 +2919,11 @@ msgstr "Se abre en una nueva ventana"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"Los resultados de %<n>s están disponibles, use las flechas hacia arriba y hacia"
+"Los resultados de %{n} están disponibles, use las flechas hacia arriba y hacia"
 " abajo para navegar por las sugerencias. Use la tecla Intro para seleccionar u"
 "na sugerencia o la tecla Escape para cerrar las sugerencias."
 
@@ -2953,8 +2975,8 @@ msgid "Example answer"
 msgstr "Ejemplo de respuesta"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr "%<org>s Ejemplo de respuesta"
+msgid "%{org} Example Answer"
+msgstr "%{org} Ejemplo de respuesta"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3108,10 +3130,10 @@ msgstr "Eliminar fase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Está a punto de eliminar la fase '%<phase_title>s'. Esto eliminará todas las se"
+"Está a punto de eliminar la fase '%{phase_title}'. Esto eliminará todas las se"
 "cciones y preguntas enumeradas a continuación. ¿Estás seguro?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3170,8 +3192,8 @@ msgid "Write plan"
 msgstr "Escribir plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "%<org_name>s Planes"
+msgid "%{org_name} Plans"
+msgstr "%{org_name} Planes"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3222,10 +3244,10 @@ msgstr "Notificar al propietario del plan que he terminado de proporcionar comen
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Descargar planes <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-win"
-"dow-popup-info\">%<open_in_new_window_text>s</span>"
+"dow-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3255,8 +3277,8 @@ msgstr ""
 " aquí."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Pregunta %<number>s:"
+msgid "Question %{number}:"
+msgstr "Pregunta %{number}:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3324,15 +3346,15 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "Borrar"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
-msgstr "Está a punto de eliminar la pregunta # %<question_number>s. ¿Estás seguro?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgstr "Está a punto de eliminar la pregunta # %{question_number}. ¿Estás seguro?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3431,10 +3453,10 @@ msgstr "Introduce un título para la sección."
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Va a borrar '%<section_title>s'. Esta acción afectará las preguntas enlazadas c"
+"Va a borrar '%{section_title}'. Esta acción afectará las preguntas enlazadas c"
 "on esta sección. ¿Está seguro?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3465,8 +3487,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "solo para uso interno %<org_name>s"
+msgid "for internal %{org_name} use only"
+msgstr "solo para uso interno %{org_name}"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3632,28 +3654,32 @@ msgstr ""
 "llas de patrocinadores, utilice las opciones de 'personalizar plantilla' a con"
 "tinuación."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "%{org_name} Plantillas"
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Plantillas personalizables"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Todos (%<count>s)"
+msgid "All (%{count})"
+msgstr "Todos (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "Publicado (%<count>s)"
+msgid "Published (%{count})"
+msgstr "Publicado (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "No publicado (%<count>s)"
+msgid "Unpublished (%{count})"
+msgstr "No publicado (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "No personalizado (%<count>s)"
+msgid "Not customised (%{count})"
+msgstr "No personalizado (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3662,8 +3688,8 @@ msgstr "Crear una plantilla"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "Perfil de edición para %<username>s"
+msgid "Editing profile for %{username}"
+msgstr "Perfil de edición para %{username}"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3671,8 +3697,8 @@ msgid "View all users"
 msgstr "Ver todos los usuarios"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "Planes de %<username>s"
+msgid "Plans of %{username}"
+msgstr "Planes de %{username}"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3734,10 +3760,10 @@ msgstr "Fusionar organizaciones"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 "Seleccione la organización que reemplazará a la organización actual: ' <strong"
-">%<org_name>s</strong> '."
+">%{org_name}</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3916,21 +3942,21 @@ msgid "Last Accessed"
 msgstr "Último accedido"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Nunca"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Está a punto de eliminar '%<client_name>s'. Ya no podrán acceder a la API. ¿Est"
+"Está a punto de eliminar '%{client_name}'. Ya no podrán acceder a la API. ¿Est"
 "ás seguro?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
-msgstr "Está a punto de eliminar '%<contributor_name>s'. ¿Estás seguro?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgstr "Está a punto de eliminar '%{contributor_name}'. ¿Estás seguro?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3943,10 +3969,10 @@ msgstr "Nombre o código abreviado"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Está a punto de eliminar '%<department_name>s'. Esto afectará la orientación. ¿"
+"Está a punto de eliminar '%{department_name}'. Esto afectará la orientación. ¿"
 "Estás seguro?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3987,15 +4013,15 @@ msgstr "Publicar"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Está a punto de borrar el grupo '%<guidance_group_name>s'. Esto afectará a la o"
+"Está a punto de borrar el grupo '%{guidance_group_name}'. Esto afectará a la o"
 "rientación. ¿Está seguro?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
-msgstr "Está a punto de borrar '%<guidance_summary>s'. ¿Está seguro?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgstr "Está a punto de borrar '%{guidance_summary}'. ¿Está seguro?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4031,8 +4057,23 @@ msgid "Managed"
 msgstr "Gestionado"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
-msgstr "Está a punto de eliminar '%<org_name>s'. ¿Estás seguro?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr "Está a punto de eliminar '%{org_name}'. ¿Estás seguro?"
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Título del Proyecto"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Prueba"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4062,25 +4103,10 @@ msgstr ""
 "l mes y un año de 4 dígitos en el cuadro de búsqueda de arriba. <br> Por ejemp"
 "lo: 'Oct 2019' o 'Jun 2013'."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Título del Proyecto"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "creado"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Prueba"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4198,10 +4224,10 @@ msgstr "Publicar cambios"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"¿Está seguro de que desea eliminar su personalización de \"%<template_title>s\"? "
+"¿Está seguro de que desea eliminar su personalización de \"%{template_title}\"? "
 "Cualquier versión publicada no estará disponible para los usuarios."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4218,10 +4244,10 @@ msgstr "Ver personalizaciones"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"¿Estás seguro de que deseas eliminar \"%<template_title>s\"? Cualquier versión pu"
+"¿Estás seguro de que deseas eliminar \"%{template_title}\"? Cualquier versión pu"
 "blicada no estará disponible para los usuarios."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4385,22 +4411,22 @@ msgstr "Derecho"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Descargar Plan <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-windo"
-"w-popup-info\">%<open_in_new_window_text>s</span>"
+"w-popup-info\">%{open_in_new_window_text}</span>"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr "Seleccione Orientación"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Para ayudarlo a escribir su plan, %<application_name>s puede mostrarle la orien"
+"Para ayudarlo a escribir su plan, %{application_name} puede mostrarle la orien"
 "tación de una variedad de organizaciones."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4421,11 +4447,11 @@ msgstr "No hay una guía adicional para esta plantilla."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Para ayudarlo a escribir su plan, %<application_name>s puede mostrarle la orien"
+"Para ayudarlo a escribir su plan, %{application_name} puede mostrarle la orien"
 "tación de una variedad de organizaciones. Elija hasta 6 organizaciones de las "
 "siguientes organizaciones que ofrezcan orientación relevante para su plan."
 
@@ -4451,19 +4477,19 @@ msgstr "Escribir plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
-"Este plan se basa en la plantilla \"%<template_title>s\" proporcionada por %{org_"
+"Este plan se basa en la plantilla \"%{template_title}\" proporcionada por %{org_"
 "name}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
-msgstr "Versión de la plantilla %<template_version>s, publicada en %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
+msgstr "Versión de la plantilla %{template_version}, publicada en %{published_date}"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4481,13 +4507,13 @@ msgstr[1] "preguntas"
 msgid "answered"
 msgstr "Contestada"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 "Si se solicita financiación, indique el nombre exactamente como en la propuest"
 "a de subvención."
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4495,51 +4521,96 @@ msgstr ""
 "Resuma brevemente su proyecto de investigación para ayudar a otros a comprende"
 "r los propósitos para los cuales se recopilan o crean los datos."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr ""
 "Una identificación pertinente según lo determine el financiador y / o la organ"
 "ización."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+"Si existen posibles problemas éticos relacionados con los datos que describe e"
+"ste DMP"
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr "Descripción de las cuestiones éticas"
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr "Enlace a un protocolo de una reunión con un comité de ética"
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr "Proyecto simulado para pruebas, práctica o fines educativos."
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Resumen del proyecto"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr "Dominio de investigación"
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr "- Por favor, seleccione uno -"
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Inicio del proyecto"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "La fecha estimada en la que comenzará este proyecto."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Fin del proyecto"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "La fecha estimada en la que completará este proyecto."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "página de destino"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "ID"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr "Los resultados de la investigación pueden tener preocupaciones éticas"
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr "Describa cualquier preocupación ética."
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr "Protocolos éticos"
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr "Estado de financiación"
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr "Número de concesión / url"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr "Conceder número:"
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4579,11 +4650,11 @@ msgstr "Establecer visibilidad del plan"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "La visibilidad pública u organizativa está destinada a los planes terminados. "
-"Debe responder al menos %<percentage>s %% de las preguntas para habilitar estas"
+"Debe responder al menos %{percentage} %% de las preguntas para habilitar estas"
 " opciones. Nota: los planes de prueba se establecen en visibilidad privada de "
 "forma predeterminada."
 
@@ -4673,8 +4744,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Haga clic en el botón 'Crear plan' a continuación para comenzar."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "%<org_title>s Planes"
+msgid "%{org_title} Plans"
+msgstr "%{org_title} Planes"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4758,11 +4829,11 @@ msgstr "Encontramos varias plantillas DMP correspondientes a su patrocinador."
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Los DMP públicos son planes creados con el servicio %<application_name>s y comp"
+"Los DMP públicos son planes creados con el servicio %{application_name} y comp"
 "artidos públicamente por sus propietarios. No se examinan por calidad, integri"
 "dad o cumplimiento de las pautas de los financiadores."
 
@@ -4813,8 +4884,8 @@ msgid "terms and conditions"
 msgstr "Términos y condiciones"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "¿Desea crear un plan basado en la plantilla \"%<name>s\"?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "¿Desea crear un plan basado en la plantilla \"%{name}\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4865,41 +4936,46 @@ msgstr "Quitar el filtro"
 msgid "Filter plans"
 msgstr "Filtro de planes"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Pregunta no respondida."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
-msgstr "Un plan de manejo de datos creado usando %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
+msgstr "Un plan de manejo de datos creado usando %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Afiliación:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr "Financiador:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "IDD DE ORCID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr "IDENTIFICACIÓN:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr "Fecha de inicio:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr "Fecha final:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr "Número de concesión / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4921,8 +4997,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Comience a escribir para ver una lista de sugerencias."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -4932,14 +5008,14 @@ msgstr ""
 ". Verifique que su organización no aparezca en la lista en una forma ligeramen"
 "te diferente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "¡El nombre que ingresó no era una de las sugerencias enumeradas!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "Acerca de %<application_name>s"
+msgid "About %{application_name}"
+msgstr "Acerca de %{application_name}"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5023,10 +5099,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "involucrarse <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-window-"
-"popup-info\">%<open_in_new_window_text>s</span>"
+"popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5047,8 +5123,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Si tiene una cuenta, inicie sesión y comience a crear o editar su DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "Si no tiene una cuenta %<application_name>s, haga clic en"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "Si no tiene una cuenta %{application_name}, haga clic en"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5087,13 +5163,14 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"Cuando inicie sesión en DMPRoadmap, se le dirigirá a la página 'Mi panel'. Des"
-"de aquí puede editar, compartir, descargar, copiar o eliminar cualquiera de su"
-"s planes. También verá planes que otros han compartido con usted."
+"Cuando inicie sesión en %{application_name}, será dirigido a la página 'Mi pan"
+"el de control'. Desde aquí puedes editar, compartir, descargar, copiar o elimi"
+"nar cualquiera de tus planes. También verá los planes que otras personas han c"
+"ompartido con usted."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5249,14 +5326,13 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
 "Desde aquí puedes descargar tu plan en varios formatos. Esto puede ser útil si"
-" necesita presentar su plan como parte de una solicitud de subvención. Elija e"
-"l formato en el que desea ver / descargar su plan y haga clic para descargar. "
-"También puede ajustar el formato (tipo de letra, tamaño y márgenes) para los a"
-"rchivos PDF, lo que puede ser útil si se trabaja a los límites de la página. <"
-"/p>"
+" necesita enviar su plan como parte de una solicitud de subvención. Elija en q"
+"ué formato le gustaría ver/descargar su plan y haga clic para descargar. Tambi"
+"én puede ajustar el formato (tipo de fuente, tamaño y márgenes) para los archi"
+"vos PDF, lo que puede ser útil si trabaja con límites de páginas."
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5264,46 +5340,46 @@ msgstr "Información sobre usted: cómo la usamos y con quién la compartimos."
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"La información que usted proporcione será utilizada por %<org_name>s para ofrec"
-"erle acceso y personalización del servicio %<application_name>s."
+"La información que usted proporcione será utilizada por %{org_name} para ofrec"
+"erle acceso y personalización del servicio %{application_name}."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"El %<org_name>s procesa los datos personales de los usuarios de %{application_n"
-"ame} para entregar y mejorar el servicio %<application_name>s de una manera per"
+"El %{org_name} procesa los datos personales de los usuarios de %{application_n"
+"ame} para entregar y mejorar el servicio %{application_name} de una manera per"
 "sonalizada y para garantizar que cada usuario reciba la información relevante."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"El procesamiento de sus datos personales por %<org_name>s es necesario para per"
+"El procesamiento de sus datos personales por %{org_name} es necesario para per"
 "seguir los siguientes intereses legítimos:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Para proporcionar acceso al servicio %<application_name>s y personalización de "
+"Para proporcionar acceso al servicio %{application_name} y personalización de "
 "su experiencia de usuario, por ejemplo. provisión de plantillas relevantes y o"
 "rientación para su organización."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Para mantenerse al día con noticias sobre %<application_name>s, como nuevas fun"
+"Para mantenerse al día con noticias sobre %{application_name}, como nuevas fun"
 "ciones o mejoras, o cambios en nuestra Política de privacidad."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5313,29 +5389,29 @@ msgstr "Para fines de seguridad de la red y de la información."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 "Retendremos los datos personales que nos haya proporcionado durante el tiempo "
-"que continúe utilizando el servicio %<application_name>s. Sus datos personales "
+"que continúe utilizando el servicio %{application_name}. Sus datos personales "
 "pueden eliminarse de este servicio si lo solicita al equipo %{application_name"
 "} en un plazo de 30 días."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
-"Si tiene alguna pregunta, comuníquese con el equipo de %<application_name>s al:"
-" <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"Si tiene alguna pregunta, comuníquese con el equipo de %{application_name} al:"
+" <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Esta declaración se revisó por última vez en %<revdate>s y se puede revisar en "
+"Esta declaración se revisó por última vez en %{revdate} y se puede revisar en "
 "cualquier momento con previo aviso."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5350,31 +5426,29 @@ msgstr ""
 "munidad de investigación. Brindamos servicios al sector de educación superior "
 "del Reino Unido, Estados Unidos e internacional."
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMPRoadmap"
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"DMPRoadmap ('la herramienta', 'el sistema') es una herramienta desarrollada po"
-"r DCC y CDL como un recurso compartido para la comunidad de investigación. Est"
-"á alojado en CDL por el Centro de Curación de la Universidad de California."
+"%{application_name} ('la herramienta', 'el sistema') es una herramienta desarr"
+"ollada por DCC y CDL como un recurso compartido para la comunidad de investiga"
+"ción. Está alojado en CDL por el Centro de Conservación de la Universidad de C"
+"alifornia."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5405,11 +5479,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5424,76 +5499,77 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3> Sus datos personales y aviso de consentimiento </h3><p> Para ayudar a ide"
-"ntificar y administrar su cuenta con DMPRoadmap, necesitamos almacenar su nomb"
-"re y dirección de correo electrónico. También podemos usarlo para comunicarnos"
-" con usted para obtener comentarios sobre su uso de la herramienta, o para inf"
-"ormarle sobre los últimos desarrollos o lanzamientos. La información puede tra"
-"nsferirse entre DCC y CDL, pero solo para los siguientes propósitos legítimos "
-"de DCC y CDL: marketing, mejora de nuestros servicios e información sobre cont"
-"enido y eventos relevantes. No venderemos, alquilaremos ni intercambiaremos ni"
-"nguna información personal que nos proporcione. Al usar este sistema, usted ac"
-"epta la recopilación, retención y uso de su información personal de acuerdo co"
-"n lo anterior. Tiene derecho a solicitarnos que no procesemos sus datos person"
-"ales con fines de marketing. </p><h3> Política de privacidad </h3><p> Usted pu"
-"ede ver la información que ingresa en este sistema, las personas con las que h"
-"a elegido compartir el acceso y, con el único fin de mantener el servicio, los"
-" administradores del sistema en DCC y CDL. Recopilamos información anónima, au"
-"tomatizada y agregada de los planes, pero no accederemos, usaremos ni comparti"
-"remos su contenido directamente con nadie sin su permiso. Los funcionarios aut"
-"orizados de su organización de origen pueden acceder a sus planes para fines e"
-"specíficos, por ejemplo, para rastrear el cumplimiento de los requisitos de la"
-" organización / financiador, calcular los requisitos de almacenamiento o evalu"
-"ar la demanda de servicios de administración de datos en todas las disciplinas"
-". </p><h3> Libertad de información </h3><p> DCC y CDL mantienen sus planes en "
-"su nombre, pero son de su propiedad y responsabilidad. Los solicitantes de FOI"
-"A serán remitidos a su organización de origen. </p><h3> Contraseñas </h3><p> S"
-"u contraseña se almacena en forma cifrada y no se puede recuperar. Si se olvid"
-"a, debe reiniciarse. </p><h3> Galletas </h3><p> Tenga en cuenta que DMPRoadmap"
-" utiliza cookies. Puede encontrar más información sobre las Cookies y cómo las"
-" usamos en el <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-sit"
-"e/website-terms-use/cookies' class=\"has-new-window-popup-info\">sitio web princ"
-"ipal de DCC <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-window-p"
-"opup-info\">%<open_in_new_window_text>s</span></a> . </p><h3> API de terceros </"
-"h3><p> Ciertas características de este sitio web utilizan API y servicios de t"
-"erceros, como InCommon / Shibboleth o el alojamiento de terceros de biblioteca"
-"s JavaScript comunes o fuentes web. La información utilizada por un servicio e"
-"xterno se rige por la política de privacidad de ese servicio. </p><h3> Revisio"
-"nes </h3><p> Esta declaración fue revisada por última vez el 5 de octubre de 2"
-"017 y puede revisarse en cualquier momento. El uso de la herramienta indica qu"
-"e comprende y acepta estos términos y condiciones. </p>"
-
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+"<h3>Sus datos personales y aviso de consentimiento</h3><p> Para ayudar a ident"
+"ificar y administrar su cuenta con %{application_name}, necesitamos almacenar "
+"su nombre y dirección de correo electrónico. También podemos usarlo para comun"
+"icarnos con usted y obtener comentarios sobre su uso de la herramienta, o para"
+" informarle sobre los últimos desarrollos o lanzamientos. La información puede"
+" transferirse entre DCC y CDL, pero solo para los siguientes fines legítimos d"
+"e DCC y CDL: marketing, mejora de nuestros servicios e información sobre conte"
+"nido y eventos relevantes. No venderemos, alquilaremos ni intercambiaremos nin"
+"guna información personal que nos proporcione. Al usar este sistema, usted ace"
+"pta la recopilación, retención y uso de su información personal de acuerdo con"
+" lo anterior. Tiene derecho a solicitarnos que no procesemos sus datos persona"
+"les con fines de marketing.</p><h3> Política de privacidad</h3><p> La informac"
+"ión que ingresa en este sistema puede ser vista por usted, las personas con la"
+"s que ha elegido compartir el acceso y, únicamente con el fin de mantener el s"
+"ervicio, los administradores del sistema en DCC y CDL. Recopilamos información"
+" anónima, automatizada y agregada de los planes, pero no accederemos, utilizar"
+"emos ni compartiremos directamente su contenido con nadie más sin su permiso. "
+"Los funcionarios autorizados de su organización de origen pueden acceder a sus"
+" planes para fines específicos, por ejemplo, para realizar un seguimiento del "
+"cumplimiento de los requisitos de los patrocinadores/organizaciones, para calc"
+"ular los requisitos de almacenamiento o para evaluar la demanda de servicios d"
+"e gestión de datos en todas las disciplinas.</p><h3> Libertad de información</"
+"h3><p> DCC y CDL mantienen sus planes en su nombre, pero son de su propiedad y"
+" responsabilidad. Todos los solicitantes de FOIA serán remitidos a su organiza"
+"ción de origen.</p><h3> contraseñas</h3><p> Su contraseña se almacena en forma"
+" cifrada y no se puede recuperar. Si se olvida, debe restablecerse.</p><h3> Ga"
+"lletas</h3><p> Tenga en cuenta que %{application_name} utiliza cookies. Más in"
+"formación sobre las Cookies y cómo las usamos está disponible en el <a target="
+"'_blank' href='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cook"
+"ies' class=\"has-new-window-popup-info\">sitio web principal de DCC <em class=\"s"
+"r-only\">(nueva ventana)</em> <span class=\"new-window-popup-info\">%{open_in_new"
+"_window_text}</span></a> .</p><h3> API de terceros</h3><p> Ciertas característ"
+"icas de este sitio web utilizan servicios y API de terceros, como InCommon/Shi"
+"bboleth o alojamiento de terceros de fuentes web o bibliotecas de JavaScript c"
+"omunes. La información utilizada por un servicio externo se rige por la políti"
+"ca de privacidad de ese servicio.</p><h3> Revisiones</h3><p> Esta declaración "
+"fue revisada por última vez el 5 de octubre de 2017 y puede ser revisada en cu"
+"alquier momento. El uso de la herramienta indica que comprende y acepta estos "
+"términos y condiciones.</p>"
+
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Nombre de contacto"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "Email de contacto"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr "Identificación del cliente"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr "Secreto del cliente"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Último acceso el"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "Actualizar ID de cliente y secreto"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "Credenciales de correo electrónico para contactar"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr "¿Está seguro de que desea eliminar el cliente API: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr "¿Está seguro de que desea eliminar el cliente API: \"%{name}\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5509,8 +5585,8 @@ msgid "View all API clients"
 msgstr "Ver todos los clientes API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "Las credenciales se han enviado a %<email>s."
+msgid "The credentials have been sent to %{email}."
+msgstr "Las credenciales se han enviado a %{email}."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5557,9 +5633,9 @@ msgstr "Desechable"
 msgid "Body"
 msgstr "Cuerpo"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "¿Está seguro de que desea eliminar la notificación \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "¿Está seguro de que desea eliminar la notificación \"%{title}\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5584,8 +5660,8 @@ msgid "New Notification"
 msgstr "Nueva notificación"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
-msgstr "Fusionando '%<from_org_name>s' en '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgstr "Fusionando '%{from_org_name}' en '%{to_org_name}'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5593,10 +5669,10 @@ msgstr "Resumen:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Recuentos de registros '%<to_org_name>s' antes y después de una fusión con %{fr"
+"Recuentos de registros '%{to_org_name}' antes y después de una fusión con %{fr"
 "om_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5605,12 +5681,12 @@ msgid "Record Type"
 msgstr "Tipo de registro"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
-msgstr "Recuento de '%<to_org_name>s': antes de la combinación"
+msgid "'%{to_org_name}' Count - before merge"
+msgstr "Recuento de '%{to_org_name}': antes de la combinación"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
-msgstr "'%<to_org_name>s' Recuento: después de la combinación"
+msgid "'%{to_org_name}' Count - after merge"
+msgstr "'%{to_org_name}' Recuento: después de la combinación"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5619,7 +5695,7 @@ msgstr "Detalles:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
@@ -5629,12 +5705,12 @@ msgstr ""
 "mplo, eliminar los departamentos que se duplicaron)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
-msgstr "%<from_org_name>s - Antes"
+msgid "%{from_org_name} - Before"
+msgstr "%{from_org_name} - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
-msgstr "%<to_org_name>s - Antes"
+msgid "%{to_org_name} - Before"
+msgstr "%{to_org_name} - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5646,7 +5722,7 @@ msgid ""
 "name}' will then be deleted."
 msgstr ""
 "Advertencia: Los cambios propuestos anteriormente se confirmarán en la base de"
-" datos. A continuación, se eliminará '%<org_name>s'."
+" datos. A continuación, se eliminará '%{org_name}'."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
 msgid "These changes cannot be undone! Do not proceed unless you are certain."
@@ -5662,10 +5738,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Advertencia: '%<from_org_name>s' tiene planes que se encuentran actualmente en "
+"Advertencia: '%{from_org_name}' tiene planes que se encuentran actualmente en "
 "proceso de revisión. Es posible que los administradores de la organización no "
 "puedan ver estos planes después de la fusión."
 
@@ -5690,8 +5766,8 @@ msgid "New organisation"
 msgstr "Nueva organizacion"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "¿Está seguro de que desea eliminar el tema \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "¿Está seguro de que desea eliminar el tema \"%{title}\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5720,11 +5796,11 @@ msgstr "Archivo"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Está a punto de archivar %<user_name>s. Esto eliminará su información personal,"
+"Está a punto de archivar %{user_name}. Esto eliminará su información personal,"
 " pero conservará sus planes, respuestas y comentarios. No podrán iniciar sesió"
 "n. ¿Estás seguro?"
 
@@ -5827,43 +5903,42 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr "Puede cambiar sus preferencias de notificación en su página de perfil."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Hola %<username>s"
+msgid "Hello %{username}"
+msgstr "Hola %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
-msgstr "Se le han otorgado privilegios de administrador en %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
+msgstr "Se le han otorgado privilegios de administrador en %{tool_name}:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
-msgstr "Se le han revocado los privilegios de administrador en %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
+msgstr "Se le han revocado los privilegios de administrador en %{tool_name}."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
-"Más información sobre la administración de %<tool_name>s para los usuarios de s"
-"u organización está disponible en %<help_url>s."
+"Más información sobre la administración de %{tool_name} para los usuarios de s"
+"u organización está disponible en %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Hola %<name>s"
+msgid "Hello %{name},"
+msgstr "Hola %{name}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
-msgstr "Utilice las siguientes credenciales al acceder a la API %<tool_name>s."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgstr "Utilice las siguientes credenciales al acceder a la API %{tool_name}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
-msgstr "Consulte la documentación de la API en: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgstr "Consulte la documentación de la API en: %{api_documentation_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
@@ -5873,49 +5948,49 @@ msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"Si no solicitó acceso a la API %<tool_name>s o no solicitó la renovación de sus"
-" credenciales, contáctenos en %<helpdesk_email>s"
+"Si no solicitó acceso a la API %{tool_name} o no solicitó la renovación de sus"
+" credenciales, contáctenos en %{helpdesk_email}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Hola %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Hola %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s ha terminado de proporcionar comentarios sobre el plan \"%{link_ht"
+"%{commenter} ha terminado de proporcionar comentarios sobre el plan \"%{link_ht"
 "ml}\". Los comentarios se pueden encontrar en la pestaña 'Escribir plan' en el "
 "lado derecho de la página (Guía / Comentarios)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Hola %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Hola %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s ha solicitado comentarios sobre un plan %<link_html>s. Para agrega"
-"r comentarios, visite la página 'Planes' en el menú Admin en %<tool_name>s y ab"
+"%{requestor} ha solicitado comentarios sobre un plan %{link_html}. Para agrega"
+"r comentarios, visite la página 'Planes' en el menú Admin en %{tool_name} y ab"
 "ra el plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s ha comentado sobre su plan %<plan_title>s. Para ver los comen"
+"%{commenter_name} ha comentado sobre su plan %{plan_title}. Para ver los comen"
 "tarios, siga el enlace al DMP a continuación, o navegue hasta el plan a través"
-" de la página de Mi Tablero en %<tool_name>s."
+" de la página de Mi Tablero en %{tool_name}."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5932,24 +6007,28 @@ msgstr ""
 " pregunta."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "DMP: %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Nombre de la sección: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Nombre de la sección: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Pregunta: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Pregunta: %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr "Hola %{recepientname}"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"Sus permisos relacionados con %<plan_title>s han cambiado. Ahora tiene acceso %"
-"{type}. Esto significa que puedes %<placeholder1>s %<placeholder2>s"
+"Sus permisos relacionados con %{plan_title} han cambiado. Ahora tiene acceso %"
+"{type}. Esto significa que puedes %{placeholder1} %{placeholder2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5964,8 +6043,8 @@ msgid " has been removed by "
 msgstr " ha sido eliminado por"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "El plan %<plan_title>s cambió su visibilidad a %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "El plan %{plan_title} cambió su visibilidad a %{plan_visibility}."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5982,14 +6061,14 @@ msgstr "Público: cualquiera puede ver en la web."
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 "Si tiene preguntas relacionadas con esta acción, visite la página Mi panel en "
-"%<tool_name>s"
+"%{tool_name}"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Hola %<recipient_name>s"
+msgid "Hello %{recipient_name},"
+msgstr "Hola %{recipient_name}"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6009,33 +6088,31 @@ msgstr " basado en la plantilla"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
-msgstr ""%<inviter_name>s
-"Tu colega %{inviter_name} te ha invitado %<tool_name>s a
-\n"
+msgstr ""
+"Tu colega %{inviter_name} te ha invitado a contribuir a
\n"
 "          su plan de gestión de datos en %{tool_name}"
-%<tool_name>s%<username>s
-#: ../../app/views/us%<tool_name>slc%<username>sation.html.erb:2
+
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Bienvenido a %{tool_name}, %{username}"
 
-#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
+#: ../../app/views/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
+"%{tool_name} will help you to develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"%<tool_name>st %{contact_us}"
+"ail} or visit %{contact_us}"
 msgstr ""
-"%{tool_name} lo ayud%<contact_us>sllar su plan de gestión de datos. Si tiene al"
+"%{tool_name} lo ayudará a desarrollar su plan de gestión de datos. Si tiene al"
 "guna pregunta o comentario mientras usa la herramienta, contáctenos en %{helpd"
 "esk_email} o visite %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Puede cambiar sus preferencias de notificación en su página de perfil."
-%<username>s
-#: ../../app/views/users/_admin_gran%<username>sns.html.erb:9
+
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Privilegios de edición para %{username}"
 
diff --git a/config/locale/fi/LC_MESSAGES/app.mo b/config/locale/fi/LC_MESSAGES/app.mo
index 7bda03479ce6c06a82e1ba825962c724a4637c2e..d6273049b123f5ec2b4c0322c1b8f9f1c3e35469 100644
GIT binary patch
delta 32289
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
KH4;vh{{H~!mlrtz

delta 30343
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

diff --git a/config/locale/fi/app.po b/config/locale/fi/app.po
index 63398a50ee..d691fcfc18 100644
--- a/config/locale/fi/app.po
+++ b/config/locale/fi/app.po
@@ -1,14 +1,14 @@
 # Finnish translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish\n"
 "Language: fi\n"
@@ -18,29 +18,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"Suunnitelman tunnisteeseen %<plan_id>s ei liity kysymyksen tunnistetta %{questi"
-"on_id}, johon voisi luoda tai päivittää vastauksen"
+"ID %:lla ei ole kysymystä<question_id> s liittyy suunnitelman tunnukseen %<pla"
+"n_id> s jolle luodaan tai päivitetään vastaus"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
-msgstr ""
-"Tunnisteeseen %<id>s ei liity suunnitelmaa, johon voisi luoda tai päivittää vas"
-"tauksia"
+msgstr "Ei ole suunnitelmaa id %<id> s jolle luodaan tai päivitetään vastaus"
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr "Tunnistetiedot eivät kelpaa"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "Osaston koodin ja nimen on oltava yksilöivä"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "Käyttäjän on oltava organisaatiostasi"
 
@@ -48,28 +46,28 @@ msgstr "Käyttäjän on oltava organisaatiostasi"
 msgid "Bad Parameters"
 msgstr "Virheelliset parametrit"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "Liittyneet käyttäjät"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Yhteensä"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "users_joined"
 
@@ -82,35 +80,35 @@ msgstr "Valmiiden suunnitelmien määrä"
 msgid "completed_plans"
 msgstr "completed_plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Suunnitelmien määrä"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "suunnitelmat"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "Puuttuu tai on virheellinen JSON"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Virheellinen JSON-muoto"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Suunnitelmaa ei löytynyt"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr "DMP: n luominen epäonnistui"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "Suunnitelma on jo olemassa. Lähetä päivitys sen sijaan."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
@@ -118,103 +116,107 @@ msgstr ""
 "DMP: n omistajuutta ei voitu määrittää. Lisää\n"
 "                          : kuuluminen: yhteyshenkilöön"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr "Virheellinen JSON!"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "Virheellinen JSON"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "Suunnitelmia ei löytynyt"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Sinulla ei ole oikeuksia suorittaa tätä toimintoa."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Kirjaudu sisään tai rekisteröidy jatkaaksesi."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr "%<object>s:n %<action>s ei onnistu. %<errors>s"
+msgstr "Ei voi %<action> s %<object> s.%<errors> s"
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "%<object>s:n %<action>s onnistui."
+msgstr "Onnistuneesti %<action> s %<object> s."
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "API-asiakas"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "suunnitelma"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "ohjeryhmä"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "kommentti"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "organisaatio"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "käyttöoikeus"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "asetukset"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "käyttäjätiedot"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "käyttäjä"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "kysymysvaihtoehto"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr "Levyä ei löydy"
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "kohteen pitäisi olla ActiveRecord::Relation object"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params pitäisi olla Hash object"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params pitäisi olla Hash object"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "paikalliset pitäisi olla Hash objekti"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Kaikkien tietojen tarkastelu on rajoitettu"
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "Järjestä %<sort_field>s"
+msgstr "Lajitella jonkun mukaan %<sort_field> s"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "mukautus"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "mallipohja"
 
@@ -222,28 +224,28 @@ msgstr "mallipohja"
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr "obj pitäisi olla Mallipohja, Vaihe, Osio, Kysymys tai Huomautus"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "obj pitäisi olla Vaihe, Osio, Kysymys tai Huomautus"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "haku_kenttä ei vastaa"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "Hakualuella ei ole elementtejä"
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Captcha tarkastus epäonnistui, yritä uudelleen."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Sähköpostin lähettäminen onnistui."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Pyyntösi ei onnistu"
 
@@ -257,60 +259,60 @@ msgid "added"
 msgstr "lisä-"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "tallennettu"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "tallenna"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "poistettu"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "poista"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "Suunnitelmaa ei löytynyt"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "osallistujaa ei löytynyt"
 
@@ -322,102 +324,102 @@ msgstr "Palautepyyntösi lähettäminen ei onnistunut juuri nyt."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Tapahtui virhe, kun pyysit palautetta tälle suunnitelmalle."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "luominen"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "luo"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr "Ohjeryhmäsi on julkaistu ja se on nyt käytettävissä."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "julkaise"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr "Ohjeryhmäsi ei ole enää julkinen ja se ei siis ole käytettävissä."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "piilota"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "poistettu"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "poista"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr "Ohjeesi on julkaistu ja se on nyt käytettävissä."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Ohjeesi ei ole enää julkinen ja se ei siis ole käytettävissä."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Tilin poistaminen %<is>s:sta onnistui."
+msgstr "Tilisi linkityksen poistaminen osoitteesta %<is> s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "Tilisi poistaminen %<is>s:sta ei onnistu."
+msgstr "Tilin linkitystä ei voi poistaa osoitteesta %<is> s."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -429,70 +431,74 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "Et voi lisätä vaihetta mallin historialliseen versioon."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "Suunnitelmapohjsta ei voitu luoda uutta versiota."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr "Tästä mallista ei voi luoda uutta versiota.<br>"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "päivitetty"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "päivitä"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "Suunnitelmapohjsta ei voitu luoda uutta versiota."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
-msgstr "%<plan_owner>s on saanut tiedon, että olet antanut palautetta"
+msgstr ""
+"%<plan_owner> s on saanut ilmoituksen, että olet lopettanut palautteen antamis"
+"en"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr "Loppupalautteesta ilmoittaminen käyttäjälle ei onnistunut."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Projektin nimi"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Suunnitelmapohja"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -503,63 +509,66 @@ msgstr "Suunnitelmapohja"
 msgid "Organisation"
 msgstr "Organisaatio"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Omistajan nimi"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "Omistajan sähköposti"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Näkyvyys"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr "Uutta osiota ei voitu luoda. Määriteltyä vaihetta ei ole olemassa."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr "Tätä mallin versiota ei voi poistaa."
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "kopio"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Suunnitelmapohjaa ei voi enää mukauttaa."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Suunnitelmapohjan mukauttaminen ei onnistu."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Suunnitelmapohjaa ei voi mukauttaa."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Kaikki suunnitelmapohjat"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "%<org_name>s:n suunnitelmapohja"
+msgstr "%<org_name> s Mallit"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Omat suunnitelmapohjani"
@@ -568,162 +577,164 @@ msgstr "Omat suunnitelmapohjani"
 msgid "Customizable Templates"
 msgstr "Mukautettavissa olevat suunnitelmapohjat"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "Virhe linkkien jäsentämisessä %<template>s:ssa"
+msgstr "Virhe jäsennettäessä linkkejä %:lle<template> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
-"Suunnitelmapohjan tekemiseen on käytetty %<application_name>s:a. Viimeksi muoka"
-"ttu %<date>s"
+"Malli luotiin käyttämällä %<application_name> s palvelu. Viimeksi muokattu %<d"
+"ate> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Aineistonhallinnan suunnitelmapohjan lataaminen ei onnistu tällä hetkellä."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "Yhtään organisaatiota ei ole rekisteröity."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Organisaatiotasi määrittelyssä on ongelmia."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Valitse organisaatio"
 
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
+msgstr "Organisaatiotasi määrittelyssä on ongelmia."
+
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "Luotu käyttäen DMPTuulia. "
+msgstr "Luotu käyttämällä %<application_name> s. Viimeksi muokattu %<date> s"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "Tämä on"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "testisuunnitelma"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "Suunnitelmallesi ei löydy sopivaa mallipohjaa."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Suunnitelmani"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr "Suunnitelma"
+msgid "My Plan (%<title>s)"
+msgstr "<html>Suunnitelmani (%<title> s)</html>"
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr "%<user_name> s suunnitelma"
+
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Tämä suunnitelma perustuu oletusmalliin."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Suunnitelma perustuu"
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "malli asiakassuhteiden mukauttamisella"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "kopionti"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
-"Suunnitelman tilan muuttaminen ei onnistunut, koska vähintään %<percentage>s:a "
-"vastauksista pitää olla vastattuna"
+"Suunnitelman tilaa ei voi muuttaa, koska sitä tarvitaan vähintään %<percentage"
+"}> s prosentti vastasi"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "Suunnitelman tunnistetta %<plan_id>s ei löydy"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr "Suunnitelman tunnusta %{ ei löydy<plan_id> s"
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Projektisi on nyt testimuodossa."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Projektisi ei ole enää testimuodossa."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr "Suunnitelman testistatuksen muuttaminen ei onnistu"
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "Tunnisteeseen %<id>s ei vielä liity suunnitelmaa"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr "Tunnukseen %{ ei liity suunnitelmaa<id}> s"
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Tee valinta alla. Kun olet linkittänyt\n"
-"                       tiedot %<application_name>s -tilille,\n"
-"                       voit kirjautua suoraan sisään\n"
-"                       institutionaaliset valtakirjat."
+"Tee valinta alla. Kun olet linkittänyt tietosi %<application_name> s-tilillesi"
+", voit kirjautua sisään suoraan instituutiotunnuksillasi."
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr "Sinun on hyväksyttävä käyttöehdot, että voit rekisteröityä käyttäjäksi."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr "Valitse organisaatio luettelosta tai valitse Muu."
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "Sähköposti on jo rekisteröity."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
-"Tervetuloa! Olet kirjautunut onnistuneesti organisaatiosi tunnuksilla. Nyt voi"
-"t kirjautua sisään tiliisi niiden avulla."
+"Tervetuloa! Olet rekisteröitynyt onnistuneesti instituutiotunnuksillasi. Voit "
+"nyt käyttää tiliäsi heidän kanssaan."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Tallennus ei onnistunut."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Lisää sähköpostiosoitteesi."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "Kirjoita etunimi."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "Kirjoita sukunimi."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
 msgstr "Valitse organisaatio listasta tai kirjoita organisaatiosi nimi."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr "Anna salasanasi, jotta voit vaihtaa sähköpostiosoitteesi."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -733,68 +744,70 @@ msgstr ""
 "                Tämä sähköpostiosoite on jo rekisteröity. \\\n"
 "                Sinun on annettava yksilöllinen sähköpostiosoite."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Väärä salasana"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Kirjoita nykyinen salasanasi"
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Vahvista salasana"
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "Salasanan ja sen vahvistuksen on oltava samoja"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"Suunnitelmaa ei voi jakaa %<email>s:n kanssa, koska sähköposti on sama kuin suu"
-"nnitelman omistajalla."
+"Ei voi jakaa suunnitelmaa %:n kanssa<email> s koska sähköposti on sama kuin su"
+"unnitelman omistaja."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "Suunnitelma on jo jaettu %<email>s:n kanssa."
+msgstr "Suunnitelma on jo jaettu %:lle<email> s."
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Sukunimi"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "Kutsun lähettäminen %<email>s:lle onnistui."
+msgstr "Kutsu %<email> s myönnetty onnistuneesti."
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Suunnitelma on jaettu %<email>s:n kanssa."
+msgstr "Suunnitelma jaettu %:lle<email> s."
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
-msgstr "Sinun on annettava voimassa oleva sähköpostiosoite ja oikeudet."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
+msgstr "Sinun on annettava kelvollinen sähköpostiosoite ja valittava käyttöoikeustaso."
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Anna sähköpostiosoite"
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
-"Vaihdettiin %<email>s -oikeuksien onnistuminen. Heille on ilmoitettu sähköposti"
-"tse."
+"%:n käyttöoikeudet muutettu onnistuneesti<email> . Heille on ilmoitettu sähköp"
+"ostitse."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Pääsy suunnitelmaan poistettu"
 
@@ -814,67 +827,67 @@ msgstr ""
 "Tilisi liittäminen organisaatiotunnuksiin onnistui. Voit nyt kirjautua organis"
 "aatiotunnuksillasi."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Vientiasetusten muuttaminen onnistui."
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Tapahtui virhe vientiasetuksia tallennettaessa/säädettäessä."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
-msgstr ". API-käyttöoikeustiedot on lähetetty sähköpostitse osoitteeseen %<email>s"
+msgstr ". API-tunnukset on lähetetty sähköpostitse osoitteeseen %<email> s"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Ilmoituksesi on nyt aktiivinen."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Ilmoituksesi ei ole enää aktiivinen."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "Ilmoituksen aktiivista tilaa ei voi muuttaa"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "Tunnisteeseen %<id>s ei liity ilmoituksia"
+msgstr "ID %:iin ei liity ilmoitusta<id> s"
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"Affiliaatiosi organisaatioon ovat muuttuneet. Nyt voit muokata %<org_name>s:n m"
-"allipohjia."
+"Organisaation jäsenyyttäsi on muutettu. Voit nyt muokata malleja %<org_name> s"
+"."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Organisaation affiliaatioiden muuttaminen ei onnistu tällä hetkellä."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Tuntematon organisaatio."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Logossa oli jokin ongelma. Yritä ladata se uudelleen."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr "Organisaatioiden yhdistämisessä tapahtui virhe."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr "Kahden organisaation yhdistäminen epäonnistui tällä hetkellä."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr "Ei voida määrittää, mitkä tietueet on yhdistettävä."
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
@@ -882,19 +895,19 @@ msgstr ""
 "Yritit yhdistää 2 tiliä samalla sähköpostiosoitteella.\n"
 "           Yhdistä toisella sähköpostiosoitteella."
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "arkistoitu"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "Archive"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "yhdistyivät"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "yhdistää"
 
@@ -906,39 +919,39 @@ msgstr ""
 "Olet jo kirjautunut toisella käyttäjänimellä. Kirjaudu ulos hyväksyäksesi kuts"
 "un."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Sisäänkirjautuminen onnistui"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Tilisi liitettiin onnistuneesti %<scheme>s:n."
+msgstr "Tilisi on yhdistetty onnistuneesti osoitteeseen %<scheme> s."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "Tilisi liittäminen %<scheme>s:hin ei onnistunut."
+msgstr "Tiliäsi ei voi linkittää osoitteeseen %<scheme> s."
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "%<username>sn tilin %<action>s onnistui."
+msgstr "Onnistuneesti %<action> s %<username> s:n tilille."
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "aktivoitu"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "pois käytöstä"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr "%<username>s:n %<action>s ei onnistunut"
+msgstr "Ei voi %<action> s %<username> s"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "aktivoi"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "kytke pois päältä"
 
@@ -960,13 +973,13 @@ msgstr ""
 " lteemojen mukaan, nämä tuodaan esiin valintojesi perusteella, joten ei kannat"
 "a toistaa liikaa tekstiä."
 
-#: ../../app/helpers/conditions_helper.rb:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "Vastaaminen"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "<b>lähettää</b> aiheen <b>sisältävän sähköpostin</b>"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr "<b>lähettää sähköpostin</b> aiheella %<subject_name> s"
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
@@ -976,19 +989,15 @@ msgstr "<b>poistaa</b> kysymyksen"
 msgid " will <b>remove</b> questions "
 msgstr "<b>poistaa</b> kysymyksiä"
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Siirrä mukautus"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Muokkaa mukautusta"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Mukauta"
 
@@ -997,26 +1006,27 @@ msgid "Creators:"
 msgstr "Tekijät:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Tekijä:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s: Suunnitelmasi on lähetetty kommentoitavaksi"
+msgstr "%<application_name> s: Suunnitelmasi on lähetetty palautetta varten"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Hei %<user_name>s. </p><p> Suunnitelmasi \"%<plan_name>s\" on toimitettu organ"
-"isaation ylläpitäjän palautetta varten. Jos sinulla on tähän toimintaan liitty"
-"viä kysymyksiä, ota meihin yhteyttä osoitteessa %<organisation_email>s. </p>"
+"<p>Hei %<user_name> s.</p><p> Suunnitelmasi \"%<plan_name> s\" on lähetetty pala"
+"utetta organisaatiosi ylläpitäjältä. Jos sinulla on tähän toimintoon liittyviä"
+" kysymyksiä, ota meihin yhteyttä numeroon %<organisation_email> s.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1054,9 +1064,9 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> %<org_name>s: n tietokirjastonhoitaja vastaa pyyntöönne 48 tunnin kuluessa."
-" Jos sinulla on tähän toimintaan liittyviä kysymyksiä, ota meihin yhteyttä oso"
-"itteessa %<organisation_email>s. </p>"
+"<p>Tietokirjastonhoitaja osoitteesta %<org_name> s vastaa pyyntöösi 48 tunnin "
+"kuluessa. Jos sinulla on kysyttävää tähän toimintoon liittyen, ota meihin yhte"
+"yttä %<organisation_email> s.</p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1096,8 +1106,8 @@ msgid "Grant API to organisations"
 msgstr "Anna API organisaatioille"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1140,235 +1150,229 @@ msgstr "Avattu: näkyvissä kaikille ilman DMPTuuli-kirjautumista"
 msgid "Private: restricted to me and people I invite."
 msgstr "Yksityinen: rajattu minulle ja kutsumilleni henkilöille."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Tuntematon sarakkeen nimi."
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Suunnitelman nimi"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "Suunnitelman tunniste"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr ""
 "Rahoitusnumero\n"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Vastaava tutkija / Tutkija"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Suunnitelman yhteyshenkilö"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Suunnitelman kuvaus"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Rahoittaja"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "ORCID tunnisteesi"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
-msgstr "Ohjeita: %<themes>s"
+msgstr "Ohjeet: %<themes> s"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr "Ei mitään yhdistettävää"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
-msgstr "<p>Seuraava %<object_types>s siirretään kohtaan %<org_name>s:</p>"
+msgstr "<p>Seuraavat %<object_types> s siirretään kohtaan '%<org_name> s':</p>"
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Tee suunnitelma"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "Viime kuussa"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "Viimeiset 3 kuukautta"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "Viimeiset 6 kuukautta"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "Viimeiset 9 kuukautta"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "Viimeiset 12 kuukautta"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "%<tool_name>s:n liittyvä kysymys tai palaute"
+msgstr "Kysely tai palaute liittyen %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "Tervetuloa %<tool_name>s:n käyttäjäksi"
+msgstr "Tervetuloa %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "Tiedonhallintasuunnitelma %<tool_name>s -palvelussa on jaettu kanssasi"
+msgstr "Tiedonhallintasuunnitelma %<tool_name> s on jaettu kanssasi"
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
-msgstr ""
-"%<tool_name>s:ssa olevan aineistonhallintasuunnitelman käyttöoikeuksia on muute"
-"ttu"
+msgstr "Tietojenhallintasuunnitelman käyttöoikeudet muuttuneet %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "DMP: ltä poistetut käyttöoikeudet %<tool_name>s"
+msgstr "Käyttöoikeudet poistettu DMP:ltä %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
-msgstr "%<user_name>s on pyytänyt palautetta %<tool_name>s -suunnitelmasta"
+msgstr "%<user_name> s on pyytänyt palautetta %<tool_name> s suunnitelma"
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
-msgstr "%<tool_name>s: %<plan_title>s: lle on annettu asiantuntijapalautetta"
+msgstr "%<tool_name> s: Asiantuntijapalautetta on annettu %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "Suunnitelman näkyvyys on muuttunut: %<plan_title>s"
+msgstr "DMP-näkyvyys muuttunut: %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: Uusi kommentti lisättiin suunnitelmaasi %<plan_title>s"
+msgstr "%<tool_name> s: %:iin lisättiin uusi kommentti<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "Minulle myönnetyt ylläpito-oikeudet %<tool_name>s:ssa"
+msgstr "Järjestelmänvalvojan oikeudet myönnetty %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "%<tool_name>s API-muutokset"
+msgstr "%<tool_name> s API muutokset"
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Vaihe"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Osio"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Kysymys"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "Vastaus"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr "Muokkaaja:"
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Tekijät:"
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr "%<authors> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "%<affiliation>s"
+msgstr "%<affiliation> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Suunnitelmapohja:"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr "%<funder> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr "%<template> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr ""
 "Rahoitusnumero:\n"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr "%<grant_number> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Projektin tiivistelmä:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr "%<description> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Viimeksi muokattu:"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr "%<date> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Tekijänoikeustiedot:"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1387,7 +1391,7 @@ msgstr ""
 "yttö merkitse sitä, että tekijä kannattaisi suunnitelmaa tai että hänellä olis"
 "i jonkinlainen suhde projektiin tai esitykseen"
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Ei vastausta"
 
@@ -1397,7 +1401,7 @@ msgid "can't be blank"
 msgstr "ei voi olla tyhjä"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "täytyy olla uniikki"
 
@@ -1417,41 +1421,40 @@ msgstr "'Kysymys teksti' ei voi olla tyhjä."
 msgid "You must specify at least one role."
 msgstr "Sinun on määritettävä ainakin yksi rooli."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "ei voi olla tyhjä, jos sähköposteja ei ole annettu"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr "ei voi olla tyhjä."
+
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr "ei voi olla tyhjä, jos sähköpostia ei ole annettu."
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "ei voi olla tyhjä, jos nimeä ei ole annettu"
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr "ei voi olla tyhjä, jos nimeä ei ole annettu."
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Valitut vaihtoehdot"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Vastaaja"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Vastattu"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "Tiedot"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
-msgstr "Kysymykseen ei ole vastattu."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
+msgstr "Kysymykseen ei vastattu."
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "jo määritetty arvo"
 
@@ -1459,35 +1462,35 @@ msgstr "jo määritetty arvo"
 msgid "Feedback email message"
 msgstr "Palautteen sähköpostiviesti"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "täytyy olla yksi seuraavista tiedostomuodoista: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "ei voi olla suurempi kuin 500KB"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organisaatiokohtainen"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "julkinen"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "testi"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "yksityinen"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "on oltava alkamispäivän jälkeen"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "ohjeistus"
 
@@ -1495,35 +1498,35 @@ msgstr "ohjeistus"
 msgid "can't be less than zero"
 msgstr "ei voi olla pienempi kuin nolla"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "Tarvittavaa asetusta ei ole annettu"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "Virheellinen marginaalin koko"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "Marginaali ei voi olla negatiivinen"
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr "Tuntematon marginaali. Voi olla vain yläosa, alaosa, vasen tai oikea."
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Virheellilnen fonttikoko"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Virheellinen kirjasinlaji"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Tuntematon muotoiluasetus"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Virheellinen enimmäismäärä sivuja"
 
@@ -1531,85 +1534,86 @@ msgstr "Virheellinen enimmäismäärä sivuja"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Ohjepohjan edellistä versiota ei pysty muokkaamaan"
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "kopion_tuottaminen! vaatii organisaatiokohteen."
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "%<template>s:n kopio"
+msgstr "Kopio %<template> s"
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "version_tuottaminen! vaatii julkaistun mallipohjan"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "mukauta! vaatii kohteeksi organisaation"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr "mukauta! vaatii rahoittajan mallipohjan"
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "Et voi julkaista julkaistua mallia."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr "Et voi julkaista mallia ilman vaiheita."
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 msgid "You can not publish a template without sections in a phase.  "
 msgstr "Et voi julkaista mallia ilman osioita vaiheessa."
 
-#: ../../app/models/template.rb:465
+#: ../../app/models/template.rb:461
 msgid "You can not publish a template without questions in a section.  "
 msgstr "Et voi julkaista mallipohjaa ilman kysymyksiä."
 
-#: ../../app/models/template.rb:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "Mallin ehdot viittaavat taaksepäin"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
-msgstr ""
-"%<application_name>slla kirjoitettu aineistonhallintasuunnitelma on jaettu kans"
-"sasi"
-
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "täytyy olla kirjautunut sisään"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+msgstr "Tiedonhallintasuunnitelma %<application_name> s on jaettu kanssasi"
+
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "sinulla täytyy olla pääsy ohjeistuksen api:in"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "täytyy olla pääsy suunnitelmien api:in"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "ei ole oikeutta tarkastella suunnitelmaa"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr "täytyy päästä mallien sovellusliittymään"
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr "Data Manager"
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr "Projektin ylläpitäjä"
+
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr ""
+"Vastaava tutkija\n"
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr "Muut"
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1620,7 +1624,7 @@ msgstr ""
 "se on tarpeen itse tietojen tulkitsemiseksi) ylläpitämiseksi alkuperäistä käyt"
 "töä ja myöhempää uudelleenkäyttöä varten."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1628,7 +1632,7 @@ msgstr ""
 "Tutkimus- ja tutkimusprosessin suorittaminen, erityisesti kokeiden suorittamin"
 "en tai tietojen / todisteiden kerääminen."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1636,60 +1640,60 @@ msgstr ""
 "Johtamis- ja koordinointivastuu tutkimustoiminnan suunnittelusta ja toteuttami"
 "sesta."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Virheellinen avustustyyppi"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "Virheelliset käyttöoikeustiedot"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Virheellinen tunnus"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Tunnus vanhentunut"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Puuttuu merkki"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ": otsikko ja yhteyshenkilön: mbox ovat molemmat pakolliset kentät"
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ": tyyppi ja: tunniste vaaditaan kaikille tunnuksille"
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ": nimi vaaditaan jokaiselle: yhteys ja rahoitus"
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ": rooli ja joko: nimi tai: sähköposti vaaditaan jokaiselle: tekijälle"
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ": nimi, funder_id tai: grant_id vaaditaan jokaiselle rahoitukselle"
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ": otsikko vaaditaan jokaiselle: tietojoukolle"
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr "Virheellinen JSON"
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "upgrade_customization! vaatii mukautetun mallipohjan"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1699,24 +1703,24 @@ msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "on oltava myöhempi kuin %<date>s"
+msgstr "täytyy olla % jälkeen<date> s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "Linkkihashit tarvitsevat \"org\" avaimen"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Linkeissä on oltava hash"
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "Linkki hashit tarvitsevat avaimen %<key>s"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "Avaimessa %<key>s ei ole sopivia kohdelinkkejä"
+msgstr "Avain %<key> s ei sisällä kelvollista objektilinkkien joukkoa"
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr "Avain %<key> s odotetaan linkkien tiivistettä"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1724,10 +1728,10 @@ msgstr "Seuraavaa vastausta ei voida tallentaa"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"koska %<name>s tallensi vastauksen sillä aikaa, kun muokkasit suunnitelmaa. Yhd"
+"koska %{name} tallensi vastauksen sillä aikaa, kun muokkasit suunnitelmaa. Yhd"
 "istä tekemäsi muutokset ja tallenna vastaus uudestaan."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1755,14 +1759,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Odota, standardit latautuvat"
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1773,11 +1777,11 @@ msgstr "Odota, standardit latautuvat"
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1801,8 +1805,8 @@ msgid "Answered"
 msgstr "Vastattu"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr "%<user_name>s"
+msgid " by %{user_name}"
+msgstr "%{user_name}"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1858,12 +1862,13 @@ msgstr "Aihe"
 msgid "Message"
 msgstr "Viesti"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Varmennus"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Lähetä"
@@ -1879,18 +1884,18 @@ msgstr "Ota yhteyttä"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s tarjoaa %<organisation_name>s. <br /> Lisätietoja meistä <a"
-" href=\"%<organisation_url>s\" class=\"has-new-window-popup-info\" target=\"_blank\">"
+"%{application_name} tarjoaa %{organisation_name}. <br /> Lisätietoja meistä <a"
+" href=\"%{organisation_url}\" class=\"has-new-window-popup-info\" target=\"_blank\">"
 "verkkosivuillamme <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-wind"
-"ow-popup-info\">%<open_in_new_window_text>s</span></a> . Jos haluat ottaa yhteyt"
-"tä meihin %<application_name>s liittyen, täytä alla oleva lomake."
+"ow-popup-info\">%{open_in_new_window_text}</span></a> . Jos haluat ottaa yhteyt"
+"tä meihin %{application_name} liittyen, täytä alla oleva lomake."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
 #: ../../app/views/layouts/_branding.html.erb:37
@@ -1924,21 +1929,21 @@ msgstr "Valitse kuhunkin osallistujaan liittyvä rooli."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Puhelinnumero"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Organisaatio"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "roolit"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1958,19 +1963,19 @@ msgstr "roolit"
 msgid "Remove"
 msgstr "Poista"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2038,14 +2043,14 @@ msgstr "Salasanan vahvistus"
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2054,8 +2059,8 @@ msgid "Create account"
 msgstr "Rekisteröidy"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "Tervetuloa %<application_name>s:n käyttäjäksi"
+msgid "Welcome to %{application_name}"
+msgstr "Tervetuloa %{application_name}:n käyttäjäksi"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2073,26 +2078,32 @@ msgstr "tai kopioida"
 msgid "into your browser"
 msgstr "selaimeesi"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "%{tool_name}:n liittyvä kysymys tai palaute"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Hei %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Hei %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Kollegasi %<inviter_name>s on kutsunut sinut osallistumaan heidän tiedonhallint"
-"asuunnitelmaansa %<tool_name>s"
+"Kollegasi %{inviter_name} on kutsunut sinut osallistumaan heidän tiedonhallint"
+"asuunnitelmaansa %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%<click_here>s hyväksyäksesi kutsun, (tai kopioi %<link>s selaimeesi). Jos et hy"
+"%{click_here} hyväksyäksesi kutsun, (tai kopioi %{link} selaimeesi). Jos et hy"
 "väksy kutsua, voit jättää tämän sähköpostin huomiotta."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2111,8 +2122,8 @@ msgstr "Ystävällisin terveisin"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "%<tool_name>sn tiimi"
+msgid "The %{tool_name} team"
+msgstr "%{tool_name}n tiimi"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2123,22 +2134,22 @@ msgstr "Älä vastaa tähän sähköpostiin."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 "Jos sinulla on kysyttävää tai tarvitset apua, ota meihin yhteyttä: %{helpdesk_"
-"email} tai käy osoitteessa %<contact_us_url>s"
+"email} tai käy osoitteessa %{contact_us_url}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Hei %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Hei %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"Joku on pyytänyt %<tool_name>s:n salasanan vaihtoa. Voit tehdä sen alla olevall"
+"Joku on pyytänyt %{tool_name}:n salasanan vaihtoa. Voit tehdä sen alla olevall"
 "a linkillä."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2152,10 +2163,10 @@ msgstr "Jos et pyytänyt tätä, voit jätttää tämän sähköpostin huomiotta
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
-"Jos tarvitset apua, voit ottaa yhteyttä: %<helpdesk_email>s tai käy sivulla: %{"
+"Jos tarvitset apua, voit ottaa yhteyttä: %{helpdesk_email} tai käy sivulla: %{"
 "contact_us}"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2226,22 +2237,22 @@ msgstr "Dokumentointi"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Katso <a href=\"%<api_v0_wiki>s\">v0</a> : n <a href=\"%<api_v0_wiki>s\">dokumentaat"
+"Katso <a href=\"%{api_v0_wiki}\">v0</a> : n <a href=\"%{api_v0_wiki}\">dokumentaat"
 "iosta</a> lisätietoja alkuperäisestä sovellusliittymästä, joka sisältää pääsyn"
 " tilastoihin, suunnitelmien koko tekstin ja mahdollisuuden yhdistää käyttäjät "
 "osastoihin."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Katso <a href=\"%<api_v1_wiki>s\">v1</a> <a href=\"%<rda_standard_url>s\">: n ohjeis"
+"Katso <a href=\"%{api_v1_wiki}\">v1</a> <a href=\"%{rda_standard_url}\">: n ohjeis"
 "ta</a> lisätietoja sovellusliittymästä, joka tukee <a href=\"%{rda_standard_url"
 "}\">RDA: n yleistä metatietostandardia DMP: lle.</a>"
 
@@ -2378,7 +2389,8 @@ msgstr "Laitos tai koulu"
 #: ../../app/views/org_admin/users/edit.html.erb:43
 #: ../../app/views/super_admin/users/edit.html.erb:53
 msgid "Language"
-msgstr "Kieli"
+msgstr ""
+"Valitse kieli\n"
 
 #: ../../app/views/devise/registrations/_personal_details.html.erb:64
 msgid "My privileges"
@@ -2417,8 +2429,8 @@ msgid "Sign in or Create account"
 msgstr "Kirjaudu sisään tai luo tili"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "Onko sinulla jo %<application_name>s -tili?"
+msgid "Do you have a %{application_name} account?"
+msgstr "Onko sinulla jo %{application_name} -tili?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2433,8 +2445,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Tämä linkittää tilisi tunnistetietoihisi."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "Eikö sinulla ole %<application_name>s -tiliä?"
+msgid "No %{application_name} account?"
+msgstr "Eikö sinulla ole %{application_name} -tiliä?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2500,7 +2512,7 @@ msgstr "Piilota kaikki"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Ohjeryhmä"
@@ -2583,7 +2595,7 @@ msgstr "Luo ohje"
 msgid "Enter your guidance here. You can include links where needed."
 msgstr "Lisää ohjeistuksesi tähän. Voit lisätä linkkejä tarvittaessa."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2594,24 +2606,24 @@ msgstr ""
 "kyviin niin yleisen koko organisaatiota koskevan ohjeistuksen tai osastokohtai"
 "set ohjeet kaikissa mallipohjissa, joilla on vastaavia teemoja."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Valitse, mihin ryhmään ohjeistuksesi liittyy."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr "Ruksaa ruutu, kun ohje on valmis näytettäväksi käyttäjille."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "Julkaistu?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %<organisation_name>s on kehittänyt <strong>%<application_name>s</strong> , "
+"<p> %{organisation_name} on kehittänyt <strong>%{application_name}</strong> , "
 "jonka avulla voit kirjoittaa tietohallintasuunnitelmia. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2717,7 +2729,7 @@ msgstr "Tietosuojaseloste"
 
 #: ../../app/views/layouts/_footer.html.erb:17
 msgid "Accessibility statement"
-msgstr "Esteettömyyslausunto"
+msgstr "Saavutettavuusseloste (englanniksi)"
 
 #: ../../app/views/layouts/_footer.html.erb:18
 msgid "Github"
@@ -2754,7 +2766,8 @@ msgstr "Julkiset aineistonhallintasuunnitelmat"
 #: ../../app/views/public_pages/template_index.html.erb:1
 #: ../../app/views/public_pages/template_index.html.erb:4
 msgid "DMP Templates"
-msgstr "Julkiset aineistonhallintasuunnitelmien suunnitelmapohjat"
+msgstr ""
+"Julkiset suunnitelmapohjat\n"
 
 #: ../../app/views/layouts/_navigation.html.erb:44
 msgid "Home"
@@ -2797,8 +2810,9 @@ msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
-msgstr "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
+msgstr "%{application_name}"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2873,11 +2887,11 @@ msgstr "Avautuu uuteen ikkunaan"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"%<n>s tulokset ovat saatavilla. Käytä ylös ja alas nuolia navigoidaksesi ehdotu"
+"%{n} tulokset ovat saatavilla. Käytä ylös ja alas nuolia navigoidaksesi ehdotu"
 "ksiin. Käytä Enter-näppäintä valitaksesi ehdotuksen tai Escape-näppäintä sulke"
 "aksesi ehdotukset."
 
@@ -2929,8 +2943,8 @@ msgid "Example answer"
 msgstr "Esimerkki Vastaus"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr "%<org>s Esimerkkivastaus"
+msgid "%{org} Example Answer"
+msgstr "%{org} Esimerkkivastaus"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3083,10 +3097,10 @@ msgstr "Poista vaihe"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Olet poistamassa %<phase_title>s -vaihetta. Se poistaa myös alla listatut osiot"
+"Olet poistamassa %{phase_title} -vaihetta. Se poistaa myös alla listatut osiot"
 " ja kysymykset. Oletko varma?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3145,8 +3159,8 @@ msgid "Write plan"
 msgstr "Kirjoita suunnitelma"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "Suunnitelmat: %<org_name>s "
+msgid "%{org_name} Plans"
+msgstr "Suunnitelmat: %{org_name} "
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3197,10 +3211,10 @@ msgstr "Ilmoita suunnitelman omistajalle, että olen antanut loppupalautteen"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Lataa suunnitelmat <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-win"
-"dow-popup-info\">%<open_in_new_window_text>s</span>"
+"dow-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3230,8 +3244,8 @@ msgstr ""
 "än."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Kysymyksen %<number>s:"
+msgid "Question %{number}:"
+msgstr "Kysymyksen %{number}:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3297,15 +3311,15 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "Poista"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
-msgstr "Olet poistamassa kysymystä #%<question_number>s? Oletko varma?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgstr "Olet poistamassa kysymystä #%{question_number}? Oletko varma?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3404,10 +3418,10 @@ msgstr "Anna osiolle otsikko "
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Olet poistmassa %<section_title>s:a. Sillä on vaikutusta kysymyksiin, jotka on "
+"Olet poistmassa %{section_title}:a. Sillä on vaikutusta kysymyksiin, jotka on "
 "liitetty tähän osioon. Oletko varma?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3437,8 +3451,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "ainoastaan %<org_name>s:n sisäiseen käyttöön"
+msgid "for internal %{org_name} use only"
+msgstr "ainoastaan %{org_name}:n sisäiseen käyttöön"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3605,28 +3619,32 @@ msgstr ""
 "ittajan suunnitelmapohjiin, käytä alla olevaa mukauta suunnitelmapohjaa -vaiht"
 "oehtoa.\n"
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "%{org_name}:n suunnitelmapohja"
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Mukautettavissa olevat suunnitelmapohjat"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Kaikki (%<count>s)"
+msgid "All (%{count})"
+msgstr "Kaikki (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "Julkaistu (%<count>s)"
+msgid "Published (%{count})"
+msgstr "Julkaistu (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "Julkaisematta (%<count>s)"
+msgid "Unpublished (%{count})"
+msgstr "Julkaisematta (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "Ei mukautettu (%<count>s)"
+msgid "Not customised (%{count})"
+msgstr "Ei mukautettu (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3635,8 +3653,8 @@ msgstr "Luo suunnitelmapohja"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "%<username>s:n muokkausprofiili"
+msgid "Editing profile for %{username}"
+msgstr "%{username}:n muokkausprofiili"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3644,8 +3662,8 @@ msgid "View all users"
 msgstr "Näytä kaikki käyttäjät"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "Suunnitelmat %<username>s"
+msgid "Plans of %{username}"
+msgstr "Suunnitelmat %{username}"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3705,7 +3723,7 @@ msgstr "Yhdistä organisaatiot"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 "Valitse organisaatio, joka korvaa nykyisen organisaation: ' <strong>%{org_name"
 "}</strong> '."
@@ -3885,21 +3903,21 @@ msgid "Last Accessed"
 msgstr "Viimeksi käytetty"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Ei ikinä"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Olet poistamassa tiedostoa %<client_name>s. He eivät voi enää käyttää sovellusl"
+"Olet poistamassa tiedostoa %{client_name}. He eivät voi enää käyttää sovellusl"
 "iittymää. Oletko varma?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
-msgstr "Olet poistamassa '%<contributor_name>s'. Oletko varma?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgstr "Olet poistamassa '%{contributor_name}'. Oletko varma?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3912,10 +3930,10 @@ msgstr "Lyhennetty nimi tai koodi"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Olet poistamassa '%<department_name>s'. Tämä vaikuttaa ohjaukseen. Oletko varma"
+"Olet poistamassa '%{department_name}'. Tämä vaikuttaa ohjaukseen. Oletko varma"
 "?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3956,15 +3974,15 @@ msgstr "Julkaise"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Olet aikeissa poistaa '%<guidance_group_name>s':n. Tämä vaikuttaa ohjeistukseen"
+"Olet aikeissa poistaa '%{guidance_group_name}':n. Tämä vaikuttaa ohjeistukseen"
 ". Haluatko varmasti tehdä niin?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
-msgstr "Olet poistamassa '%<guidance_summary>s':a. Haluatko varmasti tehdä niin?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgstr "Olet poistamassa '%{guidance_summary}':a. Haluatko varmasti tehdä niin?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4000,8 +4018,23 @@ msgid "Managed"
 msgstr "Ylläpito"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
-msgstr "Olet poistamassa '%<org_name>s':ta. Oletko aivan varma?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr "Olet poistamassa '%{org_name}':ta. Oletko aivan varma?"
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Projektin nimi"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Testi"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4031,25 +4064,10 @@ msgstr ""
 "uukauden lyhenne ja 4-numeroinen vuosi yllä olevaan hakukenttään. <br> Esimerk"
 "iksi: 'lokakuu 2019' tai 'kesäkuu 2013'."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Projektin nimi"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "luotu"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Testi"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4168,10 +4186,10 @@ msgstr "Julkaise muutokset"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Haluatko varmasti poistaa \"%<template_title>s\":n muokkaukset? Käyttäjät eivät v"
+"Haluatko varmasti poistaa \"%{template_title}\":n muokkaukset? Käyttäjät eivät v"
 "oi enää käyttää myöskään julkaistuja versioita."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4188,10 +4206,10 @@ msgstr "Tarkastele mukautuksia"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Haluatko varmasti poistaa \"%<template_title>s\"? Käyttäjät eivät voi enää käyttä"
+"Haluatko varmasti poistaa \"%{template_title}\"? Käyttäjät eivät voi enää käyttä"
 "ä myöskään julkaistuja versioita."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4296,7 +4314,8 @@ msgstr "Valitse vaihe ladattavaksi"
 
 #: ../../app/views/plans/_download_form.html.erb:23
 msgid "Optional plan components"
-msgstr "Valinnaiset suunnitelman osat"
+msgstr ""
+"Valinnaiset suunnitelman osat\n"
 
 #: ../../app/views/plans/_download_form.html.erb:27
 msgid "project details coversheet"
@@ -4353,22 +4372,22 @@ msgstr "Oikea"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Lataa suunnitelma <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-wind"
-"ow-popup-info\">%<open_in_new_window_text>s</span>"
+"ow-popup-info\">%{open_in_new_window_text}</span>"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr "Valitse ohje"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"%<application_name>s:ssa on ohjeita, jotka auttavat sinua aineistonhallintasuun"
+"%{application_name}:ssa on ohjeita, jotka auttavat sinua aineistonhallintasuun"
 "nitelman kirjoittamisessa."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4389,11 +4408,11 @@ msgstr "Tätä suunnitelmapohjaa varten ei ole muita ohjeita."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Kun kirjoitat suunnitelmaa, %<application_name>s voi näyttää monen eri organisa"
+"Kun kirjoitat suunnitelmaa, %{application_name} voi näyttää monen eri organisa"
 "ation ohjeet. Voit valita korkeintaan kuusi ohjetta."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:42
@@ -4418,19 +4437,19 @@ msgstr "Kirjoita suunnitelma"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
-"Tämä suunnitelma pohjautuu \"%<template_title>s\":iin, jonka on luonut %{org_name"
+"Tämä suunnitelma pohjautuu \"%{template_title}\":iin, jonka on luonut %{org_name"
 "}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4448,63 +4467,108 @@ msgstr[1] "kysymykset"
 msgid "answered"
 msgstr "vastasi"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 "Jos haet rahoitusta, kirjoita tutkimusprojektin nimi täsmälleen kuten hakemuks"
 "essa.\n"
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
 msgstr "Kuvaile tutkimusprojektiasi lyhyesti muutamalla avainsanalla tai lauseella."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr "Rahoittajan ja/tai instituution oma ID."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+"Onko tässä DMP:ssä kuvattuihin tietoihin liittyviä mahdollisia eettisiä ongelm"
+"ia"
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr "Kuvaus eettisistä asioista"
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr "Linkki eettisen komitean kokouksen pöytäkirjaan"
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr ""
 "Rastita, jos teet suunnitelman testaamista, harjoittelua tai opetustarkoitusta"
 " varten"
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Projektin tiivistelmä"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr "Tutkimusalue"
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr "- Valitse yksi, kiitos -"
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Projektin alku"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "Arvioitu päivämäärä, jolloin aloitat projektin."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Projektin loppu"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "Arvioitu päivämäärä, jolloin suoritat tämän projektin."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "Aloitussivu"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "Rahoittajan tai organisaation tunniste (ei pakollinen)"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr "Tutkimustuloksissa voi olla eettisiä huolenaiheita"
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr "Kuvaile mahdolliset eettiset huolenaiheet"
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr "Eettiset protokollat"
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr "Rahoituksen tila"
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr "Apurahan numero / URL"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr "Apurahanumero:"
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4544,10 +4608,10 @@ msgstr "Suunnitelman näkyvyys"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
-"Voit jakaa vain suunnitelmia, joissa on vastattu vähintään %<percentage>s%%:iin"
+"Voit jakaa vain suunnitelmia, joissa on vastattu vähintään %{percentage}%%:iin"
 " kysymyksistä. Huomaa, että testisuunnitelmia ei voi jakaa."
 
 #: ../../app/views/plans/_share_form.html.erb:19
@@ -4561,7 +4625,9 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:27
 #: ../../app/views/user_mailer/plan_visibility.html.erb:12
 msgid "Organisation: anyone at my organisation can view"
-msgstr "Organisaatiokohtainen: näkyvillä DMPTuulissa organisaatiosi käyttäjille"
+msgstr ""
+"Organisaatiokohtainen: näkyvillä DMPTuulissa organisaatiosi käyttäjille (organ"
+"isaatio perustuu käyttäjän omaan ilmoitukseen)"
 
 #: ../../app/views/plans/_share_form.html.erb:35
 msgid "Public: anyone can view"
@@ -4635,8 +4701,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Pääset alkuu klikkaamalla 'Tee suunnitelma' -painiketta."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "Suunnitelmat: %<org_title>s"
+msgid "%{org_title} Plans"
+msgstr "Suunnitelmat: %{org_title}"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4722,7 +4788,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4776,8 +4842,8 @@ msgid "terms and conditions"
 msgstr "käyttöehdot"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "Haluatko luoda suunnitelman, joka perustuu %<name>s -malliin?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Haluatko luoda suunnitelman, joka perustuu %{name} -malliin?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4818,7 +4884,7 @@ msgstr "Muista sähköpostiosoitteeni"
 
 #: ../../app/views/shared/_sign_in_form.html.erb:27
 msgid "Sign in with your institutional credentials"
-msgstr "Voit kirjautua sisään organisaatiosi tunnuksilla"
+msgstr "Kirjaudu sisään organisaatiosi tunnuksilla"
 
 #: ../../app/views/shared/_table_filter.html.erb:1
 msgid "Remove the filter"
@@ -4828,43 +4894,48 @@ msgstr "Poista suodatin"
 msgid "Filter plans"
 msgstr "Suodata suunnitelmia"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Kysymykseen ei ole vastattu."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
 msgstr ""
-"Aineistonhallintasuunnitelman kirjoittamisessa on käytetty %<application_name>s"
+"Aineistonhallintasuunnitelman kirjoittamisessa on käytetty %{application_name}"
 ":a"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Affiliaatio:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr "rahoittaja:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "ORCID tunniste:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr "Tunnus:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr "Aloituspäivämäärä:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr "Päättymispäivä:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr "Apurahan numero / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4883,10 +4954,12 @@ msgstr ""
 #: ../../app/views/shared/org_selectors/_external_only.html.erb:13
 #: ../../app/views/shared/org_selectors/_local_only.html.erb:13
 msgid "Begin typing to see a list of suggestions."
-msgstr "Aloita kirjoittaminen nähdäksesi luettelon ehdotuksista."
+msgstr ""
+"Aloita kirjoittaminen, valitse listasta.\n"
+"\n"
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -4895,14 +4968,14 @@ msgstr ""
 "Edellä nimeämällesi organisaatiolle luodaan uusi merkintä. Tarkista vielä kerr"
 "an, että organisaatiosi ei näy luettelossa hiukan eri muodossa."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Antamasi nimi ei ollut yksi luetelluista ehdotuksista!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "Tietoa %<application_name>s -työkalusta"
+msgid "About %{application_name}"
+msgstr "Tietoa %{application_name} -työkalusta"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4980,10 +5053,10 @@ msgstr "Tutkiskele DMPRoadmap GitHubin wikiä ja opit kuinka"
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "osallistua <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5006,8 +5079,8 @@ msgstr ""
 "ntasuunnitelman kirjoittamisen tai vanhan muokkaamisen."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "Jos sinulla ei ole %<application_name>s -tiliä, klikkaa"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "Jos sinulla ei ole %{application_name} -tiliä, klikkaa"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5046,13 +5119,13 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"Kun olet kirjautunut DMPTuuliin, olet ensin Suunnitelmasi-sivulla, jossa voit "
-"muokata, jakaa, viedä, kopioida ja poistaa omia suunnitelmiasi. Näet myös muid"
-"en sinulle jakamat suunnitelmat."
+"Kun kirjaudut sisään %{application_name}, sinut ohjataan \"Oma hallintapaneeli\""
+" -sivulle. Täältä voit muokata, jakaa, ladata, kopioida tai poistaa mitä tahan"
+"sa suunnitelmiasi. Näet myös suunnitelmat, jotka muut ovat jakaneet kanssasi."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5205,13 +5278,8 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
-msgstr ""
-"Tällä välilehdellä voit ladata suunnitelman eri tiedostomuodoissa, mistä voi o"
-"lla apua, jos rahoittajasi vaatii suunnitelman liittämistä rahoitushakemukseen"
-". Valitse tiedostomuoto, jolla haluat avata suunnitelman ja klikkaa Tulosta. V"
-"oit myös muotoilla PDF-tiedostoa (fontti, kirjasinkoko ja marginaalit) ja täst"
-"ä voi olla apua, jos sivumäärä on rajattu.</p>Ky"
+" may be helpful if working to page limits."
+msgstr "Tällä välilehdellä voit ladata suunnitelmasi eri tiedostomuodoissa"
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5219,46 +5287,46 @@ msgstr "Tietomme sinusta: kuinka käytämme niitä ja kenen kanssa jaamme ne"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"%<org_name>s käyttää antamiasi tietoja tarjotaakseen sinulle pääsyn %{applicati"
+"%{org_name} käyttää antamiasi tietoja tarjotaakseen sinulle pääsyn %{applicati"
 "on_name} -palveluun ja sen yksilöllistämiseen."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%<org_name>s käsittelee %<application_name>sn käyttäjien henkilötietoja tuottaak"
-"seen ja parantaakseen %<application_name>sn palvelua ja varmistaakseen, että kä"
+"%{org_name} käsittelee %{application_name}n käyttäjien henkilötietoja tuottaak"
+"seen ja parantaakseen %{application_name}n palvelua ja varmistaakseen, että kä"
 "yttäjä saa tarpeelliset tiedot."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"%<org_name>s:n on tarpeellista käsitellä henkilötietoja seuraavien lainmukaiste"
+"%{org_name}:n on tarpeellista käsitellä henkilötietoja seuraavien lainmukaiste"
 "n seikkojen vuoksi:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Tarjotakseen pääsyn %<application_name>sn ja käyttäjäkokemuksen mukauttamiseksi"
+"Tarjotakseen pääsyn %{application_name}n ja käyttäjäkokemuksen mukauttamiseksi"
 " esim. saadaksesi tarvittasemasi mallipohjat ja organisaatiokohtaisen ohjeistu"
 "ksen."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Saat tiedotteita %<application_name>s -työkalun uusista ominaisuuksista ja tiet"
+"Saat tiedotteita %{application_name} -työkalun uusista ominaisuuksista ja tiet"
 "osuojamuutoksista."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5268,28 +5336,28 @@ msgstr "Käsittely verkko- ja tietoturvatarkoituksissa."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
-"Säilytämme henkilötietojasi niin kauan kuin käytät %<application_name>s -työkal"
-"ua. Pyynnöstä %<application_name>s -tiimi voi poistaa tietosi 30 päivän sisällä"
+"Säilytämme henkilötietojasi niin kauan kuin käytät %{application_name} -työkal"
+"ua. Pyynnöstä %{application_name} -tiimi voi poistaa tietosi 30 päivän sisällä"
 "."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
-"Jos sinulla on kysyttävää, ota yhteyttä %<application_name>s -tiimiin: <a href="
-"'mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"Jos sinulla on kysyttävää, ota yhteyttä %{application_name} -tiimiin: <a href="
+"'mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Näitä tietoja on tarkistettu viimeksi %<revdate>s ja ne voidaan tarkistaa koska"
+"Näitä tietoja on tarkistettu viimeksi %{revdate} ja ne voidaan tarkistaa koska"
 " tahansa ilman etukäteisilmoitusta."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5303,31 +5371,28 @@ msgstr ""
 "sisijainen tukiryhmämme on tutkijayhteisö. Palvelemme Ison-Britannian ja Yhdys"
 "valtojen ja kansainvälistä korkeakoulutuksen sektoria."
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMPRoadmap"
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"DMPRoadmap (\"työkalu\", \"järjestelmä\") on DCC: n ja CDL: n kehittämä työkalu tu"
-"tkimusyhteisön yhteisenä resurssina. Se toimii CDL: ssä Kalifornian yliopiston"
-" Curation Centerin yliopistossa."
+"%{application_name} ('työkalu', 'järjestelmä') on DCC:n ja CDL:n kehittämä työ"
+"kalu tutkimusyhteisön yhteiseksi resurssiksi. Sitä isännöi Kalifornian yliopis"
+"ton kuratointikeskus CDL:ssä."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5358,11 +5423,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5377,77 +5443,74 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3> Henkilötietosi ja suostumustiedot </h3><p> Jotta voisimme tunnistaa ja ha"
-"llinnoida tiliäsi DMPRoadmap-sovelluksella, meidän on tallennettava nimesi ja "
-"sähköpostiosoitteesi. Voimme käyttää sitä myös ottaaksesi sinuun yhteyttä saad"
-"aksesi palautetta työkalun käytöstä tai ilmoittaaksesi sinulle viimeisimmästä "
-"kehityksestä tai julkaisuista. Tietoja voidaan siirtää DCC: n ja CDL: n välill"
-"ä, mutta vain seuraaviin laillisiin DCC: n ja CDL: n tarkoituksiin: markkinoin"
-"ti, palveluidemme parantaminen ja asiaan liittyvän sisällön ja tapahtumien ilm"
-"oittaminen sinulle. Emme myy, vuokraa tai vaihda henkilökohtaisia tietoja, jot"
-"ka olet antanut meille. Käyttämällä tätä järjestelmää hyväksyt henkilökohtaist"
-"en tietojen keräämisen, säilyttämisen ja käytön yllä olevan mukaisesti. Sinull"
-"a on oikeus pyytää meitä olemaan käsittelemättä henkilökohtaisia tietojasi mar"
-"kkinointitarkoituksiin. </p><h3> Tietosuojakäytäntö </h3><p> Tähän järjestelmä"
-"än antamasi tiedot ovat sinun, ihmisten, jotka olet päättänyt jakaa käyttöoike"
-"uksien kanssa, ja - vain palvelun ylläpitämisen kannalta - järjestelmänvalvoji"
-"en DCC: ssä ja CDL: ssä. Käännämme nimettömiä, automatisoituja ja aggregoituja"
-" tietoja suunnitelmista, mutta emme saa suoraan käyttää, käyttää tai jakaa sis"
-"ältöäsi kenellekään muulle ilman lupaasi. Kotiorganisaation valtuutetut virkam"
-"iehet voivat käyttää suunnitelmiasi tiettyihin tarkoituksiin - esimerkiksi seu"
-"rata rahoittajien / organisaation vaatimusten noudattamista, laskea tallennusv"
-"aatimuksia tai arvioida tiedonhallintapalveluiden kysyntää eri tieteenalojen v"
-"älillä. </p><h3> Tiedonvapaus </h3><p> DCC ja CDL pitävät suunnitelmasi puoles"
-"tasi, mutta ne ovat sinun omaisuuttasi ja vastuusi. Kaikki FOIA-hakijat palaut"
-"etaan kotiorganisaatioosi. </p><h3> salasanat </h3><p> Salasanasi tallennetaan"
-" salatussa muodossa, eikä sitä voi hakea. Jos unohdat, se täytyy nollata. </p>"
-"<h3> Keksit </h3><p> Huomaa, että DMPRoadmap käyttää evästeitä. Lisätietoja <a"
-" target='_blank' href='http://www.dcc.ac.uk/about-us/about-site/website-terms-"
-"use/cookies' class=\"has-new-window-popup-info\"><span class=\"new-window-popup-i"
-"nfo\">evästeistä</span></a> ja niiden käytöstä on saatavana <a target='_blank' "
-"href='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' clas"
-"s=\"has-new-window-popup-info\">DCC: n pääsivustolla <em class=\"sr-only\">(uusi i"
-"kkuna)</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s</sp"
-"an></a> . </p><h3> Kolmannen osapuolen sovellusliittymät </h3><p> Tietyt tämän"
-" verkkosivuston ominaisuudet hyödyntävät kolmansien osapuolien palveluita ja s"
-"ovellusliittymiä, kuten InCommon / Shibboleth tai kolmansien osapuolten ylläpi"
-"tämä yleisiä JavaScript-kirjastoja tai web-fontteja. Ulkoisen palvelun käyttäm"
-"iin tietoihin sovelletaan kyseisen palvelun tietosuojakäytäntöä. </p><h3> Muut"
-"oksia </h3><p> Tätä lausuntoa muutettiin viimeksi 5. lokakuuta 2017, ja sitä v"
-"oidaan tarkistaa milloin tahansa. Työkalun käyttö tarkoittaa, että ymmärrät nä"
-"mä ehdot ja hyväksyt ne. </p>"
-
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+"<h3>Henkilötietosi ja suostumusilmoitus</h3><p> Jotta voimme tunnistaa ja hall"
+"innoida tilisi %{application_name}-palvelussa, meidän on tallennettava nimesi "
+"ja sähköpostiosoitteesi. Saatamme myös käyttää sitä ottamaan sinuun yhteyttä s"
+"aadaksemme palautetta työkalun käytöstä tai ilmoittaaksemme sinulle viimeisimm"
+"istä kehityksestä tai julkaisuista. Tietoja voidaan siirtää DCC:n ja CDL:n väl"
+"illä, mutta vain seuraaviin laillisiin DCC- ja CDL-tarkoituksiin: markkinointi"
+", palveluidemme parantaminen ja sinulle tiedottaminen asiaankuuluvasta sisällö"
+"stä ja tapahtumista. Emme myy, vuokraa tai vaihda mitään meille antamiasi henk"
+"ilötietoja. Käyttämällä tätä järjestelmää hyväksyt henkilötietojesi keräämisen"
+", säilyttämisen ja käytön yllä olevan mukaisesti. Sinulla on oikeus pyytää mei"
+"tä olemaan käsittelemättä henkilötietojasi markkinointitarkoituksiin.</p><h3> "
+"Tietosuojakäytäntö</h3><p> Tähän järjestelmään syöttämäsi tiedot voivat nähdä "
+"sinä, henkilöt, joiden kanssa olet päättänyt jakaa käyttöoikeuden, ja - yksino"
+"maan palvelun ylläpitoa varten - DCC:n ja CDL:n järjestelmänvalvojat. Kokoamme"
+" anonymisoituja, automatisoituja ja koottuja tietoja suunnitelmista, mutta emm"
+"e käytä, käytä tai jaa sisältöäsi suoraan kenenkään muun kanssa ilman lupaasi."
+" Kotiorganisaatiosi valtuutetut virkailijat voivat käyttää suunnitelmiasi tiet"
+"tyihin tarkoituksiin – esimerkiksi seuratakseen rahoittajan/organisaation vaat"
+"imusten noudattamista, laskeakseen tallennusvaatimuksia tai arvioidakseen tied"
+"onhallintapalvelujen kysyntää eri alojen välillä.</p><h3> Tiedonvapaus</h3><p>"
+" DCC ja CDL pitävät suunnitelmasi puolestasi, mutta ne ovat sinun omaisuuttasi"
+" ja vastuullasi. Kaikki FOIA-hakijat ohjataan takaisin kotiorganisaatiollesi.<"
+"/p><h3> Salasanat</h3><p> Salasanasi on tallennettu salatussa muodossa, eikä s"
+"itä voi palauttaa. Jos se unohtuu, se on nollattava.</p><h3> Keksit</h3><p> Hu"
+"omaa, että %{application_name} käyttää evästeitä. Lisätietoja evästeistä ja ni"
+"iden käytöstä on saatavilla <a target='_blank' href='http://www.dcc.ac.uk/abou"
+"t-us/about-site/website-terms-use/cookies' class=\"has-new-window-popup-info\">D"
+"CC:n pääsivustolla <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-win"
+"dow-popup-info\">%{open_in_new_window_text}</span></a> .</p><h3> Kolmannen osap"
+"uolen sovellusliittymät</h3><p> Tietyt tämän verkkosivuston ominaisuudet käytt"
+"ävät kolmannen osapuolen palveluita ja API-liittymiä, kuten InCommon/Shibbolet"
+"h tai yleisten JavaScript-kirjastojen tai verkkofonttien isännöinti. Ulkoisen "
+"palvelun käyttämiin tietoihin sovelletaan kyseisen palvelun tietosuojakäytäntö"
+"ä.</p><h3> Tarkistukset</h3><p> Tätä lausuntoa tarkistettiin viimeksi 5. lokak"
+"uuta 2017, ja sitä voidaan muuttaa milloin tahansa. Työkalun käyttö osoittaa, "
+"että ymmärrät ja hyväksyt nämä ehdot.</p>"
+
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Yhteyshenkilön nimi"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "Yhteydenotto Sähköposti"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr "Asiakastunnus"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr "Asiakassalaisuus"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Viimeksi käytetty"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "Päivitä asiakastunnus ja salaisuus"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "Lähetä valtuustiedot sähköpostitse"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr "Haluatko varmasti poistaa sovellusliittymäohjelman: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr "Haluatko varmasti poistaa sovellusliittymäohjelman: \"%{name}\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5463,8 +5526,8 @@ msgid "View all API clients"
 msgstr "Näytä kaikki API-asiakkaat"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "Valtakirjat on lähetetty %<email>s."
+msgid "The credentials have been sent to %{email}."
+msgstr "Valtakirjat on lähetetty %{email}."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5511,9 +5574,9 @@ msgstr "Hylättävissä"
 msgid "Body"
 msgstr "Leipäteksti"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "Haluatko varmasti poistaa \"%<title>s\":n ilmoituksen?"
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "Haluatko varmasti poistaa \"%{title}\":n ilmoituksen?"
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5538,8 +5601,8 @@ msgid "New Notification"
 msgstr "Uusi ilmoitus"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
-msgstr "Yhdistetään %<from_org_name>s osaksi %<to_org_name>s"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgstr "Yhdistetään %{from_org_name} osaksi %{to_org_name}"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5547,10 +5610,10 @@ msgstr "Yhteenveto:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"%<to_org_name>s -tietueiden lukumäärä ennen ja jälkeen sulautumisen %{from_org_"
+"%{to_org_name} -tietueiden lukumäärä ennen ja jälkeen sulautumisen %{from_org_"
 "name} -tietoon."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5559,12 +5622,12 @@ msgid "Record Type"
 msgstr "Tietueen tyyppi"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
-msgstr "'%<to_org_name>s' Count - ennen yhdistämistä"
+msgid "'%{to_org_name}' Count - before merge"
+msgstr "'%{to_org_name}' Count - ennen yhdistämistä"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
-msgstr "'%<to_org_name>s' Count - yhdistämisen jälkeen"
+msgid "'%{to_org_name}' Count - after merge"
+msgstr "'%{to_org_name}' Count - yhdistämisen jälkeen"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5573,22 +5636,22 @@ msgstr "Yksityiskohdat:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Alla olevassa taulukossa esitetään sulautumisprosessin aikana tapahtuvat muuto"
-"kset. Kun yhdistäminen on valmis, %<from_org_name>s poistetaan. Voit sitten yhd"
+"kset. Kun yhdistäminen on valmis, %{from_org_name} poistetaan. Voit sitten yhd"
 "istää / korjata kaikki yhdistämisongelmat (esim. Poistaa kaikki päällekkäiset "
 "osastot)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
-msgstr "%<from_org_name>s - Ennen"
+msgid "%{from_org_name} - Before"
+msgstr "%{from_org_name} - Ennen"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
-msgstr "%<to_org_name>s - Ennen"
+msgid "%{to_org_name} - Before"
+msgstr "%{to_org_name} - Ennen"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5599,7 +5662,7 @@ msgid ""
 "Warning: The changes proposed above will be committed to the database. '%{org_"
 "name}' will then be deleted."
 msgstr ""
-"Varoitus: Edellä ehdotetut muutokset sitoutuvat tietokantaan. '%<org_name>s' po"
+"Varoitus: Edellä ehdotetut muutokset sitoutuvat tietokantaan. '%{org_name}' po"
 "istetaan sitten."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
@@ -5616,10 +5679,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Varoitus: Kohteella %<from_org_name>s on suunnitelmia, jotka ovat parhaillaan t"
+"Varoitus: Kohteella %{from_org_name} on suunnitelmia, jotka ovat parhaillaan t"
 "arkistusprosessissa. Organisaation järjestelmänvalvojat eivät ehkä näe näitä s"
 "uunnitelmia yhdistämisen jälkeen!"
 
@@ -5644,8 +5707,8 @@ msgid "New organisation"
 msgstr "Uusi organisaatio"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "Haluatko varmasti poistaa \"%<title>s\":n teeman?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "Haluatko varmasti poistaa \"%{title}\":n teeman?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5665,7 +5728,7 @@ msgid ""
 "<br>The selected user's content will be merged into the account for %{user_ema"
 "il}. <br> The selected account will then be removed"
 msgstr ""
-"<br> Valitun käyttäjän sisältö yhdistetään tilille %<user_email>s. <br> Valittu"
+"<br> Valitun käyttäjän sisältö yhdistetään tilille %{user_email}. <br> Valittu"
 " tili poistetaan sitten"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
@@ -5674,11 +5737,11 @@ msgstr "Archive"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Olet arkistoimasta %<user_name>s. Tämä poistaa heidän henkilökohtaiset tiedot, "
+"Olet arkistoimasta %{user_name}. Tämä poistaa heidän henkilökohtaiset tiedot, "
 "mutta säilyttää suunnitelmat, vastaukset ja kommentit. He eivät voi kirjautua "
 "sisään. Oletko varma?"
 
@@ -5780,93 +5843,92 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr "Voit muuttaa ilmoitusasetuksiasi käyttäjätiedot -kohdassa."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Hei %<username>s"
+msgid "Hello %{username}"
+msgstr "Hei %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
-msgstr "Sinulle on myönnetty ylläpito-oikeudet %<tool_name>s:ssa:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
+msgstr "Sinulle on myönnetty ylläpito-oikeudet %{tool_name}:ssa:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
-msgstr "Ylläpito-oikeutesi %<tool_name>s:ssa on poistettu."
+msgid "You have been revoked administrator privileges in %{tool_name}."
+msgstr "Ylläpito-oikeutesi %{tool_name}:ssa on poistettu."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
-msgstr "Lisätietoa %<tool_name>s:n hallinnoinnista löytyy kohdasta: %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
+msgstr "Lisätietoa %{tool_name}:n hallinnoinnista löytyy kohdasta: %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Hei %<name>s,"
+msgid "Hello %{name},"
+msgstr "Hei %{name},"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
-msgstr "Käytä seuraavia valtuustietoja, kun käytät %<tool_name>s -sovellusliittymää."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgstr "Käytä seuraavia valtuustietoja, kun käytät %{tool_name} -sovellusliittymää."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
-msgstr "Katso API-dokumentaatio osoitteessa %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgstr "Katso API-dokumentaatio osoitteessa %{api_documentation_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
-"Älä jaa näitä käyttöoikeustietoja. Ne käytettäväksi %<external_application>s -s"
+"Älä jaa näitä käyttöoikeustietoja. Ne käytettäväksi %{external_application} -s"
 "ovelluksen kanssa. Jos jaat käyttöoikeustietosi toisen sovelluksen kanssa, pid"
 "ätämme oikeuden peruuttaa käyttöoikeutesi sovellusliittymään."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"Jos et pyytänyt pääsyä %<tool_name>s -sovellusliittymään tai et pyytänyt käyttö"
-"oikeustietojesi uusimista, ota meihin yhteyttä %<helpdesk_email>s"
+"Jos et pyytänyt pääsyä %{tool_name} -sovellusliittymään tai et pyytänyt käyttö"
+"oikeustietojesi uusimista, ota meihin yhteyttä %{helpdesk_email}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Hei %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Hei %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s on antanut palautteen suunnitelmasta \"%<link_html>s\". Kommentit lö"
+"%{commenter} on antanut palautteen suunnitelmasta \"%{link_html}\". Kommentit lö"
 "ytyvät sivun oikeassa reunassa olevasta Kirjoita suunnitelma -välilehdestä (Oh"
 "je / kommentit)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Hei %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Hei %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s on pyytänyt palautetta suunnitelmasta %<link_html>s. Voit lisätä k"
-"ommentteja valitsemalla %<tool_name>s Admin-valikon alla olevat suunnitelmat-si"
+"%{requestor} on pyytänyt palautetta suunnitelmasta %{link_html}. Voit lisätä k"
+"ommentteja valitsemalla %{tool_name} Admin-valikon alla olevat suunnitelmat-si"
 "vun ja avaamalla suunnitelman."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s on kommentoinut suunnitelmaa %<plan_title>s. Voit tarkastella"
+"%{commenter_name} on kommentoinut suunnitelmaa %{plan_title}. Voit tarkastella"
 " kommentteja seuraamalla alla olevaa DMP-linkkiä tai siirtymällä suunnitelmaan"
-" My Dashboard -sivun kautta %<tool_name>s."
+" My Dashboard -sivun kautta %{tool_name}."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5881,24 +5943,28 @@ msgstr ""
 "vieressä."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "DMP: %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Kohteen nimi: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Kohteen nimi: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Kysymys: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Kysymys: %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr "Hei %{recepientname}"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"Oikeutesi %<plan_title>s:n ovat muuttuneet. Sinulla on nyt %<type>s pääsy. Voit "
-"siis %<placeholder1>s %<placeholder2>s"
+"Oikeutesi %{plan_title}:n ovat muuttuneet. Sinulla on nyt %{type} pääsy. Voit "
+"siis %{placeholder1} %{placeholder2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5913,8 +5979,8 @@ msgid " has been removed by "
 msgstr "on poistanut"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "%<plan_title>s -suunnitelman näkyvyys on muuttunut %<plan_visibility>s:ksi."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "%{plan_title} -suunnitelman näkyvyys on muuttunut %{plan_visibility}:ksi."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5931,14 +5997,14 @@ msgstr "Julkinen: kuka vaan voi tarkastella suunnitelmaa"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 "Jos sinulla on tähän toimintoon liittyviä kysymyksiä, mene Suunnitelmasi-välil"
-"ehdelle %<tool_name>s:ssa"
+"ehdelle %{tool_name}:ssa"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Hei %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
+msgstr "Hei %{recipient_name},"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5958,34 +6024,32 @@ msgstr " perustuu malliin"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
-msgstr ""%<inviter_name>s
-"Kollegasi %{inviter_name} on kutsunut sinut os%<tool_name>s
-\n"
+msgstr ""
+"Kollegasi %{inviter_name} on kutsunut sinut osallistumaan
\n"
 "          heidän tiedonhallintasuunnitelmansa %{tool_name}"
-%<tool_name>s%<username>s
-#: ../../app/views/%<tool_name>swelcome_notifica%<username>srb:2
+
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Tervetuloa %{tool_name}:n käyttäjäksi, %{username}"
 
-#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
+#: ../../app/views/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
+"%{tool_name} will help you to develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"%<tool_name>st %{contact_us}"
+"ail} or visit %{contact_us}"
 msgstr ""
-"%{tool_name} auttaa sinua aineistonhallintasu%<helpdesk_email>sttamisessa. Jos "
-"s%<contact_us>sain kysyttävää tai haluat antaa palautetta työkalusta, voit tehd"
+"%{tool_name} auttaa sinua aineistonhallintasuunnitelman kirjoittamisessa. Jos "
+"sinulla on jotain kysyttävää tai haluat antaa palautetta työkalusta, voit tehd"
 "ä sen lähettämällä sähköpostia osoitteeseen: %{helpdesk_email} tai käy sivulla"
 " %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Voit muuttaa ilmoitusasetuksiasi käyttäjätiedot -kohdassa."
-%<username>s
-#: ../..%<username>susers/_admin_grant_permissions.html.erb:9
+
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "%{username}:n muokkausoikeudet"
 
diff --git a/config/locale/fr_CA/LC_MESSAGES/app.mo b/config/locale/fr_CA/LC_MESSAGES/app.mo
index 6d66c6e855c44480b395016616b2052447f3d39a..03cdd7a0b12b4582aead31559f3191887f7f9e24 100644
GIT binary patch
delta 21729
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

delta 35270
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

diff --git a/config/locale/fr_CA/app.po b/config/locale/fr_CA/app.po
index 8206af9062..aadd3d9866 100644
--- a/config/locale/fr_CA/app.po
+++ b/config/locale/fr_CA/app.po
@@ -1,14 +1,14 @@
 # French translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "Language: fr_CA\n"
@@ -18,29 +18,25 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"L’ID %<question_id>s associée à l’ID de plan %<plan_id>s ne présente aucune ques"
-"tion nécessitant la création ou la mise à jour d’une réponse"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
-"Il n’existe aucun plan portant l’ID %<id>s nécessitant la création ou la mise à"
-" jour d’une réponse"
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr "Mauvais renseignements d’identification"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "Le code et le nom du département doivent être uniques"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "l’utilisateur doit faire partie de votre organisme"
 
@@ -48,28 +44,28 @@ msgstr "l’utilisateur doit faire partie de votre organisme"
 msgid "Bad Parameters"
 msgstr "Mauvais paramètres"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Mois"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "Nombre d’utilisateurs joints"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Total"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "users_joined"
 
@@ -82,137 +78,141 @@ msgstr "Nombre de plans terminés"
 msgid "completed_plans"
 msgstr "completed_plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Nombre de plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "plans"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "Format JSON manquant ou invalide"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Format JSON invalide"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Le plan n’a pas été trouvé"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "Le plan existe déjà. Veuillez envoyer une mise à jour."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr ""
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "Format JSON invalide"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "Aucun plan n’a été trouvé"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Vous n’êtes pas autorisé à effectuer cette action."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Vous devez vous connecter ou vous inscrire pour continuer."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr "Il est impossible de %<action>s les %<object>s. %<errors>s"
+msgstr ""
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "La mesure %<action>s pour %<object>s a été effectuée avec succès."
+msgstr ""
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "Client API"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "plan"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "groupe de directives"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "laisser un commentaire"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "organisme"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "autorisation"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "préférences"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "profil"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "utilisateur(trice)"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "choix de questions"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr ""
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "la portée doit être un objet ActiveRecord::Relation"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params doit être un objet Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params doit constituer un objet Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "les valeurs locales doivent être un objet Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Accès restreint à Voir Tous les enregistrements"
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "Trier par %<sort_field>s"
+msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "personnalisation"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "modèle"
 
@@ -222,28 +222,28 @@ msgstr ""
 "obj doit être un modèle, une phase, une section, une question ou une annotatio"
 "n"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "obj doit être une phase, une section, une question ou une annotation"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "Le search_space ne répond pas à chaque"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "L’espace de recherche n’est associé à aucun élément"
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "La vérification Captcha a échoué, veuillez réessayer."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Le courriel du contact a été envoyé avec succès."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Il est impossible de soumettre votre demande"
 
@@ -257,60 +257,60 @@ msgid "added"
 msgstr "ajouté"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "enregistré"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "enregistrer"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "retiré"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "retirer"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "plan non trouvé"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "contributeur introuvable"
 
@@ -322,110 +322,110 @@ msgstr "Il est impossible de soumettre votre demande de commentaires pour le mom
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Une erreur s’est produite lors de la demande de commentaires pour ce plan."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "créé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "créer"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Votre groupe de directives a été publié et est désormais accessible aux utilis"
 "ateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "publier"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Votre groupe de directives n’est plus publié et ne sera pas accessible aux uti"
 "lisateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "annuler la publication"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "supprimé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "supprimer"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr ""
 "Vos directives ont été publiées et sont désormais accessibles aux utilisateurs"
 "."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Vos directives ne sont plus publiés et ne seront pas accessibles aux utilisate"
 "urs."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Votre compte a bien été dissocié de l’identifiant %<is>s."
+msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "Il est impossible de dissocier votre compte de %<is>s."
+msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -437,72 +437,74 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "Vous ne pouvez pas ajouter de phase à une version historique d’un modèle."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "Il est impossible de créer une nouvelle version de ce modèle."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "mis à jour"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "mettre à jour"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "Il est impossible de créer une nouvelle version de ce modèle."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
-msgstr "%<plan_owner>s a été informé que vous avez terminé de formuler vos commentaires"
+msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr ""
 "Il est impossible d’aviser l’utilisateur que vous avez terminé de formuler des"
 " commentaires."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Titre du projet"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Modèle"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -513,65 +515,68 @@ msgstr "Modèle"
 msgid "Organisation"
 msgstr "Organisme"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Nom du propriétaire"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "Courriel du propriétaire"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr ""
 "Il est impossible de créer une nouvelle section. La phase que vous avez indiqu"
 "ée n’existe pas."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "copier"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Ce modèle n’est plus personnalisable."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Il est impossible de personnaliser ce modèle."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Ce modèle n’est pas personnalisable."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Tous les modèles"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "Modèles de %<org_name>s"
+msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Vos modèles"
@@ -580,104 +585,102 @@ msgstr "Vos modèles"
 msgid "Customizable Templates"
 msgstr "Modèles personnalisables"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "Erreur d’analyse des liens pour un %<template>s"
+msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
-"Modèle créé à l’aide du service %<application_name>s. Dernière modification : %"
-"{date}"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Il est impossible de télécharger le modèle du PGD pour le moment."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "Aucun organisme n’est actuellement inscrit."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Votre organisme ne semble pas être correctement configuré."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Veuillez choisir un organisme"
 
+#: ../../app/controllers/orgs_controller.rb:136
+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:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "Créé(e) avec %<application_name>s. Dernière modification : %<date>s"
+msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "Il s’agit d’un(e)"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "plan d’essai"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "Il est impossible de trouver un modèle qui convient à votre plan."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Mon plan"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr " Plan"
+msgid "My Plan (%<title>s)"
+msgstr ""
+
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Ce plan est fondé sur le modèle par défaut."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Ce plan est fondé sur "
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "modèle avec des personnalisations par le"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "copié"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 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>s"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "Il est impossible de trouver l’ID du plan %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Votre projet est maintenant à l’état d’essai."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Votre projet n’est plus à l’état d’essai."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 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:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "Aucun plan n’est associé à l’identifiant %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
@@ -685,43 +688,43 @@ msgid ""
 "                       institutional credentials."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr "Vous devez accepter les conditions pour vous inscrire."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "Cette adresse courriel est déjà inscrite."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
-"Bienvenue! Vous avez réussi votre inscription à l’aide de votre compte institu"
-"tionnel, qui vous servira désormais à vous connecter."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Échec de l’enregistrement."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Veuillez saisir une adresse courriel."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "Veuillez saisir un prénom."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "Veuillez saisir un nom de famille."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
@@ -729,11 +732,11 @@ msgstr ""
 "Veuillez sélectionner un organisme dans la liste ou entrer le nom de votre org"
 "anisme."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr "Veuillez saisir votre mot de passe pour modifier l’adresse courriel."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -743,70 +746,66 @@ msgstr ""
 "                Cette adresse courriel est déjà inscrite. \\\n"
 "                Vous devez saisir une adresse courriel unique."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Veuillez saisir votre mot de passe actuel"
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Veuillez saisir la confirmation du mot de passe"
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "Le mot de passe et la confirmation doivent être identiques"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"Il est impossible de transmettre ce plan à %<email>s, car cette adresse courrie"
-"l est celle du propriétaire du plan."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "Le plan est déjà partagé avec %<email>s."
+msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "Prénom"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Nom de famille"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "Invitation à %<email>s envoyée avec succès."
+msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Plan partagé avec %<email>s."
+msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
-"Vous devez fournir une adresse courriel valide et sélectionner un niveau d’aut"
-"orisation."
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Veuillez saisir une adresse courriel"
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
-"Les autorisations pour %<email>s ont été modifiées avec succès. Un avis a été e"
-"nvoyée par courriel."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Accès révoqué"
 
@@ -826,11 +825,11 @@ msgstr ""
 "Votre compte a été associé avec succès à votre compte institutionnels. Vous po"
 "urrez désormais vous connecter à l’aide de ce dernier."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Les paramètres d’exportation ont été mis à jour avec succès."
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 "Une erreur s’est produite lors de l’enregistrement ou de la réinitialisation d"
@@ -839,76 +838,72 @@ msgstr ""
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
-". Les renseignements d’identification de l’API ont été envoyés à l’adresse cou"
-"rriel %<email>s"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Votre notification est maintenant active."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Votre notification n’est plus active."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "Il est impossible de modifier l’état actif de l’avis"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "Aucun avis n’est associé à l’ID %<id>s"
+msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"Votre affiliation organisationnelle a été modifiée. Vous pouvez maintenant mod"
-"ifier les modèles pour %<org_name>s."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Il est impossible de modifier l’affiliation organisationnelle pour le moment."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Organisme inconnu."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Votre logo semble présenter un problème. Veuillez le télécharger de nouveau."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr ""
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
 msgstr ""
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "archivé"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "archiver"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "fusionné"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "fusionner"
 
@@ -920,39 +915,39 @@ msgstr ""
 "Vous êtes déjà connecté en tant qu’autre utilisateur. Veuillez vous déconnecte"
 "r pour activer votre invitation."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Connexion réussie"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Votre compte a bien été associé à %<scheme>s."
+msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "Il est impossible d’associer votre compte à %<scheme>s."
+msgstr ""
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "La mesure %<action>s pour %<username>s a été effectuée avec succès."
+msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "activé"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "désactivé"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr "Il est impossible de %<action>s %<username>s"
+msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "activer"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "désactiver"
 
@@ -976,13 +971,13 @@ 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:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "Répondre"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "<b>enverra un courriel</b> avec un objet"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr ""
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
@@ -992,19 +987,15 @@ msgstr "<b>supprimera</b> la question"
 msgid " will <b>remove</b> questions "
 msgstr "<b>supprimera</b> les questions"
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Personnalisation du transfert"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Modifier la personnalisation"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Personnaliser"
 
@@ -1013,27 +1004,24 @@ msgid "Creators:"
 msgstr "Créateurs :"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Créateur :"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s: votre plan a été soumis aux fins de rétroaction"
+msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Bonjour %<user_name>s. </p><p> Votre plan \"%<plan_name>s\" a été soumis afin d"
-"e recueillir les commentaires d’un administrateur de votre organisme. Si vous "
-"avez des questions concernant cette action, veuillez nous écrire à %{organisat"
-"ion_email}.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1071,9 +1059,6 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Un(e) bibliothécaire de données de %<org_name>s répondra à votre demande dan"
-"s les 48 heures. Si vous avez des questions concernant cette action, veuillez "
-"nous écrire à %<organisation_email>s </p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1113,8 +1098,8 @@ msgid "Grant API to organisations"
 msgstr "Accorder aux organismes l’accès à l’API"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1157,235 +1142,227 @@ msgstr "Public : Tous peuvent consulter le plan."
 msgid "Private: restricted to me and people I invite."
 msgstr "Privé : usage réservé à moi et aux personnes que j’invite."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Nom de colonne inconnu."
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Nom du plan"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "ID du plan"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr "Numéro de subvention"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Chercheur principal / chercheur"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Personne-ressource pour les données du plan"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Description du plan"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Bailleur de fonds"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "Votre ORCID"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Créer un plan"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "Le mois dernier"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "Les 3 derniers mois"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "Les 6 derniers mois"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "Les 9 derniers mois"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "Les 12 derniers mois"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "Requête ou commentaire associé à %<tool_name>s"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "Bienvenue à %<tool_name>s"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "Un plan de gestion des données dans %<tool_name>s a été partagé avec vous"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
-"Les autorisations pour un plan de gestion des données dans %<tool_name>s sont m"
-"odifiées"
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "Autorisations relatives à PGD retirées dans %<tool_name>s"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
-"%<tool_name>s: Les commentaires d’un spécialiste ont été fournis pour %{plan_ti"
-"tle}"
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "Visibilité du PGD modifiée : %<plan_title>s"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: un nouveau commentaire a été ajouté à %<plan_title>s"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "Privilèges d’administrateur accordés dans %<tool_name>s"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "Modifications de l'API pour %<tool_name>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Phase"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Section"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Question"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "Réponse"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Personnalisé par:"
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Créateurs :"
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "%<affiliation>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Modèle :"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr "Numéro de subvention :"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Résumé du projet :"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Dernière modification :"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Renseignements sur le droit d’auteur :"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1405,7 +1382,7 @@ msgstr ""
 "e du texte du plan ne signifie pas que les créateurs approuvent votre projet o"
 "u votre proposition ou qu’il(s) y sont liés."
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Pas de réponse"
 
@@ -1415,7 +1392,7 @@ msgid "can't be blank"
 msgstr "doit être rempli(e)"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "doit être unique"
 
@@ -1435,41 +1412,40 @@ msgstr "pour « Texte de la question » doit être rempli(e)."
 msgid "You must specify at least one role."
 msgstr "Vous devez préciser au moins un rôle."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "doit être rempli(e) si aucune adresse courriel n’est fournie"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr ""
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "doit être rempli(e) si aucun nom n’est fourni"
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr ""
+
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr ""
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Options sélectionnées"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Répondu par"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Répondu à"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "Détails"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
-msgstr "Question sans réponse."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
+msgstr ""
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "une valeur a déjà été attribuée"
 
@@ -1477,35 +1453,35 @@ msgstr "une valeur a déjà été attribuée"
 msgid "Feedback email message"
 msgstr "Courriel de rétroaction"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "doit être dans l’un des formats suivants: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "ne peut pas dépasser 500 Ko"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organisationnel"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "public"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "essai"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "privé"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "doit être postérieur à la date de début"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "directives sur"
 
@@ -1513,37 +1489,37 @@ msgstr "directives sur"
 msgid "can't be less than zero"
 msgstr "ne peut pas être inférieur à zéro"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "Un paramètre demandé n’a pas été fourni"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "La valeur de la marge est invalide"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "La valeur de la marge ne peut pas être négative"
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 "Marge inconnue. On peut seulement choisir « haut », « bas », « gauche » ou « d"
 "roite »."
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Taille de police invalide"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Police de caractères invalide"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Paramètre de formatage inconnu"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Invalide – Nombre maximal de pages"
 
@@ -1551,89 +1527,89 @@ msgstr "Invalide – Nombre maximal de pages"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Un modèle historique ne peut pas être récupéré pour être modifié"
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "un organisme cible est exigé pour generate_copy!"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "Copie de %<template>s"
+msgstr ""
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "un modèle publié est exigé pour generate_version!"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "organisme cible exiger pour personnaliser!"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 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:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "Vous ne pouvez pas publier un modèle déjà publié."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 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:460
+#: ../../app/models/template.rb:456
 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:465
+#: ../../app/models/template.rb:461
 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:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "Les conditions du modèle sont associées à une référence antérieure"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
-"Un plan de gestion des données dans %<application_name>s a été partagé avec vou"
-"s"
 
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "doit être connecté(e)"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "doit avoir accès à l’api relative aux directives"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "doit avoir accès à l’api relative aux plans"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "ne sont pas autorisés à consulter ce plan"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1644,7 +1620,7 @@ msgstr ""
 "ode de logiciel, lorsque c’est nécessaire à l’interprétation des données) pour"
 " une première utilisation et une réutilisation ultérieure."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1652,7 +1628,7 @@ msgstr ""
 "Mener un processus de recherche et d’enquête, en particulier, la réalisation d"
 "’expériences ou la collecte de données ou de preuves."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1660,60 +1636,60 @@ msgstr ""
 "Responsabilité de la gestion et de la coordination de la planification et de l"
 "’exécution des activités de recherche."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Type de subvention invalide"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "Renseignements d’identification invalides"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Jeton invalide"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Le jeton est expiré"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Jeton manquant"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ""
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr ""
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "un modèle personnalisé est exigé pour upgrade_customization!"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1723,24 +1699,24 @@ msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "doit être après %<date>s"
+msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "Une clé \"org\" est attendue pour le code hash associé aux liens"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Un code hash est attendu pour les liens"
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "Une clé %<key>s est attendue pour le code hash des liens"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "La clé %<key>s n’est pas associée à une série de liens entre les objets valide"
+msgstr ""
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1748,10 +1724,10 @@ msgstr "La réponse suivante ne peut pas être enregistrée"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"puisque %<name>s sauvegardait la réponse ci-dessous pendant que vous y apportie"
+"puisque %{name} sauvegardait la réponse ci-dessous pendant que vous y apportie"
 "z une modification. Veuillez combiner vos modifications, puis sauvegarder de n"
 "ouveau la réponse."
 
@@ -1780,14 +1756,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Veuillez patienter. Le chargement des normes est en cours."
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1798,11 +1774,11 @@ msgstr "Veuillez patienter. Le chargement des normes est en cours."
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1826,8 +1802,8 @@ msgid "Answered"
 msgstr "Répondu"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr " par %<user_name>s"
+msgid " by %{user_name}"
+msgstr " par %{user_name}"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1883,12 +1859,13 @@ msgstr "Objet"
 msgid "Message"
 msgstr "Message"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Vérification de sécurité"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Soumettre"
@@ -1904,17 +1881,17 @@ msgstr "Communiquez avec nous"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s est fourni par %<organisation_name>s.<br />Vous pouvez en s"
-"avoir plus sur nous sur notre <a href=\"%<organisation_url>s\" class=\"has-new-win"
+"%{application_name} est fourni par %{organisation_name}.<br />Vous pouvez en s"
+"avoir plus sur nous sur notre <a href=\"%{organisation_url}\" class=\"has-new-win"
 "dow-popup-info\" target=\"_blank\">site Internet <em class=\"sr-only\">(nouvelle fe"
-"nêtre)</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s</sp"
+"nêtre)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}</sp"
 "an></a> . Si vous souhaitez communiquer avec nous à propos de %{application_na"
 "me}, veuillez remplir le formulaire ci-dessous."
 
@@ -1952,21 +1929,21 @@ msgstr "Sélectionnez chaque rôle qui s’applique au contributeur."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Affiliation"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "Rôles"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1986,19 +1963,19 @@ msgstr "Rôles"
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2064,14 +2041,14 @@ msgstr "Confirmation de mot de passe"
 msgid "First name"
 msgstr "Prénom"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2080,8 +2057,8 @@ msgid "Create account"
 msgstr "Créer un compte"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "Bienvenue à %<application_name>s"
+msgid "Welcome to %{application_name}"
+msgstr "Bienvenue à %{application_name}"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2099,26 +2076,32 @@ msgstr "ou copier"
 msgid "into your browser"
 msgstr "dans votre navigateur"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "Requête ou commentaire associé à %{tool_name}"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Bonjour %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Bonjour %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Votre collègue %<inviter_name>s vous a invité(e) à contribuer à son plan de ges"
-"tion des données dans %<tool_name>s"
+"Votre collègue %{inviter_name} vous a invité(e) à contribuer à son plan de ges"
+"tion des données dans %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%<click_here>s pour accepter l’invitation (ou copiez %<link>s dans votre navigat"
+"%{click_here} pour accepter l’invitation (ou copiez %{link} dans votre navigat"
 "eur). Si vous ne souhaitez pas accepter l’invitation, veuillez ne pas tenir co"
 "mpte de ce courriel."
 
@@ -2138,8 +2121,8 @@ msgstr "Sincèrement"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "Équipe chargée de l’outil %<tool_name>s"
+msgid "The %{tool_name} team"
+msgstr "Équipe chargée de l’outil %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2150,22 +2133,22 @@ msgstr "Veuillez ne pas répondre à ce courriel."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 "Si vous avez des questions ou souhaitez recevoir de l’aide, veuillez nous écri"
-"re à %<helpdesk_email>s ou visiter la page %<contact_us_url>s"
+"re à %{helpdesk_email} ou visiter la page %{contact_us_url}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Bonjour %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Bonjour %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"Quelqu’un a demandé un lien pour changer votre mot de passe %<tool_name>s. Vous"
+"Quelqu’un a demandé un lien pour changer votre mot de passe %{tool_name}. Vous"
 " pouvez donner suite à cette demande à l’aide du lien ci-dessous."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2181,11 +2164,11 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 "Si vous avez des questions ou avez besoin d’aide, veuillez nous écrire à %{hel"
-"pdesk_email} ou visiter la page %<contact_us>s"
+"pdesk_email} ou visiter la page %{contact_us}"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2257,15 +2240,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2445,8 +2428,8 @@ msgid "Sign in or Create account"
 msgstr "Se connecter ou créer un compte"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "Avez-vous un compte %<application_name>s?"
+msgid "Do you have a %{application_name} account?"
+msgstr "Avez-vous un compte %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2461,8 +2444,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Votre compte actuel sera lié à vos renseignements d’identification."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "Pas de compte %<application_name>s?"
+msgid "No %{application_name} account?"
+msgstr "Pas de compte %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2530,7 +2513,7 @@ msgstr "tout réduire"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Groupe de directives"
@@ -2617,7 +2600,7 @@ msgstr "Créer des directives"
 msgid "Enter your guidance here. You can include links where needed."
 msgstr "Entrez vos directives ici. Vous pouvez inclure des liens, au besoin."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2629,26 +2612,26 @@ msgstr ""
 "squels vous créez des groupes de directives s'afficheront dans tous les modèle"
 "s contenant des questions avec les balises thématiques correspondantes."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Sélectionnez le groupe auquel ces directives se rapportent."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 "Cochez cette case lorsque ces directives peuvent apparaître sur les plans de l"
 "’utilisateur."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "Publié?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%<application_name>s a été mis au popint par <strong>%<organisation_name>s</s"
+"<p>%{application_name} a été mis au popint par <strong>%{organisation_name}</s"
 "trong> pour vous aider à rédiger des plans de gestion des données.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2834,8 +2817,9 @@ msgid "Logout"
 msgstr "Se déconnecter"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
-msgstr "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
+msgstr "%{application_name}"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2912,11 +2896,11 @@ msgstr "S’ouvre dans une nouvelle fenêtre"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"%<n>s résultats sont disponibles. Utilisez les flèches vers le haut et vers le "
+"%{n} résultats sont disponibles. Utilisez les flèches vers le haut et vers le "
 "bas pour parcourir les suggestions. Utilisez la touche Entrée pour sélectionne"
 "r une suggestion ou la touche Échap pour fermer les suggestions."
 
@@ -2968,8 +2952,8 @@ msgid "Example answer"
 msgstr "Exemple de réponse"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr " Exemple de réponse de %<org>s"
+msgid "%{org} Example Answer"
+msgstr " Exemple de réponse de %{org}"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3125,10 +3109,10 @@ msgstr "Supprimer la phase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la phase '%<phase_title>s'. Cela entraînera"
+"Vous êtes sur le point de supprimer la phase '%{phase_title}'. Cela entraînera"
 " le retrait de toutes les sections et de toutes les questions répertoriées ci-"
 "dessous. Êtes-vous sûr de vouloir continuer?"
 
@@ -3188,8 +3172,8 @@ msgid "Write plan"
 msgstr "Rédiger un plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "Plans de %<org_name>s"
+msgid "%{org_name} Plans"
+msgstr "Plans de %{org_name}"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3240,10 +3224,10 @@ msgstr "Aviser le propriétaire du plan que j’ai terminé de fournir des comme
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Télécharger les plans <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class="
-"\"new-window-popup-info\">%<open_in_new_window_text>s</span>"
+"\"new-window-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3273,8 +3257,8 @@ msgstr ""
 "pouvez saisir ce style ici."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Question %<number>s:"
+msgid "Question %{number}:"
+msgstr "Question %{number}:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3343,16 +3327,16 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "Supprimer"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la question n° %<question_number>s. Êtes-vo"
+"Vous êtes sur le point de supprimer la question n° %{question_number}. Êtes-vo"
 "us sûr de vouloir continuer?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3453,10 +3437,10 @@ msgstr "Saisissez un titre pour la section"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<section_title>s'. Cela aura une incidenc"
+"Vous êtes sur le point de supprimer '%{section_title}'. Cela aura une incidenc"
 "e sur les questions liées à cette section. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3487,8 +3471,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "réservé à l’usage interne de %<org_name>s"
+msgid "for internal %{org_name} use only"
+msgstr "réservé à l’usage interne de %{org_name}"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3661,28 +3645,32 @@ msgstr ""
 "ouhaitez ajouter des questions aux modèles de bailleur de fonds, utilisez les "
 "options « personnaliser le modèle » ci-dessous."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "Modèles de %{org_name}"
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Modèles personnalisables"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Tous (%<count>s)"
+msgid "All (%{count})"
+msgstr "Tous (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "(%<count>s) publié(s)"
+msgid "Published (%{count})"
+msgstr "(%{count}) publié(s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "(%<count>s) non publié"
+msgid "Unpublished (%{count})"
+msgstr "(%{count}) non publié"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "(%<count>s) non personnalisé"
+msgid "Not customised (%{count})"
+msgstr "(%{count}) non personnalisé"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3691,8 +3679,8 @@ msgstr "Créer un modèle"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "Modification du profil de %<username>s"
+msgid "Editing profile for %{username}"
+msgstr "Modification du profil de %{username}"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3700,8 +3688,8 @@ msgid "View all users"
 msgstr "Voir tous les utilisateurs"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "Plans de %<username>s"
+msgid "Plans of %{username}"
+msgstr "Plans de %{username}"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3731,7 +3719,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Si l’un des identifiants ci-dessus est incorrect ou manquant, veuillez <a href"
-"=\"%<contact_us_url>s\">communiquer avec nous</a> pour le mettre à jour."
+"=\"%{contact_us_url}\">communiquer avec nous</a> pour le mettre à jour."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3763,7 +3751,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3938,22 +3926,22 @@ msgid "Last Accessed"
 msgstr "Dernier accès"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Jamais"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<client_name>s'. Cette personne ne sera p"
+"Vous êtes sur le point de supprimer '%{client_name}'. Cette personne ne sera p"
 "lus en mesure d’accéder à l’API. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<contributor_name>s'. Êtes-vous sûr de vo"
+"Vous êtes sur le point de supprimer '%{contributor_name}'. Êtes-vous sûr de vo"
 "uloir continuer?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3967,10 +3955,10 @@ msgstr "Nom ou code abrégé"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<department_name>s'. Cela aura une incide"
+"Vous êtes sur le point de supprimer '%{department_name}'. Cela aura une incide"
 "nce sur les directives. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -4011,16 +3999,16 @@ msgstr "Publier"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<guidance_group_name>s'. Cela aura une in"
+"Vous êtes sur le point de supprimer '%{guidance_group_name}'. Cela aura une in"
 "cidence sur les directives. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<guidance_summary>s'. Êtes-vous sûr de vo"
+"Vous êtes sur le point de supprimer '%{guidance_summary}'. Êtes-vous sûr de vo"
 "uloir continuer?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -4057,11 +4045,26 @@ msgid "Managed"
 msgstr "Géré"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<org_name>s'. Êtes-vous sûr de vouloir co"
+"Vous êtes sur le point de supprimer '%{org_name}'. Êtes-vous sûr de vouloir co"
 "ntinuer?"
 
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Titre du projet"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Essai"
+
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
 "    The data on the usage dashboard is historical in nature. This means that t"
@@ -4089,25 +4092,10 @@ msgstr ""
 "iation du mois et une année à 4 chiffres dans le champ de recherche ci-dessus."
 "<br>Par exemple : « Oct 2019 » ou « Juin 2013 »."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Titre du projet"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "Créé(e)"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Essai"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4226,10 +4214,10 @@ msgstr "Publier les modifications"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Souhaitez-vous vraiment supprimer la personnalisation de \"%<template_title>s\"? "
+"Souhaitez-vous vraiment supprimer la personnalisation de \"%{template_title}\"? "
 "Les versions publiées ne seront plus accessibles par les utilisateurs."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4246,10 +4234,10 @@ msgstr "Voir les personnalisations"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Souhaitez-vous vraiment supprimer \"%<template_title>s\"? Les versions publiées n"
+"Souhaitez-vous vraiment supprimer \"%{template_title}\"? Les versions publiées n"
 "e seront plus accessibles par les utilisateurs."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4412,22 +4400,22 @@ msgstr "Droite"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Télécharger le plan <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"n"
-"ew-window-popup-info\">%<open_in_new_window_text>s</span>"
+"ew-window-popup-info\">%{open_in_new_window_text}</span>"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr "Sélectionner les directives"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %<application_name>s peut vous montrer le"
+"Pour vous aider à rédiger votre plan, %{application_name} peut vous montrer le"
 "s directives de divers organismes."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4448,11 +4436,11 @@ msgstr "Il n’y a pas de directives supplémentaires pour ce modèle."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %<application_name>s peut vous indiquer l"
+"Pour vous aider à rédiger votre plan, %{application_name} peut vous indiquer l"
 "es directives de divers organismes. Veuillez choisir jusqu'à 6 organismes parm"
 "i  les suivants, qui offrent des directives pertinentes pour votre plan."
 
@@ -4480,17 +4468,17 @@ msgstr "Rédiger un plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
-msgstr "Ce plan est fondé sur le modèle \"%<template_title>s\" fourni par %<org_name>s."
+msgstr "Ce plan est fondé sur le modèle \"%{template_title}\" fourni par %{org_name}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
-msgstr "Version du modèle %<template_version>s, publiée le %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
+msgstr "Version du modèle %{template_version}, publiée le %{published_date}"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4508,13 +4496,13 @@ msgstr[1] ""
 msgid "answered"
 msgstr "répondu"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 "Si vous faites une demande de financement, indiquez le nom exactement comme il"
 " figure dans la proposition de subvention."
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4522,51 +4510,94 @@ msgstr ""
 "Résumez brièvement votre projet de recherche pour aider les autres à comprendr"
 "e les fins auxquelles les données sont recueillies ou créées."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr ""
 "Une pièce d’identité pertinente déterminée par le bailleur de fonds et (ou) l’"
 "organisme."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr "projet simulé aux fins d’essai, d’exercice ou d’enseignement"
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Résumé du projet"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Début du projet"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "La date prévue pour le démarrage de ce projet."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Fin du projet"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "La date prévue pour la fin de ce projet."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "Page d’accueil"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "ID"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr "Numéro / URL de la subvention"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4606,11 +4637,11 @@ msgstr "Définir la visibilité du plan"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "La visibilité publique ou organisationnelle est réservée aux plans finis. Vous"
-" devez répondre à au moins %<percentage>s %% des questions pour activer ces opt"
+" devez répondre à au moins %{percentage} %% des questions pour activer ces opt"
 "ions. Remarque : La visibilité privée est réglée par défaut pour les plans d’e"
 "ssai."
 
@@ -4700,8 +4731,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Cliquez sur le bouton « Créer un plan » ci-dessous pour commencer."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "Plans de %<org_title>s"
+msgid "%{org_title} Plans"
+msgstr "Plans de %{org_title}"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4790,11 +4821,11 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Les PGD publics sont des plans créés à l’aide du service %<application_name>s e"
+"Les PGD publics sont des plans créés à l’aide du service %{application_name} e"
 "t partagés publiquement par leur propriétaire. Leur qualité, leur degré d’achè"
 "vement et le respect des directives des bailleurs de fonds ne sont pas vérifié"
 "s."
@@ -4846,8 +4877,8 @@ msgid "terms and conditions"
 msgstr "Conditions"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "Souhaitez-vous créer un plan fondé sur le modèle \"%<name>s\"?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Souhaitez-vous créer un plan fondé sur le modèle \"%{name}\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4898,41 +4929,46 @@ msgstr "Supprimer le filtre"
 msgid "Filter plans"
 msgstr "Filtrer les plans"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Question sans réponse."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
-msgstr "Un plan de gestion des données créé à l’aide de %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
+msgstr "Un plan de gestion des données créé à l’aide de %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Affiliation :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr "Bailleur de fonds :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "ID ORCID :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr ""
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4954,8 +4990,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Commencez à saisir des caractères pour voir une liste de suggestions."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -4965,14 +5001,14 @@ msgstr ""
 ". Veuillez vérifier que votre organisme ne figure pas dans la liste sous une f"
 "orme légèrement différente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Le nom que vous avez entré ne faisait pas partie des suggestions répertoriées!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "À propos de %<application_name>s"
+msgid "About %{application_name}"
+msgstr "À propos de %{application_name}"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5056,10 +5092,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "participer<em class=\"sr-only\"> (nouvelle fenêtre)</em><span class=\"new-window-"
-"popup-info\">%<open_in_new_window_text>s</span>"
+"popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5080,8 +5116,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Si vous avez un compte, connectez-vous pour créer ou modifier votre PGD."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "Si vous n’avez pas de compte %<application_name>s, cliquez sur"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "Si vous n’avez pas de compte %{application_name}, cliquez sur"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5121,14 +5157,10 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"Lorsque vous vous connectez à DMPRoadmap, vous serez dirigé vers la page « Mon"
-" tableau de bord ». De là, vous pouvez modifier, partager, télécharger, copier"
-" ou supprimer vos plans. Vous verrez également les plans qui ont été partagés "
-"avec vous par d’autres personnes."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5292,15 +5324,8 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
-"À partir d’ici, vous pouvez télécharger votre plan dans différents formats. Ce"
-"la peut être pratique si vous devez soumettre votre plan dans le cadre d’une d"
-"emande de subvention. Choisissez le format dans lequel vous souhaitez afficher"
-" ou télécharger votre plan et cliquez pour télécharger. Vous pouvez également "
-"ajuster la mise en forme (type de police, taille et marges) des fichiers PDF, "
-"ce qui peut être utile si vous devez respecter les limites relatives au nombre"
-" de pages.</p>"
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5310,48 +5335,48 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"Les renseignements que vous fournissez seront utilisés par le %<org_name>s pour"
-" vous offrir l'accès au service %<application_name>s et la possibilité de perso"
+"Les renseignements que vous fournissez seront utilisés par le %{org_name} pour"
+" vous offrir l'accès au service %{application_name} et la possibilité de perso"
 "nnaliser ce dernier."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%<org_name>s traite les données personnelles des utilisateurs de %{application_"
-"name} afin d’offrir et d’améliorer le service %<application_name>s de manière p"
+"%{org_name} traite les données personnelles des utilisateurs de %{application_"
+"name} afin d’offrir et d’améliorer le service %{application_name} de manière p"
 "ersonnalisée et de veiller à ce que chaque utilisateur reçoit des renseignemen"
 "ts pertinents."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Le traitement de vos données personnelles par %<org_name>s est nécessaire pour "
+"Le traitement de vos données personnelles par %{org_name} est nécessaire pour "
 "donner suite aux intérêts légitimes suivants :"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Donner accès au service %<application_name>s et permettre la personnalisation d"
+"Donner accès au service %{application_name} et permettre la personnalisation d"
 "e votre expérience utilisateur (p. ex., offre de modèles et de directives pert"
 "inents pour votre organisme)."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Vous tenir au courant des nouvelles concernant %<application_name>s, comme les "
+"Vous tenir au courant des nouvelles concernant %{application_name}, comme les "
 "nouvelles fonctionnalités ou améliorations ou les modifications à notre Politi"
 "que de confidentialité."
 
@@ -5362,29 +5387,29 @@ msgstr "À des fins de sécurité du réseau et de l’information."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 "Nous conserverons les données personnelles que vous nous avez fournies tant qu"
-"e vous continuerez à utiliser le service %<application_name>s. Pour faire retir"
+"e vous continuerez à utiliser le service %{application_name}. Pour faire retir"
 "er vos données personnelles de ce service, vous devez en faire la demande aupr"
-"ès de l’équipe %<application_name>s dans un délai de 30 jours."
+"ès de l’équipe %{application_name} dans un délai de 30 jours."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
 "Si vous avez des questions, veuillez communiquer avec l’équipe %{application_n"
-"ame} par courriel à : <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"ame} par courriel à : <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Cette déclaration a été révisée pour la dernière fois le %<revdate>s et peut êt"
+"Cette déclaration a été révisée pour la dernière fois le %{revdate} et peut êt"
 "re révisée en tout temps. Un préavis sera donné."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5399,32 +5424,25 @@ msgstr ""
 "e la recherche. Nous fournissons des services au secteur de l’enseignement sup"
 "érieur au Royaume-Uni, aux États-Unis, ainsi qu’à l’échelle internationale."
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMPRoadmap"
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"DMPRoadmap (« l’outil », « le système ») constitue un outil mis au point par l"
-"e DCC et la CDL en tant que ressource partagée pour la communauté de recherche"
-". Il est hébergé à la CDL par le Centre de conservation numérique de la Univer"
-"sity of California."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5455,11 +5473,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5474,104 +5493,38 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3> Vos données personnelles et avis de consentement </h3>\n"
-"\n"
-"      <p> Afin d’identifier et d’administrer votre compte à l’aide de l’outil "
-"DMPRoadmap, nous devons conserver votre nom et votre adresse courriel. Nous po"
-"uvons également utiliser cette dernière pour communiquer avec vous pour obteni"
-"r des commentaires sur votre emploi de l’outil ou vous informer des derniers d"
-"éveloppements ou des dernières versions. L’information peut être transférée en"
-"tre le DCC et la CDL, mais uniquement aux fins légitimes du DCC et de la CDL s"
-"uivantes, c’est-à-dire, assurer des activités de marketing, améliorer nos serv"
-"ices et vous informer du contenu et des événements pertinents. Nous ne vendron"
-"s, ne louerons ni n’échangerons les renseignements personnels que vous nous fo"
-"urnissez. \n"
-"\n"
-"        En utilisant ce système, vous consentez à la collecte, à la conservati"
-"on et à l’utilisation de vos renseignements personnels conformément à ce qui p"
-"récède. Vous avez le droit de nous demander de ne pas traiter vos renseignemen"
-"ts personnels à des fins de marketing.</p>\n"
-"\n"
-"       <h3>Politique de confidentialité</h3>\n"
-"\n"
-"      <p>Les renseignements que vous entrez dans ce système peuvent être vus p"
-"ar vous, les personnes auxquelles vous avez accordé un accès et – uniquement d"
-"ans le but de maintenir le service – les administrateurs de système du DCC et "
-"de la CDL. Nous compilons des renseignements anonymisés, automatisés et regrou"
-"pés à partir de plans, mais nous ne consulterons ni n’utiliserons votre conten"
-"u, ni le transmettrons directement à qui que ce soit sans votre autorisation. "
-"Les agents autorisés de votre organisme d’origine peuvent accéder à vos plans "
-"à des fins précises, par exemple, pour surveiller la conformité aux exigences "
-"des bailleurs de fonds ou de l’organisme, calculer les besoins en matière de s"
-"tockage ou évaluer la demande de services de gestion de données dans toutes le"
-"s disciplines.</p>\n"
-"\n"
-"      <h3>Liberté d’information</h3>\n"
-"\n"
-"      <p>Le DCC et la CDL détiennent vos plans en votre nom, mais ils sont vot"
-"re propriété et votre responsabilité. Toutes les demandes en vertu de la loi a"
-"méricaine sur la liberté d’information (FOIA) seront renvoyées à votre organis"
-"me d’origine.</p>\n"
-"\n"
-"      <h3>Mots de passe</h3>\n"
-"\n"
-"      <p>Votre mot de passe est stocké sous forme cryptée et ne peut pas être "
-"récupéré. En cas d'oubli, il doit être réinitialisé.</p>\n"
-"\n"
-"      <h3>Témoins </h3>\n"
-"\n"
-"     <p>Veuillez noter que l’outil DMPRoadmap utilise des témoins. Vous trouve"
-"rez de plus amples informations sur les témoins et la manière dont nous les ut"
-"ilisons sur <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-site/"
-"website-terms-use/cookies' class=\"has-new-window-popup-info\">site Web principa"
-"l du DCC <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"new-window-p"
-"opup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
-"\n"
-"       <h3> API tierces </h3>\n"
-"\n"
-"        <p> Certaines fonctionnalités de ce site Web utilisent des services et"
-" des API tierces tels que InCommon et Shibboleth ou l’hébergement tiers de bib"
-"liothèques JavaScript ou de polices Web courantes. Les informations utilisées "
-"par un service externe sont régies par la politique de confidentialité de ce s"
-"ervice.</p>\n"
-"\n"
-"     <h3>Révisions</h3>\n"
-"\n"
-"      <p>Cette déclaration a été révisée pour la dernière fois le 5 octobre 20"
-"17 et peut être révisée à tout moment. L’emploi de l’outil indique que vous co"
-"mprenez et acceptez ces conditions.</p>"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Nom du contact"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "Courriel du contact"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr "ID du client"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr "Client – secret"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Dernier accès le"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "Actualiser l’ID du client et ses renseignements secrets"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "Envoyer les identifiants au contact par courriel"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr "Souhaitez-vous vraiment supprimer le client API: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr "Souhaitez-vous vraiment supprimer le client API: \"%{name}\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5587,8 +5540,8 @@ msgid "View all API clients"
 msgstr "Voir tous les clients API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "Les renseignements d’identification ont été envoyés à %<email>s."
+msgid "The credentials have been sent to %{email}."
+msgstr "Les renseignements d’identification ont été envoyés à %{email}."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5635,9 +5588,9 @@ msgstr "Rejetable"
 msgid "Body"
 msgstr "Corps"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "Souhaitez-vous vraiment supprimer l’avis \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "Souhaitez-vous vraiment supprimer l’avis \"%{title}\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5662,7 +5615,7 @@ msgid "New Notification"
 msgstr "Nouvel avis"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5671,7 +5624,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5681,11 +5634,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
+msgid "'%{to_org_name}' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
+msgid "'%{to_org_name}' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5695,17 +5648,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
+msgid "%{from_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
+msgid "%{to_org_name} - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5730,7 +5683,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5753,8 +5706,8 @@ msgid "New organisation"
 msgstr "Nouvel organisme"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "Souhaitez-vous vraiment supprimer le thème \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "Souhaitez-vous vraiment supprimer le thème \"%{title}\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5775,7 +5728,7 @@ msgid ""
 "il}. <br> The selected account will then be removed"
 msgstr ""
 "<br>Le contenu de l’utilisateur sélectionné sera fusionné dans le compte pour "
-"%<user_email>s. <br> Le compte sélectionné sera alors supprimé"
+"%{user_email}. <br> Le compte sélectionné sera alors supprimé"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
 msgid "Archive"
@@ -5783,11 +5736,11 @@ msgstr "Archiver"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Vous êtes sur le point d’archiver %<user_name>s. Les renseignements personnels "
+"Vous êtes sur le point d’archiver %{user_name}. Les renseignements personnels "
 "de ce dernier seront retirés, mais ses plans, ses réponses et ses commentaires"
 " seront conservés. Il ne sera plus en mesure de se connecter. Êtes-vous sûr de"
 " vouloir continuer?"
@@ -5892,100 +5845,99 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr "Vous pouvez modifier vos préférences quant aux avis sur votre page de profil."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Bonjour %<username>s"
+msgid "Hello %{username}"
+msgstr "Bonjour %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
-msgstr "Vous disposez de privilèges d’administrateur dans %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
+msgstr "Vous disposez de privilèges d’administrateur dans %{tool_name}:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
-msgstr "On a révoqué vos privilèges d’administrateur dans %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
+msgstr "On a révoqué vos privilèges d’administrateur dans %{tool_name}."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
-"Vous trouverez plus de renseignements sur l’administration de %<tool_name>s pou"
-"r les utilisateurs de votre organisme ici : %<help_url>s."
+"Vous trouverez plus de renseignements sur l’administration de %{tool_name} pou"
+"r les utilisateurs de votre organisme ici : %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Bonjour %<name>s,"
+msgid "Hello %{name},"
+msgstr "Bonjour %{name},"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
 msgstr ""
 "Veuillez utiliser les identifiants suivants pour accéder à l’API de %{tool_nam"
 "e}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
 msgstr ""
 "Veuillez consulter la documentation de l’API à l’adresse : %{api_documentation"
 "_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 "Ne partagez pas ces renseignements d’identification. Ils sont à utiliser avec "
-"l’application %<external_application>s. Si vous les partagez avec une autre app"
+"l’application %{external_application}. Si vous les partagez avec une autre app"
 "lication, nous nous réservons le droit de révoquer votre accès à l'API."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"Si vous n’avez pas demandé l’accès à l’API %<tool_name>s ni le renouvellement d"
+"Si vous n’avez pas demandé l’accès à l’API %{tool_name} ni le renouvellement d"
 "e vos renseignements d’identification, veuillez nous écrire à %{helpdesk_email"
 "}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Bonjour %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Bonjour %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s a terminé de fournir ses commentaires sur le plan \"%<link_html>s\"."
+"%{commenter} a terminé de fournir ses commentaires sur le plan \"%{link_html}\"."
 " Les commentaires se trouvent à l’onglet « Rédiger un plan » sur le côté droit"
 " de la page (Directives / Commentaires)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Bonjour %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Bonjour %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s a demandé des commentaires sur un plan %<link_html>s. Pour ajouter"
+"%{requestor} a demandé des commentaires sur un plan %{link_html}. Pour ajouter"
 " des commentaires, veuillez consulter la page « Plans » dans le menu Admin dan"
-"s %<tool_name>s et ouvrir le plan."
+"s %{tool_name} et ouvrir le plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s a effectué des commentaires sur votre plan %<plan_title>s. Po"
+"%{commenter_name} a effectué des commentaires sur votre plan %{plan_title}. Po"
 "ur les afficher, suivez le lien vers le PGD ci-dessous ou accédez au plan à pa"
-"rtir de la page Mon tableau de bord dans %<tool_name>s."
+"rtir de la page Mon tableau de bord dans %{tool_name}."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -6002,24 +5954,28 @@ msgstr ""
 "ves pour chaque question."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "PGD : %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "PGD : %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Nom de la section: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Nom de la section: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Question : %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Question : %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"Vos autorisations relatives à %<plan_title>s ont changé. Vous avez maintenant u"
-"n accès %<type>s. Cela signifie que vous pouvez %<placeholder1>s %<placeholder2>s"
+"Vos autorisations relatives à %{plan_title} ont changé. Vous avez maintenant u"
+"n accès %{type}. Cela signifie que vous pouvez %{placeholder1} %{placeholder2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -6034,8 +5990,8 @@ msgid " has been removed by "
 msgstr " a été supprimé(e) par"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "La visibilité du plan %<plan_title>s est passée à %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "La visibilité du plan %{plan_title} est passée à %{plan_visibility}."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -6052,14 +6008,14 @@ msgstr "Public : Tous peuvent consulter le plan sur le Web"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 "Si vous avez des questions concernant cette action, veuillez visiter la page M"
-"on tableau de bord dans %<tool_name>s"
+"on tableau de bord dans %{tool_name}"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Bonjour %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
+msgstr "Bonjour %{recipient_name},"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6079,25 +6035,24 @@ msgstr " basé sur le modèle"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
-msgstr ""%<inviter_name>s
-"Votre collègue %{invit%<tool_name>ss a invité(e) à contribuer à son plan de ges"
+msgstr ""
+"Votre collègue %{inviter_name} vous a invité(e) à contribuer à son plan de ges"
 "tion des données dans %{tool_name}"
 
-#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
-msgid "Welcome to %{%<tool_name>s%{%<username>s
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Bienvenue à %{tool_name}, %{username}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-m%<tool_name>s
+msgid ""
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
+"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
-m%<tool_name>s
+msgstr ""
 "%{tool_name} vous aidera à élaborer votre plan de gestion des données. Si vous"
-" avez des %<helpdesk_email>scommentaires sur l%<contact_us>soutil, veuillez nous"
+" avez des questions ou des commentaires sur l’emploi de l’outil, veuillez nous"
 " écrire à %{helpdesk_email} ou rendez-vous à %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
@@ -6106,8 +6061,8 @@ msgstr ""
 "Vous pouvez modifier vos préférences relatives aux avis sur votre page de prof"
 "il."
 
-#: ../../app/views/users/_admi%<username>smissions.html.erb:9
-msgid "Editing privileges for %{usernam%<username>s
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+msgid "Editing privileges for %{username}"
 msgstr "Modification des privilèges de %{username}"
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:19
diff --git a/config/locale/fr_FR/LC_MESSAGES/app.mo b/config/locale/fr_FR/LC_MESSAGES/app.mo
index 3dab52347f1dc3d7056a0834b05338a010c596dd..aa66bc7601a3aac9a0d552a550d7c0c5dad86578 100644
GIT binary patch
delta 31730
zcmai-2Ygk<7O(d{gx(3g9%`te_W;tA-ismvhvX0fY33v}kwZ~LQ9&XcMFdntKt&*G
zlp;v5g90jc#D-!6QNaeh@4sgP!Rvc(|L*Y3tm!jrt(m<~?!8-275nY4V&UTzqE<RQ
zQ==TGCLCYialS3=IBTwz)NwjZaGYCR$LS0ofVmSLrwsC80mrEUC&F^@7I-uHcf$us
zU!3eXRp0~hCVv~OMEYe|0e%3lbDXgAJ(2bZ+9WtmbvP9=7H1Kx1((3ua3kylUx8)e
zMc4zD2|7+mI0P1h<Dl~6VF?(58sI!w87_kZ;6_-A{+(ZlR6}qPs)MRi9H%!N4mHx1
zFb-~l(eNAi7W@+~WyY^0I?f8x!;>6m2mBgtfstvZ-ColjXFcihuspl~wGw5MX`lX`
zhD0Rj1P8+*@KLx1Y6*L!u<URwYyiuqQU|t!>UbQy2mS;#fm_nNrFEW#Ka>6kM)@4)
zhjg=bXEHQ%$GHT<T9Q&Bvt;$5I&2Fypn<R*48THg71YwMhT5_%P%Co+vX@S+OvmX6
zgHQu~7{<c=Z~^=U7Awh?WU;-Z=gw#S_Y+a>FCY&NgwHKxJD^J`&B(dUbkG@ILvjI>
zvhIf(z~`_Lta-cRG={z5lQ0=dUUjia_khxwAE0!q*&VFEDh#;8Dhp(Q&ODpG%W@^G
zihRB0i?A^1qfol@AuI#WLM^Sk#H?f)ScG&VSQNIf>Gn|l#D$5dVm~P57z@=vlI095
zUu3xwzDE8NurW-#({W0}2OxUqY=rG#xx0+KFDyZNBvktoU{{z98^G{WM5F^pU{m-V
z)XbunnkA|Rqe*vy(uqN^HJl7f!uz2HupVk6TWxv|)I{Eb8rX-BF+08PX4xf&$ivQg
zD+r*%QmT7k8<+=s!gH_}>~t?q2;Ks_z~`Wr^b9Ns|A1QRsAXnAC1Ekr)u8h0S;oTR
zq`Sanvj09d<2|SbPe2sZ`3|bX3CqorJpeVp_n-z?;y%Yof!$yW_#~88e*~puH?1JR
zhv6#tH!KZTWE<UB4?X*Tfrv8Rf@R@Hunar}QDEl}sI8fIzvCpr&9E;lztVWhu~0J~
z4`pWYupImbeg)6j{Er#MEYe><wKp!p`d1)wI}z~#SP?!6yTg5OG`s{8;OGZ%PH-n2
z3yVK!$_HQx(lcN^xB$k&4X`DA7i!N7t#%wN+i3~41v^%={+ju21lp@NVF{NCP+M{Q
zAtOI&c^Ycuf4~{A{u)zmHB>u~LMh!gr~&P<^4FoX{g{>i4OOnl!|Z<)k?4obh^j(4
zhI&vd(GymNV_+&wfg|9jusm$J)>ubRSe^7}SOum-<u8F6*lL^J1hut0p;qdRFcI1D
zk5GGGX`SQLfeoRwwlCC3heJ7_2~aCD6KaNGn|~MVLOKGql1HJI_!Fpd-#~5g87SQ-
zwBAfCT#-mk1kGS=*bk~=BGiCxhIQcrsFipOdNY8U*&DDC`~a$hi%<hD|A-lAZK(2%
zpvt$0Qr6y(a$#ox5iRvtsFg^Dwctvq707{g;a;eQzkphSpP^=Y4mN?8V13x+Q6nD=
zdyyUk)y{*^4<Cnb!B=5Z+5d{i%*gh@9%Q@))o{rTX2unv%%&OC05-r%a68n@UW2pY
zF{nKs_PCKxhJ{Jr4C}#}Fbb}QYG)m6O#jYPM6`78!)W*&)SmrgS#+bRPytHG>Od`F
z7pR%_gsMN-auU>vhM?M80yTg&unyb{i@?uexG<5EM6@?QTK)y46UCk|18E4gWUV0o
zasJ_-5ZtiIarVKgo6VMe1b31?54*t~Ta0d;fkjAHdD5&<ZK#!N^(5=BNDl-W@ert)
z$HRs&6>7=uhf=-=t$Z77MEV%iKrcY8K=r50O0|HkNq2#DVKUT2?}cjres~nFdy4g!
zAmeGHEVn{+xDUp{SD?)0H>f=?yw%L42Au4&tTui7Gp6Iap>*d#SOz`{%fjtY?Ys<2
z!=q3uaw1H`N90>5`~Dt!_PNdMbwyYTc}vSUsFmsu%fSgy4W>bLcq`NZ?uKe_rIl}m
z(uF+`SK}Oksuxb*ZkA>q)QE0_YG^6clCOsHXxpJ0d;_YXFQJzFoJ|+sVfMBb)C#tQ
z8b~`B54%CF^dqn+d<s%7>^w_E1z&`k>3*mcdB+rRj>3|pKY$D1SFk?}=5QH-&%l%L
zADFHDXU#D^^EoEM7CjB+8FxQ#ZrA5w66wCVv?2R{hR7lWm0mC-eGuMD#S3sK^1D&#
zWcVrU4*T!oFd=^l)WDwJZSH_CLQUXZ%M&n~^iNPr?d~z@vameq`l9T=J&_9VIw&O@
z2g|{9sEP|<bGQs@?{~v{;Ss0~C%t5t0=1HJptfKU)K)HmYA0g(xMdCuE8}G%#o;?p
z4SobQfRj-9=V4h`c(2*RN>JtfQ01FKb=VQg%;Ic*FW8y%AXpzRhJE1{sB&lavi_Zj
zoI{|cY`M>L&=pD<uZ6YYV5pfVLk(mBtOM_ZHQ;ur0Uv@=+T&14_B(73FTi(T+n2c|
z!9x2@f0Ooy&E6#=s6xhKsFAIOTDlETdzb^Y60gBl@O`KbisYGkWuWpKLDg>uvtSpv
z7H)$Y@X!Nh#nPbKof{@nlgM(Y2A+n6;4T;i_d+#z0BS&QT7CpI<L{uh;7`jUub35z
zhRUyR*$%2)U#NaYKy6`o5|Jn()1VKgL5(y6s>2nq1$+e7gYUrZ@GNW!Tfb_SbUbWK
z`b9VdehH=2tzR=U?E}@}^-u$w3{m#56C$F9?u6Chv#>6F2WnuyK#lwy)W{3HZqntU
z23Q-a!4|L@>~7`P!wBg__yoKJH^C>~Fy)86sV!vx14OElkp$JjLf8#1hlSzWumpV1
z@^h%Y{T^zoCcR}=E&*yFiIAB&v!M3)URVS^3f0eMC?(zx3)8=Il!z*R2-V;zs2TqR
z)xcj+4x`LLV+DSwrEL!-?+0taaW;Pzloi}#<r}PgKWv5k1K1iCJH-0Sthx~C0f$1Z
zz%n=!5BD%s2bHj$hA;+dMFvBa8)?%4Sdw%i)Jlb*wq_nI2Je9l;3}w<*#%Yp$UCfm
z3nHH(&<d11Y&xh3)j>U23buk>VK*q9m<=_sd9WN@4vWG^pp<MgYz}i^BX|O8Kt+$3
zb}K`*+u#W6F9*^Zfj2X#6&VS&q*I}^elb+J%}`4E3e=2FK$R<e)L2b@s1AEW)td$<
zz<Xd@_#>PI{qJJBa6y>JZA7NMXD%S8p_H%9`=-NmD93a+l=5tVa;bY@7kD0e<&T-e
zDjk+bz7I}=M`3^1?E|w?cR&s70jL!V?;@f-%7c~RL0BJt1=Uc|4^6>pFqU*(%VDq$
z=`b7(cR(p?v5!ngHDM*vEnr#L8*0x-LT&9t!?2S=q#S}<U<G)$EwBzIkbWADgB3nD
zW|RWeP$t|7=R<bE>H3LTsnVaC88(DnkoSXC;UcIRuYnrS23TD7|11&h`AbmR`z~w>
zkHaRg_-AH?+Ct4R4yu7+Ha!Vy<uYLvxYXu91~su9s2LxCHQ`YxB|Qzj^Z!pPD0$pe
zs01~`Mo<OYKvj&h`8Pmm^E4>OG8?M=e5ftE8>-{AuseLlrhkSS;3b=`@;Te54jL0t
zgKeN@))Q(4hC{8uTqtwd2xTQXP-gg|O}_+H{{Ykg-i0dv4IBW^LY41!!qo2twUYf#
zu>P{s@d)mKcR~%Q{1?pDhXp`w&GlcI3Mo)CUI4YEOQ80271Y4j!rE{vlu{pp8rU&-
z2z~>%!JMznKoh<RbLl`Z;~O*MjZg)TKsC7Tq|u3IU_;V7VQY8-7QsVS_!ciox*EnT
zCCh~|@Gxu)|A1{_-BZRPjfPV4g-|Q9GE78Dw;F0m9*2eDi%@&I7Z!nULCyFm)QnC*
z)jJKf0)N43(D%Lh)KU{l-VdsyVQ?B84R3_|pp-UT^9R#mTc`nahT6NqP)aurYGyN`
z2C^Kg;fPJIgId9jP%}RUli@|1p8lgbbh4p3JOEYx6IhJ?osvJ9nO1~q*bm8Y8bj@6
zYbb3V21~;Ll#->vp>P3I{t?&*ehEv!n4hinz<#9TU@3Sz)QYU|$o@x&6i2WIs^Uf%
z2e-o}@MqW<Ry}PTOHX)=bOMxz>w1P04GxFf(TUQ(m@U|Q*3A3|*opj_znVjAG;Bcn
zKIpywKTqT^g3sYRxa~K`xeK=Z-T3;Quq)}`U>!PWb<WIa*m-jic@VZCzw94oz`fu^
z(#i0Bco62mNB`uW2*><|JBGvlX8p?&xu1ykb_1*rpM;w6JFpJ?1FD0n{}}Bb2wRc9
z6}E+2;q~xK*c^7fU_RGRg)>NRgAoQEbJ29X_Yzlo<b@nJ?A^}?IId^s^I=^wRzi8I
zT(}Uv1GPmXT-Vd`@o*^V8L%0A6>7$3p=LJ1=Xw{KRWOe9G1wVK7jnHV9Slp7o>?gD
zdgitW0snFC<ex+`?ul|8PGaYGr~$lL*mX9;!5DpMcpeslg^QZ{#i5j|ER>elgi^A$
zP~|#7O)L(^!U<4*<eo5*cp`hD%%^@aGva~pI?_v^mijPk2i@Xk1v)^T<HMjD3_)$h
zqfiYWgEzopd`_(oC&Tt|F>DHVLzNGIOGJBHqoffGf!B~;2(_1aP}+J1R)dvFx!#SZ
zCG13cFjRw!q0DzXl*@h*R)=rH?(h_>1RIxjy`OlxL(Dkr+(pDQKd3#~2(^Sepp^0r
zsD=+idBzW6Ie6U4PeX4@Y<^*0`c=Lp)D}cT`ID+p1FH))kPcot%-bmuM&bmZIu2Rh
z1*L?KzzXn1C~G+g%fL@zH2eW-0+(P_SiG$3`H^~1^;^IdurHhjKZM<2?{X+B{W}YY
z;A5Oupho^|dDGBtC=d8P)E4{(Ux(Ey7+v`i9wl8O+I4or&*0Z^bw$@11H+Y!wjYDn
zkajAYf%UW;1U>s7OGH|l2z$Wka0h%6PJt7u7^Qp#s$pMM*SnJ40A*g!LMi7jFc~(g
zX3Q`f%6dM4syD8>QP%BHW_zMK_CKCTsT!{5D3ah@Wk6~1O*L5=%yJo&63wgade`ec
zP#u2_)lgmBqO4>vyavvLTH?L%CU^n%rJWo7M*c`$GttlMhE1eSJ=b%+6JakZ9EZJO
z-TJQg(J2TufN!D9s1YB4<WR=L1h@*S!@uDm*twxGyTwow*#cAGr%*~cppn^%p<yCY
znsHFd6@pr-MNsDTF`NmbV_fg0b19ro+HGvMC<XQ<?Qi0GuiaCiw(vRF5B?4t!R}36
z#}9*0E4~=&b{zhS$Pyy8n;8%F1gt^&4LAyZ17$v4nj0<e4YlNhp;l-%>;U&bt;lb1
zFpO<sbZRb?+0KWW=whh$)<Kj#>};}vZBXX&B9wU@fids|)C`KnniXmZ<yd+^l^+My
zU<Q;6z6HvPmO!oOawvOW59LpuhuVTYUK;z`Pec{ofHmO}D2MVhln49=%EL8jY4&Us
zEJ=DIRD;u@>Sx&W9H<E_fF<B^C>Q(?)ETfB#=<XPOWA+9R%VZ{fvWfdR0pp?Ii`1^
zX7&w~!#NA(7mBntGieC5#7&_F)CzWm9bsh{f|}S}P)hs+R6i$SSR?wKNG({UjTvEk
z*pc*D*b^>;a=AyK4}J+X<8Pn__7hZte?fW5;%&{0YeKESHBd`F5USiTr~yxGi~Vb+
zK?G{>X3N=7d%OT@Mr*A6G1!3glTaNUhT7w=U_JON)PyRxGs@ZtN|}2>wKD;#pCHtL
zQrcnv8c7BMIgnXUGu;el!<|q|)~>x#vJli>&V@Qm)<ZS)9Ml=G)5;In^hZz~e+AX?
z_wagn7Rrwd40kXMEPxvMVyGqE1lz#pV6w}{0(cCL?&LbZz~)_ylGcthcHJCG%Ll{z
z$d8AwlK#D$k?-zqbm=Hmxvwq5e-W9Apj;2*!)HUC^IM^2_Bxbq9D;S=4^Vbq@*1;J
zePJKcW1t595Y$R+viUopwm1(;ncsn0xi8>I+5b5rGPeOe&C*^E2a=u(<$zv?(&AdZ
z%#ElWloiZ{=iqYq95cS7x9hAS-L0?d9DpCg*WkKqjpIqY&h>7?^PvVZrk@6a{Y@nz
zWx5qg>6SxzuqWYe_$Sl=p6~BE_rpU_{$TO|bG+UIpCg?Mcfyo`uJ;>p<3VPxZ-E?m
z&U^5F%;)rAqqMgTqhHzo{Y0cxPe5twTd*$t7RJEh!_9Hq8WtjbH}pIk>`8h(><z!P
z=|&@r`A&t>q4iMt@4^+Z%1GDwjJ?_d!w(`@GRgJcdg}#T=RD~%Z~**nGBao7ZR1S?
z0}{MFbMA$M$o~?`>{<rR={Lf1Ih6l+8(x4#rkGPOD$#6B2RIb@--+12W;$@HF~1Zj
zhp`q)X*S#Rb5P2)4@!9sS$+xS`_Drur;}tHjNh^)l=60mGQ;suW*84;_S2KXW^Zps
zpgmq<xeltM=b@DCEvUohb0}AO9-e^}r<r54@N{EV*T7qmkAcJCdr&&n2pg7;^@QqY
z6x5bX4-;ud<Qb@uegZqdKcPn0D#aW^9iRpf57odeP~}!Yt<)P(uJwH=-S`?x%YTDf
zxgx2q_eUtva4YF8P-YvxA<cCjBC;0h!qFw&Tp&VFo-YTEgJ<CcIQVAQ`=Iy~l$oA`
z+JasgW*`Hh(qo}!Jjtd*Hh(VEfR;e~MA%tLL?c>f3k(UF2F5{IM?91=eFf!sYGfKm
zH5%%ay9>^Oufi6vN0!Uq^<aju2fP5|VYeBs_j|x2P%G1!FWgPk!$2Z_1X)lcUgc$=
zd{8>@F5CpagIe<YW|<Xx9Zn>jFxx2A0a%FiK{y{ChT5{>b8v82Q4*B$&Ai3js>3i&
zGdxK|KDqu}<9a(o`GJv8W|9WwkoLk1Sen1byb;ca<Kd@Jexma{vjqXDbPDVSSHd{>
zF4T&YL+Q7}VbJ^j=bLX_a49I|sSepzrzw<jtyy69Y!lSpJ_p;vm*5h37Ru+}ve29f
zw?ir8DySJh4rN78!-nu>EB|&O_AlRm8iDNd0#wDQMaIQOLuq?=sDX`!+Up?H3LJ;p
zqAs_Yr5+0FlTNf;3RV9ZsCHk4+WYsR{LHtvu>|s9XA!i7m2Nj%&=<-qCqk{jQm6(Z
zQ1-tOYQT9=Gk+7R;rF1->LiqwH(PA#cY>N|AE<gGpjPCDFcBTMDX;;&1FGYvpelR_
zHG`8-OLqaPeEmDjigdFa3|k<-2}+5VLUphfY63f;R_Z02|1Q+lgil(*&rlt?ON_Zy
zg;JtnPz}t2es~*{vOW%_3%j6J-~iOA_%_r){)BR1F?SjzZUHr*TcK`R_rWMx_<ka)
z@Y-Ew#=pZMqzf%I=@C#fp9H0Bi=k#%_HMJ+^`Ok`T6h<n0PDb0ur@4yj~QTND1Xrg
zYT&7`oa}!l5qZ8PP<#8b<#DJz{ToX8O5bZbt_ACoZUr^-5m34@9?I8Gw_FUhRgb``
za2Hg)_n;r1gT-Y3RhF3%`JtA!3Di>cfKtwpP|7p|egzl7bue+cdA%-rpSP6GT~Oth
zt#F;+;SP8m+>~uR=NYJ(H@)BJLR%PCNBxM1<Dr%|9m+fw!B}`Nl-BNnn!y3s7M_Id
zVfB^fCNvCc1?NDmTm*K3n_+YKHI&koUu9Tr752}ozEjr<x<$;DsV~$@tc5y+o`q7*
zUoA^KU<Ond?x%iZsIB<nK{J8hp(aplwP`0BYKxjcUGF<VSy%tn*uQ2r7J-&#0@R)*
zLha=OsAG8z)PQzE4dgIXxo@GA%zeo0vEQ;Yl+KKRsy`X3{Cp@gUkyKod&5Me9IMxu
zCCPyr$S$an9)QY!AF6?$p$1m$VKbomP<GwfriVanWde+Xv!LqT3TMFxRJ-NYniUGy
zC89lP4%KlxC}rygW%mPYdW>Z}ya#zY48V&p6;4{m9gnSe2R={QeZ+i8c>!YQ&fl;%
za_2GgVX_Zgq4R$&kp;+GZ!q?q14E?a9(SEQDsF>ANoPJ`z7ZXO^8H;mp<Lugpayz$
zvr)d|P!sqYY72^OF<Vv@N(WlPX0SW-%l@YksexcA)LuOS>%do__WB#BivK`qamgpm
z7IcD7ksb-P<jzxu6`^#hG1SVogj({BPy^~`dA%t6pGrg>%!0Z=+yT|`QYbTe6sm(~
zq4x51sD{3TDt{KL+&QR@i#=^v7D~%2!)sszC{G%MBj8f#{r%r@B0Ug%4K<JkTa8O?
z3$>I3p|t#Zr~%A`Qo{RSefSh?0uMtC^e-q!ROT5okk(LJ*a<dd%a*{Iq_=Lv{$;0)
zwj0ON8mi%uQ1+Y(Wp=Zmw&-4{E!qOxz}KOc_;09z7207YPzy@?o5Q<dYj_a81U2BL
zIc5c)$+74EUIbd2FQMl+o;6Dw4b?#vsHLp~<slncc7__@AgC>v47D|xP-c0X&3_O|
z2cEI=eNZd)ewc`s{1jA2e?aZ2UTHPbD5wq_!)~xE)Iev$fp8sc2Y-N5p#OQ3z5`Aq
zy&GypYv!5(b%dJWAShQI9!o?^n+ap#a@ZE`g<asUurQ2$!6;KZr~&t~9Bw%YN@>%e
ztY<OQifn{O;S2BxT>7Hx{n&NWPA@;~#O^Xndks{@>!7qY5e|b{Py=`sYDo`5&EN|t
zCHfI+#S(U#k5f}&4C(3653?<wh1$aRp=SOmtSbBelZZN~u*ZzJDpZ3_p|n31$_00Y
z+KN$714*>$xlnt#3~D7GgHqnTP)q*?)Ruh>Rj<TL#uL_oedynbCnBxh1P8!Zp=MZq
zFNXx?QWL6!^ZU%!lziC?xChh#`$DbQ2&kLTB+FS)9WI9|_c-hbcR;Pc_b@EiS(GzW
z8PQOCI}mC`#zD<!64c(#g=1hglzDv*>%!Ae?Uct~%NlAy4X7>b1bf2fa1N9eJOS0u
z3whYTBCjD(L&u;x{sU^{7ok=r`hZ!&)=*Y47B+>qSouaM2XxS;&%q9)YrbOSBjG~Q
zx59pq9}K-Wss68G|F4kVjbI~O_?r2`(d2cbe7C|z$lrz<;O|f~tn!BI{esy7_92}K
zwRJDT>tWQJX2ouTH!B|o;Yp~i9Q2kk=Sg8Avir4AOSloLzz!&Dcoq8LNhs|tdeAIo
z8Q7k5SJ)EX3@5=yptj0)$S7+yDCKPqwdZ}Iwq`QaR)o`u$YU*l((e19X1Kx1cftjv
z--IDJ=xsBQeNamE8vF&m2QR@_-!ZQE)x*YroPfQN*EnLVVItIo=RjO`*jZ==YoOOL
zl=<w0vG4$t^85;QLGd3oy3qt`rrj+^Lur4q<!x5J#xe&=r{08GiO-?;_dov-(cw|#
zU9&WPD7%e?8c=_zt(gd=eABIb8Pw7~4mIGHpgi8|P+R!1P5%sskapfP9S^lk7G?i;
z5>W#ip&Hl*HPZc1O7#J34ePyc_G}cCE(D>hB^k<JWI%1<txywK4%Ob1@J6@?Y9iH+
znfeW3*i#N7^7Vb;^Kd>?106r$%cc*<0=3k|@J3=Cs17?o=|E4YJskpNu4AAdW<qV*
zN~k4Y3x9^Y;2UtuC)mICEb~)iuXn>{r1RiKcpAzIe*VnNtjuv^&vl^&JP>wuIc(r&
z()&L*zCZbdd8fP|_LST*>I-wxxfW`L7k`2MYvd0h&{91H)!}ncBYz*tOpe?1X{Z(Z
z18RlJe`$24In)+*fx7whfilZPsQMA8E!zZV!DnD1Y#jc|DBp6Z0$Xf)JCs?z1+}D~
zz`F2HsB$&FHhW(WY66X+bfguOwM>RLz-6#0JO%s0ir<)-kAoUuIE{!#zRqTBhH}X-
zL9M_c*aRMfvIgg*$*&A$H4WiSum_aZKMd8;b|@V=57mzETjN<v!Um)#Le7w|a~lz9
z@tshfX_@82a46{~VLSLYjDfAbGiSl|@B-<1P)a%Xl=<~L8xBEfXMJy8KwkUNxabl;
znZsx()M2*-w$%B*kBDY?21@Cw|7^bJS3B)`|4rt1U>x$KGv))rMmPke`x0J<y!Bc0
zlk9BRhV(a3exmBHt}_S5!HSg6g<p|A_#5q!-u62yBK!a8obg;e&zrrx0m_a8P<x+g
zxdL`2y$#Bx{s;%cR)3iL{ahFzy$7mXoj=Ww(>KDEr1wEAkH7yhex>z4*uVB}E|FgF
zV<>a1b-|cnd#F7Qz^C9XP<z?<qOpS3a4_isumyYoE`+Z_=|KNW=9F9phmk%8d%zfe
zMO67j#~1d@ZY2Wgz!R_sBYYa(LHZ}x=l#V}me1$?rju64=l!bHF3RVv(BDuOkurr%
z{b(p1ss?4oF;Mx}!9s8lYy^kF&TwYou+LM5?Fep0a0*JvZY<*S&i6%7uJcXU2{tO~
z^K@Y%)Em(nsPem@%<n7MA66>n^RDX?VHW9!p>!y^xZyA;^SdWZL`$*<c83=%<4X9v
zU%zgFQnJHPp0R34GqXOhA?XA-0Nw>#!S`WNSfrHC+sZOfTi6I*53hkT(+A-VF#NPF
zP_(qqv)8&%heUHIUFZbmABI`^I4GY#1<C`4p!~(XP%iaho4*5UAbX+wz-v(L9EBRt
zr?7_X|D1_970Q^I#X@QQ5GYrh3>(ASq3nDslp}ftY5<==8gkA-byT6OsaFeXA|0R~
z_JXg%c(?#IE$8Ddi2Xf9M0@-@EQ|6DFK<Q~s9+kN4(pPC2h?6~h8y4!D8Dfy+UI-#
z*Te7NtcvU{?F1_MykAc4t8A3+N7#-0=qf(XiiV5y?~Eg&J&A|X(wR`Ya0@&LcS0%W
z9aVkaMdD95m2|&qKJQYw9jbhl>Y5Su4Hv<6a2%{(!{_~%Q0Boz(zR+D?Y|v{V-f5n
zG7<g^Wxqpe`JDCe2)q_%)b=@jaj7ptIh;#=pZAV9u&&R!hIAOJoqbRq@HAAtdi8vs
zqe_B7(oe&ctW0!$)6V7w*neL#es5qJ>e|rfIhwgpX4IsSPd^g#S1~^CJ^nSQ0gQ?<
z^7XI}>EGa3*txN>n)~2n(kG#Gr+*XEeg+&(ItLbp#hYUPQj)SwjXl?ZI<LFHR5%cJ
zfIH!Q_zRo|Gn)Cl7l>b=_B^4vF|WZbeBR#!ZG=ORmy9)AFb*~({T!6ed;({}!r_)i
zDQ<-iBiIG~@P<}C@0gqebqcP7GN;p)=V3F_m!QsqX06RY)1W-tMkv>O0;*nY8>4g`
zpsb~bO^0u^kp#;WScC#Ipm&*sI)0Z!dAL`g{K9#thRU`z*3k@>B|R9*1>Xd<veThf
zbS9KJFM(?R5y%$s_diy!)$%#08_aH~il?Al<zG;H*|eQ$c%<b-s2NU&axfvAz7@)<
zZii~;LD&{<fm*rau(|BNM0=yX9pM5pra*b9?<{>CjKir3HN!SgGw%gs-~^~cW--(N
zmRhcaT}ZEkD*rK5$LFAwwq8e{`TPGwA~K)ZumRj;c?fDR&%$1?c_-rm(;(L9EQadv
zPAHe0ZPV+amU;`+O6J-8Gf)G)0JS2%&e*>ih$f;vs|B?;%`DqM4XCqCPk>tLAZ!6s
zpj`4pP`a|i%3py^NdF4GcDoqsY6jKc0H^_v>Vo}CNdgGO6xa#Qh8p1xxE$s|Ih0Xd
z%>W*P>fkY`0Um;y*;%ND&qJ+1RGb-LEhu?AsD66FBse$@`_~@j+KjWX73qsm6<T&P
z_k%cy<MQ%=lS868;coeBp1GF2Gzy;j@HO&(K;D&jW5PDluaI{d+0BHBq)UhSM^9VZ
zKyi4z5ncZGTFS&D9|m<^%p=~Bcy}5d2xD#C%N2;A+|CNZXXJkg;|V<}7e{D=>_b8p
z@$fn_?xw<%ggywk0y?t^^7mTuwaD~jkk-?Jyn6{cYV{0e5PL}H5+0;XM_b<Ha=4MN
zXSkIoP%i)Z#mt8v8xXcfx&juVLJ0m&g+B>pi2p#)a~J7DbkdSC+^C!ic2LUOPFPO<
zNJ0Zb4(Wd6`)u8vD#UXqveyX{JUQ#R4B=~pI}mce^q$Wwn^9;!k|~6Wbb2EV_lA1@
zBCh8EWv38-)pm5$GTN4FPg+W>=MUR1uNvO73;pvn^#&Sv5#eH6pd{%VNndL_2~zwR
zc@L9b0JoF(1+t5TCvBM*kiA4`Oc-n1Q7=;DA1N~oHnwFYk79u37ZZ7&3g_VsgfZFf
zxae@a9Xt1Hrw8$5O3Wqbd8t4Xw^-S9WDgSWPx(cJeUy{))w7#Wm%RFfZ;4l+z5URI
z+o;!r@EdhT!MBj}NXxmFP@ye_CJ?Ve=06mA6GjLlyb|W0&p{dTWZ8N)6TgXida`IE
z|G|d6=T+Fz3ai`vm84%p9`Vxjf0)E@64mHTPbQ%<jlPXspB(a^XNY`4nI={iApIQS
zbJ8iWH|2F|6d}ahGCKM7tR^r2@e%J%{xJkaq!oJZLy)BmJBYK$iV(jK*+$|e$UkTE
zJ|kU{0WP(56NxWSzD<8;ISBb($Wut)K^;B0#JSsfPf_y2_mjAhh@Q{s;BG2BL1;s|
zI2=Xz-Bu`1{4wHZ39nK1l$8&+^|>rMBPsJPe3I}KZM;KT&p-m-W}IKW6po(!xtvN)
z1saMbG1bma`L9#(xJ~mp)O(h}w~4uw)l-{J57<23Y@BLVuFD*kMDM4|*S(T_C$r@;
z;1XLdK>MW&vHu@iK^_856Yt*ImH5jPUSli%W*h2bXR72-%6<b&!a<aq0MiL`Y}tCW
zv5fR+_!#*?>ON)LQ<0s-d+Jo^O5z?09;Tq4cZlyN=$T8<CxwRyLuep|kU~6U%U%x?
zklpH)X4R;7!PXs*tO@yfDsS^U+j=(XgnzPvTaesNK|Ox>j)^+$X#6i5-$2>DG~UJ5
zDFfdiZz$#K6R&3LKSG%Yh~I?lX*-xPu$OJ;0(no6?qA5-e<R!AE4G1bGT%eC34Ti`
z&LB3EZb!b}e`XQCp7<>CUM9WO)~kcOEM>nyzL$7i!ft||(#UT?{s3vNMUIcO=YK|l
ze-NHTsAm_AC7P)77qVAv{Bz=ks8odfBev{I<kh6^EZC8}VP2y+Ez0l$;dFun$*)g7
z7Y%16@pNQmY`LPw|Ct`%CZiSwioryv=RM+j`Vf4`?u1`Sz|)5Y55Rv2kCRt}P!`!1
z(i3b4CrCFZ-AHW`c-?ZwQ|@}GCwvVBUq;ZtR+vNl5ei;w(-8_?L{^kghWNEq<g(}N
zAXK7E5_|#qlhkPmSCY<vAHWZg4TE}qwY-&f@}HXd{{Jh4Tz#Eg1v2MRY6lHu!{LPL
zbfzn)o~eXNUW_uf&P3{0wDE1^y+Ha~(ht~<AJzZ~dfFlz<xP<FzllT~!Zs9cWoO;S
zRw_oCkAKc2@?!|eg#O4zBfDtJj3u36JKjuwFXXQg)>EbldCBA*CG@ssDB`@Ue|TCA
zL-?U>s1Wf_5dLOIIgR)=HZK4xA@?KW`>fN3hS%G?a->^RcLbrD4)yGE<D$YpQgRL@
z%96W-cm+avO6aLa?azpxByT;uk5CKwP~<t(DGalbEhWDS^4-XCN$VL-ygEEf-a*&_
z_JBjk??Amq1fH<>A)_>f2a#$4Cs5#JIFJHOiQht~LYnth@2LoXM)oGD{zl~Rh1Yv{
zL31{dcPHtsNZOlDoQ248ZP_8V9VKt$=LUyQ4Nfa6tVS?^_@@*;L*PZ)X$JG3zLXh<
z>?gv52-m`81@Z?IFJ;sGUgCXOy^aAqhU^UG7ZE<8&Lb*g2R2j{QV30{aJzTY$|hEW
zu!vBRl6qDcIOCCBAU=ueb!qBXYF34M-h>CqFNf@R(oe%xFpuy)^6IwSZ^$>0u1We&
z!Z)Nx!RJhV*oh`{Kf<bneZ;2{j?l<<3j9J`PZQ$LkU!DRL$dFYRU^F-zEAoM@@EtD
z#;RwA+9P~K7)`k^pq{TN{}JJNf?p?X6*6xl^8}e)3UtuNcK)5Mc#sMetZc2N8r1WG
zE%UvlWNEg{y-M)BOI{7ypM`ufZRxp2C++TkHCC#?AWqo^%Tbum6;3Hzwhr-T1U+fC
zF~#Q*{}`q#!Lx;QLl{N96Sl27#J@*Y7>3`Xz-ltyfDgh;2*(igoU|1bKTEte@_xi`
zrR+@NwUKRvh2fv@Zsgy>zu{3;;@L@F5}_n=Jr9#Nn0OcBx9g<U3wjrXdRkC077ihN
zNLYh>GOKZqt&GU=lYR*K3}l}W`rEv*mS3t6&uPj`CFDPM(Dr`HG$4eKCy<^lgY01o
zohG9l!u8Z>O?ZMZjlA~>HR-el+=Q%|E#Hgsg>4+MlR$h0^>2VbkamgRPnqR}DYo3-
zD#-I9;R*8f_y3olk#rJ+P|t^!ijO5cN4hTg9cbuN+gKs$)+$i{F!3P-eHvM8<@eZj
zCX=2-y-5YyRoh`c96HaaQKfi}*ovc(l_PXRHh@YW6N-~=Owdz;!4#!zDq)Qgc|UC^
zI+!xEZ8@9e^rL>5P=fG?6?WH6TThTirVzd){6YaeBk15d8hMy_KjN9h*AcHmnf#}^
zExX5dcAUKPYRAg^Qt+Yt!mtwZXUHD|=fM_Hrhg}%%n`Pc!NeEXN?|M8NQIur{v>QC
z{u1&44ZH$Z!#4@vk@p<bbJD;`CO^@(v6Xt)S$T6N^dn_ID!Bhu5iGZbdr>%*P|sGF
zY<UWPO_*-WNj#r;UmCoZ@{ig9#98)5HjVgglsg2UB0ZTfh&o@94nI!DM}+c(-w~vf
zIh1%Yf}U?E_z<$zbddk#kX}m2f4-yM9uoB_yNdXWHg5|I5=tO1Pnba%K>q8<_yFy6
z=J!A6fGu2?26`gAnF3D}|H-yq&UPFmuLpS%nE(7i-Bi+T5zHjM&F0-zpiHF#@#(f=
z6WE(jkMDoZLK<}m4G9Y=+?<ALkU189kE}PLEnzgWIk2T|Z~^%Z3F8Q9grmsM5H3>Y
zYso2J@R>>8E6BgL^<O3aXug7};QI*lj8p+zXbQ7`-jlM=<X=NrL%3wiHYKkf9qKtx
zoej3$5@Z{YJxaM}VO84MYV%ZfzOCcw{|zMWAUtk`l`T6^a3Nuk?MxL95#Awv-pY1K
z$nzeJKTC+EqdIUE`OSzAFxgIf(wk@(k@qC=@7wbKYpviWGLP9tXCs?PxI{xw5$aH@
z7JQ5R&crj}ILa@E1Cj3|d~FAPKeAP%?}U48+kcZc9@$^E%pvm3!~B;J8$+XMuwnl2
zh>s`!2Nn9+O25Ltsd$&E>HYEV4C2osFN^#>;!Ua3h>iw8{V$s9xt(<Wv&FWxj`B|v
zj|<yE>qsoIqpD5mPKp!C+x(igVk~@v@T@JXhTqdaJS~wu2IW(Jrqgb=%m>I$s{qfV
z2Hsce8))0x|B+TWkqVb={3dvu(24LV4K9V5@E~Pwr19&B>(Q&i5kd^<J+K|J%H-cn
z_>piMq2SYrPOm5YfV@@|{db^}o^uAy1)F{zP9xlp{Aa=>I(VE)jfn?npeXSu^1BgV
z1g}AU9sGcBBXK=nP^TE_o|MTlBIg(CJz(Rl-G1ybiD(M_OySD#FzIu|-z8l2kS5#N
z4DY3p;=~gOM4g?!oVDY}7Rs*mQ(R8RNev3MZx|QKnmjESpE)r#kP_@3avH`3rc6mn
zP6}iurKOs5dU|qFyqC6xvi-pp!MH$H=G3%|kXI%lkZCF>1Vix|N$Hm>PsvJ62xfR?
z5;Fp+bd!}b*$UD!5^aP2QNfh-WZF>wL{cZF%}iCP>=RSFw~foRxn47wX=%y%)p`!=
z?~k7vNKN!A7Rbqdd0OonrlriJ%w#jRg86?;YZCkK{H#zgBfsTg41%!~5M_6nUb{kE
zfj0aasFOW>LB;F^@fEWht$iV9LHxaL&JDp|-0VPNbzkbO+1v6e=RBR**v+n!v?2SQ
zq<YyUrahT`@APUp3#T_I9PJ;L91Mhl{!lQP9q^~62L0KOr^gnH3#J5;lDmg;K29I)
zTe-uH&gmQ~Rg_4@oMCe=6e<~aW#zKR&RaA>=|E~y$n24=92?g%y}J{a-o0NiIXTUL
z)m*$hvTjJr%J8P)uV>fYXhFT~W(=i&cz&h-Y&!e1aMgBkX-01{XQu~I0{_gU<YfQk
zpg$#TMliw8KN<eaG=EIP0)vf-%pUJH$Qd}ly&D}D_+PbJv7mjaf-9VTbit!V;-&{@
zqX@$n*3OA6tXAZz0y(>uOetA6f4Tgjq}2GJKXYmz)9)>UKP8YEKQ$Oywa={@DYwrp
zmVM@MRCcfXpS`*fcjchMB?~B7&e+w%ea-%3fU*8TflwwhOh}rN#3UQW8NJUrvZjt(
z`YLsboSE-dDjCQO_y-441Bt<m?9bND>&x;4QfK>vnNu;SWPf}b<IPA7Ieo5JO~JT7
zZ3?pqUM`;$3S|XDIg{2kE8d{Mc%8l(8EF|^oW8c%^o+F3wD`2-P|li7qobNT*LpT+
z;UAQgIz40)UHo1oDK*g_$_!*?g|aI=eK7m*(~XPA(Qk_Ob;Z^{iUiY>f~lF=m$uf*
ziF)Q($t(K##m*<)4(xKkpWml{N=8}=>6BnFQ_apy%ACra%@jh+I3*=1GZ=IRWk0g4
zUe1=?A4iq)H*OebjkHP5Z7=UF5k=n_**y<Fb=5Xy|8elw%ROhGJ=FbjBB$fqclm1m
z$A0+(@$qR{shQ2C06D)M{-{vS^Y4vxOZQAjNy1z*GXj}u89R>cEOd284}Ek`>9kBn
z9hw=;2qwgq$gcJAoZ>?eT}x{TIm<q-<8}-NGUBKD6VkBMRA)pmWYTF_ndw=XArx=6
ze`;XHm95L)>YOc~Y$;hfE|iv$IT0O7PC&IMeY>z<Tp-@~Olzpd4r4<3Q;2m&X2r(`
zL!l{I$;q=Rbh*3~1S9i|k;WQ**Sv}~h*<xqsX;rA$-!W%Rv~-ZcTX3NOJZZQYn;0O
zKdtcPQ`L&*EB1*~zZSI?nDgN;(M74M5ug5Jej{SH;*jYgBj`^G`BT%3C-HVXNygz7
zz3<QKTE*Rr+G=_eCGrPCp|p4o7%T|gkr(xQ<vqu5E49pN|5x?meXdN?_%C}%jZO_r
zPR7#Z*8VRG5!)~>D6<H4kL)YtR*5`b$i1mdTzW7g9#zI58GCM-D7Ua1`7+9_6BRc(
zqkDwZfU3#CO!*LIgbNEXXlsR$c7@%qOBf^9AS3=F?%3jSAsmbj&fIVj_Z8PHZEn9}
zZneTy3c509Y%m$+*O*sscPmChrEy7fO8Ck|wwHF>WY;@l9aP67wIUZwyLB$RET7+>
zTdR!wwJY}@DOJwhHwyP5=jttdfW?<fNl(jUUP(BWeCJ}Eg+C*xbJbgEoK?VhM{jz4
z1`qR_<9c#1l>0_G_fnb5z2?4A$F1nQGP}srb={V^73;aHt~z~kpKa)V<csWR><)5c
zBNrRHjmpP5@qyHsOq~Ri+1cr_xec1QeG27kR3x>z+bFWJxx2V#N*2D<GZM@c&DM72
zpY*wnTDa$;O1Ejzs!fa5t^BPzb!p!!(xi=BqugatXGG0fway*Y#{DKLw?{{JMxjP=
zEhl&PCkOob`sTz<?jFiYPtQn731$RLZZH)2q>I}$%(0s_Ett7~{lBh2{(s+rjNsp=
zl|Qt9eHZ_Xv`jX@Q{jL=Z*ykeW`8IxD+T3A*U>6>Cv{88@GdC%Hzu_>-k6xzc)?4P
zC$P6BFMidv$&*|@{r!W}67n`Bdu@BhV{T3UP^3do*B`m`zFVv#TkN00SW=TRwA=q4
zQvQN>_gcPkyNLvPxz!3@cg%dVBDH$EP3sgq>i$(x<sy@MyKOsaWxY`u=kArea-ZVv
z!<7XWnBf$>nlSbSJ>B|MRQbwi{205Mx_sNJ-+2F%``0JO;BS+X_pjf-tGVA3u&J{{
znR%O1f{dd50=I4{YWC^f8>^s=$oK_rqn_FrbVPfTmCBZ|XRHyDj3Bm*R}aSe`(sDa
z&b-ZBRud@^$ny8@GsvGFpl<e#was%|cXeNIbNhC4i~9T{f@&;~ih<!TLjIQi-UT+k
zNo-_p54UFSjvnr8H!`!Q`%<K5FSl-FaW8jCq--CzM((BF?ma~s`bWkjC8JSUC{J=A
zDbpXy+pK#bO>!6Z2UGo7ss6~)0q(F;S{-xE^M`W39^lsZ`NpJ0ww}PJ)EkVm>oVAl
z@#U?L{IbD~F2dN-GlP+N$K7g`o8zWwKQKeX#O%|OQki^Y)nNBAw|S)V5O+(_P*&0m
zF6xmJL-02jhPbmkCZ}ZuGgKih3mrH2Z7&_jiqGQCnv^;vErY9;d?gMxr12&v2XnU%
z<$rxE^6@aYQLa1Oo#_tpCtwKis2n!o&s%S;hoceSmBrB5g&1vU5*KmxmmUad<0NPQ
z0~zw$`5BR2Biwf@X89*`Q%(-DrJkOrCWKl>HjZ@fk8~a7){9IS<z_VvQ5(Hydy?3o
zkpJ4D{d;odrlCx>JatCe?7Yp!*{>Su)~aIe##7sN$GRv@vkW5?j5HbTE^Veeb)52g
zC57U%k}^YaElF{c_Kyi>X&`f0;7oSw=Bx<+3xAb!e;)1L=SJp_Wi3~Zb(7tek*Mq4
z!_k-98IiYnMv_jMP~_D0?uXf1Zmk(PeuKL>5*+8&FLmYaj9si4=Y~6a*Xe)X_5GpC
zm;GL8snew3SKCx<WcZD4rFO;~y))Dws>dy@pvPjK|8`m0qsYn|-C2|Wf8F*DGUFsX
zDr%d58JTF_4E!N2cEF#Iw;8pL$Ch-iUiD(&55@R%c{P~fM$)^urK+UT#{aw?umU$t
zaO*@`PH=0L#~7~i4_@9YMZI?g3eKP4R?O`?(G9sZIC41+j9GCZo1-lc1(Om}^EOA`
zo#eLir37<}1>DaIcNmtDG$ScFZxb(*{=k(RqI665$P6ZcI{v%k+-iw#Zs{TYQ_|By
zp(Nc(JdH8Bn(wzTxL`aZ&bL{AdR9_M!-_|}gDv#7hd;{Tlt@oYP4EXIEwkK5Yxm6J
zdTQV5xKes=9eJA>U5FuNMOv^L6@sb%@|2-S$r)~^NT{Z-QsnRqw_EP&8SYMBx&D3p
z@yWWyJ0pYf8Ntlln`gTnbnnf7wZ@TbpX)y8>t=`gAL}3M@59?lQr;$xJTn^eRX`)a
zvVxo;xp#%#wr-0tsPts)SiV))jLT!^%v5Rl@`?G!f?ky>M%&jUtzH5SMDvXNxxigt
z50AsfuyL6<dz3UIZ*y9Fd{(;gH)!zG>|yIF*2@3tKm*#PX~C>nQtzorx(nn!w$L3}
za#%9gL3NNE!#i2>Y~H+8Sj%G1>nyXHSJp(YR#Jd2&M^B@MTINPHoDjSqEPWZw3xTP
zxqn84{|-*I$do>A@5uBOZjI;!ULm9c@qq-EEFlJG8QJrITcxhQ_tZ3&2)8mv`Nn<v
zZE*&i967MU?O17!F-cZ2+4H*@xWCv)xoo#~P45Wfp1~VNs#ibgZ!CM$^djA|-6}Og
zO}yDnNs6D!Asg}!>vL^$^i6geS=Ps`9_ICDhUYxz<oB$#(CeA?dKf~ib8S*;fVb4F
z3}=wHP6=85DVIf;GrKq=_5PTt?rpZ5yff^IOW{rTs$}HnZ1<N!C`9Cq``s?3JvBD(
zoTyRhm2SLi-#a5SSGjd^=dN<2%apxhL3x{*eeS~>+>37CRO3=O9`j#A?P~i`maJ5r
zOP*F!fWy$!%7mEwUDUiX@DGvgC49AW_iS|A7pWIFH8Ul-`(T}CXzG<0RDY-m4qth>
ze?8?+C|wv6%?L)u?sQLA;huq}|F3@-zsnur7Qa03$aA~h*1Sk&Owkc<4mI5`u67W)
z?jCo%uRAB94ii+Qx4D_1inyuN_@s1h`fLUB<qq52&r4`1$#Zl%>+B&Md2p|r&`ei8
zoR_sJxpbD{KmBX-$hduOtH^x=Tz@&*!#+8T?O`6-v(N3|rsV#%&keXGuBdPB^!@Gz
zU+&)r+(fthzr1EbFn8RmZgx~X-Hz-v7!6~#4B}tz`^1~>ipaRP+(o4^Z}T-v6OVlV
zmRr4g-_(p?qTbid%^{V2$;?R0nt=;1bkN-!sd~t*6ghs--B`Jg_df1f!R6bWGbqxp
zh_6<2mL+S3ZXVoz>}B|BXHw9z7aejxEmqFE6BfAIMW!Be*G1ZX=$0=-^93{NeBf63
zx2)?2T+C8}k@yeX0g-Mi-LjEqKXBtJWlq)oRNIp8@VRc~miy5Cv{0FX9|kzb{`kbb
zBivJ}5#sGXZ&OGcXFe2gtQL4BmR@tollft@|Cbu^F}l;DO!+4?4m;N29fE7P@#LPp
zaEz%T4ngnyiJbb>EmJ#Re|0tHBB=YD_qK!HW@IKsDu3qQ-(rmSGGs>*@K45H*is3&
zI$rtNc?QUbflzmU<j`mCj>wBQxg~pNX;%O9e#JPsH_S+i=Q{rXKX-DEyT^)$?fLId
zjp2(Fmq#>Rr+tc!<r#tGBzosR#^EQ#=$lEVGbqOD+yC4YLIHfVZl6<<60`K0M~lWs
z2WSJ!bOr@<pPr%Ht~^Dq|CGDDXz|(l9;UL9-Dlh;#pT)fV8C|%aK@b)zMSj%ea{P+
z4<g1cl4BSpZ}L-;&<cOUTfEOKygTtmk{VN>uIHFMuW?n4%bl5{18<<?1ZBe$Vo+&W
zVLr`e>ZKJM^lpl}!IR0wgZ~HEfA^xp)4SJuJ$YYg@<sZVgA(SC9phQg!CG+e@=tP~
z_PjUc+jzIk{~g!=V_3P_XWa`WCZ@&*(!I|<o(}!D8L&?OUF<(~UyEfw60tj9UU09A
zH#ZgIbG=WZ9BFnM@x1$SPm>LCJ<%5nz1Qo_FooABUVE8mfzL~<jizcpH=z<{krT2a
zTQ9m*bJt#UeQu=WCAV}W^O9THe1IBGEVBNRdrhQFAzz7d+zzqn{LfI-TyTk+CoZ`~
z-G*1M^c7t~W3=dIcOoTS--I%rx3%A?I9q4Bz9v4t*vTT9sQH9(#eW#{4CU@F<h!{@
zo&WLFPA|+FH_GLeYpC}vt4|4E4Smb15?j|lMz5FNJ8a$-T_ji-Zf5ei1)P|d;KbEQ
z!{_L$PnuAyX+(>c!Tm_rZoOXeO@(WC-e!JIlB!)bY~I=D__^`rRw(KF$*nzzdmd_P
z#^DWycg$41dCsA##(WdEHH{Pxqb`y%lJt`Ay_oPJAf5M2e?1-lnNm1*7?qpMAzCli
zpEsXuT%PyBX|8?V8@t@V9DC7?B$xIz@TFx%R+RR&jHXp}lD9cAkZcaHgviIGeI3Wg
zI(=u!jkL&YfnLeua-2`*4Me9y{`Ev!<bB$c73=VnU!HaOj;!U;0;@9m$^DL7$o};`
za_f}wrIasX-Ys$;tmB*Ei}b1ID_4TAU91*gEd9AL^?X&L+(D6LkGQoWWk$M1M&!Q{
zUcRqi*$Z!WTr(Jp98&>1@m@{5&rrtac<+klcQmwZQzPHszR2MwzQKGUtku-l+MtRX
zn>(bb@AE>%@?RYyZDW0%B8y^u>l-Abc^acrT3gPsrzz8==_MhC-~Dpywe-!18XBAx
yjMpa|U9vs%OpOV8i%JzfPUKh0zY=i<@Kq(>H|AeexmEEyfqtHhoN4QO>Hh#ItoIuL

delta 29745
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
HZ^!=u<9C<8

diff --git a/config/locale/fr_FR/app.po b/config/locale/fr_FR/app.po
index 38c655bc48..f5ce866af7 100644
--- a/config/locale/fr_FR/app.po
+++ b/config/locale/fr_FR/app.po
@@ -1,14 +1,14 @@
 # French translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -18,30 +18,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"Il n'existe aucune question avec l'identifiant %<question_id>s associée à l'ide"
-"ntifiant de plan %<plan_id>s pour laquelle une réponse peut être créée ou modif"
-"iée"
+"Il n'y a pas de question avec id %<question_id> s associés à l'identifiant du "
+"plan %<plan_id> s pour lesquels créer ou mettre à jour une réponse"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
-"Il n'existe aucun plan avec l'identifiant %<id>s pour lequel une réponse peut ê"
-"tre créée ou modifiée"
+"Il n'y a pas de plan avec l'identifiant %<id> s pour lesquels créer ou mettre "
+"à jour une réponse"
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr "Mauvaises informations d'authentification"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "Le code et le nom du département doivent être uniques"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "l'utilisateur doit appartenir à votre organisme"
 
@@ -49,28 +48,28 @@ msgstr "l'utilisateur doit appartenir à votre organisme"
 msgid "Bad Parameters"
 msgstr "Paramètres erronés"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Mois"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "Nbre d'utilisateurs inscrits"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Total"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "users_joined"
 
@@ -83,35 +82,35 @@ msgstr "Non. Plans terminés"
 msgid "completed_plans"
 msgstr "complété_plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Non. Plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "Des plans"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "JSON manquant ou invalide"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Format JSON non valide"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Plan non trouvé"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr "Impossible de créer votre DMP"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "Le plan existe déjà. Envoyez plutôt une mise à jour."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
@@ -119,103 +118,107 @@ msgstr ""
 "Impossible de déterminer la propriété du DMP. Veuillez ajouter un\n"
 "                          : affiliation au: contact"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr "JSON invalide!"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "JSON non valide"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "Aucun plan trouvé"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Vous n'êtes pas autorisé à effectuer cette opération."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Vous devez vous connecter ou vous enregistrer afin de continuer."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr "Impossible de %<action>s le %<object>s. %<errors>s"
+msgstr "Incapable de %<action> c'est le %<object> s. %<errors> s"
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "Avec succès %<action>s le %<object>s."
+msgstr "Avec succès %<action> c'est le %<object> s."
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "Client API"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "plan"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "Groupe de recommandations"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "Commentaire"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "organisation"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "autorisation"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "préférences"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "profil"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "utilisateur"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "option de question"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr "Enregistrement non trouvé"
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "scope doit être un objet de type ActiveRecord::Relation"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params doit être un objet de type Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params doit être un objet de type Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "locals doit être un objet de type Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Accès restreint à Voir tous les enregistrements"
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "Trier par %<sort_field>s"
+msgstr "Trier par %<sort_field> s"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "personnalisation"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "modèle"
 
@@ -223,28 +226,28 @@ msgstr "modèle"
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr "obj doit être un Template, Phase, Section, Question or Annotation"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "obj doit être une Phase, Section, Question ou Annotation"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "search_space ne répond pas à each"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "L'espace de recherche n'a aucun élément associé"
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "la vérificatio du CAPTCHA a échouée, veuillez réessayer."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Mail de contact envoyé avec succès."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Impossible de soumettre votre demande"
 
@@ -258,60 +261,60 @@ msgid "added"
 msgstr "Ajoutée"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "enregistré"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "Enregistrer"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "supprimé(e)"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "Supprimer"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "Plan non trouvé"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "contributeur introuvable"
 
@@ -323,108 +326,108 @@ msgstr "Impossible de soumettre votre demande d'assistance conseil pour le momen
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Une erreur s'est produite lors de la demande de commentaires sur ce plan."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "créé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "Créer"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Votre groupe de recommendations a été publié et est disponible pour les utilis"
 "ateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "publier"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Votre groupe de recommentations n'est plus publié et ne sera plus disponible p"
 "our les utilisateurs."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "annuler la publication"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "supprimé"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "Effacer"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr "Votre recommendation a été publiée et est disponible pour les utilisateurs."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Votre recommendation n'est plus publiée et ne sera plus disponible pour les ut"
 "ilisateurs."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Compte délié de %<is>s avec succès."
+msgstr "Votre compte a bien été dissocié de %<is> s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "Impossible de délier votre compte de %<is>s."
+msgstr "Impossible de dissocier votre compte de %<is> s."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -436,72 +439,76 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "Vous ne pouvez pas ajouter de phase à une version historique d'un modèle."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "Impossible de créer une nouvelle version de ce modèle."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr "Impossible de créer une nouvelle version de ce modèle.<br>"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "mis à jour"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "Mise à jour"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "Impossible de créer une nouvelle version de ce modèle."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
-msgstr "%<plan_owner>s a été informé que vous avez finalisé l'assistance conseil"
+msgstr ""
+"%<plan_owner> s a été informé que vous avez terminé de fournir des commentaire"
+"s"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr ""
 "Impossible de notifier à l'utilisateur que vous avez terminé l'assistance cons"
 "eil."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Titre du projet"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Template"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -512,65 +519,68 @@ msgstr "Template"
 msgid "Organisation"
 msgstr "Organisation"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Le nom du propriétaire"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "E-mail du propriétaire"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr ""
 "Impossible de créer une nouvelle section. La phase que vous avez spécifiée n'e"
 "xiste pas."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr "Impossible de supprimer cette version du modèle."
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "copie"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Ce template n'est plus personnalisable."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Impossible de personnaliser ce modèle."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Ce modèle n'est pas personnalisable."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Tous les modèles"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "%<org_name>s Modèles"
+msgstr "%<org_name> Modèles"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Vos modèles"
@@ -579,152 +589,158 @@ msgstr "Vos modèles"
 msgid "Customizable Templates"
 msgstr "Modèles personnalisables"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "Erreur d'analyse des liens pour un %<template>s"
+msgstr "Erreur lors de l'analyse des liens pour un %<template> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
-msgstr "Modèle créé avec %<application_name>s. Dernière modification %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
+msgstr ""
+"Modèle créé à l'aide du %<application_name> le service. Dernière modification "
+"%<date> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Impossible de télécharger le modèle de DMP pour le moment."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "Aucune organisation n'est actuellement enregistrée."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Votre organisme ne semble pas être correctement configurée."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Veuillez choisir un organisme"
 
+#: ../../app/controllers/orgs_controller.rb:136
+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:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "Créé en utilisant %<application_name>s. Dernière modification %<date>s"
+msgstr "Créé avec %<application_name> s. Dernière modification %<date> s"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "C'est un"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "plan de test"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "Impossible d'identifier un modèle approprié à votre plan."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Mon plan"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr " Plan"
+msgid "My Plan (%<title>s)"
+msgstr "<html>Mon plan (%<title> s)</html>"
+
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr "%<user_name> Planifier"
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Ce plan est basé sur le modèle par défaut."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Ce plan est basé sur le"
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "modèle avec des personnalisations par le"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "copié"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
-"Impossible de changer le statut du plan, au moins %<percentage>s % de questions"
-" répondues sont nécessaires"
+"Impossible de modifier le statut du plan car il est nécessaire au moins %<perc"
+"entage}> s pourcentage a répondu"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "Impossible de trouver le plan avec l'identifiant %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr "Impossible de trouver l'identifiant de forfait %{<plan_id> s"
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Votre projet est maintenant un test."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Votre projet n'est plus un test."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr "Impossible de changer le statut du plan"
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "Il n'existe aucun plan associé à l'identifiant %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr "Il n'y a pas de forfait associé à l'identifiant %{<id}> s"
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Veuillez faire un choix ci-dessous. Après avoir lié votre\n"
-"                       détails sur un compte %<application_name>s,\n"
-"                       vous pourrez vous connecter directement avec votre\n"
-"                       diplômes institutionnels."
+"Veuillez faire un choix ci-dessous. Après avoir lié vos coordonnées à un %<app"
+"lication_name> s, vous pourrez vous connecter directement avec vos information"
+"s d'identification institutionnelles."
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr ""
 "Vous devez accepter les conditions générales d'utilisation pour vous enregistr"
 "er."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr "Veuillez sélectionner une organisation dans la liste ou choisissez Autre."
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "Cette adresse électronique est déjà enregistrée."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
-"Bienvenue ! Vous êtes connecté avec vous identifiants institutionnels. Vous po"
-"uvez à présent accéder à votre compte en les utilisant."
+"Bienvenue! Vous vous êtes inscrit avec succès avec vos informations d'identifi"
+"cation institutionnelles. Vous pourrez désormais accéder à votre compte chez e"
+"ux."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Enregistrer non réussi."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Veuillez entrer une adresse courriel."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "S'il vous plaît entrer un prénom."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "S'il vous plaît entrer un nom de famille."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
@@ -732,11 +748,11 @@ msgstr ""
 "Merci de sélectionner un organisme de la liste, ou de saisir le nom de votre o"
 "rganisme."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr "Veuillez saisir votre mot de passe pour changer l'adresse électronique."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -746,68 +762,72 @@ msgstr ""
 "                Cette adresse email est déjà enregistrée. \\\n"
 "                Vous devez entrer une adresse email unique."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Mot de passe incorrect"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Veuillez entrer votre mot de passe actuel"
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Veuillez confirmer votre mot de passe"
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "Le mot de passe et sa confirmation doivent correspondre"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"Vous ne pouvez pas partager ce plan avec %<email>s parce que cette adresse corr"
-"espond à celui du propriétaire du plan."
+"Impossible de partager le plan avec %<email> s puisque cet e-mail correspond a"
+"u propriétaire du plan."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "Le plan est déjà partagé avec %<email>s."
+msgstr "Le plan est déjà partagé avec %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "Prénom"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Nom de famille"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "Invitation à %<email>s émise avec succès."
+msgstr "Invitation à %<email> s émis avec succès."
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Plan partagé avec %<email>s."
+msgstr "Forfait partagé avec %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
-"Vous devez fournir une adresse électronique valide et sélectionner un niveau d"
-"'autorisation."
+"Vous devez fournir une adresse e-mail valide et sélectionner un niveau d'autor"
+"isation."
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Veuillez entrer une adresse électronique"
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
-msgstr "Modification des autorisations pour %<email>s. Ils ont été informés par e-mail."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
+msgstr ""
+"Modification réussie des autorisations pour %<email> . Ils ont été avertis par"
+" e-mail."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Accès retiré"
 
@@ -827,11 +847,11 @@ msgstr ""
 "Votre compte a été lié avec succès à vos identifiants institutionnels. Vous po"
 "uvez à présent vous connecter avec ceux-ci."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Paramètres d'export mis à jour avec succès."
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 "Une erreur s'est produite lors de la sauvegarde/réinitialisation de vos paramè"
@@ -840,58 +860,58 @@ msgstr ""
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
-". Les informations d'identification de l'API ont été envoyées par e-mail à %{e"
-"mail}"
+". Les informations d'identification de l'API ont été envoyées par e-mail à %<e"
+"mail> s"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Votre notification est maintenant active."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Votre notification n'est plus active."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "Impossible de modifier l'état actif de la notification"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "Il n'existe aucune notification associée à l'identifiant %<id>s"
+msgstr "Il n'y a pas de notification associée à l'identifiant %<id> s"
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"Votre organisme d'affiliation a été changé. Vous pouvez à présent éditer les m"
-"odèles de %<org_name>s."
+"L'affiliation de votre organisation a été modifiée. Vous pouvez maintenant mod"
+"ifier les modèles pour %<org_name> s."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Impossible de changer l'affiliation de votre organisme pour le moment."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Organisme inconnue."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Il y a un problème avec votre logo. Veuillez le télécharger à nouveau."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr "Une erreur s'est produite lors de la tentative de fusion des organisations."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr "Impossible de fusionner les deux organisations pour le moment."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr "Impossible de déterminer quels enregistrements doivent être fusionnés."
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
@@ -899,19 +919,19 @@ msgstr ""
 "Vous avez tenté de fusionner 2 comptes avec la même adresse e-mail.\n"
 "           Veuillez fusionner avec une autre adresse e-mail."
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "archivé"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "archiver"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "fusionné"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "fusionner"
 
@@ -923,39 +943,39 @@ msgstr ""
 "Vous êtes connecté avec un autre utilisateur. Veuillez vous déconnecter et act"
 "iver votre invitation."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Vous êtes connecté"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Votre compte a été lié à %<scheme>s avec succès."
+msgstr "Votre compte a été lié avec succès à %<scheme> s."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "Impossible de lier votre compte avec %<scheme>s."
+msgstr "Impossible de lier votre compte à %<scheme> s."
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "Compte de %<username>s %<action>s avec succès."
+msgstr "Avec succès %<action> s %<username> compte de s."
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "activé"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "désactivé"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr "Impossible de %<action>s %<username>s"
+msgstr "Incapable de %<action> s %<username> s"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "activer"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "désactiver"
 
@@ -978,35 +998,31 @@ msgstr ""
 "e que sélectionnez ci-dessous, aussi mieux vaut éviter de dupliquer trop dextr"
 "aits."
 
-#: ../../app/helpers/conditions_helper.rb:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "Répondre"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "<b>enverra un e-mail</b> avec l'objet"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr "<b>enverra un e-mail</b> avec le sujet %<subject_name> s"
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
-msgstr "<b>supprimera la</b> question"
+msgstr "<b>supprimera</b> la question"
 
 #: ../../app/helpers/conditions_helper.rb:204
 msgid " will <b>remove</b> questions "
-msgstr "<b>supprimera les</b> questions"
-
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\""
+msgstr "<b>supprimera</b> les questions"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Transférer la personnalisation"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Modifier la personnalisation"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Personnaliser"
 
@@ -1015,27 +1031,28 @@ msgid "Creators:"
 msgstr "Créateurs:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Créateur : "
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s : Une assistance conseil a a été demandée pour votre plan"
+msgstr "%<application_name> s : votre plan a été soumis pour commentaires"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Bonjour %<user_name>s. </p><p> Votre plan \"%<plan_name>s\" a été soumis aux c"
-"ommentaires d'un administrateur de votre organisation. Si vous avez des questi"
-"ons concernant cette action, veuillez nous contacter à l'adresse %{organisatio"
-"n_email}. </p>"
+"<p>Bonjour %<user_name> s.</p><p> Votre plan \"%<plan_name> s\" a été soumise po"
+"ur commentaires à un administrateur de votre organisation. Si vous avez des qu"
+"estions concernant cette action, veuillez nous contacter à %<organisation_emai"
+"l> s.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1073,9 +1090,9 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Un bibliothécaire de données de %<org_name>s répondra à votre demande dans "
-"les 48 heures. Si vous avez des questions concernant cette action, veuillez no"
-"us contacter à l'adresse %<organisation_email>s. </p>"
+"<p>Un bibliothécaire de données de %<org_name> s répondra à votre demande dans"
+" les 48 heures. Si vous avez des questions concernant cette action, veuillez n"
+"ous contacter à %<organisation_email> s.</p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1115,8 +1132,8 @@ msgid "Grant API to organisations"
 msgstr "Droit API pour les organismes"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1159,231 +1176,229 @@ msgstr "Public : visible par tous."
 msgid "Private: restricted to me and people I invite."
 msgstr "Privé : accès restreint aux personnes que j'invite."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Nom de colonne inconnu."
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Nom du projet"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "Identifiant du projet"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr "Titre de la subvention"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Chercheur principal / Chercheur"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Contact pour les données du plan"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Description"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Financeur"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "Votre ORCID"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr "Aucun"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
-msgstr "Conseils pour : %<themes>s"
+msgstr "Conseils pour : %<themes> s"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr "Rien à fusionner"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
-msgstr "<p>Les %<object_types>s suivants seront déplacés vers '%<org_name>s' :</p>"
+msgstr "<p>Ce qui suit %<object_types> s sera déplacé vers '%<org_name> s' :</p>"
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Create plan"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "Le mois dernier"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "3 derniers mois"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "6 derniers mois"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "9 derniers mois"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "12 derniers mois"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "Requête ou suggestion liée à %<tool_name>s"
+msgstr "Requête ou commentaire lié à %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "Bienvenue sur %<tool_name>s"
+msgstr "Bienvenue à %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "Un plan de gestion des données dans %<tool_name>s a été partagé avec vous"
+msgstr "Un plan de gestion des données en %<tool_name> s a été partagé avec vous"
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
-msgstr "Modification des autorisations sur un plan de %<tool_name>s"
+msgstr "Autorisations modifiées sur un plan de gestion des données en %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "Autorisations supprimées sur un DMP dans %<tool_name>s"
+msgstr "Autorisations supprimées sur une DMP en %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
-msgstr "%<user_name>s a demandé des commentaires sur un plan %<tool_name>s"
+msgstr "%<user_name> s a demandé des commentaires sur un %<tool_name> le plan"
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
-msgstr "%<tool_name>s: des commentaires d'experts ont été fournis pour %<plan_title>s"
+msgstr ""
+"%<tool_name> s : des commentaires d'experts ont été fournis pour %<plan_title>"
+" s"
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "Changement de visibilité d'un plan : %<plan_title>s"
+msgstr "Visibilité DMP modifiée : %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: Un nouveau commentaire a été ajouté à %<plan_title>s"
+msgstr "%<tool_name> s : un nouveau commentaire a été ajouté à %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "Droits administrateur attribués dans %<tool_name>s"
+msgstr "Privilèges administrateur accordés en %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "%<tool_name>s Modifications de l'API"
+msgstr "%<tool_name> Modifications de l'API"
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Phase"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Section"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Question"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "Réponse"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Personnalisé par : "
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Créateurs : "
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr "%<authors> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "%<affiliation>s"
+msgstr "%<affiliation> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Modèle : "
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr "%<funder> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr "%<template> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr "Numéro de subvention : "
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr "%<grant_number> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Résumé du projet : "
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr "%<description> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Dernière modification : "
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr "%<date> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Droits d'auteur"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1408,7 +1423,7 @@ msgstr ""
 "n quelconque avec,\n"
 "             votre projet ou proposition"
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Non répondues"
 
@@ -1418,7 +1433,7 @@ msgid "can't be blank"
 msgstr "ne peut être vide"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "doit être unique"
 
@@ -1438,41 +1453,40 @@ msgstr "pour 'Texte de la question' ne peut pas être vide."
 msgid "You must specify at least one role."
 msgstr "Vous devez spécifier au moins un rôle."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "ne peut pas être vide si aucun e-mail n'est fourni"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr "ne peut pas être vide."
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "ne peut pas être vide si aucun nom n'est fourni"
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr "ne peut pas être vide si aucun e-mail n'est fourni."
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr "ne peut pas être vide si aucun nom n'est fourni."
+
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Option(s) choisie(s)"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Répondu par"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Répondu à"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "Détails"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
 msgstr "Question sans réponse."
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "déjà attribué une valeur"
 
@@ -1480,35 +1494,35 @@ msgstr "déjà attribué une valeur"
 msgid "Feedback email message"
 msgstr "Message électronique de feedback"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "doit être dans l'un des formats suivants : jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "ne peut peser plus de 500ko"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organisme"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "public"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "test"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "privé"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "doit être postérieur à la date de début"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "recommandation concernant"
 
@@ -1516,37 +1530,37 @@ msgstr "recommandation concernant"
 msgid "can't be less than zero"
 msgstr "ne peut être inférieur à zéro"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "Vous navez pas précisé un réglage obligatoire"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "Valeur de marge non valide"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "Une marge ne peut être négative"
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 "Marge inconnue. Seuls les paramètres 'haut', 'bas', 'gauche' ou 'droite' sont "
 "possibles"
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Taille de police non valide"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Police de caractères non valide"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Réglage de mise en forme"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Nombre de pages maxi non valide"
 
@@ -1554,83 +1568,87 @@ msgstr "Nombre de pages maxi non valide"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Un modèle historisé ne peut être extrait pour modification"
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! nécessite un organisme cible"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "Copie de %<template>s"
+msgstr "Copie de %<template> s"
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "generate_version! nécessite un modèle publie"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "customize! nécessite un organisme cible"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr "customize! nécessite le modèle d'un financeur"
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "Vous ne pouvez pas publier un modèle publié."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr "Vous ne pouvez pas publier un modèle sans phases."
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 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:465
+#: ../../app/models/template.rb:461
 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:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "Les conditions du modèle se réfèrent à l'envers"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
-msgstr "Un plan de gestion de données a été partagé avec vous sur %<application_name>s"
-
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "doit être connecté à"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+msgstr ""
+"Un plan de gestion des données en %<application_name> s a été partagé avec vou"
+"s"
+
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "doit avoir accès à l'API des recommandations"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "doit avoir accès à l'API des plans"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "ne sont pas autorisés à visualiser ce plan"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr "doit avoir accès aux modèles d'API"
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr "Manager de données"
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr "administrateur de projet"
+
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr "Chercheur principal"
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr "Autre"
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1641,7 +1659,7 @@ msgstr ""
 "e cela est nécessaire pour interpréter les données elles-mêmes) pour une utili"
 "sation initiale et une réutilisation ultérieure."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1649,7 +1667,7 @@ msgstr ""
 "Mener un processus de recherche et d'investigation, en effectuant spécifiqueme"
 "nt les expériences ou la collecte de données / preuves."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1657,87 +1675,87 @@ msgstr ""
 "Responsabilité de la gestion et de la coordination de la planification et de l"
 "'exécution des activités de recherche."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Type de subvention non valide"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "les informations d'identification invalides"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Jeton invalide"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Le jeton a expiré"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Jeton manquant"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ": title et le contact: mbox sont tous deux obligatoires"
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ": type et: identifiant sont obligatoires pour tous les identifiants"
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ": le nom est obligatoire pour chaque: affiliation et: financement"
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ": role et le: name ou: email sont requis pour chaque: contributor"
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ": name,: funder_id ou: grant_id sont requis pour chaque financement"
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ": le titre est requis pour chaque: jeu de données"
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr "JSON non valide"
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "upgrade_customization! nécessite un modèle personnalisé"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
 msgstr ""
-"la mise à niveau ne peut pas être effectuée car il n'y a pas de modèle publié "
-"de son bailleur de fonds actuel"
+"la mise à niveau ne peut executée car il n'existe aucun modèle personnalisé po"
+"ur le financeur courant"
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "doit être après %<date>s"
+msgstr "doit être après %<date> s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "Une clé \"org\" est attendu pour la table de hachage des liens"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Un hash est attendu pour les liens"
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "Une clé %<key>s est attendue pour la table de hachage des liens"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "La clé %<key>s n'a pas un ensemble valide d'objets \"liens\""
+msgstr "La clé %<key> s n'a pas un ensemble valide de liens d'objet"
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr "Une clé %<key> s est attendu pour le hachage des liens"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1745,10 +1763,10 @@ msgstr "La réponse suivante ne peut être enregistrée"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"%<name>s a enregistré la réponse ci-dessous pendant que vous éditiez. Veuillez "
+"%{name} a enregistré la réponse ci-dessous pendant que vous éditiez. Veuillez "
 "combinez vos changements et enregistrer la réponse à nouveau."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1776,14 +1794,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Merci de patienter, les standards sont en cours de chargement"
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1794,11 +1812,11 @@ msgstr "Merci de patienter, les standards sont en cours de chargement"
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1822,8 +1840,8 @@ msgid "Answered"
 msgstr "Répondu"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr " par %<user_name>s"
+msgid " by %{user_name}"
+msgstr " par %{user_name}"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1879,12 +1897,13 @@ msgstr "Sujet"
 msgid "Message"
 msgstr "Message"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Vérifications de sécurité"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Envoyer"
@@ -1900,15 +1919,15 @@ msgstr "Contact"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s est fourni par le %<organisation_name>s. <br /> Vous pouvez"
-" en savoir plus sur nous sur notre <a href=\"%<organisation_url>s\" class=\"has-ne"
+"%{application_name} est fourni par le %{organisation_name}. <br /> Vous pouvez"
+" en savoir plus sur nous sur notre <a href=\"%{organisation_url}\" class=\"has-ne"
 "w-window-popup-info\" target=\"_blank\">site Internet <em class=\"sr-only\">(nouvel"
 "le fenêtre)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text"
 "}</span></a> . Si vous souhaitez nous contacter à propos de %{application_name"
@@ -1948,21 +1967,21 @@ msgstr "Sélectionnez chaque rôle qui s'applique au contributeur."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Affiliation"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "Les rôles"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1982,19 +2001,19 @@ msgstr "Les rôles"
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2015,8 +2034,8 @@ msgid ""
 "Please list the project’s Principal Investigator(s) and those responsible for "
 "data management."
 msgstr ""
-"Veuillez énumérer le (s) chercheur (s) principal (s) du projet et les responsa"
-"bles de la gestion des données."
+"Veuillez lister le Chercheur Principal du projet, ainsi que les personnes resp"
+"onsables de la gestion des données."
 
 #: ../../app/views/contributors/index.html.erb:29
 msgid "No contributors have been defined."
@@ -2062,14 +2081,14 @@ msgstr "Confirmation du mot de passe"
 msgid "First name"
 msgstr "Prénom"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Nom"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2078,8 +2097,8 @@ msgid "Create account"
 msgstr "S'inscrire"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "Bienvenue sur %<application_name>s"
+msgid "Welcome to %{application_name}"
+msgstr "Bienvenue sur %{application_name}"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2097,26 +2116,32 @@ msgstr "ou copiez"
 msgid "into your browser"
 msgstr "dans votre navigateur"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "Requête ou suggestion liée à %{tool_name}"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Bonjour %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Bonjour %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Votre collègue %<inviter_name>s vous a invité à contribuer à son plan de gestio"
-"n des données dans %<tool_name>s"
+"Votre collègue %{inviter_name} vous a invité à contribuer à son plan de gestio"
+"n des données dans %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%<click_here>s pour accepter l'invitation, (ou copier %<link>s dans votre naviga"
+"%{click_here} pour accepter l'invitation, (ou copier %{link} dans votre naviga"
 "teur). Si vous ne souhaitez pas accepter cette invitation, ignorez ce message."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2135,8 +2160,8 @@ msgstr "Cordialement"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "L'équipe %<tool_name>s"
+msgid "The %{tool_name} team"
+msgstr "L'équipe %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2147,22 +2172,22 @@ msgstr "Merci de ne pas répondre à ce mail."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 "Si vous avez des questions ou avez besoin d’aide, veuillez nous contacter à l’"
-"adresse %<helpdesk_email>s ou visiter le site %<contact_us_url>s."
+"adresse %{helpdesk_email} ou visiter le site %{contact_us_url}."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Bonjour %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Bonjour %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"Quelqu'un a demandé un lien pour modifier votre mot de passe %<tool_name>s. Vou"
+"Quelqu'un a demandé un lien pour modifier votre mot de passe %{tool_name}. Vou"
 "s pouvez le faire via le lien ci-dessous."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2176,11 +2201,11 @@ msgstr "Si vous n'avez pas fait cette demande, merci d'ignorer ce message."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 "Si vous avez des questions ou si vous avez besoin d'aide, merci de nous contac"
-"ter à %<helpdesk_email>s ou consulter %<contact_us>s"
+"ter à %{helpdesk_email} ou consulter %{contact_us}"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2250,22 +2275,22 @@ msgstr "Documentation"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Consultez la <a href=\"%<api_v0_wiki>s\">documentation de la v0</a> pour plus de "
+"Consultez la <a href=\"%{api_v0_wiki}\">documentation de la v0</a> pour plus de "
 "détails sur l'API d'origine qui comprend l'accès aux statistiques, le texte in"
 "tégral des plans et la possibilité de connecter les utilisateurs aux services."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Consultez la <a href=\"%<api_v1_wiki>s\">documentation de la v1</a> pour plus de "
-"détails sur l'API qui prend en charge la <a href=\"%<rda_standard_url>s\">norme d"
+"Consultez la <a href=\"%{api_v1_wiki}\">documentation de la v1</a> pour plus de "
+"détails sur l'API qui prend en charge la <a href=\"%{rda_standard_url}\">norme d"
 "e métadonnées RDA Common pour les DMP.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2377,7 +2402,7 @@ msgid ""
 "Please note that your email address is used as your username. If you change th"
 "is, remember to use your new email address on sign in."
 msgstr ""
-"Notez que votre adresse est utilisé en tant que non d'utilisateur. Si vous le "
+"Notez que votre adresse est utilisé en tant que nom d'utilisateur. Si vous le "
 "souhaitez la changer, n'oubliez pas d'utiliser la nouvelle adresse pour vous c"
 "onnecter."
 
@@ -2389,9 +2414,7 @@ msgstr "Vous pouvez modifier les renseignements ci-dessous."
 msgid ""
 "Changing your organisation will result in the loss of your administrative priv"
 "ileges."
-msgstr ""
-"Changer votre organisation entraînera la perte de vos privilèges administratif"
-"s."
+msgstr "Changer votre organisation entraînera la perte de vos droits administrateur."
 
 #: ../../app/views/devise/registrations/_personal_details.html.erb:43
 #: ../../app/views/org_admin/users/edit.html.erb:31
@@ -2443,8 +2466,8 @@ msgid "Sign in or Create account"
 msgstr "Connectez-vous ou créez un compte"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "Avez vous un compte sur %<application_name>s ?"
+msgid "Do you have a %{application_name} account?"
+msgstr "Avez vous un compte sur %{application_name} ?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2459,8 +2482,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Votre compte existant sera lié à votre compte institutionnel."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "Pas de compte %<application_name>s ?"
+msgid "No %{application_name} account?"
+msgstr "Pas de compte %{application_name} ?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2528,7 +2551,7 @@ msgstr "tout réduire"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Groupe de recommandations"
@@ -2613,38 +2636,38 @@ msgstr "Créer une recommandation"
 msgid "Enter your guidance here. You can include links where needed."
 msgstr "Entrez ici vos conseils. Vous pouvez ajouter des liens là où il faut."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
 "ch you create guidance groups, across all templates that have questions with t"
 "he corresponding theme tags."
 msgstr ""
-"Sélectionnez un ou plusieurs thèmes pertinents pour ce guide. Cela affichera v"
-"otre guide générique au niveau de l'organisation, ou tout établissement / serv"
-"ice pour lequel vous créez des groupes de guidage, parmi tous les modèles comp"
-"ortant des questions avec les balises de thème correspondantes."
+"Sélectionnez un ou plusieurs thèmes concernant cette recommandation. Cela affi"
+"chera votre recommandation générique au niveau de l'organisme, ou tout établis"
+"sement / service pour lequel vous créez des groupes de recommandations, parmi "
+"tous les modèles comportant des questions avec les thèmes correspondants."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Sélectionnez le groupe auxquel ces recommandations sont liés."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 "Cochez cette case pour faire apparaître la recommandation dans les plans de l'"
 "utilisateur."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "Publié ?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%<application_name>s a été développé par <strong>%<organisation_name>s</stron"
+"<p>%{application_name} a été développé par <strong>%{organisation_name}</stron"
 "g> afin de vous aider à rédiger des plans de gestion de données.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2830,8 +2853,9 @@ msgid "Logout"
 msgstr "Déconnexion"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
-msgstr "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
+msgstr "%{application_name}"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2908,11 +2932,11 @@ msgstr "Ouvre dans une nouvelle fenêtre"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"%<n>s les résultats sont disponibles, utilisez les flèches haut et bas pour par"
+"%{n} les résultats sont disponibles, utilisez les flèches haut et bas pour par"
 "courir les suggestions. Utilisez la touche Entrée pour sélectionner une sugges"
 "tion ou la touche Échap pour fermer les suggestions."
 
@@ -2964,8 +2988,8 @@ msgid "Example answer"
 msgstr "Exemple de réponse"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr "Exemple de réponse %<org>s"
+msgid "%{org} Example Answer"
+msgstr "Exemple de réponse %{org}"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3121,10 +3145,10 @@ msgstr "Supprimer la phase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la phase '%<phase_title>s'. Cela supprimera"
+"Vous êtes sur le point de supprimer la phase '%{phase_title}'. Cela supprimera"
 " toutes les sections et les questions listées ci-dessous. En êtes-vous sûr ?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3163,7 +3187,7 @@ msgstr "Vous pouvez les placer avant ou après les sections principales du modè
 
 #: ../../app/views/org_admin/phases/container.html.erb:67
 msgid "Re-order sections"
-msgstr "Re-commander des sections"
+msgstr "Réorganiser les sections"
 
 #: ../../app/views/org_admin/phases/preview.html.erb:11
 msgid "Back to customise phase"
@@ -3183,8 +3207,8 @@ msgid "Write plan"
 msgstr "Rédiger"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "%<org_name>s Plans"
+msgid "%{org_name} Plans"
+msgstr "%{org_name} Plans"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3237,10 +3261,10 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Télécharger les plans <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class="
-"\"new-window-popup-info\">%<open_in_new_window_text>s</span>"
+"\"new-window-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3270,8 +3294,8 @@ msgstr ""
 " le style ici."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Question %<number>s :"
+msgid "Question %{number}:"
+msgstr "Question %{number} :"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3339,16 +3363,16 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "Effacer"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la question #%<question_number>s. En êtes-v"
+"Vous êtes sur le point de supprimer la question #%{question_number}. En êtes-v"
 "ous sûr ?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3449,10 +3473,10 @@ msgstr "Saisissez un titre pour la section"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<section_title>s'. Cela affectera les que"
+"Vous êtes sur le point de supprimer '%{section_title}'. Cela affectera les que"
 "stions liées à cette section. En êtes-vous sûr ?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3483,8 +3507,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "réservé à l'usage interne de %<org_name>s"
+msgid "for internal %{org_name} use only"
+msgstr "réservé à l'usage interne de %{org_name}"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3652,28 +3676,32 @@ msgstr ""
 ". Si vous souhaitez ajouter des questions dans un modèle de financeur, utilise"
 "z les options 'personnaliser le modèle' ci-dessous."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "%{org_name} Modèles"
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Modèles personnalisables"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Tous (%<count>s)"
+msgid "All (%{count})"
+msgstr "Tous (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "Publié(s) (%<count>s)"
+msgid "Published (%{count})"
+msgstr "Publié(s) (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "Non publiés (%<count>s)"
+msgid "Unpublished (%{count})"
+msgstr "Non publiés (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "Non personnalisé(s) (%<count>s)"
+msgid "Not customised (%{count})"
+msgstr "Non personnalisé(s) (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3682,8 +3710,8 @@ msgstr "Créer un modèle"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "Edition du profil de %<username>s"
+msgid "Editing profile for %{username}"
+msgstr "Edition du profil de %{username}"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3691,8 +3719,8 @@ msgid "View all users"
 msgstr "Voir tous les utilisateurs"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "Plans de %<username>s"
+msgid "Plans of %{username}"
+msgstr "Plans de %{username}"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3722,7 +3750,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Si l'un des identifiants ci-dessus est incorrect ou manquant, veuillez <a href"
-"=\"%<contact_us_url>s\">nous contacter</a> pour le mettre à jour."
+"=\"%{contact_us_url}\">nous contacter</a> pour le mettre à jour."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3739,9 +3767,7 @@ msgstr "Off"
 
 #: ../../app/views/orgs/_feedback_form.html.erb:22
 msgid "Request Expert Feedback - Message Displayed on Share Plan Tab:"
-msgstr ""
-"Demander des commentaires d'experts - Message affiché dans l'onglet Plan de pa"
-"rtage:"
+msgstr "Demande d'assistance conseil - Message affiché dans l'onglet Plan de partage:"
 
 #: ../../app/views/orgs/_feedback_form.html.erb:31
 msgid "Sample Message"
@@ -3754,10 +3780,10 @@ msgstr "Fusionner des organisations"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 "Veuillez sélectionner l'organisation qui remplacera l'organisation actuelle : "
-"' <strong>%<org_name>s</strong> '."
+"' <strong>%{org_name}</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3935,21 +3961,21 @@ msgid "Last Accessed"
 msgstr "Dernier accès"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Jamais"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer «%<client_name>s». Ils ne pourront plus acc"
+"Vous êtes sur le point de supprimer «%{client_name}». Ils ne pourront plus acc"
 "éder à l'API. Êtes-vous sûr?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
-msgstr "Vous êtes sur le point de supprimer «%<contributor_name>s». Êtes-vous sûr?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgstr "Vous êtes sur le point de supprimer «%{contributor_name}». Êtes-vous sûr?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3962,10 +3988,10 @@ msgstr "Nom abrégé ou code"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%<department_name>s'. Cela affectera les c"
+"Vous êtes sur le point de supprimer '%{department_name}'. Cela affectera les c"
 "onseils. Êtes-vous sûr?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -4006,15 +4032,15 @@ msgstr "Publier"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Vous allez effacer '%<guidance_group_name>s'. Cela impactera les recommendation"
+"Vous allez effacer '%{guidance_group_name}'. Cela impactera les recommendation"
 "s. En êtes-vous sûr ?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
-msgstr "Vous allez effacer '%<guidance_summary>s'. En êtes-vous sûr ?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgstr "Vous allez effacer '%{guidance_summary}'. En êtes-vous sûr ?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4050,8 +4076,23 @@ msgid "Managed"
 msgstr "Géré"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
-msgstr "Vous êtes sur le point de supprimer '%<org_name>s'. En êtes-vous sûr ?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr "Vous êtes sur le point de supprimer '%{org_name}'. En êtes-vous sûr ?"
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Titre du projet"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Test"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4081,25 +4122,10 @@ msgstr ""
 "iation du mois et une année à 4 chiffres dans le champ de recherche ci-dessus."
 " <br> Par exemple: «Oct 2019» ou «Jun 2013»."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Titre du projet"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "Créé"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Test"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4218,10 +4244,10 @@ msgstr "Publier les modifications"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Voulez-vous vraiment supprimer la personnalisation de \"%<template_title>s\" ? Le"
+"Voulez-vous vraiment supprimer la personnalisation de \"%{template_title}\" ? Le"
 "s versions publiées ne seront plus disponibles aux utilisateurs."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4238,10 +4264,10 @@ msgstr "Voir les personnalisations."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Voulez-vous vraiment supprimer \"%<template_title>s\" ? Les versions publiées ne "
+"Voulez-vous vraiment supprimer \"%{template_title}\" ? Les versions publiées ne "
 "seront plus disponibles aux utilisateurs."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4405,22 +4431,22 @@ msgstr "Droite"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Télécharger le plan <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"n"
-"ew-window-popup-info\">%<open_in_new_window_text>s</span>"
+"ew-window-popup-info\">%{open_in_new_window_text}</span>"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
-msgstr "Sélectionnez le guidage"
+msgstr "Sélectionnez la recommandation"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %<application_name>s peut vous proposer d"
+"Pour vous aider à rédiger votre plan, %{application_name} peut vous proposer d"
 "es recommandations provenant de différents organismes."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4441,11 +4467,11 @@ msgstr "Il n'y a aucune indication supplémentaire pour ce modèle."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %<application_name>s peut vous proposer d"
+"Pour vous aider à rédiger votre plan, %{application_name} peut vous proposer d"
 "es recommandations provenant de différents organismes. Dans la liste ci-dessou"
 "s, choisissez jusqu'à 6 organismes proposant des recommandations adaptées à vo"
 "tre plan."
@@ -4472,17 +4498,17 @@ msgstr "Rédiger"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
-msgstr "Ce plan est basé sur le modèle  \"%<template_title>s\" fourni par %<org_name>s."
+msgstr "Ce plan est basé sur le modèle  \"%{template_title}\" fourni par %{org_name}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
-msgstr "Version du modèle %<template_version>s, publiée le %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
+msgstr "Version du modèle %{template_version}, publiée le %{published_date}"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4500,13 +4526,13 @@ msgstr[1] "des questions"
 msgid "answered"
 msgstr "répondu"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 "En cas de demande de financement, indiquer le nom exactement comme dans la dem"
 "ande de subvention."
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4514,49 +4540,94 @@ msgstr ""
 "Résumer brièvement votre projet de recherche en indiquant les raisons pour les"
 "quelles vos données sont collectées ou crées."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr "Un identifiant approprié conforme aux attentes du financeur ou de l'organisme."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+"Existe-t-il des problèmes éthiques potentiels liés aux données décrites par ce"
+" DMP ?"
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr "Description des enjeux éthiques"
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr "Lien vers un protocole d'une réunion avec un comité d'éthique"
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr "projet de test, d'entrainement ou à des fins de formation"
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Résumé du projet"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr "Domaine de recherche"
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr "- S'il vous plait sélectionner en un -"
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Début du projet"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "La date estimée à laquelle vous commencerez ce projet."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Fin du projet"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "La date estimée à laquelle vous terminerez ce projet."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "Page de destination"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "Identifiant"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr "Les résultats de la recherche peuvent avoir des préoccupations éthiques"
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr "Décrivez toute préoccupation éthique"
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr "Protocoles éthiques"
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr "Statut de financement"
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr "Numéro / URL de la subvention"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr "Numéro de subvention :"
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4596,11 +4667,11 @@ msgstr "Définir la visibilité du plan"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Les visibilités ‘Public’ et‘Organisationnel’ sont à l'intention des plans term"
-"inés. Vous devez répondre à au moins %<percentage>s%% des questions pour pouvoi"
+"inés. Vous devez répondre à au moins %{percentage}%% des questions pour pouvoi"
 "r activer ces options. Note : les plans de test on la visibilité privé par déf"
 "ault."
 
@@ -4690,8 +4761,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Cliquez le bouton ci-dessous \"Créer un plan\" pour commencer."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "%<org_title>s Plans"
+msgid "%{org_title} Plans"
+msgstr "%{org_title} Plans"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4769,7 +4840,7 @@ msgstr "Quel modèle souhaitez vous utiliser ?"
 
 #: ../../app/views/plans/new.html.erb:111
 msgid "Please select a template"
-msgstr "Veuillez sélectionner un modèle"
+msgstr "Choisissez un modèle"
 
 #: ../../app/views/plans/new.html.erb:116
 msgid "We found multiple DMP templates corresponding to your funder."
@@ -4777,11 +4848,11 @@ msgstr "Nous avons trouvé plusieurs modèles correspondants à votre financeur.
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Les DMPs publics sont créés à l'aide de %<application_name>s et partagés publiq"
+"Les DMPs publics sont créés à l'aide de %{application_name} et partagés publiq"
 "uement par leurs propriétaires. Ils n'ont pas été vérifiés pour leur qualité, "
 "leur exhaustivité ou leur adhésion aux lignes directrices des financeurs."
 
@@ -4832,8 +4903,8 @@ msgid "terms and conditions"
 msgstr "conditions générales d'utilisation"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "Souhaitez-vous créer un plan basé sur le modèle \"%<name>s\"?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Souhaitez-vous créer un plan basé sur le modèle \"%{name}\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4884,41 +4955,46 @@ msgstr "Supprimer le filtre"
 msgid "Filter plans"
 msgstr "Filtrer les plans"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Question sans réponse."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
-msgstr "Plan de gestion de données créé à l'aide de %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
+msgstr "Plan de gestion de données créé à l'aide de %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Affiliation : "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
-msgstr "Bailleur de fonds:"
+msgstr "Financeur:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "Identifiant ORCID : "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr "IDENTIFIANT:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr "Date de début:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr "Date de fin:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr "Numéro d'octroi / URL :"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4939,25 +5015,25 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Commencez à taper pour voir une liste de suggestions."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
 "different form."
 msgstr ""
-"Une nouvelle entrée sera créée pour l'organisation que vous avez nommée ci-des"
-"sus. Veuillez vérifier que votre organisation n'apparaît pas dans la liste sou"
-"s une forme légèrement différente."
+"Une nouvelle entrée sera créée pour l'organisme que vous avez renseigné ci-des"
+"sus. Veuillez vérifier que votre organisme n'apparaît pas dans la liste sous u"
+"ne forme légèrement différente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
-msgstr "Le nom que vous avez entré ne faisait pas partie des suggestions répertoriées!"
+msgstr "L'organisme que vous avez saisi ne figure pas dans la liste"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "A propos de %<application_name>s"
+msgid "About %{application_name}"
+msgstr "A propos de %{application_name}"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5040,10 +5116,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "impliquez-vous <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"new-wi"
-"ndow-popup-info\">%<open_in_new_window_text>s</span>"
+"ndow-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5066,8 +5142,8 @@ msgstr ""
 "tre DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "Si vous ne possédez pas de compte %<application_name>s, cliquez sur"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "Si vous ne possédez pas de compte %{application_name}, cliquez sur"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5106,14 +5182,14 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"Quand vous vous connectez à DMPRoadmap vous serez redirigé à la page 'Tableau "
-"de bord'. Vous pourrez éditer, partager, télécharger, copier et supprimer n'im"
-"porte lequel de vos plans. Vous pourrez également voir les plans qui ont été p"
-"artagés avec vous par d'autres utilisateurs."
+"Lorsque vous vous connectez à %{application_name}, vous serez dirigé vers la p"
+"age \"Mon tableau de bord\". À partir de là, vous pouvez modifier, partager, tél"
+"écharger, copier ou supprimer n'importe lequel de vos plans. Vous verrez égale"
+"ment des plans qui ont été partagés avec vous par d'autres."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5272,14 +5348,14 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
-"Vous pouvez ici télécharger votre plan dans différents formats. Cette option e"
-"st utilise si vous devez soumettre votre plan lors d'une demande de financemen"
-"t. Choisissez dans quel format vous souhaitez voir/télécharger votre plan et c"
-"liquer sur 'Télécharger' Vous pouvez également ajuste le formatage (police, ta"
-"ille et marge) des fichiers PDF, utile dans la cas où vous auriez des limites "
-"de page.</p>"
+"De là, vous pouvez télécharger votre plan dans différents formats. Cela peut ê"
+"tre utile si vous devez soumettre votre plan dans le cadre d'une demande de su"
+"bvention. Choisissez le format dans lequel vous souhaitez voir/télécharger vot"
+"re plan et cliquez pour télécharger. Vous pouvez également ajuster la mise en "
+"forme (type de police, taille et marges) des fichiers PDF, ce qui peut être ut"
+"ile si vous travaillez dans les limites de pages."
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5289,44 +5365,44 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"Les informations que vous fournissez seront utilisée par %<org_name>s afin de v"
-"ous offrir l'accès à la personnalisation du service %<application_name>s."
+"Les informations que vous fournissez seront utilisée par %{org_name} afin de v"
+"ous offrir l'accès à la personnalisation du service %{application_name}."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%<org_name>s traite les données personnelles des utilisateurs de %{application_"
-"name} afin de fournir et d'amélioler %<application_name>s, de manière personnal"
+"%{org_name} traite les données personnelles des utilisateurs de %{application_"
+"name} afin de fournir et d'amélioler %{application_name}, de manière personnal"
 "isée, et d'assurer que chaque utilisateur reçoive les informations qui lui son"
 "t pertinantes."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Le traitenement de vos données personnelle par %<org_name>s est nécessaire pour"
+"Le traitenement de vos données personnelle par %{org_name} est nécessaire pour"
 " les intérêts suivants : "
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Afin de fournir l'accès à %<application_name>s et personnaliser votre expérienc"
+"Afin de fournir l'accès à %{application_name} et personnaliser votre expérienc"
 "e utilisateur (ex: mise à disposition de modèles pertinents et de recommendati"
 "ons provenant de votre organisation)."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 "Pour vous tenir informer des dernières actualités à propos de %{application_na"
@@ -5340,29 +5416,29 @@ msgstr "Afin d'assurer la sécurité des réseaux et de l'information "
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 "Nous stockerons les données personnelles que vous avez fournies aussi longtemp"
-"s que vous utiliserez %<application_name>s. Vos données personnelles peuvent êt"
+"s que vous utiliserez %{application_name}. Vos données personnelles peuvent êt"
 "re supprimées de ce service suite à tout demande à l'équipe %{application_name"
 "}, dans un délai de 30 jours."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
-"Si vous avez des questions, merci de contacter l'équipe %<application_name>s à "
-"<a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"Si vous avez des questions, merci de contacter l'équipe %{application_name} à "
+"<a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Cette déclaration a été mise à jour le %<revdate>s et peut etre modifiée à tout"
+"Cette déclaration a été mise à jour le %{revdate} et peut etre modifiée à tout"
 " moment, suite à une notification préalable."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5377,31 +5453,28 @@ msgstr ""
 "che. Nous fournissons des services au Royaume Uni, aux Etats Unis et au secteu"
 "r international de l'éducation supérieure."
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMPRoadmap"
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"DMPRoadmap («l'outil», «le système») est un outil développé par CDC et CDL en "
-"tant que ressource partagée par la communauté des chercheurs. Il est hébergé a"
-"u CDL par le centre de conservation de l'Université de Californie."
+"%{application_name} (« l'outil », « le système ») est un outil développé par l"
+"e DCC et le CDL en tant que ressource partagée pour la communauté de la recher"
+"che. Il est hébergé au CDL par le University of California Curation Center."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5432,11 +5505,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5451,79 +5525,80 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3> Vos données personnelles et avis de consentement </h3><p> Afin d'aider à "
-"identifier et administrer votre compte avec DMPRoadmap, nous devons stocker vo"
-"tre nom et votre adresse e-mail. Nous pouvons également l'utiliser pour vous c"
-"ontacter afin d'obtenir des commentaires sur votre utilisation de l'outil ou p"
-"our vous informer des derniers développements ou versions. Les informations pe"
-"uvent être transférées entre le DCC et le CDL, mais uniquement aux fins légiti"
-"mes du DCC et du CDL suivantes: marketing, amélioration de nos services et vou"
-"s informer du contenu et des événements pertinents. Nous ne vendrons, ne louer"
-"ons ni n'échangerons les informations personnelles que vous nous fournissez. E"
-"n utilisant ce système, vous consentez à la collecte, à la conservation et à l"
-"'utilisation de vos informations personnelles conformément à ce qui précède. V"
-"ous avez le droit de nous demander de ne pas traiter vos données personnelles "
-"à des fins de marketing. </p><h3> Politique de confidentialité </h3><p> Les in"
-"formations que vous entrez dans ce système peuvent être vues par vous, les per"
-"sonnes avec lesquelles vous avez choisi de partager l'accès et - uniquement da"
-"ns le but de maintenir le service - les administrateurs système de DCC et CDL."
-" Nous compilons des informations anonymisées, automatisées et agrégées à parti"
-"r de plans, mais nous n'accéderons pas, n'utiliserons pas ou ne partagerons pa"
-"s directement votre contenu avec qui que ce soit sans votre permission. Les ag"
-"ents autorisés de votre organisation d'origine peuvent accéder à vos plans à d"
-"es fins spécifiques - par exemple, pour suivre la conformité aux exigences des"
-" bailleurs de fonds / de l'organisation, pour calculer les besoins de stockage"
-" ou pour évaluer la demande de services de gestion de données dans toutes les "
-"disciplines. </p><h3> La liberté d'information </h3><p> DCC et CDL détiennent "
-"vos plans en votre nom, mais ils sont votre propriété et votre responsabilité."
-" Tout candidat FOIA sera renvoyé à votre organisation d'origine. </p><h3> Mots"
-" de passe </h3><p> Votre mot de passe est stocké sous forme cryptée et ne peut"
-" pas être récupéré. En cas d'oubli, il doit être réinitialisé. </p><h3> Biscui"
-"ts </h3><p> Veuillez noter que DMPRoadmap utilise des cookies. De plus amples "
-"informations sur les cookies et la manière dont nous les utilisons sont dispon"
-"ibles sur le <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-site"
-"/website-terms-use/cookies' class=\"has-new-window-popup-info\">site Web princip"
-"al de DCC <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"new-window-"
-"popup-info\">%<open_in_new_window_text>s</span></a> . </p><h3> API tierces </h3>"
-"<p> Certaines fonctionnalités de ce site Web utilisent des services et des API"
-" tiers tels que InCommon / Shibboleth ou l'hébergement tiers de bibliothèques "
-"JavaScript ou de polices Web courantes. Les informations utilisées par un serv"
-"ice externe sont régies par la politique de confidentialité de ce service. </p"
-"><h3> Révisions </h3><p> Cette déclaration a été révisée pour la dernière fois"
-" le 5 octobre 2017 et peut être révisée à tout moment. L'utilisation de l'outi"
-"l indique que vous comprenez et acceptez ces termes et conditions. </p>"
-
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+"<h3>Vos données personnelles et avis de consentement</h3><p> Afin d'aider à id"
+"entifier et à administrer votre compte avec %{application_name}, nous avons be"
+"soin de stocker votre nom et votre adresse e-mail. Nous pouvons également l'ut"
+"iliser pour vous contacter afin d'obtenir des commentaires sur votre utilisati"
+"on de l'outil, ou pour vous informer des derniers développements ou versions. "
+"Les informations peuvent être transférées entre le DCC et le CDL, mais uniquem"
+"ent aux fins légitimes suivantes du DCC et du CDL : marketing, amélioration de"
+" nos services et vous informer du contenu et des événements pertinents. Nous n"
+"e vendrons, louerons ou échangerons aucune information personnelle que vous no"
+"us fournissez. En utilisant ce système, vous consentez à la collecte, à la con"
+"servation et à l'utilisation de vos informations personnelles conformément à c"
+"e qui précède. Vous avez le droit de nous demander de ne pas traiter vos donné"
+"es personnelles à des fins de marketing.</p><h3> Politique de confidentialité<"
+"/h3><p> Les informations que vous entrez dans ce système peuvent être vues par"
+" vous, les personnes avec lesquelles vous avez choisi de partager l'accès et -"
+" uniquement dans le but de maintenir le service - les administrateurs système "
+"de DCC et CDL. Nous compilons des informations anonymisées, automatisées et ag"
+"régées à partir de plans, mais nous n'accéderons pas directement à votre conte"
+"nu, ne l'utiliserons pas et ne le partagerons pas avec qui que ce soit sans vo"
+"tre permission. Les agents autorisés de votre organisation d'origine peuvent a"
+"ccéder à vos plans à des fins spécifiques - par exemple, pour suivre la confor"
+"mité aux exigences du bailleur de fonds/de l'organisation, pour calculer les b"
+"esoins de stockage ou pour évaluer la demande de services de gestion de donnée"
+"s dans toutes les disciplines.</p><h3> La liberté d'information</h3><p> DCC et"
+" CDL détiennent vos plans en votre nom, mais ils sont votre propriété et votre"
+" responsabilité. Tous les candidats FOIA seront renvoyés vers votre organisati"
+"on d'origine.</p><h3> Mots de passe</h3><p> Votre mot de passe est stocké sous"
+" forme cryptée et ne peut pas être récupéré. En cas d'oubli, il doit être réin"
+"itialisé.</p><h3> Biscuits</h3><p> Veuillez noter que %{application_name} util"
+"ise des cookies. De plus amples informations sur les cookies et la manière don"
+"t nous les utilisons sont disponibles sur le <a target='_blank' href='http://w"
+"ww.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-win"
+"dow-popup-info\">site Web principal de DCC <em class=\"sr-only\">(nouvelle fenêtr"
+"e)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}</span><"
+"/a> .</p><h3> API tierces</h3><p> Certaines fonctionnalités de ce site Web uti"
+"lisent des services et des API tiers tels que InCommon/Shibboleth ou l'héberge"
+"ment tiers de bibliothèques JavaScript ou de polices Web courantes. Les inform"
+"ations utilisées par un service externe sont régies par la politique de confid"
+"entialité de ce service.</p><h3> Révisions</h3><p> Cette déclaration a été rév"
+"isée pour la dernière fois le 5 octobre 2017 et peut être révisée à tout momen"
+"t. L'utilisation de l'outil indique que vous comprenez et acceptez ces termes "
+"et conditions.</p>"
+
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Nom du contact"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "Email du contact"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
-msgstr "identité du client"
+msgstr "ID client"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
-msgstr "Secret du client"
+msgstr "Secret client"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Dernier accès le"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "Actualiser l'ID client et le secret"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "E-mail des identifiants au contact"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr "Voulez-vous vraiment supprimer le client API: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr "Voulez-vous vraiment supprimer le client API: \"%{name}\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5539,8 +5614,8 @@ msgid "View all API clients"
 msgstr "Voir tous les clients API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "Les informations d'identification ont été envoyées à %<email>s."
+msgid "The credentials have been sent to %{email}."
+msgstr "Les informations d'identification ont été envoyées à %{email}."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5587,9 +5662,9 @@ msgstr "Peut être retirée"
 msgid "Body"
 msgstr "Contenu"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "Voulez-vous vraiment supprimer la notification \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "Voulez-vous vraiment supprimer la notification \"%{title}\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5614,8 +5689,8 @@ msgid "New Notification"
 msgstr "Nouvelle notification"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
-msgstr "Fusion de '%<from_org_name>s' dans '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgstr "Fusion de '%{from_org_name}' dans '%{to_org_name}'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5623,10 +5698,10 @@ msgstr "Résumé:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Nombre d'enregistrements '%<to_org_name>s' avant et après une fusion avec %{fro"
+"Nombre d'enregistrements '%{to_org_name}' avant et après une fusion avec %{fro"
 "m_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5635,12 +5710,12 @@ msgid "Record Type"
 msgstr "Type d'enregistrement"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
-msgstr "Nombre '%<to_org_name>s' - avant la fusion"
+msgid "'%{to_org_name}' Count - before merge"
+msgstr "Nombre '%{to_org_name}' - avant la fusion"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
-msgstr "Nombre '%<to_org_name>s' - après la fusion"
+msgid "'%{to_org_name}' Count - after merge"
+msgstr "Nombre '%{to_org_name}' - après la fusion"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5649,22 +5724,22 @@ msgstr "Détails:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Le tableau ci-dessous montre les changements spécifiques qui se produiront au "
-"cours du processus de fusion. Une fois la fusion terminée, '%<from_org_name>s' "
+"cours du processus de fusion. Une fois la fusion terminée, '%{from_org_name}' "
 "sera supprimé. Vous pouvez ensuite consolider/corriger tous les problèmes de f"
 "usion (par exemple, supprimer tous les départements qui ont été dupliqués)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
-msgstr "%<from_org_name>s - Avant"
+msgid "%{from_org_name} - Before"
+msgstr "%{from_org_name} - Avant"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
-msgstr "%<to_org_name>s - Avant"
+msgid "%{to_org_name} - Before"
+msgstr "%{to_org_name} - Avant"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5676,7 +5751,7 @@ msgid ""
 "name}' will then be deleted."
 msgstr ""
 "Attention : Les modifications proposées ci-dessus seront validées dans la base"
-" de données. '%<org_name>s' sera alors supprimé."
+" de données. '%{org_name}' sera alors supprimé."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
 msgid "These changes cannot be undone! Do not proceed unless you are certain."
@@ -5694,10 +5769,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Avertissement : « %<from_org_name>s » a des plans qui sont actuellement en cour"
+"Avertissement : « %{from_org_name} » a des plans qui sont actuellement en cour"
 "s de révision. Les administrateurs de l'organisation ne pourront peut-être pas"
 " voir ces plans après la fusion !"
 
@@ -5722,8 +5797,8 @@ msgid "New organisation"
 msgstr "Nouvel organisme"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "Voulez vous vraiment supprimer le thème \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "Voulez vous vraiment supprimer le thème \"%{title}\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5744,7 +5819,7 @@ msgid ""
 "il}. <br> The selected account will then be removed"
 msgstr ""
 "<br> Le contenu de l'utilisateur sélectionné sera fusionné dans le compte pour"
-" %<user_email>s. <br> Le compte sélectionné sera alors supprimé"
+" %{user_email}. <br> Le compte sélectionné sera alors supprimé"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
 msgid "Archive"
@@ -5752,11 +5827,11 @@ msgstr "archiver"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Vous êtes sur le point d'archiver %<user_name>s. Cela supprimera leurs informat"
+"Vous êtes sur le point d'archiver %{user_name}. Cela supprimera leurs informat"
 "ions personnelles, mais conservera leurs plans, réponses et commentaires. Ils "
 "ne pourront pas se connecter. Êtes-vous sûr?"
 
@@ -5862,101 +5937,100 @@ msgstr ""
 "il."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Bonjour %<username>s"
+msgid "Hello %{username}"
+msgstr "Bonjour %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
 msgstr "Vous avez reçu des privilèges d'administrateur dans % {tool_name} :"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
 msgstr "Vos droits administrateur dans % {tool_name} ont été retirés."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
 "De plus amples informations concernant l'administration des utilisateurs de %{"
-"tool_name} de votre organisme sont disponibles à %<help_url>s."
+"tool_name} de votre organisme sont disponibles à %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Bonjour %<name>s,"
+msgid "Hello %{name},"
+msgstr "Bonjour %{name},"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
 msgstr ""
 "Veuillez utiliser les informations d'identification suivantes lors de l'accès "
-"à l'API %<tool_name>s."
+"à l'API %{tool_name}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
 msgstr ""
 "Veuillez consulter la documentation de l'API à l'adresse: %{api_documentation_"
 "url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 "Ne partagez pas ces informations d'identification. Ils sont à utiliser avec l'"
-"application %<external_application>s. Si vous partagez vos informations d'ident"
+"application %{external_application}. Si vous partagez vos informations d'ident"
 "ification avec une autre application, nous nous réservons le droit de révoquer"
 " votre accès à l'API."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"Si vous n'avez pas demandé l'accès à l'API %<tool_name>s ou n'avez pas demandé "
+"Si vous n'avez pas demandé l'accès à l'API %{tool_name} ou n'avez pas demandé "
 "le renouvellement de vos informations d'identification, veuillez nous contacte"
-"r à %<helpdesk_email>s"
+"r à %{helpdesk_email}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Bonjour %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Bonjour %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s a fini de fournir ses commentaires sur le plan \"%<link_html>s\". Le"
+"%{commenter} a fini de fournir ses commentaires sur le plan \"%{link_html}\". Le"
 "s commentaires se trouvent dans l'onglet \"Rédiger un plan\" situé à droite de l"
-"a page (Conseils / Commentaires)."
+"a page (Recommandations / Commentaires)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Bonjour %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Bonjour %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s a demandé des commentaires sur un plan %<link_html>s. Pour ajouter"
+"%{requestor} a demandé des commentaires sur un plan %{link_html}. Pour ajouter"
 " des commentaires, veuillez visiter la page «Plans» sous le menu Admin dans %{"
 "tool_name} et ouvrir le plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s a commenté votre plan %<plan_title>s. Pour afficher les comme"
+"%{commenter_name} a commenté votre plan %{plan_title}. Pour afficher les comme"
 "ntaires, suivez le lien vers le DMP ci-dessous ou accédez au plan via la page "
-"Mon tableau de bord dans %<tool_name>s."
+"Mon tableau de bord dans %{tool_name}."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5973,24 +6047,28 @@ msgstr ""
 "our chaque question."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "DMP: %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Nom de section: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Nom de section: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Question: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Question: %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr "Bonjour %{recepientname}"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"Vos permissions concernant %<plan_title>s ont changées. Vous avez à présent l'a"
-"ccès %<type>s. Cela signifie que vous pouvez %<placeholder1>s %<placeholder2>s"
+"Vos permissions concernant %{plan_title} ont changées. Vous avez à présent l'a"
+"ccès %{type}. Cela signifie que vous pouvez %{placeholder1} %{placeholder2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -6005,8 +6083,8 @@ msgid " has been removed by "
 msgstr " a été retiré par "
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "La visibilité du plan %<plan_title>s a changé pour %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "La visibilité du plan %{plan_title} a changé pour %{plan_visibility}."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -6023,14 +6101,14 @@ msgstr "Public : toute personne sur le web peut consulter mon plan"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 "Si vous avez des questions concernant cette action, veuillez visiter la page M"
-"on tableau de bord dans %<tool_name>s."
+"on tableau de bord dans %{tool_name}."
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Bonjour %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
+msgstr "Bonjour %{recipient_name},"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6050,32 +6128,30 @@ msgstr " basé sur le modèle"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
-msgstr ""%<inviter_name>s
-"Votre collègue %{inviter_name} vous a invité à c%<tool_name>s
-\n"
+msgstr ""
+"Votre collègue %{inviter_name} vous a invité à contribuer à
\n"
 "          leur plan de gestion des données dans %{tool_name}"
-%<tool_name>s%<username>s
-#: ../../app/views/use%<tool_name>sco%<username>stion.html.erb:2
+
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Bienvenue sur %{tool_name}, %{username}"
 
-#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
+#: ../../app/views/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
+"%{tool_name} will help you to develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"%<tool_name>st %{contact_us}"
-msgstr ""%<helpdesk_email>s%<contact_us>s
+"ail} or visit %{contact_us}"
+msgstr ""
 "%{tool_name} vous aidera à élaborer votre DMP. Si vous avez des questions ou s"
 "uggestions, contactez nous à %{helpdesk_email} ou par %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Vous pouvez changer vos préférences de notifications dans votre profil."
-%<username>s
-#: ../../app/views/users/_admi%<username>smissions.html.erb:9
+
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Edition des droits de %{username}"
 
diff --git a/config/locale/pt_BR/LC_MESSAGES/app.mo b/config/locale/pt_BR/LC_MESSAGES/app.mo
index 7d2e6cb2d67266d9b7497ff57a7fc1443c70e120..3f5d9b49415f49b038a350e5b4c94f1127b732a5 100644
GIT binary patch
delta 30745
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
Z!sUHKaHltaeP9@;BxLcQCDqOI{{TAOq6Yu~

delta 28788
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
Yey(ykKe+gwd#$P`n9;MEr&{*^1Fl3P?*IS*

diff --git a/config/locale/pt_BR/app.po b/config/locale/pt_BR/app.po
index e2c605b656..28f8b4a836 100644
--- a/config/locale/pt_BR/app.po
+++ b/config/locale/pt_BR/app.po
@@ -1,14 +1,14 @@
 # Portuguese translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese\n"
 "Language: pt_BR\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"Não há dúvidas com o id %<question_id>s associado ao id do plano %<plan_id>s par"
-"a o qual criar ou atualizar uma resposta"
+"Não há dúvida com id %<question_id> s associados ao ID do plano %<plan_id> s p"
+"ara os quais criar ou atualizar uma resposta"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
-msgstr "Não há nenhum plano com id %<id>s para o qual criar ou atualizar uma resposta"
+msgstr "Não há plano com id %<id> s para os quais criar ou atualizar uma resposta"
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr "Credenciais Inválidas"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "O código e o nome dos departamentos devem ser exclusivos"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "usário deve estar em sua organização"
 
@@ -46,28 +46,28 @@ msgstr "usário deve estar em sua organização"
 msgid "Bad Parameters"
 msgstr "Parâmetros Inválidos"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Mês"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "Núm. usuários ingressados"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Total"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "users_joined"
 
@@ -80,35 +80,35 @@ msgstr "Núm. Planos Concluídos"
 msgid "completed_plans"
 msgstr "complete_plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Núm. Planos"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "planos"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "JSON ausente ou inválido"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Formato JSON inválido"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Plano não encontrado"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr "Não foi possível criar seu DMP"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "O plano já existe. Envie uma atualização."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
@@ -116,103 +116,107 @@ msgstr ""
 "Não foi possível determinar a propriedade do DMP. Adicione um\n"
 "                          : afiliação ao: contato"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr "JSON inválido!"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "JSON inválido"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "Nenhum plano encontrado"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Você não tem permissão para realizar essa ação."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Você precisa entrar ou registrar-se antes de continuar."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr "Não é possível %<action>s o %<object>s. %<errors>s"
+msgstr "Incapaz de %<action> é a %<object> s.%<errors> s"
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "Com sucesso %<action>s o %<object>s."
+msgstr "% com sucesso<action> é a %<object> s."
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "Cliente da API"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "plano"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "grupo de instruções"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "commentário"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "organização"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "permissão"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "preferências"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "perfil"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "usuário"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "opção de pergunta"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr "Registro não encontrado"
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "escopo deve ser um objeto ActiveRecord::Relation"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params deve ser um objeto hash"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params deve ser um objeto hash"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "locals deve ser um objeto Hash"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Acesso restrito para visualizar todos os registros"
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "Classificar por %<sort_field>s"
+msgstr "Ordenar por %<sort_field> s"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "customização"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "modelo"
 
@@ -220,28 +224,28 @@ msgstr "modelo"
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr "obj deve ser um modelo, fase, seção, pergunta ou anotação"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "obj deve ser uma fase, seção, pergunta ou anotação"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "O search_space não responde a cada"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "O espaço de pesquisa não possui elementos associados"
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "A verificação do Captcha falhou. Tente novamente."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Email de contato foi enviado com sucesso."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Não é possível enviar sua solicitação"
 
@@ -255,60 +259,60 @@ msgid "added"
 msgstr "adicionado"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "salvo"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "Salvar"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "removido"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "Remover"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "plano não encontrado"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "colaborador não encontrado"
 
@@ -320,108 +324,108 @@ msgstr "Não conseguimos submeter seu pedido de feedback neste momento."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Ocorreu um erro ao solicitar feedback para este plano."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "criado"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "criar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr ""
 "Seu grupo de instruções foi publicado e agora está disponível para os usuários"
 "."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "publicar"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Seu grupo de instruções não é mais publicado e não estará disponível para os u"
 "suários."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "cancelar publicação"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "apagado"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "excluir"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr "Suas instruções foram publicadas e agora estão disponíveis para os usuários."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Suas instruções não são mais publicadas e não estarão disponíveis para os usuá"
 "rios."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Sua conta em %<is>s foi desvinculada com sucesso."
+msgstr "Desvinculou com sucesso sua conta de %<is> s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "Não conseguimos desvincular sua conta de %<is>s."
+msgstr "Não foi possível desvincular sua conta de %<is> s."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -433,70 +437,72 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "Você não pode adicionar uma fase a uma versão histórica de um modelo."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "Não criar uma nova versão deste modelo."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr "Não foi possível criar uma nova versão deste modelo.<br>"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "Atualizado"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "atualizar"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "Não criar uma nova versão deste modelo."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
-msgstr "%<plan_owner>s foi avisado de que você terminou de dar feedback"
+msgstr "%<plan_owner> s foi notificado de que você terminou de fornecer feedback"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr "Não conseguimos notificar o usuário de que você acabou seu feedback."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Título do projeto"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Modelo"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -507,63 +513,66 @@ msgstr "Modelo"
 msgid "Organisation"
 msgstr "Organização"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Nome do proprietário"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "Email do proprietário"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "Atualizado"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr "Não é possível criar uma nova seção. A fase que você especificou não existe."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr "Não foi possível excluir esta versão do modelo."
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "cópia"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Esse modelo não é mais customizáveis."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Não customização esse modelo."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Esse modelo não é customizáveis."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Todos os Modelos"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "%<org_name>s Modelos"
+msgstr "%<org_name> s Modelos"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Modelos Próprios"
@@ -572,150 +581,155 @@ msgstr "Modelos Próprios"
 msgid "Customizable Templates"
 msgstr "Modelos customizáveis"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "Erro ao analisar links para um %<template>s"
+msgstr "Erro ao analisar links para um %<template> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
-msgstr "Modelo criado usando %<application_name>s. Última modificação %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
+msgstr ""
+"Modelo criado usando o %<application_name> s serviço. Última modificação %<dat"
+"e> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Não conseguimos baixar o Modelo de PGD neste momento."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "No momento não há nenhuma organização registrada."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Parece que sua organização não está configurada corretamente."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Por favor, escolha uma organização."
 
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
+msgstr "Parece que sua organização não está configurada corretamente."
+
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "Criado usando %<application_name>s. Última modificação %<date>s"
+msgstr "Criado usando %<application_name> s. Última modificação %<date> s"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "Isto é um"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "Plano de teste"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "Não conseguimos identificar um modelo adequado para seu plano."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Meu Plano"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr " Plano"
+msgid "My Plan (%<title>s)"
+msgstr "<html>Meu plano (%<title> e)</html>"
+
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr "%<user_name> s Plano"
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Este plano é baseado no modelo padrão."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Este plano é baseado no"
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "modelo com personalizações pelo"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "copieado"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
-"Não conseguimos mudar o status do plano. É preciso pelo menos %<percentage>s de"
-" respostas."
+"Não é possível alterar o status do plano, pois é necessário pelo menos %<perce"
+"ntage}> s porcentagem respondeu"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "Não conseguimos encontrar o plano com id %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr "Não foi possível encontrar o ID do plano %{<plan_id> s"
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Seu projeto agora é um teste."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Seu projeto não é mais um teste."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr "Não conseguimos mudar o status de teste do plano"
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "Não há nenhum plano associado à id %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr "Não há plano associado ao id %{<id}> s"
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Faça uma escolha abaixo. Depois de ligar o seu\n"
-"                       detalhes para uma conta %<application_name>s,\n"
-"                       você poderá fazer login diretamente com o seu\n"
-"                       credenciais institucionais."
+"Por favor, faça uma escolha abaixo. Depois de vincular seus dados a um %<appli"
+"cation_name> s, você poderá fazer login diretamente com suas credenciais insti"
+"tucionais."
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr "Você deve aceitar os termos e condições para registrar-se."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr "Selecione uma organização da lista ou escolha Outra."
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "Esse email já está registrado."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
 "Bem vinda! Você se inscreveu com sucesso com suas credenciais institucionais. "
 "Agora você poderá acessar sua conta com eles."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Falha ao salvar."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Por favor insira um endereço de e-mail."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "Por favor, insira um primeiro nome."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "Por favor, insira um sobrenome."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
@@ -723,11 +737,11 @@ msgstr ""
 "Por favor, selecione uma organização na lista, ou insira o nome de sua organiz"
 "ação."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr "Por favor, insira sua senha para mudar seu endereço de email."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -737,70 +751,72 @@ msgstr ""
 "                Esse endereço de e-mail já foi registrado. \\\n"
 "                Você deve inserir um endereço de e-mail exclusivo."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Por favor, insira sua senha atual."
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Por favor, insira a confirmação de senha."
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "A senha e a confirmação devem ser iguais"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"Impossível compartilhar o plano com %<email>s; email é o mesmo do proprietário "
-"do plano."
+"Não é possível compartilhar o plano com %<email> s, pois esse e-mail correspon"
+"de ao proprietário do plano."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "O plano já está compartilhado com %<email>s."
+msgstr "O plano já está compartilhado com %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "Primeiro nome"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Sobrenome"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "Convite para %<email>s emitido com sucesso."
+msgstr "Convite para %<email> s emitido com sucesso."
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Plano compartilhado com %<email>s."
+msgstr "Plano compartilhado com %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
 msgstr ""
 "Você deve fornecer um endereço de e-mail válido e selecionar um nível de permi"
 "ssão."
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Por favor, insira um endereço de email."
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
-"Alterou as permissões para %<email>s com sucesso. Eles foram notificados por e-"
-"mail."
+"Alterou com sucesso as permissões para %<email> . Eles foram notificados por e"
+"-mail."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Acesso retirado"
 
@@ -820,67 +836,67 @@ msgstr ""
 "Sua conta foi vinculada às suas credenciais institucionais. Agora você poderá "
 "entrar com eles."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Parâmetros de exportação atualizados com sucesso."
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Ocorreu um erro ao salvar/redefinir seus parâmetros de exportação."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
-msgstr ". As credenciais da API foram enviadas por email para %<email>s"
+msgstr ". As credenciais da API foram enviadas por e-mail para %<email> s"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Sua notificação agora está ativa."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Sua notificação não está mais ativa."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "Não foi possível alterar o status ativo da notificação"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "Não há nenhum plano associado à id %<id>s"
+msgstr "Não há notificação associada ao id %<id> s"
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"Sua afiliação organizacional foi modificada. Você agora pode editar modelos pa"
-"ra %<org_name>s."
+"A afiliação da sua organização foi alterada. Agora você pode editar modelos pa"
+"ra %<org_name> s."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Não conseguimos mudar sua afiliação organizacional neste momento."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Organização desconhecida."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Parece haver um problema com seu logo. Por favor, suba-o novamente."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr "Ocorreu um erro ao tentar mesclar as organizações."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr "Não foi possível mesclar as duas organizações no momento."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr "Incapaz de determinar quais registros precisam ser mesclados."
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
@@ -888,19 +904,19 @@ msgstr ""
 "Você tentou mesclar 2 contas com o mesmo endereço de e-mail.\n"
 "           Por favor, mescle com um endereço de e-mail diferente."
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "arquivado"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "Arquivo"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "mesclado"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "mesclar"
 
@@ -912,39 +928,39 @@ msgstr ""
 "Você já está logado como outro usuário. Por favor, saia para ativar seu convit"
 "e."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Entrada bem sucedida"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Sua conta foi vinculada a %<scheme>s."
+msgstr "Sua conta foi vinculada com sucesso a %<scheme> s."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "Não é possível vincular sua conta a% {scheme}."
+msgstr "Não foi possível vincular sua conta a %<scheme> s."
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "Successo ao %<action>s conta do %<username>s"
+msgstr "% com sucesso<action> s %<username> conta de s."
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "ativado"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "desativado"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr "Incapaz de %<action>s %<username>s"
+msgstr "Incapaz de %<action> s %<username> s"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "Ativo"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "desativar"
 
@@ -967,13 +983,13 @@ 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:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "Respondendo"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "<b>enviará um email</b> com o assunto"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr "<b>enviará um e-mail</b> com o assunto %<subject_name> s"
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
@@ -983,19 +999,15 @@ msgstr "irá <b>remover a</b> pergunta"
 msgid " will <b>remove</b> questions "
 msgstr "irá <b>remover</b> perguntas"
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Customização da transferência"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Editar customização"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Customizar"
 
@@ -1004,26 +1016,27 @@ msgid "Creators:"
 msgstr "Criadores:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Criador:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s: Seu plano foi submetido para feedback."
+msgstr "%<application_name> s: Seu plano foi enviado para feedback"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Olá %<user_name>s </p><p> Seu plano \"%<plan_name>s\" foi enviado para comentá"
-"rios de um administrador da sua organização. Se você tiver dúvidas sobre essa "
-"ação, entre em contato conosco pelo %<organisation_email>s. </p>"
+"<p>Olá %<user_name> s.</p><p> Seu plano \"%<plan_name> s\" foi enviado para feed"
+"back de um administrador em sua organização. Se você tiver dúvidas sobre esta "
+"ação, entre em contato conosco em %<organisation_email> s.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1061,9 +1074,9 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Um bibliotecário de dados de %<org_name>s responderá a sua solicitação em a"
-"té 48 horas. Se você tiver dúvidas sobre essa ação, entre em contato conosco p"
-"elo %<organisation_email>s. </p>"
+"<p>Um bibliotecário de dados de %<org_name> s responderá ao seu pedido dentro "
+"de 48 horas. Se você tiver dúvidas relacionadas a esta ação, entre em contato "
+"conosco em %<organisation_email> s.</p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1103,8 +1116,8 @@ msgid "Grant API to organisations"
 msgstr "Autorizar API para organizações"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1147,231 +1160,229 @@ msgstr "Público: qualquer pessoa pode ver."
 msgid "Private: restricted to me and people I invite."
 msgstr "Privado: restrito a mim e a meus convidados."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Nome de coluna desconhecido"
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Nome do Plano"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "ID do Plano"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr "Número da Concessão"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Investigador / Pesquisador Principal"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Contato para Dados do Plano"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Descrição do Plano"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Órgão Financiador"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "Seu ORCID"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr "Nenhum"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
-msgstr "Orientação para: %<themes>s"
+msgstr "Orientação para: %<themes> s"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr "Nada para fundir"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
-msgstr "<p>O seguinte %<object_types>s será movido para '%<org_name>s':</p>"
+msgstr "<p>A seguir %<object_types> s será movido para '%<org_name> s':</p>"
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Criar plano"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "Mês passado"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "Últimos 3 meses"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "Últimos 6 meses"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "Últimos 9 meses"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "Últimos 12 meses"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "Pergunta ou feedback relacionado a %<tool_name>s"
+msgstr "Consulta ou feedback relacionado a %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "Bem-vindo a %<tool_name>s"
+msgstr "Bem-vindo ao %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "Um plano de gerenciamento de dados em %<tool_name>s foi compartilhado com você"
+msgstr ""
+"Um Plano de Gerenciamento de Dados em %<tool_name> s foi compartilhado com voc"
+"ê"
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
-msgstr "Permissões modificadas em um Plano de Gestão de Dados em %<tool_name>s"
+msgstr "Permissões alteradas em um plano de gerenciamento de dados em %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "Permissões removidas em um DMP em %<tool_name>s"
+msgstr "Permissões removidas em um DMP em %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
-msgstr "%<user_name>s solicitou feedback sobre um plano %<tool_name>s"
+msgstr "%<user_name> s solicitou feedback sobre um %<tool_name> plano"
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
-msgstr "%<tool_name>s: O feedback de especialistas foi fornecido para %<plan_title>s"
+msgstr "%<tool_name> s: O feedback de especialistas foi fornecido para %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "Visibilidade do PGD Modificada: %<plan_title>s"
+msgstr "Visibilidade DMP alterada: %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: Um novo comentário foi adicionado a %<plan_title>s"
+msgstr "%<tool_name> s: Um novo comentário foi adicionado a %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "Privilégios de administrador atribuídos em %<tool_name>s"
+msgstr "Privilégios de administrador concedidos em %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "Alterações na API %<tool_name>s"
+msgstr "%<tool_name> Alterações na API"
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Fase"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Seção"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Pergunta"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "Resposta"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Customizado Por: "
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Criadores:"
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr "%<authors> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "%<affiliation>s"
+msgstr "%<affiliation> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Modelo: "
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr "%<funder> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr "%<template> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr "Número da Concessão"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr "%<grant_number> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Resumo do projeto:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr "%<description> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Última modificação: "
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr "%<date> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Informação de copyright"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1395,7 +1406,7 @@ msgstr ""
 "relação com\n"
 "             seu projeto ou proposta"
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Não Respondido"
 
@@ -1405,7 +1416,7 @@ msgid "can't be blank"
 msgstr "não pode estar em branco"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "deve ser único"
 
@@ -1425,41 +1436,40 @@ msgstr "para \"Texto da pergunta\" não pode estar em branco."
 msgid "You must specify at least one role."
 msgstr "Você deve especificar pelo menos uma função."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "não pode ficar em branco se nenhum email for fornecido"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr "não pode ficar em branco."
+
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr "não pode ficar em branco se nenhum e-mail for fornecido."
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "não pode ficar em branco se nenhum nome for fornecido"
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr "não pode ficar em branco se nenhum nome for fornecido."
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Opção(ões) selecionadas"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Respondido por"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Respondido em"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
 msgstr "Pergunta não respondida."
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "já atribuiu um valor"
 
@@ -1467,35 +1477,35 @@ msgstr "já atribuiu um valor"
 msgid "Feedback email message"
 msgstr "Mensagem de email de feedback"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "deve ser um dos seguintes formatos: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "não pode ser maior que 500KB"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organizacional"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "público"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "teste"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "privado"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "deve ser posterior à data de início"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "instruções sobre"
 
@@ -1503,37 +1513,37 @@ msgstr "instruções sobre"
 msgid "can't be less than zero"
 msgstr "não pode ser menor que zero"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "Uma configuração obrigatória não foi fornecida"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "Valor da margem inválido"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "A margem não pode ser negativa."
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr ""
 "Margem desconhecida. Só pode haver 'superior', 'inferior', 'esquerda' ou 'dire"
 "ita'."
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Tamanho de fonte inválido"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Fonte inválida"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Parâmetro de formatação desconhecido"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Máximo de páginas inválido"
 
@@ -1541,83 +1551,87 @@ msgstr "Máximo de páginas inválido"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Um modelo histórico não pode ser recuperado para ser modificado"
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! requer uma meta de organização"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "Cópia do %<template>s"
+msgstr "Cópia de %<template> s"
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "generate_version! requer um modelo publicado"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "customizar! requer uma meta de organização"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr "customizar! requer um modelo de um financiador"
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "Você não pode publicar um modelo publicado."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr "Você não pode publicar um modelo sem fases."
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 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:465
+#: ../../app/models/template.rb:461
 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:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "As condições no modelo se referem ao contrário"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
-msgstr "Um Plano de Gestão de Dados em %<application_name>s foi compartilhado com você"
-
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "deve estar logado"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+msgstr ""
+"Um Plano de Gerenciamento de Dados em %<application_name> s foi compartilhado "
+"com você"
+
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "deve ter acesso à api de instruções"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "deve ter acesso à api de planos"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "não autorizado a  visualizar esse plano"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr "deve ter acesso a templates api"
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr "Gerenciador de dados"
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr "Administrador de projetos"
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr "Investigador Principal"
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr "De outros"
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1627,7 +1641,7 @@ msgstr ""
 "anter os dados de pesquisa (incluindo código de software, onde é necessário in"
 "terpretar os dados) para uso inicial e posterior reutilização."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1635,7 +1649,7 @@ msgstr ""
 "Conduzir um processo de pesquisa e investigação, realizando especificamente os"
 " experimentos ou coleta de dados / evidências."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1643,60 +1657,60 @@ msgstr ""
 "Responsabilidade de gerenciamento e coordenação pelo planejamento e execução d"
 "as atividades de pesquisa."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Tipo de concessão inválido"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "Credenciais inválidas"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Token inválido"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Token expirado"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Token ausente"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ": title e o: mbox do contato são campos obrigatórios"
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ": type e: identifier são necessários para todos os ids"
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ": o nome é obrigatório para cada: afiliação e: financiamento"
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ": role e: name ou: email são necessários para cada: contribuidor"
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ": name,: funder_id ou: grant_id são necessários para cada financiamento"
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ": o título é necessário para cada: conjunto de dados"
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr "JSON inválido"
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "upgrade_customization! requer um modelo customizado"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1706,24 +1720,24 @@ msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "deve ser depois de %<date>s"
+msgstr "deve ser depois de %<date> s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "Uma \"org\" chave é esperada para hash de links"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Espera-se uma 'jogo da velha' para os links"
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "Uma chave %<key>s é esperada para 'jogos da velha' de links"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "A chave %<key>s não possui um conjunto válido de links de objeto"
+msgstr "A chave %<key> s não tem um conjunto válido de links de objetos"
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr "Uma chave %<key> s é esperado para links hash"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1731,10 +1745,10 @@ msgstr "A resposta seguinte não pode ser salva"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"visto que %<name>s salvou a resposta abaixo enquanto você estava editando. Por "
+"visto que %{name} salvou a resposta abaixo enquanto você estava editando. Por "
 "favor, combine suas mudanção e depois salve a resposta novamente."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1762,14 +1776,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Por favor, espere enquanto os Padrões são carregados."
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1780,11 +1794,11 @@ msgstr "Por favor, espere enquanto os Padrões são carregados."
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1808,8 +1822,8 @@ msgid "Answered"
 msgstr "Respondido"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr " por %<user_name>s"
+msgid " by %{user_name}"
+msgstr " por %{user_name}"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1865,12 +1879,13 @@ msgstr "Assunto"
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Verificação de segurança"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Submeter"
@@ -1886,18 +1901,18 @@ msgstr "Contate-nos"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s é fornecido pelo %<organisation_name>s. <br /> Você pode de"
-"scobrir mais sobre nós em nosso <a href=\"%<organisation_url>s\" class=\"has-new-w"
+"%{application_name} é fornecido pelo %{organisation_name}. <br /> Você pode de"
+"scobrir mais sobre nós em nosso <a href=\"%{organisation_url}\" class=\"has-new-w"
 "indow-popup-info\" target=\"_blank\">site <em class=\"sr-only\">(nova janela)</em> "
-"<span class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a> . Se"
-" você quiser entrar em contato conosco sobre o %<application_name>s, preencha o"
+"<span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a> . Se"
+" você quiser entrar em contato conosco sobre o %{application_name}, preencha o"
 " formulário abaixo."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
@@ -1932,21 +1947,21 @@ msgstr "Selecione cada função que se aplica ao colaborador."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Número de telefone"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Afiliação"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "Papéis"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1966,19 +1981,19 @@ msgstr "Papéis"
 msgid "Remove"
 msgstr "Remover"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2046,14 +2061,14 @@ msgstr "Confirmação de senha"
 msgid "First name"
 msgstr "Primeiro nome"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2062,8 +2077,8 @@ msgid "Create account"
 msgstr "Criar conta"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "Bem-vindo a  %<application_name>s"
+msgid "Welcome to %{application_name}"
+msgstr "Bem-vindo a  %{application_name}"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2081,26 +2096,32 @@ msgstr "ou copiar"
 msgid "into your browser"
 msgstr "em seu navegador"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "Pergunta ou feedback relacionado a %{tool_name}"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Olá %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Olá %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Seu colega %<inviter_name>s convidou você para contribuir com o plano de gerenc"
-"iamento de dados em %<tool_name>s"
+"Seu colega %{inviter_name} convidou você para contribuir com o plano de gerenc"
+"iamento de dados em %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%<click_here>s para aceitar o convite, (ou copie %<link>s em seu navegador). Se "
+"%{click_here} para aceitar o convite, (ou copie %{link} em seu navegador). Se "
 "não quiser aceitar o convite, por favor, ignore esta mensagem."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2119,8 +2140,8 @@ msgstr "Atenciosamente"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "A equipe %<tool_name>s"
+msgid "The %{tool_name} team"
+msgstr "A equipe %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2131,22 +2152,22 @@ msgstr "Por favor, não responda esta mensagem."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
 "Se você tiver alguma dúvida ou precisar de ajuda, entre em contato conosco pel"
-"o %<helpdesk_email>s ou acesse %<contact_us_url>s"
+"o %{helpdesk_email} ou acesse %{contact_us_url}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Olá %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Olá %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"Alguém solicitou um link para mudar sua senha em %<tool_name>s password. Você p"
+"Alguém solicitou um link para mudar sua senha em %{tool_name} password. Você p"
 "ode fazer isso usando o link abaixo."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2160,11 +2181,11 @@ msgstr "Se você não fez essa solicitação, por favor, ignore esta mensagem."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
 "Caso tenha perguntas ou precise de ajuda, por favor, entre em contato conosco "
-"em %<helpdesk_email>s ou visite %<contact_us>s."
+"em %{helpdesk_email} ou visite %{contact_us}."
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2236,22 +2257,22 @@ msgstr "Documentação"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Consulte a <a href=\"%<api_v0_wiki>s\">documentação da v0</a> para obter mais det"
+"Consulte a <a href=\"%{api_v0_wiki}\">documentação da v0</a> para obter mais det"
 "alhes sobre a API original, que inclui acesso a estatísticas, o texto completo"
 " dos planos e a capacidade de conectar usuários a departamentos."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Consulte a <a href=\"%<api_v1_wiki>s\">documentação da v1</a> para obter mais det"
-"alhes sobre a API que suporta o <a href=\"%<rda_standard_url>s\">padrão de metada"
+"Consulte a <a href=\"%{api_v1_wiki}\">documentação da v1</a> para obter mais det"
+"alhes sobre a API que suporta o <a href=\"%{rda_standard_url}\">padrão de metada"
 "dos RDA Common para DMPs.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2425,8 +2446,8 @@ msgid "Sign in or Create account"
 msgstr "Entrar ou Criar conta"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "Você tem uma conta %<application_name>s?"
+msgid "Do you have a %{application_name} account?"
+msgstr "Você tem uma conta %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2441,8 +2462,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Isso vinculará sua conta existente às suas credenciais."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "Nenhuma conta %<application_name>s?"
+msgid "No %{application_name} account?"
+msgstr "Nenhuma conta %{application_name}?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2509,7 +2530,7 @@ msgstr "colapsar todos"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Grupo de Instruções"
@@ -2592,7 +2613,7 @@ msgstr "Criar instrução"
 msgid "Enter your guidance here. You can include links where needed."
 msgstr "Insira suas instruções aqui. Você pode incluir links onde necessário."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2604,26 +2625,26 @@ msgstr ""
 "s para os quais você criar grupos de orientação em todos os modelos que tivere"
 "m perguntas com as tags de tema correspondentes."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Selecione o grupo ao qual se relacionam estas instruções."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 "Marque esta caixa quando estiver pronto para que esta orientação apareça nos p"
 "lanos do usuário."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "Publicado?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%<application_name>s foi desenvolvido por <strong>%<organisation_name>s</stro"
+"<p>%{application_name} foi desenvolvido por <strong>%{organisation_name}</stro"
 "ng> para ajudar você a escrever planos de gestão de dados.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2809,8 +2830,9 @@ msgid "Logout"
 msgstr "Sair"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
-msgstr "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
+msgstr "%{application_name}"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2887,11 +2909,11 @@ msgstr "Abre em uma nova janela"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"Os resultados %<n>s estão disponíveis, use as setas para cima e para baixo para"
+"Os resultados %{n} estão disponíveis, use as setas para cima e para baixo para"
 " navegar pelas sugestões. Use a tecla Enter para selecionar uma sugestão ou a "
 "tecla Escape para fechar as sugestões."
 
@@ -2943,8 +2965,8 @@ msgid "Example answer"
 msgstr "Resposta de exemplo"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr "%<org>s Exemplo de Resposta"
+msgid "%{org} Example Answer"
+msgstr "%{org} Exemplo de Resposta"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3099,10 +3121,10 @@ msgstr "Apagar fase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Você está prestes a apagar fase '%<phase_title>s'. Isso removerá todas as seçõe"
+"Você está prestes a apagar fase '%{phase_title}'. Isso removerá todas as seçõe"
 "s e perguntas listadas abaixo. Tem certeza?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3161,8 +3183,8 @@ msgid "Write plan"
 msgstr "Escrever plano"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "%<org_name>s Planos"
+msgid "%{org_name} Plans"
+msgstr "%{org_name} Planos"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3213,10 +3235,10 @@ msgstr "Notificar o proprietário do plano de que eu acabei de dar feedback"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Download de planos <em class=\"sr-only\">(nova janela)</em> <span class=\"new-win"
-"dow-popup-info\">%<open_in_new_window_text>s</span>"
+"dow-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3246,8 +3268,8 @@ msgstr ""
 "qui."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Pergunta %<number>s:"
+msgid "Question %{number}:"
+msgstr "Pergunta %{number}:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3315,15 +3337,15 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "Apagar"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
-msgstr "Você está prestes a apagar '%<question_text>s'. Tem certeza?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgstr "Você está prestes a apagar '%{question_text}'. Tem certeza?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3422,10 +3444,10 @@ msgstr "Insira um título para a seção"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Você está prestes a apagar '%<section_title>s'. Isso afetará as perguntas ligad"
+"Você está prestes a apagar '%{section_title}'. Isso afetará as perguntas ligad"
 "as a esta seção. Tem certeza?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3452,8 +3474,8 @@ msgstr "Selecionar esta caixa impede que o modelo apareça na lista pública de
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "para %<org_name>s interno use somente"
+msgid "for internal %{org_name} use only"
+msgstr "para %{org_name} interno use somente"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3620,28 +3642,32 @@ msgstr ""
 "e órgãos financiadores aplicáveis. Se você quiser acrescentar perguntas aos mo"
 "delos de órgãos financiadores, use as opões 'customizar modelo' abaixo."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "%{org_name} Modelos"
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Modelos personalizáveis"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Tudo (%<count>s)"
+msgid "All (%{count})"
+msgstr "Tudo (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "Publicado (%<count>s)"
+msgid "Published (%{count})"
+msgstr "Publicado (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "Não publicado (%<count>s)"
+msgid "Unpublished (%{count})"
+msgstr "Não publicado (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "Não customizado (%<count>s)"
+msgid "Not customised (%{count})"
+msgstr "Não customizado (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3650,8 +3676,8 @@ msgstr "Criar um modelo"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "Editando o perfil de %<username>s"
+msgid "Editing profile for %{username}"
+msgstr "Editando o perfil de %{username}"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3659,8 +3685,8 @@ msgid "View all users"
 msgstr "Ver todos os usuários"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "Planos de %<username>s"
+msgid "Plans of %{username}"
+msgstr "Planos de %{username}"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3690,7 +3716,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Se algum dos identificadores acima estiver incorreto ou ausente, entre em <a h"
-"ref=\"%<contact_us_url>s\">contato conosco</a> para atualizá-lo."
+"ref=\"%{contact_us_url}\">contato conosco</a> para atualizá-lo."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3722,7 +3748,7 @@ msgstr "Unir Organizações"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 "Selecione a organização que substituirá a organização atual: ' <strong>%{org_n"
 "ame}</strong> '."
@@ -3902,21 +3928,21 @@ msgid "Last Accessed"
 msgstr "Último acesso"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Nunca"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Você está prestes a excluir '%<client_name>s'. Eles não poderão mais acessar a "
+"Você está prestes a excluir '%{client_name}'. Eles não poderão mais acessar a "
 "API. Você tem certeza?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
-msgstr "Você está prestes a excluir '%<contributor_name>s'. Você tem certeza?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgstr "Você está prestes a excluir '%{contributor_name}'. Você tem certeza?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3929,10 +3955,10 @@ msgstr "Nome abreviado ou código"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Você está prestes a excluir '%<department_name>s'. Isso afetará a orientação. V"
+"Você está prestes a excluir '%{department_name}'. Isso afetará a orientação. V"
 "ocê tem certeza?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3973,15 +3999,15 @@ msgstr "Publicar"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Você está prestes a apagar '%<guidance_group_name>s'. Isso afetará a instrução."
+"Você está prestes a apagar '%{guidance_group_name}'. Isso afetará a instrução."
 " Tem certeza?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
-msgstr "Você está prestes a apagar '%<guidance_summary>s'. Tem certeza?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgstr "Você está prestes a apagar '%{guidance_summary}'. Tem certeza?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4017,8 +4043,23 @@ msgid "Managed"
 msgstr "Gerenciou"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
-msgstr "Você está prestes a apagar '%<org_name>s'. Tem certeza?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr "Você está prestes a apagar '%{org_name}'. Tem certeza?"
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Título do Projeto"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Teste"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4048,25 +4089,10 @@ msgstr ""
 "o mês e um ano de 4 dígitos na caixa de pesquisa acima. <br> Por exemplo: 'Out"
 " 2019' ou 'Jun 2013'."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Título do Projeto"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "Criado"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Teste"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4185,10 +4211,10 @@ msgstr "Publicar mudanças"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Tem certeza de que deseja remover sua customização de \"%<template_title>s\"? Qua"
+"Tem certeza de que deseja remover sua customização de \"%{template_title}\"? Qua"
 "lquer versão publicada ficará indisponível para os usuários."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4205,10 +4231,10 @@ msgstr "Ver customização"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Tem certeza de que deseja remover \"%<template_title>s\"? Qualquer versão publica"
+"Tem certeza de que deseja remover \"%{template_title}\"? Qualquer versão publica"
 "da ficará indisponível para os usuários."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4371,22 +4397,22 @@ msgstr "Direito"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Plano de download <em class=\"sr-only\">(nova janela)</em> <span class=\"new-wind"
-"ow-popup-info\">%<open_in_new_window_text>s</span>"
+"ow-popup-info\">%{open_in_new_window_text}</span>"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr "Selecione orientação"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Para ajudar você a escrever seu plano, %<application_name>s pode mostrar-lhe in"
+"Para ajudar você a escrever seu plano, %{application_name} pode mostrar-lhe in"
 "struções de várias organizações."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4407,11 +4433,11 @@ msgstr "Não há orientação adicional para esse modelo."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Para ajudar você a escrever seu plano, %<application_name>s pode mostrar-lhe in"
+"Para ajudar você a escrever seu plano, %{application_name} pode mostrar-lhe in"
 "struções de várias organizações. Por favor, escolha até 6 dentre as seguintes "
 "organizaçõs que oferecem instruções relevantes para seu plano."
 
@@ -4437,17 +4463,17 @@ msgstr "Escrever Plano"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
-msgstr "Este plano é baseado no modelo \"%<template_title>s\" fornecido por %<org_name>s."
+msgstr "Este plano é baseado no modelo \"%{template_title}\" fornecido por %{org_name}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
-msgstr "Versão do modelo %<template_version>s, publicada em %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
+msgstr "Versão do modelo %{template_version}, publicada em %{published_date}"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4465,13 +4491,13 @@ msgstr[1] "questões"
 msgid "answered"
 msgstr "respondidas"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr ""
 "Se vai solicitar financiamento, insira o nome exatamente como aparece na propo"
 "sta."
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4479,51 +4505,96 @@ msgstr ""
 "Faça um breve resumo de seu projeto de pesquisa, de forma que as pessoas possa"
 "m ententer as razões pelas quais os dados estão sendo coletados ou criados."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr ""
 "Uma ID pertinente, conforme determinado pelo órgão financiador e/ou pela organ"
 "ização."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+"Se há algum problema ético potencial relacionado aos dados que este DMP descre"
+"ve"
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr "Descrição das questões éticas"
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr "Link para um protocolo de uma reunião com um comitê de ética"
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr "projeto simulado para testes, prática ou propósitos educacionais"
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Resumo do projeto"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr "Domínio de pesquisa"
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr "- Por favor escolha um -"
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Início do Projeto"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "A data estimada em que você iniciará este projeto."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Fim do Projeto"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "A data estimada em que você concluirá este projeto."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "Página de destino"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "ID"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr "Os resultados da pesquisa podem ter preocupações éticas"
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr "Descreva quaisquer preocupações éticas"
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr "Protocolos éticos"
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr "Status de financiamento"
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr "Número / URL da concessão"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr "Número da concessão:"
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4563,11 +4634,11 @@ msgstr "Definir visibiliade do plano"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Pretende-se atribuir visibilidade organizacional ou pública a planos finalizad"
-"os. Você precisa responder pelo menos %<percentage>s%% das questões para habili"
+"os. Você precisa responder pelo menos %{percentage}%% das questões para habili"
 "tar essas opções. Nota: por padrão, atribui-se visibilidade privada aos planos"
 " de teste."
 
@@ -4657,8 +4728,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Para começar, clique no botão 'Criar plano' abaixo."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "%<org_title>s Planos"
+msgid "%{org_title} Plans"
+msgstr "%{org_title} Planos"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4740,7 +4811,7 @@ msgstr "Encontramos muitos modelos de PGD correspondentes a seu órgão financia
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4795,8 +4866,8 @@ msgid "terms and conditions"
 msgstr "termos e condições"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "Deseja criar um plano com base no modelo \"%<name>s\"?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Deseja criar um plano com base no modelo \"%{name}\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4847,41 +4918,46 @@ msgstr "Remover o filtro"
 msgid "Filter plans"
 msgstr "Filtrar planos"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Pergunta não respondida."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
-msgstr "Um Plano de Gestão de Dados criado usando %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
+msgstr "Um Plano de Gestão de Dados criado usando %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Afiliação: "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr "Financiador:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "ORCID iD: "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr "EU IA:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr "Data de início:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr "Data final:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr "Número de concessão / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4902,8 +4978,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Comece a digitar para ver uma lista de sugestões."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -4912,14 +4988,14 @@ msgstr ""
 "Uma nova entrada será criada para a organização que você nomeou acima. Verifiq"
 "ue se sua organização não aparece na lista de forma um pouco diferente."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "O nome digitado não foi uma das sugestões listadas!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "Sobre o %<application_name>s"
+msgid "About %{application_name}"
+msgstr "Sobre o %{application_name}"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4999,10 +5075,10 @@ msgstr "Nós convidamos você a ler o wiki do DMPRoadmap GitHub para aprender co
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "participe <em class=\"sr-only\">(nova janela)</em> <span class=\"new-window-popup"
-"-info\">%<open_in_new_window_text>s</span>"
+"-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5021,8 +5097,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Se você tiver uma conta, entre e comece a criar ou editar seu PGD."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "Se você não tiver uma conta %<application_name>s, clique em"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "Se você não tiver uma conta %{application_name}, clique em"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5061,14 +5137,14 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"Ao fazer login no DMPRoadmap, você será direcionado para a página 'Meu Painel'"
-". A partir daqui você pode editar, compartilhar, baixar, copiar ou remover qua"
-"lquer um dos seus planos. Você também verá planos que foram compartilhados com"
-" você por outras pessoas."
+"Ao fazer login no %{application_name}, você será direcionado para a página 'Me"
+"u Painel'. A partir daqui você pode editar, compartilhar, baixar, copiar ou re"
+"mover qualquer um dos seus planos. Você também verá planos que foram compartil"
+"hados com você por outras pessoas."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5225,14 +5301,14 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
-"A partir daqui, você pode fazer o download do seu plano em vários formatos. Is"
-"so pode ser útil se você precisar enviar seu plano como parte de um pedido de "
-"subsídio. Escolha o formato que você gostaria de ver / baixar o seu plano e cl"
-"ique para baixar. Você também pode ajustar a formatação (tipo de fonte, tamanh"
-"o e margens) para arquivos PDF, o que pode ser útil se trabalhar com limites d"
-"e página.</p>"
+"A partir daqui você pode baixar seu plano em vários formatos. Isso pode ser út"
+"il se você precisar enviar seu plano como parte de um pedido de subsídio. Esco"
+"lha em qual formato você gostaria de visualizar/baixar seu plano e clique para"
+" baixar. Você também pode ajustar a formatação (tipo de fonte, tamanho e marge"
+"ns) para arquivos PDF, o que pode ser útil se estiver trabalhando com limites "
+"de página."
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5240,46 +5316,46 @@ msgstr "Informações sobre você: como as usamos e com quem as compartilhamos"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"As informações fornecidas serão usadas pelo %<org_name>s para oferecer acesso e"
-" customização do serviço %<application_name>s."
+"As informações fornecidas serão usadas pelo %{org_name} para oferecer acesso e"
+" customização do serviço %{application_name}."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"O %<org_name>s processa os dados pessoais de %<application_name>s usuários para "
-"entregar e melhorar o serviço %<application_name>s de maneira customizada e par"
+"O %{org_name} processa os dados pessoais de %{application_name} usuários para "
+"entregar e melhorar o serviço %{application_name} de maneira customizada e par"
 "a garantir que cada usuário receba informações relevantes."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"O processamento dos seus dados pessoais pelo %<org_name>s é necessário para per"
+"O processamento dos seus dados pessoais pelo %{org_name} é necessário para per"
 "seguir os seguintes interesses legítimos:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Para fornecer acesso ao serviço %<application_name>s e customização da sua expe"
+"Para fornecer acesso ao serviço %{application_name} e customização da sua expe"
 "riência do usuário, por exemplo, Fornecimento de modelos e orientações relevan"
 "tes para a sua organização."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Para mantê-lo atualizado com notícias sobre %<application_name>s, como novos re"
+"Para mantê-lo atualizado com notícias sobre %{application_name}, como novos re"
 "cursos ou melhorias, ou alterações em nossa Política de Privacidade."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5289,29 +5365,29 @@ msgstr "Para fins de segurança de rede e informações."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 "Nós manteremos os dados pessoais fornecidos por você enquanto você continuar u"
-"sando o serviço %<application_name>s. Seus dados pessoais podem ser removidos d"
-"este serviço mediante solicitação para a equipe %<application_name>s dentro de "
+"sando o serviço %{application_name}. Seus dados pessoais podem ser removidos d"
+"este serviço mediante solicitação para a equipe %{application_name} dentro de "
 "um período de 30 dias."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
 "Se você tiver alguma dúvida, entre em contato com a equipe do %{application_na"
-"me} em: <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"me} em: <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Esta declaração foi revisada pela última vez em %<revdate>s e pode ser revisada"
+"Esta declaração foi revisada pela última vez em %{revdate} e pode ser revisada"
 " a qualquer momento com aviso prévio."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5326,31 +5402,28 @@ msgstr ""
 "squisa. Nós fornecemos serviços para o UK, US e o setor de ensino superior int"
 "ernacional."
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMPRoadmap"
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"O DMPRoadmap ('a ferramenta', 'o sistema') é uma ferramenta desenvolvida pelo "
-"DCC e CDL como um recurso compartilhado para a comunidade de pesquisa. Está ho"
-"spedado no CDL pelo Centro de Curadoria da Universidade da Califórnia."
+"%{application_name} ('a ferramenta', 'o sistema') é uma ferramenta desenvolvid"
+"a pelo DCC e CDL como um recurso compartilhado para a comunidade de pesquisa. "
+"Está hospedado no CDL pelo Centro de Curadoria da Universidade da Califórnia."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5381,11 +5454,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5400,76 +5474,76 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3> Seus dados pessoais e aviso de consentimento </h3><p> Para ajudar a ident"
-"ificar e administrar sua conta com o DMPRoadmap, precisamos armazenar seu nome"
-" e endereço de email. Também podemos usá-lo para entrar em contato com você pa"
-"ra obter feedback sobre o uso da ferramenta ou para informar sobre os últimos "
-"desenvolvimentos ou versões. As informações podem ser transferidas entre o DCC"
-" e o CDL, mas apenas para os seguintes fins legítimos do DCC e do CDL: marketi"
-"ng, aprimoramento de nossos serviços e informações sobre conteúdo e eventos re"
-"levantes. Não venderemos, alugaremos ou trocaremos nenhuma informação pessoal "
-"que você nos fornecer. Ao usar este sistema, você concorda com a coleta, reten"
-"ção e uso de suas informações pessoais de acordo com o acima. Você tem o direi"
-"to de solicitar que não processemos seus dados pessoais para fins de marketing"
-". </p><h3> Política de Privacidade </h3><p> As informações inseridas neste sis"
-"tema podem ser vistas por você, pessoas que você escolheu para compartilhar o "
-"acesso e - apenas com a finalidade de manter os administradores de sistema de "
-"serviço no DCC e CDL. Compilamos informações anonimizadas, automatizadas e agr"
-"egadas dos planos, mas não vamos acessar diretamente, fazer uso ou compartilha"
-"r seu conteúdo com outras pessoas sem a sua permissão. Oficiais autorizados da"
-" sua organização local podem acessar seus planos para fins específicos - por e"
-"xemplo, para rastrear a conformidade com os requisitos organizadores / organiz"
-"acionais, calcular requisitos de armazenamento ou avaliar a demanda por serviç"
-"os de gerenciamento de dados em todas as disciplinas. </p><h3> Liberdade de in"
-"formação </h3><p> O DCC e a CDL mantêm seus planos em seu nome, mas eles são d"
-"e sua propriedade e responsabilidade. Todos os candidatos a FOIA serão encamin"
-"hados de volta à sua organização de origem. </p><h3> Senhas </h3><p> Sua senha"
-" é armazenada em forma criptografada e não pode ser recuperada. Se esquecido, "
-"ele deve ser redefinido. </p><h3> Biscoitos </h3><p> Observe que o DMPRoadmap "
-"usa cookies. Mais informações sobre cookies e como os usamos estão disponíveis"
-" no <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-site/website-"
-"terms-use/cookies' class=\"has-new-window-popup-info\">site principal do DCC <em"
-" class=\"sr-only\">(nova janela)</em> <span class=\"new-window-popup-info\">%{open"
-"_in_new_window_text}</span></a> . </p><h3> APIs de terceiros </h3><p> Certos r"
-"ecursos deste site utilizam serviços e APIs de terceiros, como InCommon / Shib"
-"boleth ou hospedagem de bibliotecas JavaScript comuns ou fontes da web. As inf"
-"ormações usadas por um serviço externo são regidas pela política de privacidad"
-"e desse serviço. </p><h3> Revisões </h3><p> Esta declaração foi revisada pela "
-"última vez em 5 de outubro de 2017 e pode ser revisada a qualquer momento. O u"
-"so da ferramenta indica que você entende e concorda com estes termos e condiçõ"
-"es. </p>"
-
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+"<h3>Seus dados pessoais e aviso de consentimento</h3><p> Para ajudar a identif"
+"icar e administrar sua conta com %{application_name}, precisamos armazenar seu"
+" nome e endereço de e-mail. Também podemos usá-lo para entrar em contato com v"
+"ocê para obter feedback sobre o uso da ferramenta ou para informá-lo sobre os "
+"últimos desenvolvimentos ou lançamentos. As informações podem ser transferidas"
+" entre a DCC e a CDL, mas apenas para os seguintes propósitos legítimos da DCC"
+" e da CDL: marketing, melhoria dos nossos serviços e informação sobre conteúdo"
+"s e eventos relevantes. Não venderemos, alugaremos ou comercializaremos quaisq"
+"uer informações pessoais que você nos fornecer. Ao usar este sistema, você con"
+"corda com a coleta, retenção e uso de suas informações pessoais de acordo com "
+"o acima. Você tem o direito de nos pedir para não processar seus dados pessoai"
+"s para fins de marketing.</p><h3> Política de Privacidade</h3><p> As informaçõ"
+"es que você insere neste sistema podem ser vistas por você, pelas pessoas com "
+"quem você escolheu compartilhar o acesso e - exclusivamente para fins de manut"
+"enção do serviço - pelos administradores do sistema na DCC e CDL. Compilamos i"
+"nformações anônimas, automatizadas e agregadas dos planos, mas não acessaremos"
+", usaremos ou compartilharemos diretamente seu conteúdo com qualquer outra pes"
+"soa sem sua permissão. Os funcionários autorizados de sua organização de orige"
+"m podem acessar seus planos para fins específicos - por exemplo, para rastrear"
+" a conformidade com os requisitos do financiador/organizacional, para calcular"
+" os requisitos de armazenamento ou para avaliar a demanda por serviços de gere"
+"nciamento de dados em todas as disciplinas.</p><h3> Liberdade de informação</h"
+"3><p> DCC e CDL mantêm seus planos em seu nome, mas são de sua propriedade e r"
+"esponsabilidade. Quaisquer candidatos à FOIA serão encaminhados de volta à sua"
+" organização de origem.</p><h3> Senhas</h3><p> Sua senha é armazenada de forma"
+" criptografada e não pode ser recuperada. Se esquecido, deve ser redefinido.</"
+"p><h3> Biscoitos</h3><p> Observe que %{application_name} usa cookies. Mais inf"
+"ormações sobre Cookies e como os usamos estão disponíveis no <a target='_blank"
+"' href='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' cl"
+"ass=\"has-new-window-popup-info\">site principal da DCC <em class=\"sr-only\">(nov"
+"a janela)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}<"
+"/span></a> .</p><h3> APIs de terceiros</h3><p> Certos recursos neste site util"
+"izam serviços e APIs de terceiros, como InCommon/Shibboleth ou hospedagem de t"
+"erceiros de bibliotecas JavaScript comuns ou fontes da web. As informações usa"
+"das por um serviço externo são regidas pela política de privacidade desse serv"
+"iço.</p><h3> Revisões</h3><p> Esta declaração foi revisada pela última vez em "
+"5 de outubro de 2017 e pode ser revisada a qualquer momento. O uso da ferramen"
+"ta indica que você entende e concorda com estes termos e condições.</p>"
+
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Nome de contato"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "email de contato"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr "ID do Cliente"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr "Segredo do cliente"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Último acesso em"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "Atualizar ID e segredo do cliente"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "Credenciais de e-mail para contato"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr "Tem certeza de que deseja excluir o cliente da API: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr "Tem certeza de que deseja excluir o cliente da API: \"%{name}\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5485,8 +5559,8 @@ msgid "View all API clients"
 msgstr "Ver todos os clientes da API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "As credenciais foram enviadas para %<email>s."
+msgid "The credentials have been sent to %{email}."
+msgstr "As credenciais foram enviadas para %{email}."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5533,9 +5607,9 @@ msgstr "Desprezível"
 msgid "Body"
 msgstr "Corpo"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "Tem certeza de que deseja excluir a notificação \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "Tem certeza de que deseja excluir a notificação \"%{title}\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5560,8 +5634,8 @@ msgid "New Notification"
 msgstr "Nova notificação"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
-msgstr "Mesclando '%<from_org_name>s' em '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgstr "Mesclando '%{from_org_name}' em '%{to_org_name}'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5569,10 +5643,10 @@ msgstr "Resumo:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Contagens de registros '%<to_org_name>s' antes e depois de uma mesclagem com %{"
+"Contagens de registros '%{to_org_name}' antes e depois de uma mesclagem com %{"
 "from_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5581,12 +5655,12 @@ msgid "Record Type"
 msgstr "Tipo de Registro"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
-msgstr "'%<to_org_name>s' Contagem - antes da fusão"
+msgid "'%{to_org_name}' Count - before merge"
+msgstr "'%{to_org_name}' Contagem - antes da fusão"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
-msgstr "'%<to_org_name>s' Contagem - após fusão"
+msgid "'%{to_org_name}' Count - after merge"
+msgstr "'%{to_org_name}' Contagem - após fusão"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5595,22 +5669,22 @@ msgstr "Detalhes:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "A tabela abaixo mostra as mudanças específicas que ocorrerão durante o process"
-"o de mesclagem. Assim que a fusão for concluída, '%<from_org_name>s' será exclu"
+"o de mesclagem. Assim que a fusão for concluída, '%{from_org_name}' será exclu"
 "ído. Você pode então consolidar / corrigir quaisquer problemas de mesclagem (p"
 "or exemplo, remover quaisquer departamentos que foram duplicados)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
-msgstr "%<from_org_name>s - Antes"
+msgid "%{from_org_name} - Before"
+msgstr "%{from_org_name} - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
-msgstr "%<to_org_name>s - Antes"
+msgid "%{to_org_name} - Before"
+msgstr "%{to_org_name} - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5640,10 +5714,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Aviso: '%<from_org_name>s' tem Planos que estão atualmente em processo de revis"
+"Aviso: '%{from_org_name}' tem Planos que estão atualmente em processo de revis"
 "ão. Os administradores da organização podem não conseguir ver esses planos apó"
 "s a fusão!"
 
@@ -5668,8 +5742,8 @@ msgid "New organisation"
 msgstr "Nova organização"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "Tem certeza de que deseja excluir o tema \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "Tem certeza de que deseja excluir o tema \"%{title}\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5698,11 +5772,11 @@ msgstr "Arquivo"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Você está prestes a arquivar %<user_name>s. Isso removerá suas informações pess"
+"Você está prestes a arquivar %{user_name}. Isso removerá suas informações pess"
 "oais, mas manterá seus planos, respostas e comentários. Eles não conseguirão e"
 "ntrar. Você tem certeza?"
 
@@ -5803,43 +5877,42 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr "Você pode alterar suas preferências de notificação na sua página de perfil."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Olá %<username>s"
+msgid "Hello %{username}"
+msgstr "Olá %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
-msgstr "Você recebeu privilégios de administrador para %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
+msgstr "Você recebeu privilégios de administrador para %{tool_name}:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
-msgstr "Seus privilégios de administrador de %<tool_name>s foram revogados."
+msgid "You have been revoked administrator privileges in %{tool_name}."
+msgstr "Seus privilégios de administrador de %{tool_name} foram revogados."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
-"Mais informações sobre administrar %<tool_name>s para usuários em sua organizaç"
-"ão estão disponíveis em %<help_url>s."
+"Mais informações sobre administrar %{tool_name} para usuários em sua organizaç"
+"ão estão disponíveis em %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Olá %<name>s,"
+msgid "Hello %{name},"
+msgstr "Olá %{name},"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
-msgstr "Por favor, use as seguintes credenciais ao acessar a API %<tool_name>s."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgstr "Por favor, use as seguintes credenciais ao acessar a API %{tool_name}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
-msgstr "Por favor, consulte a documentação da API em: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgstr "Por favor, consulte a documentação da API em: %{api_documentation_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
@@ -5849,49 +5922,49 @@ msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"Se você não solicitou acesso à API %<tool_name>s ou não solicitou a renovação d"
-"e suas credenciais, entre em contato conosco em %<helpdesk_email>s"
+"Se você não solicitou acesso à API %{tool_name} ou não solicitou a renovação d"
+"e suas credenciais, entre em contato conosco em %{helpdesk_email}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Olá %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Olá %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s terminou de fornecer feedback sobre o plano \"%<link_html>s\". Os co"
+"%{commenter} terminou de fornecer feedback sobre o plano \"%{link_html}\". Os co"
 "mentários podem ser encontrados na guia \"Write plan\" no lado direito da página"
 " (Guidance / Comments)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Olá %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Olá %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s solicitou feedback sobre um plano %<link_html>s. Para adicionar co"
-"mentários, visite a página 'Planos' no menu Admin em %<tool_name>s e abra o pla"
+"%{requestor} solicitou feedback sobre um plano %{link_html}. Para adicionar co"
+"mentários, visite a página 'Planos' no menu Admin em %{tool_name} e abra o pla"
 "no."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s comentou seu plano %<plan_title>s. Para visualizar os comentá"
+"%{commenter_name} comentou seu plano %{plan_title}. Para visualizar os comentá"
 "rios, siga o link para o DMP abaixo ou navegue até o plano por meio da página "
-"Meu Painel em %<tool_name>s."
+"Meu Painel em %{tool_name}."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5906,24 +5979,28 @@ msgstr ""
 "a pergunta."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "DMP: %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Nome da seção: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Nome da seção: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Pergunta: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Pergunta: %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr "Olá %{recepientname}"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"Suas permissões com relação ao plano %<plan_title>s foram modificadas. Você ago"
-"ra tem acesso %<type>s. Isso significa que você pode %<placeholder1>s %{placehol"
+"Suas permissões com relação ao plano %{plan_title} foram modificadas. Você ago"
+"ra tem acesso %{type}. Isso significa que você pode %{placeholder1} %{placehol"
 "der2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5939,8 +6016,8 @@ msgid " has been removed by "
 msgstr " foi removido por "
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "O plano %<plan_title>s teve sua visibilidade modificad para %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "O plano %{plan_title} teve sua visibilidade modificad para %{plan_visibility}."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5957,14 +6034,14 @@ msgstr "Público: qualquer pessoa na web pode ver"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 "Se você tiver dúvidas relacionadas a essa ação, visite a página Meu Painel em "
-"%<tool_name>s"
+"%{tool_name}"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Olá %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
+msgstr "Olá %{recipient_name},"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5984,25 +6061,23 @@ msgstr " com base no modelo"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
-msgstr ""%<inviter_name>s
-"Seu colega %{inviter_name} convidou você para con%<tool_name>s
-\n"
+msgstr ""
+"Seu colega %{inviter_name} convidou você para contribuir com
\n"
 "          seu plano de gerenciamento de dados em %{tool_name}"
-%<tool_name>s%<username>s
-#: ../../app/views/u%<tool_name>sel%<username>scation.html.erb:2
+
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Bem-vindo a %{tool_name}, %{username}"
 
-#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
+#: ../../app/views/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
+"%{tool_name} will help you to develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"%<tool_name>st %{contact_us}"
+"ail} or visit %{contact_us}"
 msgstr ""
-"%{tool_name} vai ajudá-lo a desenvolver seu Plano%<helpdesk_email>sos. Se você "
+"%{tool_name} vai ajudá-lo a desenvolver seu Plano de Gestão de Dados. Se você "
 "tiver dúvidas ou quiser enviar-nos algum feedback enquanto estiver usando a fe"
 "rramenta, por favor, entre em contato conosco em %{helpdesk_email} ou visite %"
 "{contact_us}"
@@ -6010,8 +6085,8 @@ msgstr ""
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Você pode modificar suas preferências de notificação na página com seu perfil."
-%<username>s
-#: ../../app/views/users/_admin_gr%<username>sions.html.erb:9
+
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Editando o privilégios de %{username}"
 
diff --git a/config/locale/sv_FI/LC_MESSAGES/app.mo b/config/locale/sv_FI/LC_MESSAGES/app.mo
index 3da5a80fca8038738959f449d08a4ae83d5cf4e6..80e8d8837c2ee994c26a70e0b0aef0725dbd4900 100644
GIT binary patch
delta 30669
zcma*P2Ygk<_Q$(-AoM`!9S*%FbfpB4D!n6$3Y;V-g;aA6&B75-L=ZtD96=OOK#J5T
zQ3O%3H=3e&Em#1tfFKI?_x<ge0DABLy|+Ji_^!34uURv*_W|$Xjio-{RVw^hrQ%B+
zp0whQQwQGE$Z<|aJI>1fvN}%Z3667z>o{HDL$Gk7<CMof!tXe>;Y1h<Z-cjxe;-_q
z{#T;oREG~Gnfz_AD*8*X68sQe>o{TOTZB#++9x|sEtm!wi!%q-h4WxNxDIxPufhuO
zFW3{74>(R)I1HA8<Dv4CU>O*M8sJP=4K9L%;5t~2{++W3H8K1J)j^FE$LRw{LXC7O
zOn~cQWq2IE4S$6TnDMKrj<W=PWV++*fM3InFf!S++dIQ?9z(wgR)l{-d7?rl?bE;0
z1VM(*a3~xGABQWUT-Y-Ux5II;F|3eH9oP}7<MD7I`~hkLx8-=Qb)JT&(f@$Oqa5eE
zT(fjP=4s}R^EV93CFO#~WsRUZ>;N^O!LTFr!(wn5lxtT&E!jpW&m4oSrBgTLI9I~}
z)IcAB@$h9h3!a6g%CaO=SYGto@5KKvBPjPQ*arv0XJ)e;(4~}S<lJRC=mM`nodp%F
zFGCIBbJ!Htx!ZA?!#;2m%!IPnm}~T&P%-lzR7|zH2mh<WpnGhvKnCc{wEBF@rLYF}
z$1I<N(ddVuV&@}R9-f18tvk<nvOFw--V~OEaaQjH)lWhgK@|r;1;;q32GT93TKgQ!
zrSNs~pM=d}&b^Kk10RCKowE*hgt7CDy&o)tJ{qe139uW?g^gkODFns9LD&+012wbC
z3yh0u!pi8Kp<-ePYzGrzS@<B-03L&y$QG;bfttwMPy_o2GG?dueYjnAh&}9Fum(RN
zte{#5+rxdZ7yJeGhMn){5Q4YCuJ9Qsm;MOL!i!L@F22YNs4OgnUK1+6p=CTQjouY5
z(*EyjGv0@4@E9aOoo}EzoUquq>>;QDz7I9PG7mUT7VHk=;3lZ3J_;3NH!mT<N8mE}
zJB)!#@=a_!2EG0NEP^uLh85sZSRS5&1h8`vYH4OZ=s2lx1MCMYE;T3RIH;N51hvhQ
zU@SZizk<Km{Er#Mbo4Kv+8ZCi|CJE#Mi3u@Rp2Jr1HK5y!oOiM9QzQ56Wj&I!P3i3
zc|R<JJ{2~EvtT@21KYsEP-|Xnh2yZZoi<QQuww=O*UWcg&|19(%eYj4T8hseHue*i
zXP`!Y5l)4TR+@4vpxSvHD(JRB4QP+GzX28PN38vKsB$G9Vf~9ERDQ&as0P%*&=ATK
zy<jzX9n6MVa1{ImR)lRHHM^r1tc5-nR)@Jz`SYL#w!-S`p_X<Rl&9VdBWNFg54HAH
zS2<37*aRwS`$3I#B-8;k0m?Jepk^4h`SW2{^azwE4?(&3KTze4LoM--P_a?$F*C7n
z6@)q%TETj7093_Pr~%yq8^Bpmo_GR!Gk}`eo3JVT5UPW}paxuVwHatVsPavr%6Eba
z);^GOVP_D6Ts;oT6Pd6sTngoZ0@wiVg=+W<C=Z;5n&~gF1^gQ}f-N35_Mxyh`gKt4
zEQdb07QPK%gDtiHmpoxcwg>hk<87#h%dRmqt^&1fT0sq94Xg^cL(S}UI0GJmTJsTW
zjXe=Yqu&A>!fCKLTmjY2D%hO<ou?4wx({Gw_zl#W{b5;hovBa>D#+?Xxv(qL%z8o9
zA8I)X%A-N3_U1tiU?r>%_renJa~O_BIDw$G`QGw3sF*1Aq!~yPD3`T`{LlG=KZ0=0
zddGPY*4SW{>?quYegSreJ2slw_z{*sufEB6s2-H(+HS)C5_)3Lh=)PVJP9^|*-$Qf
z5GweVTl+TH6#WR)K>vjDK&_{Yr{Z8c^scZ0%!Hcg{ZQ>c2oJ$kPvL(V@-~}bxdW=h
z7hybn6>7Vjhg$RKEoLUQVWNv$t$z1b)A4;!v9lbOhmXSwa642xFTogi2+AYJ!U$0a
zC!zNDx6s?4+ss;5f#tBbu}pyS)Ib;uCqOlr1J&UjPy@IRs=cMwz6B~4_CSsr=O9$Q
zaPD^Fnwd}|x(lkI1yC+u0d=BnhidRmsD{3Ta``V-FTKO8ZCxl2wt*T*N0<b=LwR~N
zED4{2lnXmgBdFkWP&0iQ$|L(t0p}1bi~b>;1;2s=VW5DQ5x5nefPcVz<v(q%>1od}
z5te8()XBJer+K@+0MpU?71D<G|5k)K7^*&NM!Fo{PsKmsaP0RH(wXoR*aHrHp38*%
zc~Aq}yxY73J_j{{!<NTjW%M7QT<z{LdIeY!y^*N>-wB}-ycR0R#=}^c3srFzYz-Gd
zt^ICzKRgK4;iMM~v!FbAE7TIqfm+IWQ0+u4*IE|9urgjkC=K^RHFy+i04JdGFTe^g
zdaqf-s!-*9P~}@fb$B(@HcPPiy<r#hA+Qmg3;V&1Q00Eyi~l<#{DMKQZ1bY&pc_;$
z_J{T0P^g(_LJedVtPdZ6wc&QC0ly0sw4Xr*+0U>O{1fhn9bV!s2^M?V^f&3{uvxoI
z4Ase)3pKJwp<K5HY7GmZJn=eg3qOGBpu|2?uRK(KQ>gkK;S|^vJ_@%%4S4t~#$!29
z?cN?nsDrQ=s)5b07<?WUhkKzKd<AMiZ&@CNn(;SKOYo~@iC2w>DnsQrvg`;|t{+rC
zqo9^BJPDyV!ekf)bD&0=2i4&c7zbCwhHyXZ0nfpfu-$9Mr8mLm=+D7n@JpzmZuh#G
zX<w)guZJ2~A|%+uP7py2-3x2Mr(pxQA8KG{p+^1-)X0myVf2bn1FQ$tU>vLodszGR
zFoK>6pM-zI_3+6zP5BXTX$e_>KSB*M(xEz-4ZFj|FdDuG%fR<7KZjb|Z=sfI(%Z&!
z$xs7Hh0M&E4z<Sj!xHdusD3s;1@X%;n*N<b2&(uIRD-9WX8Z$G1HVBX80FtFyTAwK
z+D=gR0kAF{Z}X=^?Sh5YzQ)>LhHbHb2;0F@@8W-LtF8z=;czGqEP~TG;U0nNpelQ(
z32X-Ck)crKMqAwv%c7@3c`69CG&5l-xDYmm%b+~-JXHCE`|*Dq!lxMIfwBio2X&x2
zXb8)}wy+!Q4iytKpawP*#=^z0BwP&@WE)^>SOA;CV^9MsdC;_54XWM72l2lSkaifn
znL&AEG?YuzprU>*RJjdMLHa7xjE+H-i#}v_O(Uod`#{y33@5;aumk)aPJ+I}Y+X1j
zjBppi<oC@B$Qh{MYyW}iFc<1zx(_ON)<7Mpdtg_10ea<+n9C{`R>b}yoD2`afw23B
z##8q|4eTK(kA<H{&>HQ7)!;j@5&R0Op^_h&f;C}0dIQT5uswPhj)gm*g0<99(@`B*
z6+I4CfPJ9Wd^FV3PBaWVSqQNhZiAKJeYU_Vn2f#|j)#>#Hrpr*s-Y0v1@DBcg469k
z##1q$m>D*KU9k^<HQ*em8LxyI&>C1;`~PVKt@#U3(R&!SgrC6{u=J<KLmi-Im;lwl
z2&+$m@>~d3hYM`}6HpT?fSU0uuns%~6{KgNcmMxt4P`$w6{<qbuqjl*_D~fQZ2k>U
z(L5RIV3`3`{!XYRyAP`4M_~`R)#|6A2KcwttAEb&se|SSYOp=j%z8n2U?h|WZim_~
z>!5Z?0n|2p&gw5f)qe$Q0EeN<ABThBIjHj8kD2<tp*%U@82;Bjy$QoT@Ls3^Rs4e4
zMzI5+mgf4eOoc3{8P9@p={%@4T?RGqM`1m<1uCfDg&Noq_%1vSx50w1%|Mfnhk5D1
zF!i{Z@j9r22ca5Vb;88NR@el67i<TQ!4jO1l}>U>qSs_IE656AGk5?thZkW7*x-~o
zkj6p<`D`eUEDa+l=vF|vWG#$_&q1x}URVOY4K?FKP%}CPRqqUx2Y!P!Vbr(gr<OWU
z_5n~GjewKkSa>6R5h`fIb-ptlc7Pf{7pS!x3KewYp=LG>Y9NcD8je_f6_f|pLCyRK
z%!GegJ>z?G>EuIo_zG0{|G-l8@09()%(Mzr!#+rc(;R9o+d)P12p9wXP(hXhhr?M=
z`3GTN_$4d@o1M112M$0_faT!bP##(0k@b%tl*X_Us^U7B0Jp;y@HA`=Yn(9$OD}i?
zJsIkR>-Hlz8XO6?6B99K%@XWAXJ-B#>`Z>0pUfpT7B)tI0D9m5I}r|G_#DoJ+s-@A
zeAwn^bJp*I-O$g&`gG9t7c-*~7tD*ua@d~y3Kz|Qd&7z7neYSn4lIC=|H^wJyzV!S
zV>se>{9gg#K?JSs8rTSKf|~JuSRY=5>Y&CSCi(}%w&-`j4sZ*+9)1a1!)||?pX<}$
zRP=2y!oZvTWjfybH?Q{Ci#cxCdp{rKxZXa$6E+}YDbz_-2xr6nP)jt*b-gIR2@Xe}
z3R}U~pk{myYG$LNT<?Wu8B9Pw0=vM<#awSmhr+Vx(~5;%Z@bOG!2g_k`6HE#g~eTm
zo7njoY5;FVyUqqUluaK4FTi3jx}>RJ8Y;LdKt*{Ss37YARjxDC#1ddUoB(x>EDR$g
zA?$_PK8;G55f6sfqR)eJ^#Rxsx}}W=u7bM9M?f_ggj$Nnp&C8{Z-AxvIkgc?gq`4A
z*b?rBDjz<HptY@C))<DtYtUyyt>r$bX#Ek^gjLJA-WyLF*cp8&RD*M&w(oYRBl|g6
z3%&<?z*Dd)Y#!r!f5p=SvW>&ed<1X%L9NL;C>QR43d%R38a@DZGJXVO;b+!<26{_k
z^P~CbSNXC~OHdi=JgEUSum(^AxysYSe4QdN62}kKanN!;R1mI)mEdzwyX75N9)1EV
z!|$Lb@HeahOIL8cbEF|u{W!P;_Jfn*N3c8W6HBntzcUMgGsbxpYUEE>G!5;BIsrd`
zT7vWN4Op|1iIp$mA@nkpU1vA^6n+g?RB@f_V7RJ@_9O5bbf=mbSTD;V(A)px5EP}U
zuqVubJK!dm0w+{ALHR0F!%;O{@0IKZsO|MMRB)b!nXqY1vkmj1cF%`U^~TpS!MYu4
z+a9aM{=W&KTy57oDAM8W%7BXEo9o~iw&fzIAevdv^<J;{Ky~~zR6`9o7PU);!fW76
zC>QUAH^V<+Kiav`XY8vRn2CPgAZ&#C4PEc(od|nV;WO9=HfZE}KRN}V25=H;8#Uzz
zARQ<-!DP4$s>9#m5ZI-O*>-cGCbAJ`!B3!qa!^yV6vM*^3Yzgy!4-sZ)f}kp^)Z|V
zD>rk!kIn@!1Kn+ImM9DML-)0Cz0d9xs3m*`4uC(yrm#m#*YUvsl*i{ny&Z?YLYRk8
zua!BWo`kj0--Kh}aj5OnwY7=zK2R<n3gw|0@G7_m$|L9DP#7O)V(NCNZF?uwMCU@a
zw+a&MVQ0NHY=hb^&p~akgRmJq1~r3H@y0`KpbnOvQ02!%HJAr=1m6a=i{?RjbTQO^
ze+=q8*$K4-dpw=}_cDSiyb0^TgHQ*`X{ZzM52zEaMH{nbV_;eIiBJt@K-JH)`mInC
zm<7wg#ZX7^!%%m?UKkI*fNiw@W80cFz6Pq|vrrwp4s|dchML)Nr~~I5)VWZiota4!
zC>OVc8c<u<4PFha!64Mc=0gSXlTiJffMJd3XN0=2dV4d%PVj2<aj+L$1a;&dgi-KI
zs2LxJ8rTm|4gLmoQkL#uW?To#1J^*gd@xkG5l{o3*n$18nFcVZ!CNe6K&|mCs2Q!a
z_9tLt^i5D59e`TnuV6#?6V!yNbu_`+87i22L$xyjs-FPVfU-KW|22|43_3ujL(Oyp
zoB?-1xvXO+6J$ZCwY(kbGI<QDp=Y4(fL+%9iq(%ob^H}n$KS&1;W?;tWN`Q@)4(jK
zk<W#4>3Y~6J_EB|ek_2q;JD7NvlbrhVuCc>&3I}dlxx?+Rpb}KXVJ%XH!&02!+5GO
z)WADhh6f@H!Y~0U+BZP$(<4xxIRhKOpP{x}^`7RWYXjw}EUV9i8u)G~PrPaK4?`{S
z*HFRyBh&z*uJK-Q!cKJrZMTU~L6`-vfeS3(fr|Q=US=s8K<Sg<t1txh50tw0#xv;8
z_Hmt8;Do-evl2GyXD0L_+>3q`Dt4Cl7ukPLA*jK<mWQEEu#@mf*y&ocjXs4hp`VBG
zaOVKS<8Uc@m4UAJ_xu}SKlEOM4DW%b(cgs~*gm@lTTcvSNwoi?hM5sog4(aGpbz$j
za%mD&hq<sATm?1YC!mhrLf8wQh67;R;pS|g0ktchhHc=7a3L%?f?JU_Sqj7RG5mC+
z>;056^Ct5G(dA~>`%S0b1Y!W!hM;!AtrN}CJO_2w{|0ribev?~9Y?}A^t+)3TmbjM
zFJW`I&Trm?_QU?@iHYog?eh(Zrot;wGyciaNiqjW3{<eyfHh$Y%RW%Sb~BXcQlZv%
zCR9v40JZ;DLERD0Lmf!3KyAzYNnsP!M=+@3X{Zj|WD}*ep&D)r)zGz2yCVsngSW$u
zFehN@uYsxPg|H8-pJLicf@*iV<r3Hv{i!fQD}?W%wpWc*bHKEP<<ZB$CNK%=7P}W}
zK&zmR=$%kAIt{hWeuX*_qtlFD6>7i@;2hW$u7EGV&M<sKy31dK@i`3J!;4UB-D<LV
z#hMI9qdy6CPW%ov^8Ohn=;lH#!5dIZcL?f4{2XdvUqhXIXKeljsDT#G^v;*C6N_*c
zhH6j^JZv(Y^>8-&7N}RNc3I|D%YlmeO;9uV63&FRvrYaAxETEi)PPfS%uDPJ_$+$O
zT;th8u&(z17YOyp_#5hks&|W7%eGJ_RUbGPUJu*C&!IYu%`>lDi(oYRXHY@)HCzI}
zgIcngLD&0dI1fU3YI?}^eu9||+iL%RhM<lsOfeN2SY8c#V;>5ygNvccpM+Yn)TypB
z3BC&zyz%^IFW2^hE#OcnPfddg(k)j13a&-3HJ$b}q8AYqG;cxaA486N=WDAsy45rs
z2epm5Ky}a?=E6*<HU1PTXpch;<UG`pI=2~n4AePL2g=^>Hhce%!XOt;fZDgoP#xq!
zMf*yq?Nb16gYUvbIPi9JE<6S0fjv;?$pNUP`_AU;f>65^E$c%~IPMPie`AF17@EOE
zsHK<>>%)~$QM?;!#IHkb)Aym)`g@!Ilg<ANcEw(HrtwsN%i)&SLk-Lib%ak1BWQ;6
zp&DKdbqhWR<<bwKM*g|A{{U6KECbho8bS@Q4QvX#LV3auRWAg!WV5Zl0BVVrLroyO
z9zkoh70PwbL#@#f*Z}@*^Bdf0E|WN@21Y<NJP|5p(qI#q2j$U+peC>fUJGA^>L+HF
zX{RPUp!fd-1XYZgZARPy>Ne{I)$knXgA3sua0}D`TF)^t(GA9;kA>PDDNx()1k_Ug
z0X5L_cbV7t>QH)bSV1)gBWPdW2(>2nK{fE0SAZiHs>9c;{sGhy9fulVvAaz$#Xv1h
zUCWM8?F@!mT0d+JXFwlZ2TN<juOnzJ4nnQzM^Mpu9O_{D8ETEI%ypepus+0fPU(Bh
z$LGgTde3=gV6peQ-aprghyAes2HU`E=9{BA7s_K(U|1c_MG*6$qVqARwR;A(gL|xg
z25K8#fLgMO3(Q(x4K?%eP@cL4D){b%I->7~&EV@$6Fmd91ivg`|NnsSw>A85pZR?L
z1?m#%v(TJe1E4y%!}38W*KdL|Tm}lgU9iYZq$^bZwNOhs(%J)11IvRN=$(s*ZjERW
zhGK9TtN~X*ZKDFHbKo_oiYF}3LwPD{v0-)S1*K&-sAwMq6)V?SdkAVkbKr6q2_vXr
zy9dkwx?A>wT9STH9gTttrc~&80xG&6gj&mWRxgB#oj0K-b`+}pV{knD9;)4ImzX68
zk3rDPZ-!cPKh#XpVHBKh^KXOlKo~v*7s5fXX})<|z6D0J6nmlaUwzPAUK5rQeArjR
zZrBelGw*&e5!bmz`+p2V78$R>ZLs4*<`>c9kge_vTy9=A-&tX1P~u_N`<>qpuO@#T
z)C@mcX%4V&p#~cLh?!|+C=dFe?46*NwvT6L|6PY57iQRu+o4>%2x_g?K~>xZ+ru}k
z{df2TdWA<#eu3pnP_Ew(qu~*#rTYYGAm=Pgu0q%TuY;fgw1bM;-cV~h1Zt!ctbPmB
z+Rm}ehbsSs&EE{Qt@c87{D#ec4|YfY2x{9_d(13Z0t{=-=ObvJE`gfq+fYGr6so}!
zPzTW&D36q1ZP*YtM866u%5Q**ooP_z=R&o=7IuM~;RSdSDi}Y1oc*s3yFOt)BnDUp
zp!V}@C=V=zx||+^^33zFBYYRCT+|wKFvUO(ycyIIbcETk8{7^z!UpiBwPpe{*M`ju
zmSFIa@eI^b9D#D-NvMP92dD<mK@Ip<%aZF%@KuFciUv?KZUxm&2b<p)YUxHmd1w;U
zz;nU~s(33@2X{ej#|2O>Tm%&~TVM;g4>p27z=5#hlja@oMwo)W1jfT(VPDvMy%|Ur
zR8Y@^+AT|=4!ZDao3RVF#&8ho#QO`jg7r2SPYi;Z(Fmw$_CtAMnzi2zHN$049j&wZ
zd*E91x8Y`Z%SPAP0_$(`+6g=FAt<Q6hPqrXLakw?r%X`Rhgyp3p*%GKs-rYG4NiwT
zsD6a<+)q#+r5B*C-71?6TSK|LuhoacSl$1r2wJo0Py@IVs-YE719=o`#+#sm@g=Lj
zZ}o4j{wGw&mA9DkZJ|8bA1dfltbHET5<LpN-~Zl4(8uMUP}{KPRud$nU>+x&A1Vgk
z-)1^E1r;kLwwtw#fzoS2dBz9jskT<{YV|>|IrcG79=`*6|Nid*gbo;1*^I+b9ykf*
zf$yN!`XcNBOYATm_Je9@2vo<Dpgfrib#6?D+NQIh&WW8+6FCai-sv6ee+AVa7_`4*
z3d~wJhg!RMDA)Igda1k#%Ehyw4xC4!f_AsHpR)E6Pn(%GhRw(y3Nzpos7vSzI26`>
zhW)Q-%y`CpG}hW_M!X4Li~ShXK$;gCUIR7q>*3Wf1!{(m!cOoo)V3@Atl2HYU^e<h
z*bBaA?Xl09ZQLM?AP@9|a@loI9ZZDUpIK0@oeQ<b%V1mh2-E=HgY966UFPTd&QK@h
zLa1%H3d(~!q563Ts=ZI4mNxtYf)0e=pemGj-psTvl)V#7gT3Gla3fT372j=wv^;zt
zy)HZk&p{3R@E#NO-$Qw_{0nAxT?bV^7ZM9${<W&vmy4iAx&o@>ZBRkE8)}9>LV2L!
zUNgfMP@d`r%fo?C^{<Bt%50lI8_FY#p=SO#RIKfQ-oO8Q7eP_^0aVA|TKyNOhReQa
zmZlceK5hiPC9}K^mc*V4)lm*qN3)<j@c`@tH$wGu+S-e~gznw{2wIDFPzOv8s18O#
z?bk%u0xp0W&@)h;cm?WmdfVy;Z2pH(^-n;Zco*O(81=H*U1Ke8gkg=?kD%xc!ZmOM
zlqZJm<5i5abv%@7UwGBb;C-l$PeFBX8p;E|LUruEW-hNvP;1=|YGU2saX1XFhaF#M
z|7%8{zHUC7zlTlGo4sNFW^*Xi0DW(oj@rXU=-r|Ay&sm~guEXXpf7#P3~=Dv=7^mD
zTVY=ab#Ogr^@~tT(fFOPab=fx%o1D!wF`z?JsHXqw?JJ&cR&qzj^z@lZM)iXBUEq|
zKy~~cl!tzU@=)}<uJ>O~#K4K@v%&~E$-aQ<;BTmrMZaeTR12!XW>D_~y`dWPLzT~j
ziiJGb2F`$rl?`wJJPdWI)!A=6cNNruHXdrp!+8jb*7Z;`eHLoXUV&QU_n^0*p@Q^#
zs2TqXwf&+FnEf3Ky^|5@q)UMs;CiS5Zh^z#Gf<u=e$dMgJLM46Q6;DWREHWsBdCVr
zpsvvzD3>mRih<|hxA1eQ{r=V=69b>Y3Iy$v!{+RN`~&l&^jokq<u1Ym*zSlt%Kpnn
z&=M?!U%^dq9$fSxf0Y7jd}M;>S$Gxt1vrMFi$7{yJm+KYOU8Kz%Jn_|V{W@NI0=0L
z{0x2%x5BqSVPMq1?Nh#x=-+wbGrM1*Ty_EKmirU7hqXR89vBKWgDlt^u7ktjDcBBn
zIc9!X%z*LeufxIc7dQj<{(^tRLdUz|AoP^4*#8QW?Fb5<-=JLC@@sS5_J9hyBsd$+
zhKiNw<0dGp!U^bYVN19OX24yrKWuu!EMXSZwYwE+0^h;5u<=RuzoL2UNi*|FusS15
zfmzsRe&ae{!tdcyxc`*-mkxn%O|Uim&csezD9?3*-kksy<pW_c=(h~OhUn=~9=h+l
zu(@QO$B>HQj4d$kdlMwL!lBp;VHX(vgZY%|2^Exgz$Wk!sOxwi>;->^+FspH8xI9x
z9Qq;H9Xe-BevdFhSM(5+Yqr9k@EfQ#YW|~Hnjlp4KLLGkKWq+vgeqV2tof^%8=$t^
z3aBG@HPk?#hJE4tQ0Gg{b7o@Ucm%Ea?XWCdY`GFD2-idH_gA5o>OGr(6zWbmZuQ@x
zVx#0wrd)NXeclj8!In_lIu7cDy&AGaVP_bE8cKm0+3i+;0M<Z%5~{+BP?yVxP#t{(
zRsJH>9T9WhOrSngy;e{i_JztH2G_tza2kyMSso9wh6p;DcEV%I_{GfN1XT2&g*tFz
zFPQz^5iUTV0JZkt!Vi>x(frlQ33wKL)~{we27fd4_QMX?e}(d7-0zV7oz4j5VIL@0
zje-igvG6(g1k8pv|6$hp9hib%?oaa%ih}SO^v|GTsQzE<Yj{1>Hv9<QD*NBA_n+;q
zfEvg-7}kl^lx}Z^BVZQX0v~~O+$b+NcR`ld`5CH%Z;C~E*KdR3QQoc?2G!0y%N<bV
zK7l$ht42q8e}ORsPNAJApn|bx$*8c`z=V=f-V7ds3&}VNd&AUHh8y85^dF$k?wr!5
z;isTF`U+~Mb;_8Ali(Qi^-xFqpHS`9E*s_jYr6?h=fcZn!%<$4yoNzRb^vPIoP?v`
zZ%`c!Ef?ke#lu`E4@Jd9dH?Pw7ru)A0UQV)E+6In$7RQ%^x@n@NpLxA4F80>&Kt%?
zdB1>k4<qQ{cnB_r2VgVkuV_YoFPw<}B-A!6S;-7I7V12x1^dAMP_CX2bx^$o6+^#6
z1>3;NrrsE+0Zf3}p5Yk?Iyz_B0{1{g{R2?<{WhqBW)Ex%Pe6Gnrb?7|5c!~7+zXb5
z6JZQYxB4`w?K%tUBliKQiEM`S8+LXY!PyN<knu9C58s3u`6<{2o`)@A<Eq9!9O}Rt
z4^=M(s^KiCflP&(z@1RLYa!GGRzkJ254P4mIqeAqM>Vs?1E4CrVtE+q0QnNC!Shfv
zajTnMP#4OTgP;aH%IY`69_Rt6@@t?x`y%WPKZmi}r*&(XHIIinXs)xo73vas6zckX
zAIi0{HO-RMgVGyA4Xizst9wEP^Khu3OM!~^1yG(^1a)#QgWiAty9q(A+-?i(v3vz;
z<ZnZ{^rYoksFUw^C{H!0WjxdtHbn0YHIV?+!0v@=XBm{Ic0euFu3GGW1>ZiK@g~%6
zI0)tP(zT<!e-Bt24n}_n7KdNM8t@cUgHd&iN6J7o919hsHK8Wf+Ojj$67_|X;qW@_
ze+AbroAE7FaQqB4a$nsj@6{>}a&UQXEx;*2X-&FMe&xB{vbRRZ(+Iv!{&(2BAvY&&
zLw}XLGuUn+O+=3g^M{@ewt>>{dSkluXMf5hVIKh%FEf#^M(#nQgJHa_d#M6K$0*)_
zNxWk^UqXGx^`cw?sXaE{VVx<+;Z<bZM}<wKz8JV$yuVWEhrK_xN3rS2L)Q~W{{1Am
zQO{5Yu?M}7w45?m+wvxt?Mc3#k=C9}xuS<#QuE<838Nx?2`oW{ApDsMzmm!$^H%0P
z^U>d>lQxv$DsVX5E<M|k7Lz}k)R<I&K7jlvTX&Z&c`vp%NE19e{VyWpb<#Z;x!Ant
zQ_EHqx)VzZsS2ImNW*=gp5Ku5yh7O&<kxIRhb$}Ga-Gn1wClNO+vWApd!8r$yhy%*
z2KXt*nQIG_MZXcfzwIPI@gw9tf<6mwC+`bve~~uXGS6arfz+Hd&bFgo6v*FGW&~_*
z%gSDy0al!gu#*ZG;0>hf^4;;3!%24RT;NVm<V;H3PSW$j6;0e`Z5h~>BM+qf9MX%F
z(_5vU-J}NOH6oovu0(q;Ll<tNUQg0_>WqPJW9KnZv6l)RC^P{}bu#~;&|5G<(&b$A
ze2&0<>+N*eHXz?jJw1BeD0;eM*Yg_GDWj*B&0mWA9QKH()BgdKktj9kOizeZjYi+Y
z-tCG;w_^VfWm;I9AN?89=jd6m59M_zmmnqCGSiUttRS!Gi9+r{{t*l%6cu_Nz%WG_
zb`a;Vl|X&~+dAYj<o{yxK1DCf02kQ0smQaGZ}o31hhU$NJq!IF>gXv%u4nU0k{^B$
z<wgWOpVPs8RCtoq9=$XiL;BfPsEGUo@;TD$ls#qbBW-;j`e@1=hMP!F(Z+ssJv!9+
zI(2^XG%f=2Z|7EWD$x*c8cv#>o$~oH$ob6bZ`%eI!S~4H&D4A9(djETk9ReP8_IjK
z`Lh}FLimO;dH-rqVjkt^*>Zl`k159be{2o=Fmyv+N}+DZFTs_zgY&kbzILWkhg0@A
z<i*h$Lb(Yrm!ubPJq>AN5&Bs81o;8#K4sfe{x0NRx)pTeFQniB3hLR9{4z<;?W8J{
zd6+be2AYwwkb}1D^)MOR9bRd?M!i36-J7trAb+3A+x#xJo>lo(*cxubayJF__~3pc
zIvr{JH!H89>|Pr0YU`ATZ<05h@{N#d+WM<0^APgQ*f!h2TnBsGcKCX6o<tv5%<liD
zw!v3z1NmgWk8M3XNh-}CHlTMTUoTqIk*`OdPTouCTWr1h*eg)>3+#K58<2LB^u%Dl
z4f{jronaKZcmC+};SY=_FzR`p#!`*w{D$o{D}Rn$j7lZQKWNLoKwcf{PKQ^MH^OU_
zLyIykDbpDaCchE+3Fu3abFr1T<w~0K&-Cyf8FeX83Z_Cm?<4E!ONzpFFZ@adp1w5r
z3jBk#mb}^|zB;`BOS%cRgJbBe$#1GQNlnmiqTKaRPxu-NzJ#H%t#B*yY6|wZdW1rM
zVJk_}8(@Dbb|LK`Ri#Wid=~pA>a>AN(evPk@I!1Ppq`&B@1UKcr%uuN{}sloDe(Li
znKLQ1g9h^9NK!32)4Q&oG*VShqKvIGk@{7vyp6nP(NCg3WIKLD10?C`fNhL7LHvI+
zN&?3A6mDy0-QHFzh0gCT&Lr}ikupgGv5m#{mn}06J<oQ$f&AXsUnf0AnHJ<_l6Q#I
z$Cjapb69`yv>k!*Bim3h<o{qiZ%3*3)@y8@A6CWg!^UrJPJ0@D%;v?Sx1;VTQcYdz
z`LW}Rhrg%ft(2%h?hfQiq>7Z#(~#PqBA+1dG57#UpLWBs7f>e}=3`qxes%1-u@$20
z8Hud#%5&ts1FwQT;V|;AqFz%HPgwuv!-=8r5Eut1P~asvm;x=4ZzEMlZ%5L@SD$kl
z+gr#3JqtGsjqB+|-g@%xMc*RbbmGj$R_K*r0Ja^ecky$h(-=crDy+aT2>BBV|43?!
z+zJ*w{U|dY+YhAW7$1d;uE-yXT+Zr8DEl$#S_be0wjU`!hx8xntX3I2u;HqZMQTam
zyS+E9e5Bf>IV63Q=~-gn+=T5<<VjR-KvO?avj)`j7JP^NSZqI|Z-&d@KGFx+YuR$=
zv9Cd|gZ?Y&IQkg)jL8o>mC1Y=V-3=a$Z4d5G_sunXOZ=^K;BCJL^}`JzQtA(eI5J&
z{Y~;`ko4<=o~de&bd)rfa$i6_Us3)jX(!32o3=WccaeFF%&u2-(AReUjji|&6)IWV
zqn2t=&$G77x0bTy*fRG^;W<oRZQ7rXJ(0HbT%((I_rDq|cf}x1*#=`NtS{AawrqXm
zRwO++wlT>wkw1pHQg}9^H-W{ecg(g`ANgBs(J=fr1y+#pCR`5x#&{h`&k0*W@;T&s
z*aslrLD^}@^{}mj(U2b-o%^t#gulZ>s>HL4ymV4o?0Oy{ZzytC<hym#>KBBr81=+a
zFdhygeMDM`JrQp#w3RVAKJ<sNPsR2h(m<Ox&hkqY;yFW^G*Z!X4{g6pnZ~3b_GI)7
zZOERs&>1p1VtkAm?MP3OCX@F8sScgihU>AlvgLbIo*xn~J;}&RsDA_e4y%j&AY~Sl
zQf#^3ZRzLWljNss{fnN_bkYo?o{uagk0U*U-hlk8Xy_B$STX9>y`ugB<YA;Z%Fng-
zg|?kU^hwm4bVa*rJKP%MRy8V(=b)`P7F#T-JGMbo`j}K2y*Wuw83t35ve~4S#^n9H
zC2=TaX4rBz%NaoZFsTe_wKew8o3@?+jiiviB%P&zo>6pgEsZ>aJODX_yb8HGWs06!
zw(K6;*=OWkP&?M%kAe>u6^2!@ZzcaaI1|PdH~l+FWR9|p3`L%0D}}9X9Tj?E`<1jE
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

delta 28670
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
a3aei*$*<o)-h|-EsIb+!&qRmqiTFRBP7U7x

diff --git a/config/locale/sv_FI/app.po b/config/locale/sv_FI/app.po
index a6c6ec696e..534539335b 100644
--- a/config/locale/sv_FI/app.po
+++ b/config/locale/sv_FI/app.po
@@ -1,14 +1,14 @@
 # Swedish translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish\n"
 "Language: sv_FI\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"Det finns ingen fråga med id %<question_id>s som är associerad med plan id %{pl"
-"an_id} för vilken du skapar eller uppdaterar ett svar"
+"Det finns ingen fråga med id %<question_id> s kopplade till plan-id %<plan_id>"
+" s för att skapa eller uppdatera ett svar"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
-msgstr "Det finns ingen plan med id %<id>s för att skapa eller uppdatera ett svar"
+msgstr "Det finns ingen plan med id %<id> s för att skapa eller uppdatera ett svar"
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
 msgstr "Dåliga referenser"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "Avdelningskod och namn måste vara unikt"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "Användaren måste vara i din organisation"
 
@@ -46,28 +46,28 @@ msgstr "Användaren måste vara i din organisation"
 msgid "Bad Parameters"
 msgstr "Felaktiga parametern"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Månad"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "Nej. Användare gick med"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Total"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "users_joined"
 
@@ -80,35 +80,35 @@ msgstr "Nej. Slutförda planer"
 msgid "completed_plans"
 msgstr "completed_plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Inga planer"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "Plans"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "JSON saknas eller ogiltig"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Ogiltigt JSON-format"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Planen hittades inte"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr "Det gick inte att skapa din DMP"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "Planen finns redan. Skicka en uppdatering istället."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
@@ -116,103 +116,107 @@ msgstr ""
 "Det gick inte att fastställa äganderätten till DMP. Lägg till en\n"
 "                          : anslutning till: kontakten"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr "Ogiltig JSON!"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "Ogiltig JSON"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "Inga planer hittades"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Du har inte behörighet att utföra denna åtgärd."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Du behöver logga in eller registrera dig innan du kan fortsätta."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr "Kan inte %<action>s %<object>s. %<errors>s"
+msgstr "Kan inte %<action> är %<object> s.%<errors> s"
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "Framgångsrikt %<action>s %<object>s."
+msgstr "framgångsrikt %<action> är %<object> s."
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "API-klient"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "planen"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "Guidningsgrupp"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "organisation"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "lov"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "preferenser"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "profil"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "användare"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "fråga alternativ"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr "Posten hittades inte"
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "Räckvidd bör vara ett ActiveRecord :: Relation-objekt"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params ska vara ett Hash-objekt"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params ska vara ett Hash-objekt"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "lokalbefolkningen borde vara ett Hash-objekt"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Begränsad åtkomst till Visa alla poster"
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "Sortera efter %<sort_field>s"
+msgstr "Sortera efter %<sort_field> s"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "anpassning"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "Mall"
 
@@ -220,28 +224,28 @@ msgstr "Mall"
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr "Obj ska vara en mall, fas, avsnitt, fråga eller anteckning"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "Obj ska vara en fas, avsnitt, fråga eller anteckning"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "Search_space svarar inte på varje"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "Sökutrymmet har inga element associerade"
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Captcha-verifiering misslyckades, försök igen."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "Kontaktadressen skickades med framgång."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "Det gick inte att skicka din förfrågan"
 
@@ -255,60 +259,60 @@ msgid "added"
 msgstr "Lagt till"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "sparade"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "spara"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "tog bort"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "ta bort"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "Planen hittades inte"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "bidragsgivare hittades inte"
 
@@ -320,106 +324,106 @@ msgstr "Det gick inte att skicka din begäran om återkoppling just nu."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Ett fel uppstod när du begärde feedback för den här planen."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "skapad"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "skapa"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr "Din vägledning har publicerats och är nu tillgänglig för användarna."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "publicera"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr ""
 "Din vägledningsgrupp är inte längre publicerad och kommer inte att vara tillgä"
 "nglig för användarna."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "Avpublicera"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "raderade"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "radera"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr "Din vägledning har publicerats och är nu tillgänglig för användarna."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 "Din vägledning är inte längre publicerad och kommer inte att vara tillgänglig "
 "för användarna."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Har länkat ditt konto framgångsrikt från %<is>s."
+msgstr "Har tagit bort länken till ditt konto från %<is> s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "Det gick inte att koppla bort ditt konto från %<is>s."
+msgstr "Det går inte att ta bort länken till ditt konto från %<is> s."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -431,70 +435,72 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "Du kan inte lägga till en fas till en historisk version av en mall."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "Det gick inte att skapa en ny version av den här mallen."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr "Det gick inte att skapa en ny version av den här mallen.<br>"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "Uppdaterad"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "uppdatering"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "Det gick inte att skapa en ny version av den här mallen."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
-msgstr "%<plan_owner>s har fått meddelande om att du har lämnat feedback"
+msgstr "%<plan_owner> s har fått ett meddelande om att du har lämnat feedback"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr "Det går inte att meddela användaren att du är klar med att ge feedback."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Projektnamn"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Mall"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -505,63 +511,66 @@ msgstr "Mall"
 msgid "Organisation"
 msgstr "Organisation"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Ägarnamn"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "Ägarens e-post"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr "Det gick inte att skapa en ny sektion. Fasen du specificerade existerar inte."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr "Det gick inte att ta bort den här versionen av mallen."
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "kopia"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Den mallen är inte längre anpassningsbar."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Det gick inte att anpassa den mallen."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Den mallen är inte anpassningsbar."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Alla mallar"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "%<org_name>s Mallar"
+msgstr "%<org_name> s Mallar"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Egna mallar"
@@ -570,160 +579,163 @@ msgstr "Egna mallar"
 msgid "Customizable Templates"
 msgstr "Anpassningsbara mallar"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "Felsökning av länkar för en %<template>s"
+msgstr "Fel vid analys av länkar för en %<template> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
-msgstr "Mall skapad med tjänsten %<application_name>s. Senast ändrad %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
+msgstr "Mall skapad med %<application_name> s tjänst. Senast ändrad %<date> s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "Det gick inte att hämta DMP-mallen för tillfället."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "Inga organisationer är för närvarande registrerade."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Din organisation verkar inte vara korrekt konfigurerad."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Välj en organisation"
 
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
+msgstr "Din organisation verkar inte vara korrekt konfigurerad."
+
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "Skapat med hjälp av %<application_name>s. Senast ändrad %<date>s"
+msgstr "Skapad med %<application_name> s. Senast ändrad %<date> s"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "Det här är en"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "testplan"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "Det gick inte att identifiera en lämplig mall för din plan."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Min plan"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr " Planen"
+msgid "My Plan (%<title>s)"
+msgstr "<html>Min plan (%<title> s)</html>"
+
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr "%<user_name> s Plan"
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Denna plan är baserad på standardmallen."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Denna plan är baserad på"
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "mall med anpassningar av"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "kopieras"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
-"Det går inte att ändra planens status eftersom det behövs minst %<percentage>s "
-"procent svarat"
+"Det går inte att ändra planens status eftersom den behövs minst %<percentage}>"
+" s procentsats svarade"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "Det gick inte att hitta plan id %<plan_id>s"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr "Det gick inte att hitta plan-id %{<plan_id> s"
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Ditt projekt är nu ett test."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Ditt projekt är inte längre ett test."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr "Kan inte ändra planens teststatus"
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "Det finns ingen plan i samband med id %<id>s"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr "Det finns ingen plan kopplad till id %{<id}> s"
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Vänligen gör ett val nedan. Efter att ha länkat din\n"
-"                       information till ett %<application_name>s -konto,\n"
-"                       du kommer att kunna logga in direkt med din\n"
-"                       institutionella referenser."
+"Vänligen gör ett val nedan. Efter att ha länkat dina uppgifter till en %<appli"
+"cation_name> s konto kommer du att kunna logga in direkt med dina institutione"
+"lla referenser."
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr "Du måste godkänna villkoren för att registrera dig."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr "Välj en organisation från listan eller välj Annat."
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "E-posten är redan registrerat."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
-"Välkommen! Du har anmält dig framgångsrikt med dina institutionella uppgifter."
-" Du kommer nu att kunna komma åt ditt konto med dem."
+"Välkommen! Du har registrerat dig framgångsrikt med dina institutionella refer"
+"enser. Du kommer nu att kunna komma åt ditt konto hos dem."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Spara misslyckad."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Vänligen ange en mailadress."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "Vänligen ange ett förnamn."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "Vänligen ange ett efternamn."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
 msgstr "Välj en organisation från listan, eller ange organisationens namn."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr "Vänligen ange ditt lösenord för att ändra e-postadress."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -733,66 +745,68 @@ msgstr ""
 "                Den e-postadressen är redan registrerad. \\\n"
 "                Du måste ange en unik e-postadress."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Felaktigt lösenord"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Vänligen ange ditt nuvarande lösenord"
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Vänligen skriv in en lösenordsbekräftelse"
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "Lösenord och bekräftelse måste matcha"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"Kan inte dela plan med %<email>s eftersom det matchade e-postmeddelandet med pl"
-"anens ägare."
+"Kan inte dela plan med %<email> s eftersom det e-postmeddelandet matchar ägare"
+"n av planen."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "Planen delas redan med %<email>s."
+msgstr "Planen delas redan med %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "Förnamn"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Efternamn"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "Inbjudan till %<email>s utfärdad framgångsrikt."
+msgstr "Inbjudan till %<email> s utfärdat framgångsrikt."
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Planen delas med %<email>s."
+msgstr "Plan delad med %<email> s."
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
-msgstr "Du måste ange en giltig e-postadress och välj en behörighetsnivå."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
+msgstr "Du måste ange en giltig e-postadress och välja en behörighetsnivå."
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Vänligen ange en mailadress"
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
-msgstr "Ändrade behörigheterna för %<email>s. De har meddelats via e-post."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
+msgstr "Har ändrat behörigheterna för %<email> . De har meddelats via e-post."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Åtkomst borttagen"
 
@@ -812,67 +826,67 @@ msgstr ""
 "Ditt konto har blivit framgångsrikt kopplat till dina institutionella referens"
 "er. Du kommer nu att kunna logga in med dem."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Exportinställningarna uppdateras framgångsrikt."
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Ett fel uppstod när du sparade / återställde dina exportinställningar."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
-msgstr ". API-referenser har skickats till %<email>s"
+msgstr ". API-uppgifterna har skickats till %<email> s"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Din anmälan är nu aktiv."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Din anmälan är inte längre aktiv."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "Det går inte att ändra meddelandets aktiva status"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "Det finns ingen anmälan i samband med id %<id>s"
+msgstr "Det finns ingen avisering kopplad till id %<id> s"
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"Din organisationsanslutning har ändrats. Du kan nu redigera mallar för %{org_n"
-"ame}."
+"Din organisationstillhörighet har ändrats. Du kan nu redigera mallar för %<org"
+"_name> s."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Det går inte att ändra organisationens anslutning just nu."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Okänd organisation."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Det verkar vara ett problem med din logotyp. Vänligen ladda upp det igen."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
 msgstr "Ett fel uppstod när man försökte slå samman organisationerna."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
 msgstr "Det går inte att slå samman de två organisationerna just nu."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
 msgstr "Det går inte att avgöra vilka poster som behöver slås samman."
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
@@ -880,19 +894,19 @@ msgstr ""
 "Du försökte slå samman två konton med samma e-postadress.\n"
 "           Slå ihop med en annan e-postadress."
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "arkiverad"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "arkiv"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "fusione"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "sammanfoga"
 
@@ -904,39 +918,39 @@ msgstr ""
 "Du är redan inloggad som en annan användare. Logga ut för att aktivera din inb"
 "judan."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Inloggad framgångsrikt"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Ditt konto har länkats till %<scheme>s."
+msgstr "Ditt konto har framgångsrikt länkats till %<scheme> s."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "Det gick inte att länka ditt konto till %<scheme>s."
+msgstr "Det går inte att länka ditt konto till %<scheme> s."
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "Framgångsrikt %<action>s %<username>s s konto."
+msgstr "framgångsrikt %<action> s %<username> s konto."
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "aktiverad"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "deaktiveras"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr "Kan inte %<action>s %<username>s"
+msgstr "Kan inte %<action> s %<username> s"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "Aktivera"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "avaktivera"
 
@@ -958,13 +972,13 @@ 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:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "svara"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "<b>skickar ett e-postmeddelande</b> med ämne"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr "kommer att <b>skicka ett mail</b> med ämne %<subject_name> s"
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
@@ -974,19 +988,15 @@ msgstr "kommer att <b>ta bort</b> frågan"
 msgid " will <b>remove</b> questions "
 msgstr "tar <b>bort</b> frågor"
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Överföring anpassning"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Redigera anpassning"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Anpassa"
 
@@ -995,26 +1005,27 @@ msgid "Creators:"
 msgstr "skapare:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Skapare:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s: Din plan har skickats in för feedback"
+msgstr "%<application_name> s: Din plan har skickats in för feedback"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Hej %<user_name>s. </p><p> Din plan \"%<plan_name>s\" har skickats in för feed"
-"back från en administratör i din organisation. Om du har frågor angående denna"
-" åtgärd, kontakta oss på %<organisation_email>s. </p>"
+"<p>Hej %<user_name> s.</p><p> Din plan \"%<plan_name> s\" har skickats för feedb"
+"ack från en administratör på din organisation. Om du har frågor angående denna"
+" åtgärd, vänligen kontakta oss på %<organisation_email> s.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1052,9 +1063,9 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> En databibliotekare från %<org_name>s svarar på din förfrågan inom 48 timma"
-"r. Om du har frågor angående denna åtgärd, kontakta oss på %{organisation_emai"
-"l}. </p>"
+"<p>En databibliotekarie från %<org_name> s kommer att svara på din förfrågan i"
+"nom 48 timmar. Om du har frågor angående denna åtgärd, kontakta oss på %<organ"
+"isation_email> s.</p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1094,8 +1105,8 @@ msgid "Grant API to organisations"
 msgstr "Bevilja API till organisationer"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1138,231 +1149,229 @@ msgstr "Offentlig: alla kan visa."
 msgid "Private: restricted to me and people I invite."
 msgstr "Privat: begränsad till mig och personer jag bjuder in."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Okänt kolumnnamn."
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Plannamn"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "Plan ID"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr "Bidragsnummer"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Huvudforskare / Forskare"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Planera datakontakt"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Planbeskrivning"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Finansiär"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "Din ORCID"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
 msgstr "Ingen"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
-msgstr "Vägledning för: %<themes>s"
+msgstr "Vägledning för: %<themes> s"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
 msgstr "Inget att slå samman"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
-msgstr "<p>Följande %<object_types>s kommer att flyttas till '%<org_name>s':</p>"
+msgstr ""
+"<p>Det följande %<object_types> s kommer att flyttas över till '%<org_name> s'"
+":</p>"
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Skapa plan"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "Förra månaden"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "Senaste 3 månaderna"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "Senaste 6 månaderna"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "Senaste 9 månaderna"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "Senaste 12 månaderna"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "Fråga eller feedback relaterad till %<tool_name>s"
+msgstr "Fråga eller feedback relaterad till %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "Välkommen till %<tool_name>s"
+msgstr "Välkommen till %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "En datahanteringsplan i %<tool_name>s har delats med dig"
+msgstr "En datahanteringsplan i %<tool_name> s har delats med dig"
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
-msgstr "Ändrade behörigheter på en datahanteringsplan i %<tool_name>s"
+msgstr "Ändrade behörigheter för en datahanteringsplan i %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "Behörigheter tas bort på en DMP i %<tool_name>s"
+msgstr "Behörigheter borttagna på en DMP i %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
-msgstr "%<user_name>s har begärt feedback på en %<tool_name>s plan"
+msgstr "%<user_name> s har begärt feedback på en %<tool_name> s plan"
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
-msgstr "%<tool_name>s: Feedback från experter har lämnats för %<plan_title>s"
+msgstr "%<tool_name> s: Expertfeedback har lämnats för %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "DMP-synlighet ändrad: %<plan_title>s"
+msgstr "DMP-synlighet ändrad: %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: En ny kommentar läggs till i %<plan_title>s"
+msgstr "%<tool_name> s: En ny kommentar har lagts till i %<plan_title> s"
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "Administratörsbehörighet beviljas i %<tool_name>s"
+msgstr "Administratörsbehörigheter beviljade i %<tool_name> s"
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "%<tool_name>s API-ändringar"
+msgstr "%<tool_name> s API-ändringar"
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Fas"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Sektion"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Fråga"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "Svar"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Anpassad av:"
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "skapare:"
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr "%<authors> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "%<affiliation>s"
+msgstr "%<affiliation> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Mall:"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr "%<funder> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr "%<template> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr "Bidragsnummer:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr "%<grant_number> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Projektens abstrakt:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr "%<description> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Senast ändrad:"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr "%<date> s"
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Upphovsrättsinformation:"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1386,7 +1395,7 @@ msgstr ""
 "amband med,\n"
 "             ditt projekt eller förslag"
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Inte besvarad"
 
@@ -1396,7 +1405,7 @@ msgid "can't be blank"
 msgstr "måste anges"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "måste vara unik"
 
@@ -1416,41 +1425,40 @@ msgstr "för \"Frågetekst\" kan inte vara tomt."
 msgid "You must specify at least one role."
 msgstr "Du måste ange minst en roll."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "kan inte vara tomt om inget e-postmeddelande tillhandahålls"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr "kan inte vara tom."
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "kan inte vara tomt om inget namn anges"
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr "kan inte vara tom om ingen e-post anges."
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr "kan inte vara tom om inget namn anges."
+
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Valt alternativ (er)"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Besvaras av"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Besvaras vid"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "detaljer"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
-msgstr "Fråga inte besvarad."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
+msgstr "Fråga ej besvarad."
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "redan tilldelat ett värde"
 
@@ -1458,35 +1466,35 @@ msgstr "redan tilldelat ett värde"
 msgid "Feedback email message"
 msgstr "Feedback e-postmeddelande"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "måste vara ett av följande format: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "kan inte vara större än 500 kB"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "organisatoriska"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "offentlig"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "Testa"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "Privat"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "måste vara efter startdatumet"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "vägledning om"
 
@@ -1494,35 +1502,35 @@ msgstr "vägledning om"
 msgid "can't be less than zero"
 msgstr "kan inte vara mindre än noll"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "En obligatorisk inställning har inte lämnats"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "Marginalvärdet är ogiltigt"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "Margin kan inte vara negativ"
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr "Okänd marginal. Kan bara vara \"top\", \"bottom\", \"left\" eller \"right\""
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Ogiltig typsnitt"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Ogiltigt teckensnitt"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Okänd formatering inställning"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Ogiltiga högsta sidor"
 
@@ -1530,83 +1538,85 @@ msgstr "Ogiltiga högsta sidor"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "En historisk mall kan inte hämtas för att ändras"
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! kräver ett organisationsmål"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "Kopia av %<template>s"
+msgstr "Kopia av %<template> s"
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "generate_version! kräver en publicerad mall"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "skräddarsy! kräver ett organisationsmål"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr "skräddarsy! kräver en mall från en funderare"
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "Du kan inte publicera en publicerad mall."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr "Du kan inte publicera en mall utan faser."
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 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:465
+#: ../../app/models/template.rb:461
 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:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "Förhållandena i mallen hänvisar bakåt"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
-msgstr "En datahanteringsplan i %<application_name>s har delats med dig"
-
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "måste vara inloggad"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+msgstr "En datahanteringsplan i %<application_name> s har delats med dig"
+
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "måste ha tillgång till guidningar api"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "måste ha tillgång till planer api"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "har inte behörighet att se den planen"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr "måste ha tillgång till mallar api"
+
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr "Datahanterare"
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr "Projektadministratör"
+
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr "Huvudforskare"
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr "Övrig"
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1617,7 +1627,7 @@ msgstr ""
 "att tolka själva uppgifterna) för initial användning och senare återanvändning"
 "."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1625,7 +1635,7 @@ msgstr ""
 "Genomföra en forsknings- och utredningsprocess, specifikt utföra experimenten "
 "eller insamling av data / bevis."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1633,60 +1643,60 @@ msgstr ""
 "Lednings- och samordningsansvar för planering och genomförande av forskningsak"
 "tiviteter."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Ogiltig bidragstyp"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "Ogiltiga uppgifter"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Ogiltig token"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Token gick ut"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Saknar token"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ": title och kontaktens: mbox är båda obligatoriska fält"
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr ": typ och: identifierare krävs för alla id: n"
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ": namn krävs för varje: anslutning och: finansiering"
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ": roll och antingen: namn eller: e-post krävs för varje: bidragsgivare"
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ": namn,: funder_id eller: grant_id krävs för varje finansiering"
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr ": title krävs för varje: dataset"
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr "Ogiltig JSON"
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "upgrade_customization! kräver en anpassad mall"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1696,24 +1706,24 @@ msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "måste vara efter %<date>s"
+msgstr "måste vara efter %<date> s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "En nyckel \"org\" förväntas för länkar hash"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "En hash väntas för länkar"
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "En nyckel %<key>s förväntas för länkar hash"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "Nyckeln %<key>s har inte en giltig uppsättning objektlänkar"
+msgstr "Nyckeln %<key> s har inte en giltig uppsättning objektlänkar"
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr "En tangent %<key> s förväntas för länkhash"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1721,10 +1731,10 @@ msgstr "Följande svar kan inte sparas"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"eftersom %<name>s sparade svaret nedan medan du redigerade. Vänligen, kombinera"
+"eftersom %{name} sparade svaret nedan medan du redigerade. Vänligen, kombinera"
 " dina ändringar och spara sedan svaret igen."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1752,14 +1762,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Vänligen vänta, Standarder laddas"
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1770,11 +1780,11 @@ msgstr "Vänligen vänta, Standarder laddas"
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1798,8 +1808,8 @@ msgid "Answered"
 msgstr "svarade"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr "av %<user_name>s"
+msgid " by %{user_name}"
+msgstr "av %{user_name}"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1855,12 +1865,13 @@ msgstr "Ämne"
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Säkerhetskontroll"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Skicka"
@@ -1876,18 +1887,18 @@ msgstr "Kontakta oss"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s tillhandahålls av %<organisation_name>s. <br /> Du kan läsa"
-" mer om oss på vår <a href=\"%<organisation_url>s\" class=\"has-new-window-popup-i"
+"%{application_name} tillhandahålls av %{organisation_name}. <br /> Du kan läsa"
+" mer om oss på vår <a href=\"%{organisation_url}\" class=\"has-new-window-popup-i"
 "nfo\" target=\"_blank\">webbplats <em class=\"sr-only\">(nytt fönster)</em> <span c"
-"lass=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a> . Om du vil"
-"l kontakta oss om %<application_name>s, fyll i formuläret nedan."
+"lass=\"new-window-popup-info\">%{open_in_new_window_text}</span></a> . Om du vil"
+"l kontakta oss om %{application_name}, fyll i formuläret nedan."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
 #: ../../app/views/layouts/_branding.html.erb:37
@@ -1921,21 +1932,21 @@ msgstr "Välj varje roll som gäller bidragsgivaren."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Anslutning"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "roller"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1955,19 +1966,19 @@ msgstr "roller"
 msgid "Remove"
 msgstr "ta bort"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2033,14 +2044,14 @@ msgstr "Bekräfta lösenord"
 msgid "First name"
 msgstr "Förnamn"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Efternamn"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2049,8 +2060,8 @@ msgid "Create account"
 msgstr "Skapa ett konto"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "Välkommen till %<application_name>s"
+msgid "Welcome to %{application_name}"
+msgstr "Välkommen till %{application_name}"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2068,26 +2079,32 @@ msgstr "eller kopiera"
 msgid "into your browser"
 msgstr "i din webbläsare"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "Fråga eller feedback relaterad till %{tool_name}"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Hej %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Hej %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Din kollega %<inviter_name>s har bjudit in dig att bidra till deras datahanteri"
-"ngsplan i %<tool_name>s"
+"Din kollega %{inviter_name} har bjudit in dig att bidra till deras datahanteri"
+"ngsplan i %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%<click_here>s för att acceptera inbjudan, (eller kopiera %<link>s till din webb"
+"%{click_here} för att acceptera inbjudan, (eller kopiera %{link} till din webb"
 "läsare). Om du inte vill acceptera inbjudan, ignorerar du det här e-postmeddel"
 "andet."
 
@@ -2107,8 +2124,8 @@ msgstr "med vänliga hälsningar"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "Teamet %<tool_name>s"
+msgid "The %{tool_name} team"
+msgstr "Teamet %{tool_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2119,22 +2136,22 @@ msgstr "Var god och svara ej på detta mail."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
-"Om du har några frågor eller behöver hjälp, kontakta oss på %<helpdesk_email>s "
-"eller besök %<contact_us_url>s"
+"Om du har några frågor eller behöver hjälp, kontakta oss på %{helpdesk_email} "
+"eller besök %{contact_us_url}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Hej %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Hej %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"Någon har begärt en länk för att ändra ditt lösenord för %<tool_name>s. Du kan "
+"Någon har begärt en länk för att ändra ditt lösenord för %{tool_name}. Du kan "
 "göra det genom länken nedan."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2148,11 +2165,11 @@ msgstr "Om du inte begärt detta, ignorerar du det här e-postmeddelandet."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
-"Om du har några frågor eller behöver hjälp, kontakta oss på %<helpdesk_email>s "
-"eller besök %<contact_us>s"
+"Om du har några frågor eller behöver hjälp, kontakta oss på %{helpdesk_email} "
+"eller besök %{contact_us}"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2224,22 +2241,22 @@ msgstr "Dokumentation"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Se <a href=\"%<api_v0_wiki>s\">dokumentationen för v0</a> för mer information om "
+"Se <a href=\"%{api_v0_wiki}\">dokumentationen för v0</a> för mer information om "
 "det ursprungliga API: et som inkluderar åtkomst till statistik, planens fullst"
 "ändiga text och möjligheten att ansluta användare till avdelningar."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Se <a href=\"%<api_v1_wiki>s\">dokumentationen för v1</a> för mer information om "
-"API som stöder <a href=\"%<rda_standard_url>s\">RDA Common metadata standard för "
+"Se <a href=\"%{api_v1_wiki}\">dokumentationen för v1</a> för mer information om "
+"API som stöder <a href=\"%{rda_standard_url}\">RDA Common metadata standard för "
 "DMP.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2410,8 +2427,8 @@ msgid "Sign in or Create account"
 msgstr "Logga in eller Skapa konto"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "Har du ett %<application_name>s konto?"
+msgid "Do you have a %{application_name} account?"
+msgstr "Har du ett %{application_name} konto?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2426,8 +2443,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Detta kopplar ditt befintliga konto till dina uppgifter."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "Nej %<application_name>s konto?"
+msgid "No %{application_name} account?"
+msgstr "Nej %{application_name} konto?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2494,7 +2511,7 @@ msgstr "kollapsa alla"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Guidningsgrupp"
@@ -2577,7 +2594,7 @@ msgstr "Skapa vägledning"
 msgid "Enter your guidance here. You can include links where needed."
 msgstr "Ange din vägledning här. Du kan inkludera länkar där det behövs."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2589,26 +2606,26 @@ msgstr ""
 "ningar som du skapar vägledning för, över alla mallar som har frågor med motsv"
 "arande temakoder."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Välj vilken grupp denna vägledning avser."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 "Markera den här rutan när du är redo för att denna vägledning ska visas på anv"
 "ändarens planer."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "Publicerad?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %<application_name>s har utvecklats av <strong>%<organisation_name>s för</st"
+"<p> %{application_name} har utvecklats av <strong>%{organisation_name} för</st"
 "rong> att hjälpa dig att skriva datahanteringsplaner. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2794,8 +2811,9 @@ msgid "Logout"
 msgstr "Logga ut"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
-msgstr "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
+msgstr "%{application_name}"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2870,11 +2888,11 @@ msgstr "Öppnar i nytt fönster"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"%<n>s resultat är tillgängliga, använd upp- och nedpilarna för att navigera i f"
+"%{n} resultat är tillgängliga, använd upp- och nedpilarna för att navigera i f"
 "örslag. Använd Enter-knappen för att välja ett förslag eller Escape-knappen fö"
 "r att stänga förslagen."
 
@@ -2926,8 +2944,8 @@ msgid "Example answer"
 msgstr "Exempel Svar"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr "%<org>s Exempel Svar"
+msgid "%{org} Example Answer"
+msgstr "%{org} Exempel Svar"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3081,10 +3099,10 @@ msgstr "Ta bort fas"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Du håller på att ta bort fasen \"%<phase_title>s\". Detta tar bort alla avsnitt o"
+"Du håller på att ta bort fasen \"%{phase_title}\". Detta tar bort alla avsnitt o"
 "ch frågor som anges nedan. Är du säker?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3143,8 +3161,8 @@ msgid "Write plan"
 msgstr "Skriv Plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "%<org_name>s Planer"
+msgid "%{org_name} Plans"
+msgstr "%{org_name} Planer"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3195,10 +3213,10 @@ msgstr "Meddela planägaren att jag är klar med att ge feedback"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Ladda ner planer <em class=\"sr-only\">(nytt fönster)</em> <span class=\"new-wind"
-"ow-popup-info\">%<open_in_new_window_text>s</span>"
+"ow-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3227,8 +3245,8 @@ msgstr ""
 "at (t ex tabeller) kan du ange den här stilen här."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Fråga %<number>s:"
+msgid "Question %{number}:"
+msgstr "Fråga %{number}:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3295,15 +3313,15 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "radera"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
-msgstr "Du håller på att ta bort fråga # %<question_number>s. Är du säker?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgstr "Du håller på att ta bort fråga # %{question_number}. Är du säker?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3402,10 +3420,10 @@ msgstr "Ange en rubrik för avsnittet"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Du håller på att ta bort '%<section_title>s'. Detta påverkar frågor som är kopp"
+"Du håller på att ta bort '%{section_title}'. Detta påverkar frågor som är kopp"
 "lade till det här avsnittet. Är du säker?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3434,8 +3452,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "för intern %<org_name>s användning endast"
+msgid "for internal %{org_name} use only"
+msgstr "för intern %{org_name} användning endast"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3599,28 +3617,32 @@ msgstr ""
 "rganisation när ingen mallar är tillämpliga. Om du vill lägga till frågor till"
 " fundermallar använder du alternativen 'Anpassa mall' nedan."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "%{org_name} Mallar"
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Anpassningsbara mallar"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Alla (%<count>s)"
+msgid "All (%{count})"
+msgstr "Alla (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "Publicerad (%<count>s)"
+msgid "Published (%{count})"
+msgstr "Publicerad (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "Ej offentliggjord (%<count>s)"
+msgid "Unpublished (%{count})"
+msgstr "Ej offentliggjord (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "Ej anpassad (%<count>s)"
+msgid "Not customised (%{count})"
+msgstr "Ej anpassad (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3629,8 +3651,8 @@ msgstr "Skapa en mall"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "Redigera profil för %<username>s"
+msgid "Editing profile for %{username}"
+msgstr "Redigera profil för %{username}"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3638,8 +3660,8 @@ msgid "View all users"
 msgstr "Visa alla användare"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "Planer för %<username>s"
+msgid "Plans of %{username}"
+msgstr "Planer för %{username}"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3669,7 +3691,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Om någon av ovanstående identifierare är felaktiga eller saknas, vänligen <a h"
-"ref=\"%<contact_us_url>s\">kontakta oss för</a> att få dem uppdaterade."
+"ref=\"%{contact_us_url}\">kontakta oss för</a> att få dem uppdaterade."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3699,10 +3721,10 @@ msgstr "Slå samman organisationer"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
 "Välj den organisation som kommer att ersätta den nuvarande organisationen: ' <"
-"strong>%<org_name>s</strong> '."
+"strong>%{org_name}</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3878,21 +3900,21 @@ msgid "Last Accessed"
 msgstr "Senaste åtkomst"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Aldrig"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Du håller på att radera '%<client_name>s'. De kommer inte längre att kunna komm"
+"Du håller på att radera '%{client_name}'. De kommer inte längre att kunna komm"
 "a åt API: et. Är du säker?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
-msgstr "Du håller på att radera '%<contributor_name>s'. Är du säker?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgstr "Du håller på att radera '%{contributor_name}'. Är du säker?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3905,10 +3927,10 @@ msgstr "Förkortat namn eller kod"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Du håller på att ta bort '%<department_name>s'. Detta kommer att påverka vägled"
+"Du håller på att ta bort '%{department_name}'. Detta kommer att påverka vägled"
 "ning. Är du säker?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3949,15 +3971,15 @@ msgstr "publicera"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Du håller på att ta bort '%<guidance_group_name>s'. Detta kommer att påverka vä"
+"Du håller på att ta bort '%{guidance_group_name}'. Detta kommer att påverka vä"
 "gledning. Är du säker?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
-msgstr "Du håller på att ta bort '%<guidance_summary>s'. Är du säker?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgstr "Du håller på att ta bort '%{guidance_summary}'. Är du säker?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -3993,8 +4015,23 @@ msgid "Managed"
 msgstr "Managed"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
-msgstr "Du håller på att ta bort '%<org_name>s'. Är du säker?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr "Du håller på att ta bort '%{org_name}'. Är du säker?"
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Projektnamn"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Testa"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4024,25 +4061,10 @@ msgstr ""
 "gen och ett fyrsiffrigt år i sökrutan ovan. <br> Till exempel: 'okt 2019' elle"
 "r 'juni 2013'."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Projektnamn"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "skapad"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Testa"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4161,10 +4183,10 @@ msgstr "Publicera ändringar"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Är du säker på att du vill ta bort din anpassning av \"%<template_title>s\"? Alla"
+"Är du säker på att du vill ta bort din anpassning av \"%{template_title}\"? Alla"
 " publicerade versioner blir inte tillgängliga för användare."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4181,10 +4203,10 @@ msgstr "Visa anpassningar"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Är du säker på att du vill ta bort \"%<template_title>s\"? Alla publicerade versi"
+"Är du säker på att du vill ta bort \"%{template_title}\"? Alla publicerade versi"
 "oner blir inte tillgängliga för användare."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4347,22 +4369,22 @@ msgstr "Höger"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Ladda ner plan <em class=\"sr-only\">(nytt fönster)</em> <span class=\"new-window"
-"-popup-info\">%<open_in_new_window_text>s</span>"
+"-popup-info\">%{open_in_new_window_text}</span>"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr "Välj vägledning"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"För att hjälpa dig att skriva din plan kan %<application_name>s visa vägledning"
+"För att hjälpa dig att skriva din plan kan %{application_name} visa vägledning"
 " från olika organisationer."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4383,11 +4405,11 @@ msgstr "Det finns ingen ytterligare vägledning för denna mall."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"För att hjälpa dig att skriva din plan kan %<application_name>s visa vägledning"
+"För att hjälpa dig att skriva din plan kan %{application_name} visa vägledning"
 " från olika organisationer. Välj upp till 6 organisationer av följande organis"
 "ationer som erbjuder vägledning som är relevant för din plan."
 
@@ -4413,19 +4435,19 @@ msgstr "Skriv Plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
-"Den här planen är baserad på \"%<template_title>s\" mallen som tillhandahålls av "
-"%<org_name>s."
+"Den här planen är baserad på \"%{template_title}\" mallen som tillhandahålls av "
+"%{org_name}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
-msgstr "Mallversion %<template_version>s, publicerad på %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
+msgstr "Mallversion %{template_version}, publicerad på %{published_date}"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4443,11 +4465,11 @@ msgstr[1] "frågor"
 msgid "answered"
 msgstr "svarade"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr "Om du ansöker om finansiering, ange namnet exakt som i bidragsförslaget."
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4455,49 +4477,94 @@ msgstr ""
 "Sammanfattningsvis sammanfatta ditt forskningsprojekt för att hjälpa andra att"
 " förstå de syften för vilka uppgifterna samlas in eller skapas."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr "Ett relevant ID som bestäms av funderaren och / eller organisationen."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+"Om det finns några potentiella etiska frågor relaterade till data som denna DM"
+"P beskriver"
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr "Beskrivning av de etiska frågorna"
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr "Länk till ett protokoll från ett möte med en etikkommitté"
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr "mock projekt för testning, övning eller utbildningsändamål"
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Projektens abstrakt"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr "Forskningsdomän"
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr "- Välj en -"
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Projektstart"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "Det beräknade datumet för vilket du börjar projektet."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Projektets slut"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "Det uppskattade datum då du kommer att slutföra projektet."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "Landningssida"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "ID"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr "Forskningsresultat kan ha etiska problem"
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr "Beskriv eventuella etiska problem"
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr "Etiska protokoll"
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr "Finansieringsstatus"
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
 msgstr "Bevilja nummer / url"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr "Bidragsnummer:"
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4536,11 +4603,11 @@ msgstr "Ange planens synlighet"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Offentlig eller organisatorisk synlighet är avsedd för färdiga planer. Du måst"
-"e svara minst %<percentage>s %% av frågorna för att aktivera dessa alternativ. "
+"e svara minst %{percentage} %% av frågorna för att aktivera dessa alternativ. "
 "Obs! Testplanerna är som standard inställda på privat sikt."
 
 #: ../../app/views/plans/_share_form.html.erb:19
@@ -4629,8 +4696,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Klicka på knappen \"Skapa plan\" nedan för att börja."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "%<org_title>s Planer"
+msgid "%{org_title} Plans"
+msgstr "%{org_title} Planer"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4710,11 +4777,11 @@ msgstr "Vi hittade flera DMP-mallar som motsvarar din funderare."
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Offentliga DMP är planer som skapats med hjälp av %<application_name>s -tjänste"
+"Offentliga DMP är planer som skapats med hjälp av %{application_name} -tjänste"
 "n och delas offentligt av sina ägare. De är inte kända för kvalitet, fullständ"
 "ighet eller efterlevnad av funderingsriktlinjer."
 
@@ -4763,8 +4830,8 @@ msgid "terms and conditions"
 msgstr "Villkor"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "Vill du skapa en plan baserad på mallen \"%<name>s\"?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "Vill du skapa en plan baserad på mallen \"%{name}\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4815,41 +4882,46 @@ msgstr "Ta bort filtret"
 msgid "Filter plans"
 msgstr "Filter planer"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Fråga inte besvarad."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
-msgstr "En datahanteringsplan skapad med hjälp av %<application_name>s"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
+msgstr "En datahanteringsplan skapad med hjälp av %{application_name}"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Anslutning:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr "Grundare:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "ORCID iD:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
 msgstr "ID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
 msgstr "Start datum:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
 msgstr "Slutdatum:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
 msgstr "Bidragsnummer / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4871,8 +4943,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Börja skriva för att se en lista med förslag."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -4881,14 +4953,14 @@ msgstr ""
 "En ny post skapas för den organisation du har namngivit ovan. Kontrollera att "
 "din organisation inte visas i listan i något annorlunda formulär."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Namnet du angav var inte ett av de listade förslagen!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "Om %<application_name>s"
+msgid "About %{application_name}"
+msgstr "Om %{application_name}"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4966,10 +5038,10 @@ msgstr "Vi uppmanar dig att läsa igenom DMPRoadmap GitHub wiki för att lära d
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "engagera sig <em class=\"sr-only\">(nytt fönster)</em> <span class=\"new-window-p"
-"opup-info\">%<open_in_new_window_text>s</span>"
+"opup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -4988,8 +5060,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Om du har ett konto, logga in och börja skapa eller redigera din DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "Om du inte har ett %<application_name>s konto klickar du på"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "Om du inte har ett %{application_name} konto klickar du på"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5027,13 +5099,14 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"När du loggar in på DMPRoadmap kommer du att skickas till sidan \"Min Dashboard"
-"\". Härifrån kan du redigera, dela, hämta, kopiera eller ta bort några av dina "
-"planer. Du kommer också att se planer som har delats med dig av andra."
+"När du loggar in på %{application_name} kommer du att dirigeras till sidan 'My"
+" Dashboard'. Härifrån kan du redigera, dela, ladda ner, kopiera eller ta bort "
+"alla dina planer. Du kommer också att se planer som har delats med dig av andr"
+"a."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5183,13 +5256,13 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
 "Härifrån kan du ladda ner din plan i olika format. Det kan vara användbart om "
 "du behöver lämna in din plan som en del av en bidragsansökan. Välj vilket form"
 "at du vill visa / ladda ner din plan och klicka för att ladda ner. Du kan ocks"
 "å justera formateringen (typsnitt, storlek och marginaler) för PDF-filer, vilk"
-"et kan vara till hjälp om du arbetar till sidgränser. </p>"
+"et kan vara till hjälp om du arbetar till sidgränser."
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5197,46 +5270,46 @@ msgstr "Information om dig: hur vi använder den och med vilken vi delar den"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"Informationen du tillhandahåller kommer att användas av %<org_name>s för att er"
-"bjuda dig tillgång till och personalisering av tjänsten %<application_name>s."
+"Informationen du tillhandahåller kommer att användas av %{org_name} för att er"
+"bjuda dig tillgång till och personalisering av tjänsten %{application_name}."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%<org_name>s behandlar personuppgifterna för %<application_name>s -användare för"
-" att leverera och förbättra tjänsten [%<org_name>sA2] på ett anpassat sätt och "
+"%{org_name} behandlar personuppgifterna för %{application_name} -användare för"
+" att leverera och förbättra tjänsten [%{org_name}A2] på ett anpassat sätt och "
 "för att säkerställa att varje användare får relevant information."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Behandlingen av dina personuppgifter av %<org_name>s är nödvändig för att följa"
+"Behandlingen av dina personuppgifter av %{org_name} är nödvändig för att följa"
 " följande legitima intressen:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"För att ge tillgång till tjänsten %<application_name>s och personalisering av d"
+"För att ge tillgång till tjänsten %{application_name} och personalisering av d"
 "in användarupplevelse, t.ex. tillhandahållande av relevanta mallar och vägledn"
 "ing för din organisation."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"För att hålla dig uppdaterad med nyheter om %<application_name>s, som nya funkt"
+"För att hålla dig uppdaterad med nyheter om %{application_name}, som nya funkt"
 "ioner eller förbättringar, eller ändringar i vår sekretesspolicy."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5246,29 +5319,29 @@ msgstr "För nätverks- och informationssäkerhetsändamål."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
 "Vi håller de personuppgifter du gav oss så länge du fortsätter att använda tjä"
-"nsten %<application_name>s. Dina personuppgifter kan tas bort från denna tjänst"
-" på begäran till %<application_name>s -laget inom 30 dagar."
+"nsten %{application_name}. Dina personuppgifter kan tas bort från denna tjänst"
+" på begäran till %{application_name} -laget inom 30 dagar."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
 "Om du har några frågor, vänligen kontakta teamet på <a href='mailto:%{helpdesk"
-"_email}'>%<application_name>s</a> på: <a href='mailto:%<helpdesk_email>s'>%{help"
+"_email}'>%{application_name}</a> på: <a href='mailto:%{helpdesk_email}'>%{help"
 "desk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Detta uttalande ändrades senast den %<revdate>s och kan ändras när som helst me"
+"Detta uttalande ändrades senast den %{revdate} och kan ändras när som helst me"
 "d föregående meddelande."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5282,31 +5355,28 @@ msgstr ""
 " of California. Vår primära valkrets är forskargruppen. Vi tillhandahåller tjä"
 "nster till Storbritannien, USA och internationell högre utbildningssektor."
 
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMPRoadmap"
-
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"DMPRoadmap ('verktyget', 'systemet') är ett verktyg som utvecklats av DCC och "
-"CDL som en gemensam resurs för forskargruppen. Det är värd på CDL vid Universi"
-"ty of California Curation Center."
+"%{application_name} ('verktyget', 'systemet') är ett verktyg utvecklat av DCC "
+"och CDL som en delad resurs för forskarsamhället. Det är värd på CDL av Univer"
+"sity of California Curation Center."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5337,11 +5407,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5356,74 +5427,75 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3> Dina personliga uppgifter och medgivande </h3><p> För att hjälpa dig att "
-"identifiera och administrera ditt konto med DMPRoadmap måste vi lagra ditt nam"
-"n och din e-postadress. Vi kan också använda den för att kontakta dig för att "
-"få feedback om din användning av verktyget eller för att informera dig om den "
-"senaste utvecklingen eller utsläpp. Informationen kan överföras mellan DCC och"
-" CDL men endast för följande legitima DCC- och CDL-syften: marknadsföring, för"
-"bättring av våra tjänster och informera dig om relevant innehåll och händelser"
-". Vi kommer inte att sälja, hyra eller handla någon personlig information som "
-"du tillhandahåller oss. Genom att använda detta system samtycker du till insam"
-"ling, lagring och användning av din personliga information i enlighet med ovan"
-"stående. Du har rätt att be oss om att inte behandla dina personuppgifter i ma"
-"rknadsföringssyfte. </p><h3> Integritetspolicy </h3><p> Informationen du anger"
-" i detta system kan ses av dig, personer du har valt att dela åtkomst med, och"
-" - enbart för att upprätthålla tjänsten - systemadministratörer på DCC och CDL"
-". Vi sammanställer anonymiserad, automatiserad och aggregerad information från"
-" planer, men vi kommer inte direkt att få tillgång till, använda eller dela di"
-"tt innehåll med någon annan utan ditt tillstånd. Auktoriserade tjänstemän i di"
-"n hemorganisation kan komma åt dina planer för specifika ändamål - till exempe"
-"l för att spåra efterlevnaden av finansierings- / organisationskrav, för att b"
-"eräkna lagringskrav eller för att bedöma efterfrågan på datahanteringstjänster"
-" inom olika discipliner. </p><h3> Informationsfrihet </h3><p> DCC och CDL håll"
-"er dina planer för dina räkning, men de är din egendom och ansvar. Alla FOIA-s"
-"ökande kommer att hänvisas tillbaka till din hemorganisation. </p><h3> lösenor"
-"d </h3><p> Ditt lösenord lagras i krypterad form och kan inte hämtas. Om det ä"
-"r glömt måste det återställas. </p><h3> Småkakor </h3><p> Observera att DMPRoa"
-"dmap använder cookies. Mer information om kakor och hur vi använder dem finns "
-"på <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-site/website-t"
-"erms-use/cookies' class=\"has-new-window-popup-info\">DCC: s huvudsida <em class"
-"=\"sr-only\">(nytt fönster)</em> <span class=\"new-window-popup-info\">%{open_in_n"
-"ew_window_text}</span></a> . </p><h3> Tredjeparts API: er </h3><p> Vissa funkt"
-"ioner på denna webbplats använder tredjeparts tjänster och API: er som InCommo"
-"n / Shibboleth eller tredjepartshotell för vanliga JavaScript-bibliotek eller "
-"webbstilsort. Information som används av en extern tjänst regleras av den tjän"
-"stens integritetspolicy. </p><h3> revideringar </h3><p> Detta uttalande revide"
-"rades senast 5 oktober 2017 och kan ändras när som helst. Användning av verkty"
-"get indikerar att du förstår och samtycker till dessa villkor. </p>"
-
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+"<h3>Din personliga information och meddelande om samtycke</h3><p> För att hjäl"
+"pa till att identifiera och administrera ditt konto med %{application_name}, m"
+"åste vi lagra ditt namn och din e-postadress. Vi kan också använda den för att"
+" kontakta dig för att få feedback om din användning av verktyget, eller för at"
+"t informera dig om den senaste utvecklingen eller utgåvorna. Informationen får"
+" överföras mellan DCC och CDL men endast för följande legitima DCC- och CDL-än"
+"damål: marknadsföring, förbättring av våra tjänster och informera dig om relev"
+"ant innehåll och evenemang. Vi kommer inte att sälja, hyra ut eller handla med"
+" någon personlig information som du lämnar till oss. Genom att använda detta s"
+"ystem samtycker du till insamling, lagring och användning av din personliga in"
+"formation i enlighet med ovanstående. Du har rätt att be oss att inte behandla"
+" dina personuppgifter i marknadsföringssyfte.</p><h3> Integritetspolicy</h3><p"
+"> Informationen du anger i detta system kan ses av dig, personer du har valt a"
+"tt dela åtkomst med, och - enbart i syfte att underhålla tjänsten - systemadmi"
+"nistratörer på DCC och CDL. Vi sammanställer anonymiserad, automatiserad och a"
+"ggregerad information från planer, men vi kommer inte att direkt komma åt, anv"
+"ända eller dela ditt innehåll med någon annan utan din tillåtelse. Auktorisera"
+"de tjänstemän för din hemorganisation kan komma åt dina planer för specifika ä"
+"ndamål - till exempel för att spåra efterlevnad av finansiärer/organisationskr"
+"av, för att beräkna lagringskrav eller för att bedöma efterfrågan på datahante"
+"ringstjänster över discipliner.</p><h3> Informationsfrihet</h3><p> DCC och CDL"
+" håller dina planer för din räkning, men de är din egendom och ditt ansvar. Ev"
+"entuella FOIA-sökande kommer att hänvisas tillbaka till din hemorganisation.</"
+"p><h3> Lösenord</h3><p> Ditt lösenord lagras i krypterad form och kan inte häm"
+"tas. Om den glöms måste den återställas.</p><h3> Småkakor</h3><p> Observera at"
+"t %{application_name} använder cookies. Mer information om cookies och hur vi "
+"använder dem finns på <a target='_blank' href='http://www.dcc.ac.uk/about-us/a"
+"bout-site/website-terms-use/cookies' class=\"has-new-window-popup-info\">DCC:s h"
+"uvudwebbplats <em class=\"sr-only\">(nytt fönster)</em> <span class=\"new-window-"
+"popup-info\">%{open_in_new_window_text}</span></a> .</p><h3> Tredje parts API:e"
+"r</h3><p> Vissa funktioner på denna webbplats använder tredjepartstjänster och"
+" API:er som InCommon/Shibboleth eller tredje parts värd för vanliga JavaScript"
+"-bibliotek eller webbteckensnitt. Information som används av en extern tjänst "
+"styrs av integritetspolicyn för den tjänsten.</p><h3> Revisioner</h3><p> Detta"
+" uttalande reviderades senast den 5 oktober 2017 och kan när som helst revider"
+"as. Användning av verktyget indikerar att du förstår och godkänner dessa villk"
+"or.</p>"
+
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Kontaktnamn"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "Kontakta email"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr "Klient ID"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr "Klienthemlighet"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Senast öppnat den"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "Uppdatera klient-ID och hemlighet"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "E-postinformation för kontakt"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr "Är du säker på att du vill ta bort API-klienten: \"%<name>s\""
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr "Är du säker på att du vill ta bort API-klienten: \"%{name}\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5439,8 +5511,8 @@ msgid "View all API clients"
 msgstr "Visa alla API-klienter"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "Uppgifterna har skickats till %<email>s."
+msgid "The credentials have been sent to %{email}."
+msgstr "Uppgifterna har skickats till %{email}."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5487,9 +5559,9 @@ msgstr "Dismissable"
 msgid "Body"
 msgstr "Kropp"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "Är du säker på att du vill radera meddelandet \"%<title>s\""
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "Är du säker på att du vill radera meddelandet \"%{title}\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5514,8 +5586,8 @@ msgid "New Notification"
 msgstr "Ny anmälan"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
-msgstr "Sammanfogar '%<from_org_name>s' till '%<to_org_name>s'"
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgstr "Sammanfogar '%{from_org_name}' till '%{to_org_name}'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5523,11 +5595,11 @@ msgstr "Sammanfattning:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Räkningar av '%<to_org_name>s' registreras före och efter en sammanslagning med"
-" %<from_org_name>s."
+"Räkningar av '%{to_org_name}' registreras före och efter en sammanslagning med"
+" %{from_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:44
@@ -5535,12 +5607,12 @@ msgid "Record Type"
 msgstr "Inspelningstyp"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
-msgstr "'%<to_org_name>s' Räkna - innan sammanslagning"
+msgid "'%{to_org_name}' Count - before merge"
+msgstr "'%{to_org_name}' Räkna - innan sammanslagning"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
-msgstr "'%<to_org_name>s' Räkna - efter sammanslagning"
+msgid "'%{to_org_name}' Count - after merge"
+msgstr "'%{to_org_name}' Räkna - efter sammanslagning"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5549,22 +5621,22 @@ msgstr "Detaljer:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Tabellen nedan visar de specifika förändringar som kommer att inträffa under s"
-"ammanslagningsprocessen. När sammanslagningen är klar kommer '%<from_org_name>s"
+"ammanslagningsprocessen. När sammanslagningen är klar kommer '%{from_org_name}"
 "' att raderas. Du kan sedan konsolidera / korrigera eventuella sammanslagnings"
 "problem (t.ex. ta bort alla avdelningar som duplicerats)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
-msgstr "%<from_org_name>s - Innan"
+msgid "%{from_org_name} - Before"
+msgstr "%{from_org_name} - Innan"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
-msgstr "%<to_org_name>s - Innan"
+msgid "%{to_org_name} - Before"
+msgstr "%{to_org_name} - Innan"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5592,10 +5664,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Varning: '%<from_org_name>s' har planer som för närvarande håller på att gransk"
+"Varning: '%{from_org_name}' har planer som för närvarande håller på att gransk"
 "as. Org-administratörerna kanske inte kan se dessa planer efter sammanslagning"
 "en!"
 
@@ -5620,8 +5692,8 @@ msgid "New organisation"
 msgstr "Ny organisation"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "Är du säker på att du vill radera temat \"%<title>s\"?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "Är du säker på att du vill radera temat \"%{title}\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5650,11 +5722,11 @@ msgstr "arkiv"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Du håller på att arkivera %<user_name>s. Detta tar bort deras personliga inform"
+"Du håller på att arkivera %{user_name}. Detta tar bort deras personliga inform"
 "ation, men behåller sina planer, svar och kommentarer. De kommer inte att kunn"
 "a logga in. Är du säker?"
 
@@ -5755,94 +5827,93 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr "Du kan ändra dina inställningsinställningar på din profilsida."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Hej %<username>s"
+msgid "Hello %{username}"
+msgstr "Hej %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
-msgstr "Du har fått administratörsbehörigheter i %<tool_name>s:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
+msgstr "Du har fått administratörsbehörigheter i %{tool_name}:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
-msgstr "Du har återkallats administratörsbehörigheter i %<tool_name>s."
+msgid "You have been revoked administrator privileges in %{tool_name}."
+msgstr "Du har återkallats administratörsbehörigheter i %{tool_name}."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
-"Mer information om hur du administrerar %<tool_name>s för användare i din organ"
-"isation finns på %<help_url>s."
+"Mer information om hur du administrerar %{tool_name} för användare i din organ"
+"isation finns på %{help_url}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Hej %<name>s,"
+msgid "Hello %{name},"
+msgstr "Hej %{name},"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
-msgstr "Använd följande referenser när du öppnar API: n %<tool_name>s."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgstr "Använd följande referenser när du öppnar API: n %{tool_name}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
-msgstr "Se API-dokumentationen på: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgstr "Se API-dokumentationen på: %{api_documentation_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
-"Dela inte dessa referenser. De kan användas med %<external_application>s -progr"
+"Dela inte dessa referenser. De kan användas med %{external_application} -progr"
 "ammet. Om du delar dina referenser med en annan applikation förbehåller vi oss"
 " rätten att återkalla din åtkomst till API: t."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"Om du inte begärde åtkomst till %<tool_name>s API eller inte begärde att dina r"
-"eferenser skulle förnyas, vänligen kontakta oss på %<helpdesk_email>s"
+"Om du inte begärde åtkomst till %{tool_name} API eller inte begärde att dina r"
+"eferenser skulle förnyas, vänligen kontakta oss på %{helpdesk_email}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Hej %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Hej %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s har slutat ge feedback på planen \"%<link_html>s\". Kommentarer finn"
+"%{commenter} har slutat ge feedback på planen \"%{link_html}\". Kommentarer finn"
 "s i fliken \"Skriv plan\" på höger sida av sidan (Vägledning / Kommentarer)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Hej %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Hej %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s har begärt feedback på en plan %<link_html>s. För att lägga till k"
-"ommentarer, besök sidan \"Planer\" under Admin-menyn i %<tool_name>s och öppna pl"
+"%{requestor} har begärt feedback på en plan %{link_html}. För att lägga till k"
+"ommentarer, besök sidan \"Planer\" under Admin-menyn i %{tool_name} och öppna pl"
 "anen."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s har kommenterat din plan %<plan_title>s. Om du vill se kommen"
+"%{commenter_name} har kommenterat din plan %{plan_title}. Om du vill se kommen"
 "tarerna följer du länken till DMP nedan eller navigerar till planen via sidan "
-"Mina instrumentbrädor i %<tool_name>s."
+"Mina instrumentbrädor i %{tool_name}."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5857,24 +5928,28 @@ msgstr ""
 "åga."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "DMP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "DMP: %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Sektionsnamn: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Sektionsnamn: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Fråga: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Fråga: %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr "Hej %{recepientname}"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"Dina rättigheter gällande %<plan_title>s har ändrats. Du har nu tillgång till %"
-"{type}. Det betyder att du kan %<placeholder1>s %<placeholder2>s"
+"Dina rättigheter gällande %{plan_title} har ändrats. Du har nu tillgång till %"
+"{type}. Det betyder att du kan %{placeholder1} %{placeholder2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5889,8 +5964,8 @@ msgid " has been removed by "
 msgstr " har tagits bort av"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "Planen %<plan_title>s hade sin synlighet ändrad till %<plan_visibility>s."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "Planen %{plan_title} hade sin synlighet ändrad till %{plan_visibility}."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5907,14 +5982,14 @@ msgstr "Offentlig: Alla kan se på webben"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
 "Om du har frågor angående denna åtgärd, besöker du sidan Mina instrumentbrädor"
-" i %<tool_name>s"
+" i %{tool_name}"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Hej %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
+msgstr "Hej %{recipient_name},"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5934,33 +6009,31 @@ msgstr " baserat på mallen"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
-msgstr ""%<inviter_name>s
-"Din kollega %{inviter_name} har bju%<tool_name>stt bidra till
-\n"
+msgstr ""
+"Din kollega %{inviter_name} har bjudit in dig att bidra till
\n"
 "          sin datahanteringsplan i %{tool_name}"
-%<tool_name>s%<username>s
-#: ../../app/views/user%<tool_name>som%<username>sion.html.erb:2
+
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Välkommen till %{tool_name}, %{username}"
 
-#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
+#: ../../app/views/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
+"%{tool_name} will help you to develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"%<tool_name>st %{contact_us}"
+"ail} or visit %{contact_us}"
 msgstr ""
-"%{tool_name} hjäl%<contact_us>stveckla din datahanteringsplan. Om du har några "
+"%{tool_name} hjälper dig att utveckla din datahanteringsplan. Om du har några "
 "frågor eller feedback när du använder verktyget, kontakta oss på %{helpdesk_em"
 "ail} eller besök %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Du kan ändra dina inställningsinställningar på din profilsida."
-%<username>s
-#: ../../app/views/users/_admin_grant_p%<username>shtml.erb:9
+
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Redigering av behörigheter för %{username}"
 
diff --git a/config/locale/tr_TR/LC_MESSAGES/app.mo b/config/locale/tr_TR/LC_MESSAGES/app.mo
index c8fca2f36009f2d2a3c4d4c435908202ca8b5460..7d81c7b157f5f878923fdadc806babe4bfb3be09 100644
GIT binary patch
delta 27220
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

delta 36666
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
E1O22srT_o{

diff --git a/config/locale/tr_TR/app.po b/config/locale/tr_TR/app.po
index fcb3029ed9..4853e5b975 100644
--- a/config/locale/tr_TR/app.po
+++ b/config/locale/tr_TR/app.po
@@ -1,14 +1,14 @@
 # Turkish translations for app package.
-# Copyright (C) 2021 app
+# Copyright (C) 2022 app
 # This file is distributed under the same license as the app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: contact@translation.io\n"
-"POT-Creation-Date: 2021-10-01 11:19+0000\n"
-"PO-Revision-Date: 2021-10-01 13:19+0200\n"
+"POT-Creation-Date: 2022-02-10 08:50+0000\n"
+"PO-Revision-Date: 2022-02-10 09:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
@@ -18,27 +18,25 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 "\n"
 
-#: ../../app/controllers/answers_controller.rb:24
+#: ../../app/controllers/answers_controller.rb:25
 msgid ""
-"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
-"or which to create or update an answer"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s"
+" for which to create or update an answer"
 msgstr ""
-"Bir yanıt oluşturmak veya güncellemek için %<plan_id>s plan kimliğiyle ilişkili"
-" %<question_id>s kimliğine sahip bir soru yok"
 
-#: ../../app/controllers/answers_controller.rb:34
+#: ../../app/controllers/answers_controller.rb:33
 msgid "There is no plan with id %<id>s for which to create or update an answer"
-msgstr "%<id>s kimliğine sahip, bir yanıt oluşturulacak veya güncellenecek bir plan yok"
+msgstr ""
 
-#: ../../app/controllers/api/v0/base_controller.rb:124
+#: ../../app/controllers/api/v0/base_controller.rb:126
 msgid "Bad Credentials"
-msgstr "Kötü Kimlik Bilgileri"
+msgstr "Hatalı Kimlik Bilgileri"
 
-#: ../../app/controllers/api/v0/departments_controller.rb:20
+#: ../../app/controllers/api/v0/departments_controller.rb:22
 msgid "Departments code and name must be unique"
 msgstr "Bölüm kodu ve adı benzersiz olmalıdır"
 
-#: ../../app/controllers/api/v0/plans_controller.rb:26
+#: ../../app/controllers/api/v0/plans_controller.rb:27
 msgid "user must be in your organisation"
 msgstr "kullanıcı kurumunuzda olmalıdır"
 
@@ -46,28 +44,28 @@ msgstr "kullanıcı kurumunuzda olmalıdır"
 msgid "Bad Parameters"
 msgstr "Hatalı Parametreler"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
 #: ../../app/controllers/api/v0/statistics_controller.rb:89
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
+#: ../../app/controllers/usage_controller.rb:66
 #: ../../app/controllers/usage_controller.rb:87
 msgid "Month"
 msgstr "Ay"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:40
-#: ../../app/controllers/usage_controller.rb:68
+#: ../../app/controllers/api/v0/statistics_controller.rb:41
+#: ../../app/controllers/usage_controller.rb:66
 msgid "No. Users joined"
 msgstr "Katılan kullanıcı sayısı"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:46
+#: ../../app/controllers/api/v0/statistics_controller.rb:47
 #: ../../app/controllers/api/v0/statistics_controller.rb:95
-#: ../../app/controllers/api/v0/statistics_controller.rb:141
-#: ../../app/controllers/usage_controller.rb:74
+#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/usage_controller.rb:72
 #: ../../app/controllers/usage_controller.rb:93
 msgid "Total"
 msgstr "Toplam"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:47
+#: ../../app/controllers/api/v0/statistics_controller.rb:48
 msgid "users_joined"
 msgstr "users_joined"
 
@@ -80,137 +78,141 @@ msgstr "Tamamlanmış plan sayısı"
 msgid "completed_plans"
 msgstr "completed_plans"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:135
+#: ../../app/controllers/api/v0/statistics_controller.rb:136
 msgid "No. Plans"
 msgstr "Plan sayısı"
 
-#: ../../app/controllers/api/v0/statistics_controller.rb:142
+#: ../../app/controllers/api/v0/statistics_controller.rb:143
 msgid "plans"
 msgstr "planlar"
 
-#: ../../app/controllers/api/v1/authentication_controller.rb:49
+#: ../../app/controllers/api/v1/authentication_controller.rb:47
 msgid "Missing or invalid JSON"
 msgstr "Eksik veya geçersiz JSON"
 
-#: ../../app/controllers/api/v1/base_api_controller.rb:81
+#: ../../app/controllers/api/v1/base_api_controller.rb:79
 msgid "Invalid JSON format"
 msgstr "Geçersiz JSON biçimi"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:20
+#: ../../app/controllers/api/v1/plans_controller.rb:18
 msgid "Plan not found"
 msgstr "Plan bulunamadı"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:37
+#: ../../app/controllers/api/v1/plans_controller.rb:36
 msgid "Unable to create your DMP"
 msgstr "VYP'niz oluşturulamıyor"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:38
+#: ../../app/controllers/api/v1/plans_controller.rb:37
 msgid "Plan already exists. Send an update instead."
 msgstr "Plan zaten var. Bunun yerine bir güncelleme gönderin."
 
-#: ../../app/controllers/api/v1/plans_controller.rb:39
+#: ../../app/controllers/api/v1/plans_controller.rb:38
 msgid ""
 "Could not determine ownership of the DMP. Please add an\n"
 "                          :affiliation to the :contact"
 msgstr "VYP'nin sahibi belirlenemedi. lütfen :contact kişisine :affiliation ekleyin"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:74
+#: ../../app/controllers/api/v1/plans_controller.rb:70
 msgid "Invalid JSON!"
 msgstr "Geçersiz JSON!"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:77
+#: ../../app/controllers/api/v1/plans_controller.rb:73
 msgid "Invalid JSON"
 msgstr "Geçersiz JSON"
 
-#: ../../app/controllers/api/v1/plans_controller.rb:93
+#: ../../app/controllers/api/v1/plans_controller.rb:90
 msgid "No Plans found"
 msgstr "Hiç Plan bulunamadı"
 
-#: ../../app/controllers/application_controller.rb:33
+#: ../../app/controllers/application_controller.rb:36
 msgid "You are not authorized to perform this action."
 msgstr "Bu eylemi gerçekleştirme yetkiniz yok."
 
-#: ../../app/controllers/application_controller.rb:35
+#: ../../app/controllers/application_controller.rb:40
 msgid "You need to sign in or sign up before continuing."
 msgstr "Devam etmeden önce oturum açmanız veya kaydolmanız gerekir."
 
-#: ../../app/controllers/application_controller.rb:100
+#: ../../app/controllers/application_controller.rb:108
 msgid "Unable to %<action>s the %<object>s.%<errors>s"
-msgstr " %<object>s.%<errors>s %<action>s yapılamıyor"
+msgstr ""
 
-#: ../../app/controllers/application_controller.rb:108
+#: ../../app/controllers/application_controller.rb:114
 msgid "Successfully %<action>s the %<object>s."
-msgstr "%<object>s başarıyla %<action>s."
+msgstr ""
 
-#: ../../app/controllers/application_controller.rb:123
+#: ../../app/controllers/application_controller.rb:127
 msgid "API client"
 msgstr "API istemcisi"
 
-#: ../../app/controllers/application_controller.rb:124
+#: ../../app/controllers/application_controller.rb:128
 msgid "plan"
 msgstr "plan"
 
-#: ../../app/controllers/application_controller.rb:125
+#: ../../app/controllers/application_controller.rb:129
 msgid "guidance group"
 msgstr "rehberlik grubu"
 
-#: ../../app/controllers/application_controller.rb:126
+#: ../../app/controllers/application_controller.rb:130
 msgid "comment"
 msgstr "yorum yap"
 
-#: ../../app/controllers/application_controller.rb:127
+#: ../../app/controllers/application_controller.rb:131
 msgid "organisation"
 msgstr "kuruluş"
 
-#: ../../app/controllers/application_controller.rb:128
+#: ../../app/controllers/application_controller.rb:132
 msgid "permission"
 msgstr "izin"
 
-#: ../../app/controllers/application_controller.rb:129
+#: ../../app/controllers/application_controller.rb:133
 msgid "preferences"
 msgstr "tercihler"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "profile"
 msgstr "profil"
 
-#: ../../app/controllers/application_controller.rb:130
+#: ../../app/controllers/application_controller.rb:134
 msgid "user"
 msgstr "kullanıcı"
 
-#: ../../app/controllers/application_controller.rb:131
+#: ../../app/controllers/application_controller.rb:135
 msgid "question option"
 msgstr "soru seçeneği"
 
-#: ../../app/controllers/concerns/paginable.rb:44
+#: ../../app/controllers/application_controller.rb:181
+msgid "Record Not Found"
+msgstr ""
+
+#: ../../app/controllers/concerns/paginable.rb:45
 msgid "scope should be an ActiveRecord::Relation object"
 msgstr "kapsam bir ActiveRecord::Relation nesnesi olmalıdır"
 
-#: ../../app/controllers/concerns/paginable.rb:46
+#: ../../app/controllers/concerns/paginable.rb:47
 msgid "path_params should be a Hash object"
 msgstr "path_params bir Hash nesnesi olmalıdır"
 
-#: ../../app/controllers/concerns/paginable.rb:47
+#: ../../app/controllers/concerns/paginable.rb:48
 msgid "query_params should be a Hash object"
 msgstr "query_params bir Hash nesnesi olmalıdır"
 
-#: ../../app/controllers/concerns/paginable.rb:48
+#: ../../app/controllers/concerns/paginable.rb:49
 msgid "locals should be a Hash object"
 msgstr "locals bir Hash nesnesi olmalıdır"
 
-#: ../../app/controllers/concerns/paginable.rb:69
+#: ../../app/controllers/concerns/paginable.rb:70
 msgid "Restricted access to View All the records"
 msgstr "Tüm kayıtları görüntülemek için kısıtlı erişim"
 
-#: ../../app/controllers/concerns/paginable.rb:180
+#: ../../app/controllers/concerns/paginable.rb:182
 msgid "Sort by %<sort_field>s"
-msgstr "%<sort_field>s alanına göre sırala"
+msgstr ""
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "customisation"
 msgstr "özelleştirme"
 
-#: ../../app/controllers/concerns/template_methods.rb:10
+#: ../../app/controllers/concerns/template_methods.rb:8
 msgid "template"
 msgstr "şablon"
 
@@ -218,28 +220,28 @@ msgstr "şablon"
 msgid "obj should be a Template, Phase, Section, Question, or Annotation"
 msgstr "nesne bir Şablon, Aşama, Bölüm, Soru veya Açıklama olmalıdır"
 
-#: ../../app/controllers/concerns/versionable.rb:46
-#: ../../app/controllers/concerns/versionable.rb:65
+#: ../../app/controllers/concerns/versionable.rb:47
+#: ../../app/controllers/concerns/versionable.rb:66
 msgid "obj should be a Phase, Section, Question, or Annotation"
 msgstr "nesne bir Aşama, Bölüm, Soru veya Açıklama olmalıdır"
 
-#: ../../app/controllers/concerns/versionable.rb:88
+#: ../../app/controllers/concerns/versionable.rb:90
 msgid "The search_space does not respond to each"
 msgstr "search_space her birine yanıt vermiyor"
 
-#: ../../app/controllers/concerns/versionable.rb:93
+#: ../../app/controllers/concerns/versionable.rb:94
 msgid "The search space does not have elements associated"
 msgstr "Arama alanı ilişkili öğelere sahip değil"
 
-#: ../../app/controllers/contacts_controller.rb:10
+#: ../../app/controllers/contacts_controller.rb:13
 msgid "Captcha verification failed, please retry."
 msgstr "Captcha doğrulaması başarısız oldu, lütfen tekrar deneyin."
 
-#: ../../app/controllers/contacts_controller.rb:16
+#: ../../app/controllers/contacts_controller.rb:18
 msgid "Contact email was successfully sent."
 msgstr "İletişim e-postası başarıyla gönderildi."
 
-#: ../../app/controllers/contacts_controller.rb:18
+#: ../../app/controllers/contacts_controller.rb:20
 msgid "Unable to submit your request"
 msgstr "İsteğiniz gönderilemedi"
 
@@ -253,60 +255,60 @@ msgid "added"
 msgstr "eklendi"
 
 #: ../../app/controllers/contributors_controller.rb:72
-#: ../../app/controllers/guidance_groups_controller.rb:48
-#: ../../app/controllers/guidances_controller.rb:71
-#: ../../app/controllers/notes_controller.rb:92
-#: ../../app/controllers/org_admin/departments_controller.rb:48
-#: ../../app/controllers/org_admin/sections_controller.rb:102
-#: ../../app/controllers/org_admin/templates_controller.rb:203
-#: ../../app/controllers/orgs_controller.rb:87
-#: ../../app/controllers/plans_controller.rb:271
-#: ../../app/controllers/plans_controller.rb:274
-#: ../../app/controllers/registrations_controller.rb:247
-#: ../../app/controllers/registrations_controller.rb:251
-#: ../../app/controllers/registrations_controller.rb:276
+#: ../../app/controllers/guidance_groups_controller.rb:51
+#: ../../app/controllers/guidances_controller.rb:74
+#: ../../app/controllers/notes_controller.rb:89
+#: ../../app/controllers/org_admin/departments_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:103
+#: ../../app/controllers/org_admin/templates_controller.rb:204
+#: ../../app/controllers/orgs_controller.rb:88
+#: ../../app/controllers/plans_controller.rb:282
+#: ../../app/controllers/plans_controller.rb:285
+#: ../../app/controllers/registrations_controller.rb:249
+#: ../../app/controllers/registrations_controller.rb:253
 #: ../../app/controllers/registrations_controller.rb:280
-#: ../../app/controllers/users_controller.rb:98
-#: ../../app/controllers/users_controller.rb:125
+#: ../../app/controllers/registrations_controller.rb:284
+#: ../../app/controllers/users_controller.rb:101
+#: ../../app/controllers/users_controller.rb:129
 msgid "saved"
 msgstr "kaydedildi"
 
 #: ../../app/controllers/contributors_controller.rb:74
-#: ../../app/controllers/guidance_groups_controller.rb:50
-#: ../../app/controllers/guidances_controller.rb:73
-#: ../../app/controllers/notes_controller.rb:110
-#: ../../app/controllers/org_admin/departments_controller.rb:50
-#: ../../app/controllers/org_admin/sections_controller.rb:104
-#: ../../app/controllers/org_admin/templates_controller.rb:208
-#: ../../app/controllers/orgs_controller.rb:89
-#: ../../app/controllers/plans_controller.rb:280
-#: ../../app/controllers/plans_controller.rb:283
-#: ../../app/controllers/plans_controller.rb:287
-#: ../../app/controllers/plans_controller.rb:290
-#: ../../app/controllers/registrations_controller.rb:254
-#: ../../app/controllers/registrations_controller.rb:283
+#: ../../app/controllers/guidance_groups_controller.rb:53
+#: ../../app/controllers/guidances_controller.rb:76
+#: ../../app/controllers/notes_controller.rb:107
+#: ../../app/controllers/org_admin/departments_controller.rb:52
+#: ../../app/controllers/org_admin/sections_controller.rb:105
+#: ../../app/controllers/org_admin/templates_controller.rb:209
+#: ../../app/controllers/orgs_controller.rb:90
+#: ../../app/controllers/plans_controller.rb:291
+#: ../../app/controllers/plans_controller.rb:294
+#: ../../app/controllers/plans_controller.rb:298
+#: ../../app/controllers/plans_controller.rb:301
+#: ../../app/controllers/registrations_controller.rb:256
+#: ../../app/controllers/registrations_controller.rb:287
 msgid "save"
 msgstr "kaydet"
 
 #: ../../app/controllers/contributors_controller.rb:84
-#: ../../app/controllers/notes_controller.rb:134
-#: ../../app/controllers/org_admin/templates_controller.rb:236
+#: ../../app/controllers/notes_controller.rb:131
+#: ../../app/controllers/org_admin/templates_controller.rb:237
 #: ../../app/controllers/super_admin/orgs_controller.rb:94
 msgid "removed"
 msgstr "kaldırıldı"
 
 #: ../../app/controllers/contributors_controller.rb:87
-#: ../../app/controllers/notes_controller.rb:152
-#: ../../app/controllers/org_admin/templates_controller.rb:238
+#: ../../app/controllers/notes_controller.rb:149
+#: ../../app/controllers/org_admin/templates_controller.rb:239
 #: ../../app/controllers/super_admin/orgs_controller.rb:97
 msgid "remove"
 msgstr "kaldır"
 
-#: ../../app/controllers/contributors_controller.rb:160
+#: ../../app/controllers/contributors_controller.rb:161
 msgid "plan not found"
 msgstr "plan bulunamadı"
 
-#: ../../app/controllers/contributors_controller.rb:168
+#: ../../app/controllers/contributors_controller.rb:169
 msgid "contributor not found"
 msgstr "katkı sağlayan kişi bulunamadı"
 
@@ -318,102 +320,102 @@ msgstr "Geri bildirim isteğiniz şu anda gönderilemiyor."
 msgid "An error occurred when requesting feedback for this plan."
 msgstr "Bu plan için geri bildirim istenirken bir hata oluştu."
 
-#: ../../app/controllers/guidance_groups_controller.rb:28
-#: ../../app/controllers/guidances_controller.rb:51
-#: ../../app/controllers/notes_controller.rb:51
-#: ../../app/controllers/org_admin/departments_controller.rb:25
-#: ../../app/controllers/org_admin/phases_controller.rb:120
-#: ../../app/controllers/org_admin/questions_controller.rb:95
-#: ../../app/controllers/org_admin/sections_controller.rb:78
-#: ../../app/controllers/org_admin/templates_controller.rb:177
-#: ../../app/controllers/plans_controller.rb:118
+#: ../../app/controllers/guidance_groups_controller.rb:29
+#: ../../app/controllers/guidances_controller.rb:52
+#: ../../app/controllers/notes_controller.rb:48
+#: ../../app/controllers/org_admin/departments_controller.rb:26
+#: ../../app/controllers/org_admin/phases_controller.rb:121
+#: ../../app/controllers/org_admin/questions_controller.rb:94
+#: ../../app/controllers/org_admin/sections_controller.rb:79
+#: ../../app/controllers/org_admin/templates_controller.rb:180
+#: ../../app/controllers/plans_controller.rb:120
 #: ../../app/controllers/super_admin/api_clients_controller.rb:44
 #: ../../app/controllers/super_admin/notifications_controller.rb:38
-#: ../../app/controllers/super_admin/orgs_controller.rb:62
-#: ../../app/controllers/super_admin/themes_controller.rb:22
+#: ../../app/controllers/super_admin/orgs_controller.rb:61
+#: ../../app/controllers/super_admin/themes_controller.rb:21
 msgid "created"
 msgstr "oluşturuldu"
 
-#: ../../app/controllers/guidance_groups_controller.rb:31
-#: ../../app/controllers/guidances_controller.rb:53
-#: ../../app/controllers/notes_controller.rb:70
-#: ../../app/controllers/org_admin/departments_controller.rb:29
-#: ../../app/controllers/org_admin/phases_controller.rb:122
-#: ../../app/controllers/org_admin/questions_controller.rb:97
-#: ../../app/controllers/org_admin/sections_controller.rb:85
-#: ../../app/controllers/org_admin/templates_controller.rb:179
+#: ../../app/controllers/guidance_groups_controller.rb:32
+#: ../../app/controllers/guidances_controller.rb:54
+#: ../../app/controllers/notes_controller.rb:67
+#: ../../app/controllers/org_admin/departments_controller.rb:30
+#: ../../app/controllers/org_admin/phases_controller.rb:123
+#: ../../app/controllers/org_admin/questions_controller.rb:96
+#: ../../app/controllers/org_admin/sections_controller.rb:86
+#: ../../app/controllers/org_admin/templates_controller.rb:182
 #: ../../app/controllers/plans_controller.rb:151
-#: ../../app/controllers/super_admin/api_clients_controller.rb:51
+#: ../../app/controllers/super_admin/api_clients_controller.rb:50
 #: ../../app/controllers/super_admin/notifications_controller.rb:41
-#: ../../app/controllers/super_admin/orgs_controller.rb:65
-#: ../../app/controllers/super_admin/themes_controller.rb:25
+#: ../../app/controllers/super_admin/orgs_controller.rb:64
+#: ../../app/controllers/super_admin/themes_controller.rb:24
 msgid "create"
 msgstr "oluştur"
 
-#: ../../app/controllers/guidance_groups_controller.rb:61
+#: ../../app/controllers/guidance_groups_controller.rb:65
 msgid "Your guidance group has been published and is now available to users."
 msgstr "Rehberlik grubunuz yayınlandı ve artık kullanıma açık."
 
-#: ../../app/controllers/guidance_groups_controller.rb:64
-#: ../../app/controllers/guidances_controller.rb:107
+#: ../../app/controllers/guidance_groups_controller.rb:68
+#: ../../app/controllers/guidances_controller.rb:112
 msgid "publish"
 msgstr "yayınla"
 
-#: ../../app/controllers/guidance_groups_controller.rb:76
+#: ../../app/controllers/guidance_groups_controller.rb:79
 msgid "Your guidance group is no longer published and will not be available to users."
 msgstr "Rehberlik grubunuz artık yayınlanmıyor ve kullanılamayacak."
 
-#: ../../app/controllers/guidance_groups_controller.rb:79
-#: ../../app/controllers/guidances_controller.rb:124
+#: ../../app/controllers/guidance_groups_controller.rb:81
+#: ../../app/controllers/guidances_controller.rb:129
 msgid "unpublish"
 msgstr "yayından kaldır"
 
-#: ../../app/controllers/guidance_groups_controller.rb:89
-#: ../../app/controllers/guidances_controller.rb:88
-#: ../../app/controllers/org_admin/departments_controller.rb:63
-#: ../../app/controllers/org_admin/phases_controller.rb:174
-#: ../../app/controllers/org_admin/question_options_controller.rb:25
+#: ../../app/controllers/guidance_groups_controller.rb:91
+#: ../../app/controllers/guidances_controller.rb:93
+#: ../../app/controllers/org_admin/departments_controller.rb:66
+#: ../../app/controllers/org_admin/phases_controller.rb:179
+#: ../../app/controllers/org_admin/question_options_controller.rb:24
 #: ../../app/controllers/org_admin/questions_controller.rb:197
-#: ../../app/controllers/org_admin/sections_controller.rb:126
-#: ../../app/controllers/plans_controller.rb:332
-#: ../../app/controllers/super_admin/api_clients_controller.rb:79
-#: ../../app/controllers/super_admin/notifications_controller.rb:84
-#: ../../app/controllers/super_admin/themes_controller.rb:50
+#: ../../app/controllers/org_admin/sections_controller.rb:128
+#: ../../app/controllers/plans_controller.rb:344
+#: ../../app/controllers/super_admin/api_clients_controller.rb:81
+#: ../../app/controllers/super_admin/notifications_controller.rb:85
+#: ../../app/controllers/super_admin/themes_controller.rb:51
 msgid "deleted"
 msgstr "silindi"
 
-#: ../../app/controllers/guidance_groups_controller.rb:91
-#: ../../app/controllers/guidances_controller.rb:90
-#: ../../app/controllers/org_admin/departments_controller.rb:65
-#: ../../app/controllers/org_admin/phases_controller.rb:176
-#: ../../app/controllers/org_admin/question_options_controller.rb:27
+#: ../../app/controllers/guidance_groups_controller.rb:93
+#: ../../app/controllers/guidances_controller.rb:95
+#: ../../app/controllers/org_admin/departments_controller.rb:68
+#: ../../app/controllers/org_admin/phases_controller.rb:181
+#: ../../app/controllers/org_admin/question_options_controller.rb:26
 #: ../../app/controllers/org_admin/questions_controller.rb:199
-#: ../../app/controllers/org_admin/sections_controller.rb:128
-#: ../../app/controllers/plans_controller.rb:337
-#: ../../app/controllers/super_admin/api_clients_controller.rb:82
-#: ../../app/controllers/super_admin/notifications_controller.rb:87
-#: ../../app/controllers/super_admin/themes_controller.rb:53
+#: ../../app/controllers/org_admin/sections_controller.rb:130
+#: ../../app/controllers/plans_controller.rb:349
+#: ../../app/controllers/super_admin/api_clients_controller.rb:84
+#: ../../app/controllers/super_admin/notifications_controller.rb:88
+#: ../../app/controllers/super_admin/themes_controller.rb:54
 msgid "delete"
 msgstr "sil"
 
-#: ../../app/controllers/guidances_controller.rb:104
+#: ../../app/controllers/guidances_controller.rb:109
 msgid "Your guidance has been published and is now available to users."
 msgstr "Rehberliğiniz yayınlandı ve artık kullanıma açık."
 
-#: ../../app/controllers/guidances_controller.rb:121
+#: ../../app/controllers/guidances_controller.rb:126
 msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Rehberliğiniz artık yayınlanmıyor ve kullanılamayacak."
 
-#: ../../app/controllers/identifiers_controller.rb:18
+#: ../../app/controllers/identifiers_controller.rb:19
 msgid "Successfully unlinked your account from %<is>s."
-msgstr "Hesabınızın %<is>s ile olan bağlantısı başarıyla kaldırıldı."
+msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:22
 msgid "Unable to unlink your account from %<is>s."
-msgstr "Hesabınızın %<is>s ile bağlantısı kaldırılamıyor."
+msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:18
-#: ../../app/controllers/org_admin/templates_controller.rb:114
+#: ../../app/controllers/org_admin/phases_controller.rb:17
+#: ../../app/controllers/org_admin/templates_controller.rb:115
 msgid ""
 "You are viewing a historical version of this template. You will not be able to"
 " make changes."
@@ -425,70 +427,72 @@ msgstr ""
 msgid "You cannot add a phase to a historical version of a template."
 msgstr "Bir şablonun geçmiş sürümüne aşama ekleyemezsiniz."
 
-#: ../../app/controllers/org_admin/phases_controller.rb:125
-#: ../../app/controllers/org_admin/phases_controller.rb:149
-#: ../../app/controllers/org_admin/phases_controller.rb:179
-#: ../../app/controllers/org_admin/question_options_controller.rb:30
-#: ../../app/controllers/org_admin/questions_controller.rb:100
-#: ../../app/controllers/org_admin/questions_controller.rb:202
-#: ../../app/controllers/org_admin/sections_controller.rb:107
-#: ../../app/controllers/org_admin/sections_controller.rb:131
-msgid "Unable to create a new version of this template."
-msgstr "Bu şablonun yeni bir sürümü oluşturulamıyor."
+#: ../../app/controllers/org_admin/phases_controller.rb:126
+msgid "Unable to create a new version of this template.<br>"
+msgstr ""
 
-#: ../../app/controllers/org_admin/phases_controller.rb:144
+#: ../../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:400
-#: ../../app/controllers/super_admin/api_clients_controller.rb:67
-#: ../../app/controllers/super_admin/notifications_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:417
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:55
-#: ../../app/controllers/users_controller.rb:103
+#: ../../app/controllers/super_admin/users_controller.rb:54
+#: ../../app/controllers/users_controller.rb:106
 msgid "updated"
 msgstr "güncellendi"
 
-#: ../../app/controllers/org_admin/phases_controller.rb:146
+#: ../../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:403
-#: ../../app/controllers/super_admin/api_clients_controller.rb:69
-#: ../../app/controllers/super_admin/notifications_controller.rb:54
+#: ../../app/controllers/plans_controller.rb:420
+#: ../../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
-#: ../../app/controllers/super_admin/users_controller.rb:57
+#: ../../app/controllers/super_admin/users_controller.rb:56
 msgid "update"
 msgstr "güncelle"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:32
+#: ../../app/controllers/org_admin/phases_controller.rb:152
+#: ../../app/controllers/org_admin/phases_controller.rb:184
+#: ../../app/controllers/org_admin/question_options_controller.rb:29
+#: ../../app/controllers/org_admin/questions_controller.rb:99
+#: ../../app/controllers/org_admin/questions_controller.rb:202
+#: ../../app/controllers/org_admin/sections_controller.rb:108
+msgid "Unable to create a new version of this template."
+msgstr "Bu şablonun yeni bir sürümü oluşturulamıyor."
+
+#: ../../app/controllers/org_admin/plans_controller.rb:36
 msgid "%<plan_owner>s has been notified that you have finished providing feedback"
-msgstr "%<plan_owner>s, geri bildirim sağlamayı bitirdiğiniz konusunda bilgilendirildi"
+msgstr ""
 
-#: ../../app/controllers/org_admin/plans_controller.rb:38
+#: ../../app/controllers/org_admin/plans_controller.rb:40
 msgid "Unable to notify user that you have finished providing feedback."
 msgstr "Geri bildirim sağlamayı bitirdiğiniz kullanıcıya iletilemiyor."
 
-#: ../../app/controllers/org_admin/plans_controller.rb:53
-#: ../../app/views/plans/_project_details.html.erb:9
+#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/views/plans/_project_details.html.erb:14
 msgid "Project title"
 msgstr "Proje başlığı"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:54
+#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/views/paginable/plans/_index.html.erb:6
 #: ../../app/views/paginable/plans/_org_admin.html.erb:19
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:6
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:13
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:6
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:6
 msgid "Template"
 msgstr "Şablon"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:55
+#: ../../app/controllers/org_admin/plans_controller.rb:58
 #: ../../app/helpers/plans_helper.rb:22
-#: ../../app/helpers/settings_template_helper.rb:15
+#: ../../app/helpers/settings_template_helper.rb:16
 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22
 #: ../../app/views/orgs/_profile_form.html.erb:141
 #: ../../app/views/paginable/orgs/_index.html.erb:5
+#: ../../app/views/paginable/plans/_index.html.erb:7
 #: ../../app/views/paginable/plans/_org_admin.html.erb:20
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:7
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:7
 #: ../../app/views/paginable/templates/_index.html.erb:6
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
@@ -499,63 +503,66 @@ msgstr "Şablon"
 msgid "Organisation"
 msgstr "Kuruluş"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:56
+#: ../../app/controllers/org_admin/plans_controller.rb:59
 msgid "Owner name"
 msgstr "Sahibin adı"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:57
+#: ../../app/controllers/org_admin/plans_controller.rb:60
 msgid "Owner email"
 msgstr "Sahibin e-postası"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:58
+#: ../../app/controllers/org_admin/plans_controller.rb:61
+#: ../../app/views/paginable/plans/_index.html.erb:9
 #: ../../app/views/paginable/plans/_org_admin.html.erb:23
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:9
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:18
 msgid "Updated"
 msgstr "Güncellenmiş"
 
-#: ../../app/controllers/org_admin/plans_controller.rb:59
+#: ../../app/controllers/org_admin/plans_controller.rb:62
 #: ../../app/views/org_admin/templates/_form.html.erb:17
 #: ../../app/views/org_admin/templates/_show.html.erb:32
+#: ../../app/views/paginable/plans/_index.html.erb:10
 #: ../../app/views/paginable/plans/_org_admin.html.erb:24
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:10
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:10
 msgid "Visibility"
 msgstr "Görünürlük"
 
-#: ../../app/controllers/org_admin/sections_controller.rb:70
+#: ../../app/controllers/org_admin/sections_controller.rb:71
 msgid "Unable to create a new section. The phase you specified does not exist."
 msgstr "Yeni bir bölüm oluşturulamıyor. Belirttiğiniz aşama mevcut değil."
 
-#: ../../app/controllers/org_admin/template_copies_controller.rb:18
-#: ../../app/controllers/plans_controller.rb:380
+#: ../../app/controllers/org_admin/sections_controller.rb:133
+msgid "Unable to delete this version of the template."
+msgstr ""
+
+#: ../../app/controllers/org_admin/template_copies_controller.rb:20
+#: ../../app/controllers/plans_controller.rb:396
 msgid "copy"
 msgstr "kopyala"
 
 #:
-#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:27
+#: ../../app/controllers/org_admin/template_customization_transfers_controller.rb:28
 msgid "That template is no longer customizable."
 msgstr "Bu şablon artık özelleştirilemez."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:19
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:21
 msgid "Unable to customize that template."
 msgstr "Bu şablon özelleştirilemiyor."
 
-#: ../../app/controllers/org_admin/template_customizations_controller.rb:22
+#: ../../app/controllers/org_admin/template_customizations_controller.rb:24
 msgid "That template is not customizable."
 msgstr "Bu şablon özelleştirilemez."
 
-#: ../../app/controllers/org_admin/templates_controller.rb:23
+#: ../../app/controllers/org_admin/templates_controller.rb:21
 #: ../../app/views/org_admin/templates/index.html.erb:43
 msgid "All Templates"
 msgstr "Tüm Şablonlar"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:48
-#: ../../app/views/org_admin/templates/index.html.erb:52
+#: ../../app/controllers/org_admin/templates_controller.rb:47
 msgid "%<org_name>s Templates"
-msgstr "%<org_name>s Şablonlar"
+msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:50
+#: ../../app/controllers/org_admin/templates_controller.rb:49
 #: ../../app/views/org_admin/templates/index.html.erb:54
 msgid "Own Templates"
 msgstr "Kendi Şablonları"
@@ -564,161 +571,156 @@ msgstr "Kendi Şablonları"
 msgid "Customizable Templates"
 msgstr "Özelleştirilebilir Şablonlar"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:214
+#: ../../app/controllers/org_admin/templates_controller.rb:215
 msgid "Error parsing links for a %<template>s"
-msgstr "%<template>s için bağlantılar ayrıştırılırken hata oluştu"
+msgstr ""
 
-#: ../../app/controllers/org_admin/templates_controller.rb:345
-#: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+#: ../../app/controllers/org_admin/templates_controller.rb:343
+#: ../../app/controllers/public_pages_controller.rb:67
+msgid ""
+"Template created using the %<application_name>s service. Last modified %<date>"
+"s"
 msgstr ""
-"Şablon %<application_name>s hizmeti kullanılarak oluşturuldu. Son değiştirilme:"
-" %<date>s"
 
-#: ../../app/controllers/org_admin/templates_controller.rb:360
-#: ../../app/controllers/public_pages_controller.rb:83
+#: ../../app/controllers/org_admin/templates_controller.rb:355
+#: ../../app/controllers/public_pages_controller.rb:80
 msgid "Unable to download the DMP Template at this time."
 msgstr "VYP Şablonu şu anda indirilemiyor."
 
-#: ../../app/controllers/orgs_controller.rb:114
+#: ../../app/controllers/orgs_controller.rb:116
 msgid "No organisations are currently registered."
 msgstr "Şu anda kayıtlı hiçbir kuruluş yok."
 
-#: ../../app/controllers/orgs_controller.rb:137
-msgid "Your organisation does not seem to be properly configured."
-msgstr "Kuruluşunuz düzgün yapılandırılmamış gibi görünüyor."
-
-#: ../../app/controllers/orgs_controller.rb:142
+#: ../../app/controllers/orgs_controller.rb:127
 msgid "Please choose an organisation"
 msgstr "Lütfen bir kuruluş seçin"
 
+#: ../../app/controllers/orgs_controller.rb:136
+msgid "Your organisation does not seem to be properly configured."
+msgstr "Kuruluşunuz düzgün yapılandırılmamış gibi görünüyor."
+
 #: ../../app/controllers/plan_exports_controller.rb:85
 msgid "Created using %<application_name>s. Last modified %<date>s"
-msgstr "%<application_name>s kullanılarak oluşturuldu. Son değiştirildiği tarih %<date>s"
+msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "This is a"
 msgstr "Bu bir"
 
-#: ../../app/controllers/plans_controller.rb:51
+#: ../../app/controllers/plans_controller.rb:52
 msgid "test plan"
 msgstr "test planı"
 
-#: ../../app/controllers/plans_controller.rb:68
+#: ../../app/controllers/plans_controller.rb:70
 msgid "Unable to identify a suitable template for your plan."
 msgstr "Planınız için uygun bir şablon tanımlanamadı."
 
-#: ../../app/controllers/plans_controller.rb:82
-msgid "My Plan"
-msgstr "Planım"
-
 #: ../../app/controllers/plans_controller.rb:84
-msgid " Plan"
-msgstr " Plan"
+msgid "My Plan (%<title>s)"
+msgstr ""
+
+#: ../../app/controllers/plans_controller.rb:86
+msgid "%<user_name>s Plan"
+msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:122
+#: ../../app/controllers/plans_controller.rb:124
 msgid "This plan is based on the default template."
 msgstr "Bu plan, varsayılan şablonu temel alır."
 
-#: ../../app/controllers/plans_controller.rb:127
-#: ../../app/controllers/plans_controller.rb:132
+#: ../../app/controllers/plans_controller.rb:129
+#: ../../app/controllers/plans_controller.rb:133
 msgid "This plan is based on the"
 msgstr "Bu plan şunlara dayanmaktadır:"
 
-#: ../../app/controllers/plans_controller.rb:127
+#: ../../app/controllers/plans_controller.rb:129
 msgid "template with customisations by the"
 msgstr "şu kişi tarafından özelleştirmeler içeren şablon:"
 
-#: ../../app/controllers/plans_controller.rb:378
+#: ../../app/controllers/plans_controller.rb:394
 msgid "copied"
 msgstr "kopyalandı"
 
-#: ../../app/controllers/plans_controller.rb:408
+#: ../../app/controllers/plans_controller.rb:425
 msgid ""
-"Unable to change the plan's status since it is needed at least %<percentage>s p"
-"ercentage responded"
+"Unable to change the plan's status since it is needed at least %<percentage}>s"
+" percentage responded"
 msgstr ""
-"En az yüzde %<percentage>s yanıt verilmesi gerektiğinden planın durumu değiştir"
-"ilemiyor"
 
-#: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %<plan_id>s"
-msgstr "%<plan_id>s no.'lu plan bulunamadı"
+#: ../../app/controllers/plans_controller.rb:431
+msgid "Unable to find plan id %{<plan_id>s"
+msgstr ""
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is now a test."
 msgstr "Projeniz şu an bir test."
 
-#: ../../app/controllers/plans_controller.rb:433
+#: ../../app/controllers/plans_controller.rb:446
 msgid "Your project is no longer a test."
 msgstr "Projeniz artık bir test değil."
 
-#: ../../app/controllers/plans_controller.rb:437
+#: ../../app/controllers/plans_controller.rb:450
 msgid "Unable to change the plan's test status"
 msgstr "Planın test durumu değiştirilemiyor"
 
-#: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %<id>s"
-msgstr "%<id>s kimliğiyle ilişkili bir plan yok"
+#: ../../app/controllers/plans_controller.rb:463
+msgid "There is no plan associated with id %{<id}>s"
+msgstr ""
 
-#: ../../app/controllers/registrations_controller.rb:35
+#: ../../app/controllers/registrations_controller.rb:34
 msgid ""
 "Please make a choice below. After linking your\n"
 "                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Lütfen aşağıdan bir seçim yapın. Hesap ayrıntılarınızı bir %<application_name>s"
-" hesabına bağladıktan sonra doğrudan kurumsal kimlik bilgileriniz ile oturum a"
-"çabileceksiniz."
 
-#: ../../app/controllers/registrations_controller.rb:61
+#: ../../app/controllers/registrations_controller.rb:58
 msgid "You must accept the terms and conditions to register."
 msgstr "Kayıt olmak için şartlar ve koşulları kabul etmelisiniz."
 
-#: ../../app/controllers/registrations_controller.rb:64
+#: ../../app/controllers/registrations_controller.rb:61
 msgid "Please select an organisation from the list, or choose Other."
 msgstr "Lütfen listeden bir kuruluşu veya Diğer'i seçin."
 
-#: ../../app/controllers/registrations_controller.rb:77
+#: ../../app/controllers/registrations_controller.rb:74
 msgid "That email address is already registered."
 msgstr "Bu e-posta adresi zaten kullanılmakta."
 
-#: ../../app/controllers/registrations_controller.rb:119
+#: ../../app/controllers/registrations_controller.rb:115
 msgid ""
-"Welcome! You have signed up successfully with your institutional credentials. "
-"You will now be able to access your account with them."
+"Welcome! You have signed up successfully with your\n"
+"                                  institutional credentials. You will now be a"
+"ble to access\n"
+"                                  your account with them."
 msgstr ""
-"Hoşgeldiniz! Kurumsal kimlik bilgilerinizle başarıyla kaydoldunuz. Artık bu bi"
-"lgilerle hesabınıza erişebileceksiniz."
 
-#: ../../app/controllers/registrations_controller.rb:171
+#: ../../app/controllers/registrations_controller.rb:173
 msgid "Save Unsuccessful. "
 msgstr "Kayıt Başarısız."
 
-#: ../../app/controllers/registrations_controller.rb:175
+#: ../../app/controllers/registrations_controller.rb:177
 msgid "Please enter an email address. "
 msgstr "Lütfen bir e-posta adresi giriniz."
 
-#: ../../app/controllers/registrations_controller.rb:179
+#: ../../app/controllers/registrations_controller.rb:181
 msgid "Please enter a First name. "
 msgstr "Lütfen bir Ad girin."
 
-#: ../../app/controllers/registrations_controller.rb:183
+#: ../../app/controllers/registrations_controller.rb:185
 msgid "Please enter a Last name. "
 msgstr "Lütfen bir Soyadı girin."
 
-#: ../../app/controllers/registrations_controller.rb:187
+#: ../../app/controllers/registrations_controller.rb:189
 msgid ""
 "Please select an organisation from the list, or enter your organisation's name"
 "."
 msgstr "Lütfen listeden bir kuruluş seçin veya kuruluşunuzun adını girin."
 
-#: ../../app/controllers/registrations_controller.rb:203
+#: ../../app/controllers/registrations_controller.rb:212
 msgid "Please enter your password to change email address."
 msgstr "E-posta adresini değiştirmek için lütfen şifrenizi giriniz."
 
-#: ../../app/controllers/registrations_controller.rb:208
+#: ../../app/controllers/registrations_controller.rb:218
 msgid ""
 "Save unsuccessful. \\\n"
 "                That email address is already registered. \\\n"
@@ -728,68 +730,66 @@ msgstr ""
 "                Bu e-posta adresi alınmış. \\\n"
 "                Benzersiz bir e-posta adresi girmelisiniz."
 
-#: ../../app/controllers/registrations_controller.rb:213
+#: ../../app/controllers/registrations_controller.rb:224
 msgid "Invalid password"
 msgstr "Geçersiz şifre"
 
-#: ../../app/controllers/registrations_controller.rb:264
+#: ../../app/controllers/registrations_controller.rb:268
 msgid "Please enter your current password"
 msgstr "Lütfen mevcut şifrenizi giriniz"
 
-#: ../../app/controllers/registrations_controller.rb:266
+#: ../../app/controllers/registrations_controller.rb:270
 msgid "Please enter a password confirmation"
 msgstr "Lütfen bir şifre onayı girin"
 
-#: ../../app/controllers/registrations_controller.rb:268
+#: ../../app/controllers/registrations_controller.rb:272
 msgid "Password and comfirmation must match"
 msgstr "Şifre ve onay eşleşmelidir"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %<email>s since that email matches with the owner of the"
-" plan."
+"Cannot share plan with %<email>s since that email matches\n"
+"                                   with the owner of the plan."
 msgstr ""
-"Bu e-posta, planın sahibiyle eşleştiğinden dolayı plan %<email>s ile paylaşılam"
-"ıyor."
 
-#: ../../app/controllers/roles_controller.rb:37
+#: ../../app/controllers/roles_controller.rb:36
 msgid "Plan is already shared with %<email>s."
-msgstr "Plan zaten %<email>s ile paylaşılıyor."
+msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:44
+#: ../../app/controllers/roles_controller.rb:43
 #: ../../app/views/shared/_create_account_form.html.erb:4
 msgid "First Name"
 msgstr "İsim"
 
-#: ../../app/controllers/roles_controller.rb:45
+#: ../../app/controllers/roles_controller.rb:44
 msgid "Surname"
 msgstr "Soyad"
 
-#: ../../app/controllers/roles_controller.rb:48
+#: ../../app/controllers/roles_controller.rb:47
 msgid "Invitation to %<email>s issued successfully."
-msgstr "%<email>s adresine bir davet e-postası başarıyla gönderildi."
+msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:53
+#: ../../app/controllers/roles_controller.rb:52
 msgid "Plan shared with %<email>s."
-msgstr "Plan %<email>s ile paylaşıldı."
+msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:68
-msgid "You must provide a valid email address and select a permission level."
-msgstr "Geçerli bir e-posta adresi sağlamalı ve bir izin düzeyi seçmelisiniz."
+#: ../../app/controllers/roles_controller.rb:64
+msgid ""
+"You must provide a valid email address and select a permission\n"
+"                               level."
+msgstr ""
 
-#: ../../app/controllers/roles_controller.rb:74
+#: ../../app/controllers/roles_controller.rb:71
 msgid "Please enter an email address"
 msgstr "Lütfen bir e-posta adresi giriniz"
 
-#: ../../app/controllers/roles_controller.rb:93
+#: ../../app/controllers/roles_controller.rb:90
 msgid ""
-"Successfully changed the permissions for %<email>s. They have been notified via"
-" email."
+"Successfully changed the permissions for %<email>. They have been\n"
+"                       notified via email."
 msgstr ""
-"%<email>s adresi için izinler başarıyla değiştirildi ve e-posta yoluyla bilgile"
-"ndirme yapıldı."
 
-#: ../../app/controllers/roles_controller.rb:108
+#: ../../app/controllers/roles_controller.rb:107
 msgid "Access removed"
 msgstr "Erişim kaldırıldı"
 
@@ -809,85 +809,85 @@ msgstr ""
 "Hesabınız başarıyla kurumsal kimlik bilgileriniz ile ilişkilendirildi. Artık k"
 "urumsal kimlik bilgilerinizle oturum açabilirsiniz."
 
-#: ../../app/controllers/settings/plans_controller.rb:39
+#: ../../app/controllers/settings/plans_controller.rb:38
 msgid "Export settings updated successfully."
 msgstr "Dışa aktarma ayarları başarıyla güncellendi."
 
-#: ../../app/controllers/settings/plans_controller.rb:41
+#: ../../app/controllers/settings/plans_controller.rb:40
 msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Dışa aktarma ayarlarınız kaydedilirken/sıfırlanırken bir hata oluştu."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
 msgid ". The API credentials have been emailed to %<email>s"
-msgstr ". API kimlik bilgileri %<email>s adresine e-posta ile gönderildi"
+msgstr ""
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is now active."
 msgstr "Bildiriminiz artık etkin."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:69
+#: ../../app/controllers/super_admin/notifications_controller.rb:70
 msgid "Your notification is no longer active."
 msgstr "Bildiriminiz artık etkin değil."
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:73
+#: ../../app/controllers/super_admin/notifications_controller.rb:74
 msgid "Unable to change the notification's active status"
 msgstr "Bildirimin etkin durumu değiştirilemiyor"
 
-#: ../../app/controllers/super_admin/notifications_controller.rb:104
+#: ../../app/controllers/super_admin/notifications_controller.rb:105
 msgid "There is no notification associated with id  %<id>s"
-msgstr "%<id>s kimliğiyle ilişkili bildirim yok"
+msgstr ""
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:22
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:24
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
 " %<org_name>s."
 msgstr ""
-"Kuruluş bağlantınız değiştirildi. Artık %<org_name>s için şablonları düzenleyeb"
-"ilirsiniz."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:25
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
 msgid "Unable to change your organisation affiliation at this time."
 msgstr "Şu anda kuruluş bağlantınız değiştirilemiyor."
 
-#: ../../app/controllers/super_admin/org_swaps_controller.rb:28
+#: ../../app/controllers/super_admin/org_swaps_controller.rb:31
 msgid "Unknown organisation."
 msgstr "Bilinmeyen kuruluş."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:71
+#: ../../app/controllers/super_admin/orgs_controller.rb:70
 msgid "There seems to be a problem with your logo. Please upload it again."
 msgstr "Logonuzda bir sorun var gibi görünüyor. Lütfen tekrar yükleyin."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:135
+#: ../../app/controllers/super_admin/orgs_controller.rb:137
 msgid "An error occurred while trying to merge the Organisations."
-msgstr ""
+msgstr "Kuruluşlar birleştirilmeye çalışılırken bir hata oluştu."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:139
+#: ../../app/controllers/super_admin/orgs_controller.rb:141
 msgid "Unable to merge the two Organisations at this time."
-msgstr ""
+msgstr "Şu anda iki Kuruluş birleştirilemiyor."
 
-#: ../../app/controllers/super_admin/orgs_controller.rb:143
+#: ../../app/controllers/super_admin/orgs_controller.rb:145
 msgid "Unable to determine what records need to be merged."
-msgstr ""
+msgstr "Hangi kayıtların birleştirilmesi gerektiği belirlenemiyor."
 
-#: ../../app/controllers/super_admin/users_controller.rb:71
+#: ../../app/controllers/super_admin/users_controller.rb:69
 msgid ""
 "You attempted to merge 2 accounts with the same email address.\n"
 "           Please merge with a different email address."
 msgstr ""
+"Aynı e-posta adresine sahip 2 hesabı birleştirmeye çalıştınız.\n"
+"            Lütfen e-posta adresleri farklı hesapları birleştirin."
 
-#: ../../app/controllers/super_admin/users_controller.rb:107
+#: ../../app/controllers/super_admin/users_controller.rb:111
 msgid "archived"
 msgstr "arşivlendi"
 
-#: ../../app/controllers/super_admin/users_controller.rb:109
+#: ../../app/controllers/super_admin/users_controller.rb:113
 msgid "archive"
 msgstr "arşivle"
 
-#: ../../app/controllers/super_admin/users_controller.rb:129
+#: ../../app/controllers/super_admin/users_controller.rb:134
 msgid "merged"
 msgstr "birleştirildi"
 
-#: ../../app/controllers/super_admin/users_controller.rb:131
+#: ../../app/controllers/super_admin/users_controller.rb:136
 msgid "merge"
 msgstr "birleştir"
 
@@ -899,39 +899,39 @@ msgstr ""
 "Başka bir kullanıcı olarak oturum açmış durumdasınız. Davetinizi etkinleştirme"
 "k için lütfen oturumunuzu kapatın."
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:44
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:46
 msgid "Successfully signed in"
 msgstr "Başarıyla oturum açıldı"
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:59
 msgid "Your account has been successfully linked to %<scheme>s."
-msgstr "Hesabınız başarıyla %<scheme>s şemasına bağlandı."
+msgstr ""
 
-#: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
+#: ../../app/controllers/users/omniauth_callbacks_controller.rb:63
 msgid "Unable to link your account to %<scheme>s."
-msgstr "Hesabınız %<scheme>s şemasına bağlanamadı."
+msgstr ""
 
-#: ../../app/controllers/users_controller.rb:141
+#: ../../app/controllers/users_controller.rb:147
 msgid "Successfully %<action>s %<username>s's account."
-msgstr "%<username>s adlı kullanıcının hesabı başarıyla %<action>s."
+msgstr ""
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "activated"
 msgstr "etkinleştirildi"
 
-#: ../../app/controllers/users_controller.rb:142
+#: ../../app/controllers/users_controller.rb:148
 msgid "deactivated"
 msgstr "devre dışı bırakıldı"
 
-#: ../../app/controllers/users_controller.rb:149
+#: ../../app/controllers/users_controller.rb:154
 msgid "Unable to %<action>s %<username>s"
-msgstr " %<username>s %<action>s yapılamıyor"
+msgstr ""
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "activate"
 msgstr "etkinleştir"
 
-#: ../../app/controllers/users_controller.rb:150
+#: ../../app/controllers/users_controller.rb:155
 msgid "deactivate"
 msgstr "devre dışı bırak"
 
@@ -954,13 +954,13 @@ 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:194
+#: ../../app/helpers/conditions_helper.rb:193
 msgid "Answering"
 msgstr "Cevaplıyor"
 
-#: ../../app/helpers/conditions_helper.rb:198
-msgid " will <b>send an email</b> with subject "
-msgstr "şu konuyu içeren <b>bir e-posta gönderecek</b>"
+#: ../../app/helpers/conditions_helper.rb:197
+msgid " will <b>send an email</b> with subject %<subject_name>s"
+msgstr ""
 
 #: ../../app/helpers/conditions_helper.rb:203
 msgid " will <b>remove</b> question "
@@ -970,19 +970,15 @@ msgstr "soruyu <b>kaldıracak</b>"
 msgid " will <b>remove</b> questions "
 msgstr "soruları <b>kaldıracak</b>"
 
-#: ../../app/helpers/conditions_helper.rb:223
-msgid "\""
-msgstr "\""
-
-#: ../../app/helpers/customizable_template_link_helper.rb:12
+#: ../../app/helpers/customizable_template_link_helper.rb:13
 msgid "Transfer customisation"
 msgstr "Özelleştirmeyi aktar"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:17
+#: ../../app/helpers/customizable_template_link_helper.rb:18
 msgid "Edit customisation"
 msgstr "Özelleştirmeyi düzenle"
 
-#: ../../app/helpers/customizable_template_link_helper.rb:21
+#: ../../app/helpers/customizable_template_link_helper.rb:22
 msgid "Customise"
 msgstr "Özelleştir"
 
@@ -991,26 +987,24 @@ msgid "Creators:"
 msgstr "Oluşturanlar:"
 
 #: ../../app/helpers/exports_helper.rb:38
-#: ../../app/models/concerns/exportable_plan.rb:133
+#: ../../app/models/concerns/exportable_plan.rb:141
+#: ../../app/views/shared/export/_plan_coversheet.erb:6
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creator:"
 msgstr "Oluşturan:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
 msgid "%<application_name>s: Your plan has been submitted for feedback"
-msgstr "%<application_name>s: Planınız geri bildirim için gönderildi"
+msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
-"eedback from an\n"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for"
+" feedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
 "      at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Merhaba %<user_name>s.</p><p> \"%<plan_name>s\" adlı planınız, kurumunuzdaki bi"
-"r yöneticiye geri bildirim almak için gönderildi. Bu eylemle ilgili sorularını"
-"z varsa, lütfen %<organisation_email>s adresinden bizimle iletişime geçin.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1048,9 +1042,6 @@ msgid ""
 "s\n"
 "       at %<organisation_email>s.</p>"
 msgstr ""
-"<p>%<org_name>s organizasyonundan bir veri kütüphanecisi, isteğinize 48 saat iç"
-"inde yanıt verecektir. Bu işlemle ilgili sorularınız varsa lütfen %{organisati"
-"on_email} adresinden bizimle iletişime geçin.</p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1090,8 +1081,8 @@ msgid "Grant API to organisations"
 msgstr "Kuruluşlara API erişimi ver"
 
 #: ../../app/helpers/plans_helper.rb:8
+#: ../../app/views/paginable/plans/_index.html.erb:8
 #: ../../app/views/paginable/plans/_org_admin.html.erb:21
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:8
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:16
 #: ../../app/views/paginable/plans/_publicly_visible.html.erb:8
 msgid "Owner"
@@ -1134,231 +1125,227 @@ msgstr "Herkese açık: herkes görüntüleyebilir."
 msgid "Private: restricted to me and people I invite."
 msgstr "Özel: benimle ve davet ettiğim kişilerle sınırlı."
 
-#: ../../app/helpers/settings_template_helper.rb:7
-#: ../../app/helpers/settings_template_helper.rb:18
+#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:19
 msgid "Unknown column name."
 msgstr "Bilinmeyen sütun adı."
 
-#: ../../app/helpers/settings_template_helper.rb:8
+#: ../../app/helpers/settings_template_helper.rb:9
 msgid "Plan Name"
 msgstr "Plan Adı"
 
-#: ../../app/helpers/settings_template_helper.rb:9
+#: ../../app/helpers/settings_template_helper.rb:10
 msgid "Plan ID"
 msgstr "Plan ID"
 
-#: ../../app/helpers/settings_template_helper.rb:10
+#: ../../app/helpers/settings_template_helper.rb:11
 msgid "Grant number"
 msgstr "Fon/hibe numarası (grant number)"
 
-#: ../../app/helpers/settings_template_helper.rb:11
+#: ../../app/helpers/settings_template_helper.rb:12
 msgid "Principal Investigator / Researcher"
 msgstr "Proje yöneticisi (PI) / Araştırmacı"
 
-#: ../../app/helpers/settings_template_helper.rb:12
+#: ../../app/helpers/settings_template_helper.rb:13
 msgid "Plan Data Contact"
 msgstr "Plan Veri İletişim"
 
-#: ../../app/helpers/settings_template_helper.rb:13
+#: ../../app/helpers/settings_template_helper.rb:14
 msgid "Plan Description"
 msgstr "Plan Açıklaması"
 
-#: ../../app/helpers/settings_template_helper.rb:14
+#: ../../app/helpers/settings_template_helper.rb:15
 #: ../../app/views/orgs/_profile_form.html.erb:129
 #: ../../app/views/paginable/templates/_customisable.html.erb:7
 #: ../../app/views/paginable/templates/_organisational.html.erb:12
-#: ../../app/views/plans/_project_details.html.erb:88
-#: ../../app/views/plans/_project_details.html.erb:102
+#: ../../app/views/plans/_project_details.html.erb:156
 #: ../../app/views/plans/_show_details.html.erb:12
 #: ../../app/views/plans/new.html.erb:86
 msgid "Funder"
 msgstr "Fon Sağlayıcı"
 
-#: ../../app/helpers/settings_template_helper.rb:16
+#: ../../app/helpers/settings_template_helper.rb:17
 msgid "Your ORCID"
 msgstr "ORCID'niz"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:21
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:20
 msgid "None"
-msgstr ""
+msgstr "Hiçbiri"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:30
 msgid "Guidance for: %<themes>s"
 msgstr ""
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:51
 msgid "Nothing to merge"
-msgstr ""
+msgstr "Birleştirilecek bir şey yok"
 
-#: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
+#: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
-#: ../../app/helpers/template_helper.rb:46
+#: ../../app/helpers/template_helper.rb:48
 #: ../../app/views/plans/index.html.erb:29
 #: ../../app/views/plans/new.html.erb:123
 #: ../../app/views/shared/_create_plan_modal.html.erb:5
-#: ../../spec/features/locales_spec.rb:54
-#: ../../spec/features/locales_spec.rb:71
+#: ../../spec/features/locales_spec.rb:53
+#: ../../spec/features/locales_spec.rb:69
 msgid "Create plan"
 msgstr "Plan oluşturun"
 
-#: ../../app/helpers/usage_helper.rb:62
+#: ../../app/helpers/usage_helper.rb:65
 msgid "Last month"
 msgstr "Geçen ay"
 
-#: ../../app/helpers/usage_helper.rb:63
+#: ../../app/helpers/usage_helper.rb:66
 msgid "Last 3 months"
 msgstr "Son 3 ay"
 
-#: ../../app/helpers/usage_helper.rb:64
+#: ../../app/helpers/usage_helper.rb:67
 msgid "Last 6 months"
 msgstr "Son 6 ay"
 
-#: ../../app/helpers/usage_helper.rb:65
+#: ../../app/helpers/usage_helper.rb:68
 msgid "Last 9 months"
 msgstr "Son 9 ay"
 
-#: ../../app/helpers/usage_helper.rb:66
+#: ../../app/helpers/usage_helper.rb:69
 msgid "Last 12 months"
 msgstr "Son 12 ay"
 
-#: ../../app/mailers/user_mailer.rb:16
-#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
-#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
-#: ../../app/views/user_mailer/_email_signature.html.erb:2
+#: ../../app/mailers/user_mailer.rb:17
 msgid "Query or feedback related to %<tool_name>s"
-msgstr "%<tool_name>s ile ilgili sorgu veya geri bildirim"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:23
+#: ../../app/mailers/user_mailer.rb:24
 msgid "Welcome to %<tool_name>s"
-msgstr "%<tool_name>s aracına hoş geldiniz"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:58
+#: ../../app/mailers/user_mailer.rb:59
 msgid "A Data Management Plan in %<tool_name>s has been shared with you"
-msgstr "%<tool_name>s içinde bir Veri Yönetim Planı sizinle paylaşıldı"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:76
+#: ../../app/mailers/user_mailer.rb:75
 msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
-msgstr "%<tool_name>s aracındaki bir Veri Yönetim Planına ilişkin değiştirilen izinler"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:92
+#: ../../app/mailers/user_mailer.rb:89
 msgid "Permissions removed on a DMP in %<tool_name>s"
-msgstr "%<tool_name>s içindeki bir VYP'de izinler kaldırıldı"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:111
+#: ../../app/mailers/user_mailer.rb:106
 msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:134
+#: ../../app/mailers/user_mailer.rb:128
 msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
-msgstr "%<tool_name>s: %<plan_title>s için uzman geri bildirimi sağlandı"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:169
+#: ../../app/mailers/user_mailer.rb:145
 msgid "DMP Visibility Changed: %<plan_title>s"
-msgstr "VYP Görünürlüğü Değiştirildi: %<plan_title>s"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:200
+#: ../../app/mailers/user_mailer.rb:173
 msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
-msgstr "%<tool_name>s: %<plan_title>s adlı plana yeni bir yorum eklendi"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:218
+#: ../../app/mailers/user_mailer.rb:188
 msgid "Administrator privileges granted in %<tool_name>s"
-msgstr "%<tool_name>s içinde verilen yönetici ayrıcalıkları"
+msgstr ""
 
-#: ../../app/mailers/user_mailer.rb:235
+#: ../../app/mailers/user_mailer.rb:204
 msgid "%<tool_name>s API changes"
-msgstr "%<tool_name>s API değişiklikleri"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:26
+#: ../../app/models/concerns/exportable_plan.rb:30
 msgid "Phase"
 msgstr "Aşama"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Section"
 msgstr "Bölüm"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/exported_plan.rb:114
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/exported_plan.rb:116
 msgid "Question"
 msgstr "Soru"
 
-#: ../../app/models/concerns/exportable_plan.rb:28
-#: ../../app/models/concerns/exportable_plan.rb:30
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/concerns/exportable_plan.rb:32
+#: ../../app/models/concerns/exportable_plan.rb:34
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Answer"
 msgstr "Cevap"
 
-#: ../../app/models/concerns/exportable_plan.rb:120
+#: ../../app/models/concerns/exportable_plan.rb:128
 msgid " Customised By: "
 msgstr " Özelleştiren:"
 
-#: ../../app/models/concerns/exportable_plan.rb:131
+#: ../../app/models/concerns/exportable_plan.rb:139
 #: ../../app/views/shared/export/_plan_txt.erb:4
 msgid "Creators: "
 msgstr "Oluşturanlar:"
 
-#: ../../app/models/concerns/exportable_plan.rb:134
+#: ../../app/models/concerns/exportable_plan.rb:142
 msgid "%<authors>s"
-msgstr "%<authors>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:135
+#: ../../app/models/concerns/exportable_plan.rb:143
 msgid "%<affiliation>s"
-msgstr "Bağlı olunan kurum/kuruluş:"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:137
-#: ../../app/models/concerns/exportable_plan.rb:139
-#: ../../app/views/shared/export/_plan_coversheet.erb:16
+#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:147
+#: ../../app/views/shared/export/_plan_coversheet.erb:14
 #: ../../app/views/shared/export/_plan_txt.erb:7
 #: ../../app/views/shared/export/_plan_txt.erb:9
 msgid "Template: "
 msgstr "Şablon:"
 
-#: ../../app/models/concerns/exportable_plan.rb:137
+#: ../../app/models/concerns/exportable_plan.rb:145
 msgid "%<funder>s"
-msgstr "%<funder>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:139
+#: ../../app/models/concerns/exportable_plan.rb:147
 msgid "%<template>s"
-msgstr "%<template>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_txt.erb:12
 msgid "Grant number: "
 msgstr "Fon/hibe numarası:"
 
-#: ../../app/models/concerns/exportable_plan.rb:142
+#: ../../app/models/concerns/exportable_plan.rb:149
 msgid "%<grant_number>s"
-msgstr "%<grant_number>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:145
-#: ../../app/views/shared/export/_plan_coversheet.erb:26
+#: ../../app/models/concerns/exportable_plan.rb:151
+#: ../../app/views/shared/export/_plan_coversheet.erb:24
 #: ../../app/views/shared/export/_plan_txt.erb:15
 msgid "Project abstract: "
 msgstr "Proje özeti:"
 
-#: ../../app/models/concerns/exportable_plan.rb:145
+#: ../../app/models/concerns/exportable_plan.rb:151
 msgid "%<description>s"
-msgstr "%<description>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:148
-#: ../../app/views/shared/export/_plan_coversheet.erb:42
+#: ../../app/models/concerns/exportable_plan.rb:153
+#: ../../app/views/shared/export/_plan_coversheet.erb:40
 #: ../../app/views/shared/export/_plan_txt.erb:18
 msgid "Last modified: "
 msgstr "Son düzenleme:"
 
-#: ../../app/models/concerns/exportable_plan.rb:148
+#: ../../app/models/concerns/exportable_plan.rb:153
 msgid "%<date>s"
-msgstr "%<date>s"
+msgstr ""
 
-#: ../../app/models/concerns/exportable_plan.rb:149
-#: ../../app/views/shared/export/_plan_coversheet.erb:49
+#: ../../app/models/concerns/exportable_plan.rb:154
+#: ../../app/views/shared/export/_plan_coversheet.erb:47
 #: ../../app/views/shared/export/_plan_txt.erb:19
 msgid "Copyright information:"
 msgstr "Telif hakkı bilgileri:"
 
-#: ../../app/models/concerns/exportable_plan.rb:150
+#: ../../app/models/concerns/exportable_plan.rb:155
 msgid ""
 "The above plan creator(s) have agreed that others may use as\n"
 "             much of the text of this plan as they would like in their own pla"
@@ -1378,7 +1365,7 @@ msgstr ""
 "anız, planı oluşturan(lar)ın sizin projenizi veya önerinizi onayladığı veya bu"
 "nlarla herhangi bir ilişkisi olduğu anlamına gelmez"
 
-#: ../../app/models/concerns/exportable_plan.rb:175
+#: ../../app/models/concerns/exportable_plan.rb:179
 msgid "Not Answered"
 msgstr "Cevaplanmadı"
 
@@ -1388,7 +1375,7 @@ msgid "can't be blank"
 msgstr "boş bırakılamaz"
 
 #: ../../app/models/concerns/validation_messages.rb:13
-#: ../../app/models/identifier.rb:131
+#: ../../app/models/identifier.rb:134
 msgid "must be unique"
 msgstr "eşsiz olmalı"
 
@@ -1408,41 +1395,40 @@ msgstr "'Soru metni' için boş olamaz."
 msgid "You must specify at least one role."
 msgstr "En az bir rol belirtmelisiniz."
 
-#: ../../app/models/contributor.rb:136
-msgid "can't be blank if no email is provided"
-msgstr "e-posta girilmezse boş bırakılamaz"
+#: ../../app/models/contributor.rb:135 ../../app/models/contributor.rb:138
+msgid "can't be blank."
+msgstr ""
 
-#: ../../app/models/contributor.rb:137
-msgid "can't be blank if no name is provided"
-msgstr "isim girilmezse boş bırakılamaz"
+#: ../../app/models/contributor.rb:142
+msgid "can't be blank if no email is provided."
+msgstr ""
 
-#: ../../app/models/exported_plan.rb:114 ../../app/models/exported_plan.rb:117
+#: ../../app/models/contributor.rb:143
+msgid "can't be blank if no name is provided."
+msgstr ""
+
+#: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119
 msgid "Selected option(s)"
 msgstr "Seçilmiş seçenek(ler)"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:117
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:119
 msgid "Answered by"
 msgstr "Şu kişi tarafından cevaplandı:"
 
-#: ../../app/models/exported_plan.rb:115 ../../app/models/exported_plan.rb:118
+#: ../../app/models/exported_plan.rb:117 ../../app/models/exported_plan.rb:120
 msgid "Answered at"
 msgstr "Şurada cevaplandı:"
 
-#: ../../app/models/exported_plan.rb:162
+#: ../../app/models/exported_plan.rb:165
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: ../../app/models/exported_plan.rb:169
-msgid "-"
-msgstr "-"
-
-#: ../../app/models/exported_plan.rb:186
-#: ../../app/views/shared/export/_plan.erb:53
-#: ../../app/views/shared/export/_plan_txt.erb:50
-msgid "Question not answered."
-msgstr "Soru cevaplanmadı."
+#: ../../app/models/exported_plan.rb:189
+msgid ""
+"Question not answered.\n"
+msgstr ""
 
-#: ../../app/models/identifier.rb:138
+#: ../../app/models/identifier.rb:141
 msgid "already assigned a value"
 msgstr "zaten bir değer atanmış"
 
@@ -1450,35 +1436,35 @@ msgstr "zaten bir değer atanmış"
 msgid "Feedback email message"
 msgstr "Geri bildirim e-posta iletisi"
 
-#: ../../app/models/org.rb:130
+#: ../../app/models/org.rb:121
 msgid "must be one of the following formats: jpeg, jpg, png, gif, bmp"
 msgstr "şu biçimlerden biri olmalıdır: jpeg, jpg, png, gif, bmp"
 
-#: ../../app/models/org.rb:135
+#: ../../app/models/org.rb:126
 msgid "can't be larger than 500KB"
 msgstr "500KB'den büyük olamaz"
 
-#: ../../app/models/plan.rb:63
+#: ../../app/models/plan.rb:57
 msgid "organisational"
 msgstr "kuruluşla ilgili"
 
-#: ../../app/models/plan.rb:64
+#: ../../app/models/plan.rb:58
 msgid "public"
 msgstr "herkese açık"
 
-#: ../../app/models/plan.rb:65
+#: ../../app/models/plan.rb:59
 msgid "test"
 msgstr "test"
 
-#: ../../app/models/plan.rb:66
+#: ../../app/models/plan.rb:60
 msgid "private"
 msgstr "özel"
 
-#: ../../app/models/plan.rb:578 ../../app/models/research_output.rb:119
+#: ../../app/models/plan.rb:608
 msgid "must be after the start date"
 msgstr "başlangıç tarihinden sonra olmalıdır"
 
-#: ../../app/models/question.rb:153
+#: ../../app/models/question.rb:151
 msgid "guidance on"
 msgstr "rehberlik açık"
 
@@ -1486,35 +1472,35 @@ msgstr "rehberlik açık"
 msgid "can't be less than zero"
 msgstr "sıfırdan küçük olamaz"
 
-#: ../../app/models/settings/template.rb:84
+#: ../../app/models/settings/template.rb:80
 msgid "A required setting has not been provided"
 msgstr "Gerekli bir ayar sağlanmadı"
 
-#: ../../app/models/settings/template.rb:86
+#: ../../app/models/settings/template.rb:82
 msgid "Margin value is invalid"
 msgstr "Kenar boşluğu değeri geçersiz"
 
-#: ../../app/models/settings/template.rb:88
+#: ../../app/models/settings/template.rb:84
 msgid "Margin cannot be negative"
 msgstr "Kenar boşluğu boyutu negatif olamaz"
 
-#: ../../app/models/settings/template.rb:91
+#: ../../app/models/settings/template.rb:86
 msgid "Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"
 msgstr "Bilinmeyen kenar boşluğu. Yalnızca 'üst', 'alt', 'sol' veya 'sağ' olabilir"
 
-#: ../../app/models/settings/template.rb:94
+#: ../../app/models/settings/template.rb:88
 msgid "Invalid font size"
 msgstr "Geçersiz yazı tipi boyutu"
 
-#: ../../app/models/settings/template.rb:96
+#: ../../app/models/settings/template.rb:90
 msgid "Invalid font face"
 msgstr "Geçersiz yazı tipi yüzü"
 
-#: ../../app/models/settings/template.rb:98
+#: ../../app/models/settings/template.rb:92
 msgid "Unknown formatting setting"
 msgstr "Bilinmeyen biçimlendirme ayarı"
 
-#: ../../app/models/settings/template.rb:105
+#: ../../app/models/settings/template.rb:99
 msgid "Invalid maximum pages"
 msgstr "Geçersiz maksimum sayfa sayısı"
 
@@ -1522,83 +1508,85 @@ msgstr "Geçersiz maksimum sayfa sayısı"
 msgid "A historical template cannot be retrieved for being modified"
 msgstr "Tarihsel bir şablon değiştirilmek üzere çekilemiyor"
 
-#: ../../app/models/template.rb:371
+#: ../../app/models/template.rb:373
 msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! bir kuruluş hedefi gerektirir"
 
-#: ../../app/models/template.rb:380
+#: ../../app/models/template.rb:382
 msgid "Copy of %<template>s"
-msgstr "%<template>s şablonunun kopyası"
+msgstr ""
 
-#: ../../app/models/template.rb:388
+#: ../../app/models/template.rb:389
 msgid "generate_version! requires a published template"
 msgstr "generate_version! yayınlanmış bir şablon gerektirir"
 
-#: ../../app/models/template.rb:404
+#: ../../app/models/template.rb:403
 msgid "customize! requires an organisation target"
 msgstr "customize! bir kuruluş hedefi gerektirir"
 
-#: ../../app/models/template.rb:409
+#: ../../app/models/template.rb:406
 msgid "customize! requires a template from a funder"
 msgstr "customize! bir fon sağlayıcıdan bir şablon gerektirir"
 
-#: ../../app/models/template.rb:446
+#: ../../app/models/template.rb:442
 msgid "You can not publish a published template.  "
 msgstr "Yayınlanmış bir şablonu yayınlayamazsınız."
 
-#: ../../app/models/template.rb:450
+#: ../../app/models/template.rb:446
 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:455
+#: ../../app/models/template.rb:451
 msgid "You can not publish a template without phases.  "
 msgstr "Aşamaları olmayan bir şablonu yayınlayamazsınız."
 
-#: ../../app/models/template.rb:460
+#: ../../app/models/template.rb:456
 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:465
+#: ../../app/models/template.rb:461
 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:469
+#: ../../app/models/template.rb:465
 msgid "Conditions in the template refer backwards"
 msgstr "Şablondaki koşullar geriye dönük"
 
-#: ../../app/models/user.rb:379
+#: ../../app/models/user.rb:384
 msgid "A Data Management Plan in %<application_name>s has been shared with you"
-msgstr "%<application_name>s içinde bir Veri Yönetim Planı sizinle paylaşıldı"
-
-#: ../../app/policies/api/v0/departments_policy.rb:12
-#: ../../app/policies/api/v0/guidance_group_policy.rb:12
-#: ../../app/policies/api/v0/guidance_policy.rb:13
-#: ../../app/policies/api/v0/plans_policy.rb:13
-#: ../../app/policies/api/v0/statistics_policy.rb:12
-#: ../../app/policies/api/v0/template_policy.rb:12
-#: ../../app/policies/api_client_policy.rb:6
-#: ../../app/policies/notification_policy.rb:6
-#: ../../app/policies/plan_policy.rb:9 ../../app/policies/template_policy.rb:8
-#: ../../app/policies/theme_policy.rb:6
-msgid "must be logged in"
-msgstr "giriş yapmış olmalı"
-
-#: ../../app/policies/api/v0/guidance_group_policy.rb:14
-#: ../../app/policies/api/v0/guidance_policy.rb:15
-#: ../../app/policies/api/v0/statistics_policy.rb:14
-#: ../../app/policies/api/v0/template_policy.rb:14
+msgstr ""
+
+#: ../../app/policies/api/v0/guidance_group_policy.rb:11
+#: ../../app/policies/api/v0/guidance_policy.rb:11
+#: ../../app/policies/api/v0/statistics_policy.rb:11
 msgid "must have access to guidances api"
 msgstr "rehberlikler API'sine erişimi olmalıdır"
 
-#: ../../app/policies/api/v0/plans_policy.rb:15
+#: ../../app/policies/api/v0/plans_policy.rb:11
 msgid "must have access to plans api"
 msgstr "planlar API'sine erişimi olmalıdır"
 
-#: ../../app/policies/plan_policy.rb:13
-msgid "are not authorized to view that plan"
-msgstr "kullanıcısının/kullanıcılarının bu planı görme yetkisi yok"
+#: ../../app/policies/api/v0/template_policy.rb:9
+msgid "must have access to templates api"
+msgstr ""
 
-#: ../../app/presenters/contributor_presenter.rb:57
+#: ../../app/presenters/contributor_presenter.rb:42
+msgid "Data Manager"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:44
+msgid "Project Administrator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:46
+msgid "Principal Investigator"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:48
+msgid "Other"
+msgstr ""
+
+#: ../../app/presenters/contributor_presenter.rb:56
 msgid ""
 "Management activities to annotate (produce metadata), scrub data and maintain "
 "research data (including software code, where it is necessary for interpreting"
@@ -1609,7 +1597,7 @@ msgstr ""
 "mak için gerekli durumlarda yazılım kodu da dahil olmak üzere) araştırma veril"
 "erini muhafaza etme amaçlı yönetim faaliyetleri."
 
-#: ../../app/presenters/contributor_presenter.rb:59
+#: ../../app/presenters/contributor_presenter.rb:58
 msgid ""
 "Conducting a research and investigation process, specifically performing the e"
 "xperiments, or data/evidence collection."
@@ -1617,7 +1605,7 @@ msgstr ""
 "Özellikle deneyleri yaparak veya veri/kanıt toplayarak bir araştırma ve incele"
 "me süreci yürütüyor."
 
-#: ../../app/presenters/contributor_presenter.rb:61
+#: ../../app/presenters/contributor_presenter.rb:60
 msgid ""
 "Management and coordination responsibility for the research activity planning "
 "and execution."
@@ -1625,60 +1613,60 @@ msgstr ""
 "Araştırma faaliyetinin planlanması ve yürütülmesi için yönetim ve koordinasyon"
 " sorumluluğu."
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:40
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34
 msgid "Invalid grant type"
 msgstr "Geçersiz Fon/hibe türü"
 
-#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:79
+#: ../../app/services/api/v1/auth/jwt/authentication_service.rb:70
 msgid "Invalid credentials"
 msgstr "Geçersiz kimlik bilgileri"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:32
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:29
 msgid "Invalid token"
 msgstr "Geçersiz token"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:49
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:46
 msgid "Token expired"
 msgstr "Token'ın süresi doldu"
 
-#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:56
+#: ../../app/services/api/v1/auth/jwt/authorization_service.rb:53
 msgid "Missing token"
 msgstr "Eksik token"
 
-#: ../../app/services/api/v1/json_validation_service.rb:11
+#: ../../app/services/api/v1/json_validation_service.rb:7
 msgid ":title and the contact's :mbox are both required fields"
 msgstr ":title ve kişinin :mbox'ı zorunlu alanlardır"
 
-#: ../../app/services/api/v1/json_validation_service.rb:12
+#: ../../app/services/api/v1/json_validation_service.rb:8
 msgid ":type and :identifier are required for all ids"
 msgstr "Tüm id numaraları için :type ve :identifier zorunludur"
 
-#: ../../app/services/api/v1/json_validation_service.rb:13
+#: ../../app/services/api/v1/json_validation_service.rb:9
 msgid ":name is required for every :affiliation and :funding"
 msgstr ":name her :affiliation ve :funding için zorunludur"
 
-#: ../../app/services/api/v1/json_validation_service.rb:14
+#: ../../app/services/api/v1/json_validation_service.rb:10
 msgid ":role and either the :name or :email are required for each :contributor"
 msgstr ":role ile beraber  :name veya :email her bir :contributor için zorunludur"
 
-#: ../../app/services/api/v1/json_validation_service.rb:15
+#: ../../app/services/api/v1/json_validation_service.rb:11
 msgid ":name, :funder_id or :grant_id are required for each funding"
 msgstr ":name, :funder_id veya :grant_id her bir fonlama için zorunludur"
 
-#: ../../app/services/api/v1/json_validation_service.rb:16
+#: ../../app/services/api/v1/json_validation_service.rb:12
 msgid ":title is required for each :dataset"
 msgstr "Her :dataset için :title zorunludur"
 
-#: ../../app/services/api/v1/json_validation_service.rb:59
-#: ../../spec/services/api/v1/json_validation_service_spec.rb:129
+#: ../../app/services/api/v1/json_validation_service.rb:53
+#: ../../spec/services/api/v1/json_validation_service_spec.rb:128
 msgid "invalid JSON"
 msgstr "Geçersiz JSON"
 
-#: ../../app/services/template/upgrade_customization_service.rb:68
+#: ../../app/services/template/upgrade_customization_service.rb:67
 msgid "upgrade_customization! requires a customised template"
 msgstr "upgrade_customization! özelleştirilmiş bir şablon gerektirir"
 
-#: ../../app/services/template/upgrade_customization_service.rb:73
+#: ../../app/services/template/upgrade_customization_service.rb:71
 msgid ""
 "upgrade cannot be carried out since there is no published template of its curr"
 "ent funder"
@@ -1688,24 +1676,24 @@ msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
 msgid "must be after %<date>s"
-msgstr "%<date>s tarihinden sonra olmalıdır"
+msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
 msgstr "Bağlantı hash'i için bir anahtar \"org\" bekleniyor"
 
 #: ../../app/validators/org_links_validator.rb:13
-#: ../../app/validators/template_links_validator.rb:21
+#: ../../app/validators/template_links_validator.rb:23
 msgid "A hash is expected for links"
 msgstr "Bağlantılar için bir hash bekleniyor"
 
-#: ../../app/validators/template_links_validator.rb:12
-msgid "A key %<key>s is expected for links hash"
-msgstr "Bağlantı hash'i için bir anahtar %<key>s bekleniyor"
-
 #: ../../app/validators/template_links_validator.rb:15
 msgid "The key %<key>s does not have a valid set of object links"
-msgstr "%<key>s anahtarında geçerli bir nesne bağlantısı seti yok"
+msgstr ""
+
+#: ../../app/validators/template_links_validator.rb:19
+msgid "A key %<key>s is expected for links hash"
+msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1713,10 +1701,10 @@ msgstr "Aşağıdaki cevap kaydedilemez"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %<name>s saved the answer below while you were editing. Please, combine y"
+"since %{name} saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"%<name>s, siz düzenleme yaparken aşağıdaki yanıtı kaydettiği için. Lütfen değiş"
+"%{name}, siz düzenleme yaparken aşağıdaki yanıtı kaydettiği için. Lütfen değiş"
 "ikliklerinizi birleştirin ve ardından yanıtı tekrar kaydedin."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1744,14 +1732,14 @@ msgid "Please wait, Standards are loading"
 msgstr "Lütfen bekleyin, Standartlar yükleniyor"
 
 #: ../../app/views/answers/_new_edit.html.erb:68
-#: ../../app/views/contributors/_form.html.erb:92
-#: ../../app/views/devise/passwords/edit.html.erb:28
+#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/devise/passwords/edit.html.erb:35
 #: ../../app/views/devise/registrations/_password_details.html.erb:31
 #: ../../app/views/devise/registrations/_personal_details.html.erb:90
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:23
-#: ../../app/views/guidances/new_edit.html.erb:48
-#: ../../app/views/notes/_edit.html.erb:9
-#: ../../app/views/notes/_new.html.erb:12
+#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_new.html.erb:13
 #: ../../app/views/org_admin/departments/edit.html.erb:23
 #: ../../app/views/org_admin/departments/new.html.erb:23
 #: ../../app/views/org_admin/phases/_form.html.erb:25
@@ -1762,11 +1750,11 @@ msgstr "Lütfen bekleyin, Standartlar yükleniyor"
 #: ../../app/views/org_admin/users/edit.html.erb:54
 #: ../../app/views/orgs/_feedback_form.html.erb:38
 #: ../../app/views/orgs/_profile_form.html.erb:168
-#: ../../app/views/plans/_edit_details.html.erb:10
+#: ../../app/views/plans/_edit_details.html.erb:11
 #: ../../app/views/plans/_guidance_selection.html.erb:23
 #: ../../app/views/questions/_preview_question.html.erb:111
-#: ../../app/views/super_admin/api_clients/_form.html.erb:65
-#: ../../app/views/super_admin/notifications/_form.html.erb:65
+#: ../../app/views/super_admin/api_clients/_form.html.erb:67
+#: ../../app/views/super_admin/notifications/_form.html.erb:66
 #: ../../app/views/super_admin/themes/_form.html.erb:13
 #: ../../app/views/super_admin/users/edit.html.erb:61
 #: ../../app/views/users/_admin_grant_permissions.html.erb:68
@@ -1790,8 +1778,8 @@ msgid "Answered"
 msgstr "Cevaplandı"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %<user_name>s"
-msgstr " %<user_name>s tarafından"
+msgid " by %{user_name}"
+msgstr " %{user_name} tarafından"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1847,12 +1835,13 @@ msgstr "Konu"
 msgid "Message"
 msgstr "İleti"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:38
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:39
+#: ../../app/views/devise/passwords/edit.html.erb:30
 #: ../../app/views/shared/_create_account_form.html.erb:46
 msgid "Security check"
 msgstr "Güvenlik kontrolü"
 
-#: ../../app/views/contact_us/contacts/_new_left.html.erb:42
+#: ../../app/views/contact_us/contacts/_new_left.html.erb:43
 #: ../../app/views/plans/_share_form.html.erb:146
 msgid "Submit"
 msgstr "Gönder"
@@ -1868,18 +1857,18 @@ msgstr "Bize Ulaşın"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
-"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
+"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
-"would like to contact us about %<application_name>s, please fill out the form b"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 msgstr ""
-"%<application_name>s, %<organisation_name>s tarafından sağlanmaktadır. <a href=\""
-"%<organisation_url>s\" class=\"has-new-window-popup-info\" target=\"_blank\">Web sit"
+"%{application_name}, %{organisation_name} tarafından sağlanmaktadır. <a href=\""
+"%{organisation_url}\" class=\"has-new-window-popup-info\" target=\"_blank\">Web sit"
 "emizde<em class=\"sr-only\">(new window)</em><span class=\"new-window-popup-info\""
-">%<open_in_new_window_text>s</span></a> <br /> hakkımızda daha fazla bilgi bula"
-"bilirsiniz. %<application_name>s hakkında bizimle iletişime geçmek isterseniz, "
+">%{open_in_new_window_text}</span></a> <br /> hakkımızda daha fazla bilgi bula"
+"bilirsiniz. %{application_name} hakkında bizimle iletişime geçmek isterseniz, "
 "lütfen aşağıdaki formu doldurun."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
@@ -1914,21 +1903,21 @@ msgstr "Katkıda bulunan kişi için geçerli olacak tüm rolleri seçin."
 msgid "ORCID"
 msgstr "ORCID"
 
-#: ../../app/views/contributors/_form.html.erb:43
+#: ../../app/views/contributors/_form.html.erb:44
 msgid "Phone number"
 msgstr "Telefon numarası"
 
-#: ../../app/views/contributors/_form.html.erb:62
+#: ../../app/views/contributors/_form.html.erb:64
 #: ../../app/views/paginable/contributors/_index.html.erb:14
 msgid "Affiliation"
 msgstr "Bağlı olunan kurum/kuruluş"
 
-#: ../../app/views/contributors/_form.html.erb:70
+#: ../../app/views/contributors/_form.html.erb:72
 #: ../../app/views/paginable/contributors/_index.html.erb:16
 msgid "Roles"
 msgstr "Roller"
 
-#: ../../app/views/contributors/_form.html.erb:94
+#: ../../app/views/contributors/_form.html.erb:96
 #: ../../app/views/notes/_archive.html.erb:10
 #: ../../app/views/notes/_list.html.erb:16
 #: ../../app/views/notes/_list.html.erb:19
@@ -1948,19 +1937,19 @@ msgstr "Roller"
 msgid "Remove"
 msgstr "Kaldır"
 
-#: ../../app/views/contributors/_form.html.erb:97
+#: ../../app/views/contributors/_form.html.erb:99
 #: ../../app/views/guidance_groups/_guidance_group_form.html.erb:24
-#: ../../app/views/guidances/new_edit.html.erb:49
+#: ../../app/views/guidances/new_edit.html.erb:50
 #: ../../app/views/notes/_archive.html.erb:11
-#: ../../app/views/notes/_edit.html.erb:10
+#: ../../app/views/notes/_edit.html.erb:11
 #: ../../app/views/org_admin/departments/edit.html.erb:24
 #: ../../app/views/org_admin/departments/new.html.erb:24
 #: ../../app/views/org_admin/questions/_form.html.erb:103
 #: ../../app/views/org_admin/questions/_form.html.erb:105
 #: ../../app/views/plans/_guidance_selection.html.erb:35
 #: ../../app/views/plans/new.html.erb:124
-#: ../../app/views/super_admin/api_clients/_form.html.erb:84
-#: ../../app/views/super_admin/notifications/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:86
+#: ../../app/views/super_admin/notifications/_form.html.erb:73
 #: ../../app/views/super_admin/themes/_form.html.erb:19
 #: ../../app/views/super_admin/users/_confirm_merge.html.erb:15
 #: ../../app/views/users/_admin_grant_permissions.html.erb:69
@@ -2028,14 +2017,14 @@ msgstr "Şifre onayı"
 msgid "First name"
 msgstr "İsim"
 
-#: ../../app/views/devise/invitations/edit.html.erb:27
+#: ../../app/views/devise/invitations/edit.html.erb:28
 #: ../../app/views/devise/registrations/_personal_details.html.erb:21
 #: ../../app/views/org_admin/users/edit.html.erb:24
 #: ../../app/views/super_admin/users/edit.html.erb:25
 msgid "Last name"
 msgstr "Soyad"
 
-#: ../../app/views/devise/invitations/edit.html.erb:39
+#: ../../app/views/devise/invitations/edit.html.erb:40
 #: ../../app/views/devise/registrations/new.html.erb:43
 #: ../../app/views/devise/registrations/new.html.erb:58
 #: ../../app/views/shared/_access_controls.html.erb:11
@@ -2044,8 +2033,8 @@ msgid "Create account"
 msgstr "Hesap oluşturun"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %<application_name>s"
-msgstr "%<application_name>s uygulamasına hoş geldiniz"
+msgid "Welcome to %{application_name}"
+msgstr "%{application_name} uygulamasına hoş geldiniz"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2063,26 +2052,32 @@ msgstr "veya kopyala"
 msgid "into your browser"
 msgstr "tarayıcınıza"
 
+#: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
+#: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
+#: ../../app/views/user_mailer/_email_signature.html.erb:2
+msgid "Query or feedback related to %{tool_name}"
+msgstr "%{tool_name} ile ilgili sorgu veya geri bildirim"
+
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %<user_name>s"
-msgstr "Merhaba %<user_name>s"
+msgid "Hello %{user_name}"
+msgstr "Merhaba %{user_name}"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
-"nagement Plan in %<tool_name>s"
+"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
+"nagement Plan in %{tool_name}"
 msgstr ""
-"Meslektaşınız %<inviter_name>s, sizi kendisinin %<tool_name>s aracındaki Veri Yö"
+"Meslektaşınız %{inviter_name}, sizi kendisinin %{tool_name} aracındaki Veri Yö"
 "netim Planına katkıda bulunmaya davet etti."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
+"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"Daveti kabul etmek için %<click_here>s (veya %<link>s adresini kopyalayıp tarayı"
+"Daveti kabul etmek için %{click_here} (veya %{link} adresini kopyalayıp tarayı"
 "cınıza yapıştırın). Daveti kabul etmek istemiyorsanız, lütfen bu e-postayı dik"
 "kate almayınız."
 
@@ -2102,8 +2097,8 @@ msgstr "İyi çalışmalar"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %<tool_name>s team"
-msgstr "%<tool_name>s ekibi"
+msgid "The %{tool_name} team"
+msgstr "%{tool_name} ekibi"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2114,24 +2109,24 @@ msgstr "Lütfen bu e-postayı yanıtlamayın"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us_url>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us_url}"
 msgstr ""
-"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %<helpdesk_email>s "
-"adresinden bizimle iletişime geçin ya da %<contact_us_url>s adresini ziyaret ed"
+"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %{helpdesk_email} "
+"adresinden bizimle iletişime geçin ya da %{contact_us_url} adresini ziyaret ed"
 "in."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %<user_email>s"
-msgstr "Merhaba %<user_email>s"
+msgid "Hello %{user_email}"
+msgstr "Merhaba %{user_email}"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %<tool_name>s password. You can do "
+"Someone has requested a link to change your %{tool_name} password. You can do "
 "this through the link below."
 msgstr ""
-"%<tool_name>s Şifrenizi değişikliği için bir bağlantı talep edildi. Değişikliği"
-" aşağıdaki bağlantıyı kullanarak yapabilirsiniz."
+"%{tool_name} şifrenizin değişikliği için bir bağlantı talep edildi. Değişikliğ"
+"i aşağıdaki bağlantıyı kullanarak yapabilirsiniz."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
 msgid "Change my password"
@@ -2144,11 +2139,11 @@ msgstr "Böyle bir talebiniz yoksa, lütfen bu e-postayı dikkate almayın."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %<helpdesk_email>s"
-" or visit %<contact_us>s"
+"If you have any questions or need help, please contact us at %{helpdesk_email}"
+" or visit %{contact_us}"
 msgstr ""
-"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %<helpdesk_email>s "
-"adresinden bizimle iletişime geçin ya da %<contact_us>s adresini ziyaret edin."
+"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %{helpdesk_email} "
+"adresinden bizimle iletişime geçin ya da %{contact_us} adresini ziyaret edin."
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2218,21 +2213,21 @@ msgstr "Belgeler"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
+"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 "İstatistiklere erişimi, planların tam metnini ve kullanıcıları bölümleriyle eş"
 "leştirme becerisini içeren orijinal API hakkında daha fazla ayrıntı için <a hr"
-"ef=\"%<api_v0_wiki>s\">v0 belgeleri</a> adresini ziyaret edin."
+"ef=\"%{api_v0_wiki}\">v0 belgeleri</a> adresini ziyaret edin."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
+"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"<a href=\"%<rda_standard_url>s\">VYPler için ortak RDA üst veri standartlarını </"
+"<a href=\"%{rda_standard_url}\">VYPler için ortak RDA üst veri standartlarını </"
 "a> destekleyen API hakkında daha detaylı bilgi edinmek için <a href=\"%{api_v1_"
 "wiki}\">  adresindeki v1 </a>dokümanları ziyaret edin."
 
@@ -2409,8 +2404,8 @@ msgid "Sign in or Create account"
 msgstr "Oturum açın veya Hesap oluşturun"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %<application_name>s account?"
-msgstr "%<application_name>s hesabınız var mı?"
+msgid "Do you have a %{application_name} account?"
+msgstr "%{application_name} hesabınız var mı?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2425,8 +2420,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Bu işlem mevcut hesabınızı kimlik bilgilerinizle ilişkilendirir."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %<application_name>s account?"
-msgstr "%<application_name>s hesabı yok mu?"
+msgid "No %{application_name} account?"
+msgstr "%{application_name} hesabı yok mu?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2495,7 +2490,7 @@ msgstr "tümünü daralt"
 #: ../../app/views/guidance_groups/admin_edit.html.erb:4
 #: ../../app/views/guidance_groups/admin_new.html.erb:1
 #: ../../app/views/guidance_groups/admin_new.html.erb:4
-#: ../../app/views/guidances/new_edit.html.erb:33
+#: ../../app/views/guidances/new_edit.html.erb:34
 #: ../../app/views/paginable/guidances/_index.html.erb:8
 msgid "Guidance group"
 msgstr "Rehberlik grubu"
@@ -2578,7 +2573,7 @@ msgstr "Rehber oluşturun"
 msgid "Enter your guidance here. You can include links where needed."
 msgstr "Yönergelerinizi buraya girin. Gerektiğinde bağlantılar ekleyebilirsiniz."
 
-#: ../../app/views/guidances/new_edit.html.erb:31
+#: ../../app/views/guidances/new_edit.html.erb:32
 msgid ""
 "Select one or more themes that are relevant to this guidance. This will displa"
 "y your generic organisation-level guidance, or any Schools/Departments for whi"
@@ -2589,27 +2584,27 @@ msgstr ""
 "soru içeren tüm şablonlarda, genel kurum düzeyindeki rehberliğinizi veya rehbe"
 "rlik grupları oluşturduğunuz tüm Üniversite/Bölümleri görüntüler."
 
-#: ../../app/views/guidances/new_edit.html.erb:36
+#: ../../app/views/guidances/new_edit.html.erb:37
 msgid "Select which group this guidance relates to."
 msgstr "Bu rehberliğin ilgili olduğu grubu seçin."
 
-#: ../../app/views/guidances/new_edit.html.erb:43
+#: ../../app/views/guidances/new_edit.html.erb:44
 msgid "Check this box when you are ready for this guidance to appear on user's plans."
 msgstr ""
 "Bu kılavuzun kullanıcının planlarında görünmesi için hazır olduğunuzda bu kutu"
 "yu işaretleyin."
 
-#: ../../app/views/guidances/new_edit.html.erb:44
+#: ../../app/views/guidances/new_edit.html.erb:45
 msgid "Published?"
 msgstr "Yayınlandı mı?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
+"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%<application_name>s, veri yönetimi planları yazmanıza yardımcı olmak amacıy"
-"la <strong>%<organisation_name>s</strong> tarafından geliştirilmiştir.</p>"
+"<p>%{application_name}, veri yönetimi planları yazmanıza yardımcı olmak amacıy"
+"la <strong>%{organisation_name}</strong> tarafından geliştirilmiştir.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
 msgid "Getting started:"
@@ -2714,11 +2709,11 @@ msgstr "Gizlilik bildirimi"
 
 #: ../../app/views/layouts/_footer.html.erb:17
 msgid "Accessibility statement"
-msgstr ""
+msgstr "Erişilebilirlik beyanı"
 
 #: ../../app/views/layouts/_footer.html.erb:18
 msgid "Github"
-msgstr ""
+msgstr "GitHub"
 
 #: ../../app/views/layouts/_navigation.html.erb:12
 #: ../../app/views/orgs/_profile_form.html.erb:55
@@ -2794,8 +2789,9 @@ msgid "Logout"
 msgstr "Çıkış Yap"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%<application_name>s"
-msgstr "%<application_name>s"
+#: ../../app/views/static_pages/termsuse.html.erb:14
+msgid "%{application_name}"
+msgstr "%{application_name}"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2807,7 +2803,7 @@ msgstr "Bildiri:"
 
 #: ../../app/views/layouts/application.html.erb:101
 msgid "Loading..."
-msgstr ""
+msgstr "Yükleniyor..."
 
 #: ../../app/views/layouts/application.html.erb:121
 #: ../../app/views/plans/new.html.erb:2
@@ -2870,11 +2866,11 @@ msgstr "Yeni bir pencerede açılır"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
+"%{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 ""
-"%<n>s sonuç mevcut, önerilerde gezinmek için yukarı ve aşağı oklarını kullanın."
+"%{n} sonuç mevcut, önerilerde gezinmek için yukarı ve aşağı oklarını kullanın."
 " Bir öneri seçmek için Enter tuşunu veya önerileri kapatmak için Çıkış tuşunu "
 "kullanın."
 
@@ -2926,8 +2922,8 @@ msgid "Example answer"
 msgstr "Örnek cevap"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%<org>s Example Answer"
-msgstr "%<org>s Örnek Cevap"
+msgid "%{org} Example Answer"
+msgstr "%{org} Örnek Cevap"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3082,10 +3078,10 @@ msgstr "Aşamayı sil"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
+"You are about to delete the '%{phase_title}' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"'%<phase_title>s' aşamasını silmek üzeresiniz. Bu işlem aşağıda listelenen tüm "
+"'%{phase_title}' aşamasını silmek üzeresiniz. Bu işlem aşağıda listelenen tüm "
 "bölümleri ve soruları kaldıracaktır. Emin misiniz?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3144,8 +3140,8 @@ msgid "Write plan"
 msgstr "plan yazın"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%<org_name>s Plans"
-msgstr "%<org_name>s Planlar"
+msgid "%{org_name} Plans"
+msgstr "%{org_name} Planlar"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3196,10 +3192,10 @@ msgstr "Plan sahibine, geri bildirim sağlamayı tamamladığımı bildir"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%<open_in_new_window_text>s</span>"
+"pup-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "Planları indirin <em class=\"sr-only\">(yeni pencere)</em> <span class=\"new-wind"
-"ow-popup-info\">%<open_in_new_window_text>s</span>"
+"ow-popup-info\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3229,8 +3225,8 @@ msgstr ""
 "lirsiniz."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %<number>s:"
-msgstr "Soru %<number>s:"
+msgid "Question %{number}:"
+msgstr "Soru %{number}:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3297,15 +3293,15 @@ msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
 #: ../../app/views/org_admin/sections/_form.html.erb:19
-#: ../../app/views/super_admin/api_clients/_form.html.erb:77
-#: ../../app/views/super_admin/notifications/_form.html.erb:67
+#: ../../app/views/super_admin/api_clients/_form.html.erb:79
+#: ../../app/views/super_admin/notifications/_form.html.erb:68
 #: ../../app/views/super_admin/themes/_form.html.erb:15
 msgid "Delete"
 msgstr "Sil"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%<question_number>s. Are you sure?"
-msgstr "#%<question_number>s sorusunu silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgstr "#%{question_number} sorusunu silmek üzeresiniz. Emin misiniz?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3402,10 +3398,10 @@ msgstr "Bölüm için bir başlık girin"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%<section_title>s'. This will affect questions linked "
+"You are about to delete '%{section_title}'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"'%<section_title>s' öğesini silmek üzeresiniz. Bu işlem bu bölümle bağlantılı s"
+"'%{section_title}' öğesini silmek üzeresiniz. Bu işlem bu bölümle bağlantılı s"
 "oruları etkileyecektir. Emin misiniz?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3434,8 +3430,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %<org_name>s use only"
-msgstr "yalnızca dahili %<org_name>s kullanımı için"
+msgid "for internal %{org_name} use only"
+msgstr "yalnızca dahili %{org_name} kullanımı için"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3600,28 +3596,32 @@ msgstr ""
 "ulur. Fon sağlayıcı şablonlarına soru eklemek istiyorsanız aşağıdaki 'şablonu "
 "özelleştir' seçeneklerini kullanın."
 
+#: ../../app/views/org_admin/templates/index.html.erb:52
+msgid "%{org_name} Templates"
+msgstr "%{org_name} Şablonlar"
+
 #: ../../app/views/org_admin/templates/index.html.erb:63
 msgid "Customisable Templates"
 msgstr "Özelleştirilebilir Şablonlar"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%<count>s)"
-msgstr "Tüm (%<count>s)"
+msgid "All (%{count})"
+msgstr "Tüm (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%<count>s)"
-msgstr "(%<count>s) adet yayınlandı"
+msgid "Published (%{count})"
+msgstr "(%{count}) adet yayınlandı"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%<count>s)"
-msgstr "Yayınlanmamış sayısı: (%<count>s)"
+msgid "Unpublished (%{count})"
+msgstr "Yayınlanmamış sayısı: (%{count})"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%<count>s)"
-msgstr "(%<count>s) Özelleştirilmeyen sayısı "
+msgid "Not customised (%{count})"
+msgstr "(%{count}) Özelleştirilmeyen sayısı "
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3630,8 +3630,8 @@ msgstr "Bir şablon oluşturun"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %<username>s"
-msgstr "%<username>s için profil düzenleniyor"
+msgid "Editing profile for %{username}"
+msgstr "%{username} için profil düzenleniyor"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3639,8 +3639,8 @@ msgid "View all users"
 msgstr "Tüm kullanıcıları görüntüle"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %<username>s"
-msgstr "%<username>s kullanıcısına ait planlar"
+msgid "Plans of %{username}"
+msgstr "%{username} kullanıcısına ait planlar"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3670,7 +3670,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Yukarıdaki tanımlayıcılardan herhangi biri hatalı veya eksikse, bunları güncel"
-"lemek için lütfen <a href=\"%<contact_us_url>s\"> bizimle iletişime geçin.</a>"
+"lemek için lütfen <a href=\"%{contact_us_url}\"> bizimle iletişime geçin.</a>"
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3695,23 +3695,28 @@ msgstr "Örnek Mesaj"
 
 #: ../../app/views/orgs/_merge_form.html.erb:3
 msgid "Merge Organisations"
-msgstr ""
+msgstr "Kuruluşları Birleştir"
 
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%<org_name>s</strong>'."
+"trong>%{org_name}</strong>'."
 msgstr ""
+"Lütfen mevcut kuruluşun yerini alacak kuruluşu seçin: '<strong>%{org_name}</st"
+"rong>'."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
 " Then click the 'analyze' button to review the proposed changes. Note that no "
 "changes will take place until you have reviewed and approve of the changes."
 msgstr ""
+"Ardından önerilen değişiklikleri incelemek için 'analiz et' butonunu tıklayın."
+" Siz değişiklikleri gözden geçirip onaylayana kadar hiçbir değişiklik yapılmay"
+"acağını dikkate alın."
 
 #: ../../app/views/orgs/_merge_form.html.erb:18
 msgid "Analyze"
-msgstr ""
+msgstr "Analiz et"
 
 #: ../../app/views/orgs/_profile_form.html.erb:4
 msgid "Links will be displayed next to your organisation's logo"
@@ -3875,21 +3880,21 @@ msgid "Last Accessed"
 msgstr "Son Erişim"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:30
-#: ../../app/views/super_admin/api_clients/_form.html.erb:57
+#: ../../app/views/super_admin/api_clients/_form.html.erb:59
 msgid "Never"
 msgstr "Asla"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%<client_name>s'. They will no longer be able to acces"
+"You are about to delete '%{client_name}'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"'%<client_name>s' öğesini silmek üzeresiniz. Artık API'ye erişemeyecekler. Emin"
+"'%{client_name}' öğesini silmek üzeresiniz. Artık API'ye erişemeyecekler. Emin"
 " misiniz?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
-msgstr "'%<contributor_name>s' öğesini silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgstr "'%{contributor_name}' öğesini silmek üzeresiniz. Emin misiniz?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3902,10 +3907,10 @@ msgstr "Kısaltılmış Ad veya Kod"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
+"You are about to delete '%{department_name}'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"'%<department_name>s' öğesini silmek üzeresiniz. Bu işem rehberliği etkileyecek"
+"'%{department_name}' öğesini silmek üzeresiniz. Bu işem rehberliği etkileyecek"
 "tir. Emin misiniz?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3946,15 +3951,15 @@ msgstr "Yayınla"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
+"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"'%<guidance_group_name>s' öğesini silmek üzeresiniz. Bu işlem rehberliği etkile"
+"'%{guidance_group_name}' öğesini silmek üzeresiniz. Bu işlem rehberliği etkile"
 "yecektir. Emin misiniz?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
-msgstr "'%<guidance_summary>s' öğesini silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgstr "'%{guidance_summary}' öğesini silmek üzeresiniz. Emin misiniz?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -3990,8 +3995,23 @@ msgid "Managed"
 msgstr "Yönetilen"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%<org_name>s'. Are you sure?"
-msgstr "'%<org_name>s' öğesini silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgstr "'%{org_name}' öğesini silmek üzeresiniz. Emin misiniz?"
+
+#: ../../app/views/paginable/plans/_index.html.erb:5
+#: ../../app/views/paginable/plans/_org_admin.html.erb:18
+#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
+#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
+#: ../../app/views/plans/_show_details.html.erb:4
+msgid "Project Title"
+msgstr "Proje Başlığı"
+
+#: ../../app/views/paginable/plans/_index.html.erb:28
+#: ../../app/views/paginable/plans/_org_admin.html.erb:43
+#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
+msgid "Test"
+msgstr "Test"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4007,8 +4027,8 @@ msgstr ""
 " aşağıda listelenen kayıtların sayısının kullanım panosunda gösterilen toplam "
 "kayıt sayısıyla eşleşmeyebileceği anlamına gelir. Örneğin, kullanıcılarınızdan"
 " biri Ekim ayında bir plan oluşturduysa ve daha sonra bu planı Kasım ayında ka"
-"ldırdıysa; bu, kullanım panosunun Ekim ayı için toplamına dahil edilecek; faka"
-"t aşağıdaki listede görünmeyecektir."
+"ldırdıysa; bu, kullanım panosundaki Ekim ayı toplamına dahil edilecek; fakat a"
+"şağıdaki listede görünmeyecektir."
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:12
 msgid ""
@@ -4020,25 +4040,10 @@ msgstr ""
 "arama kutusuna ay kısaltmasını ve 4 haneli yılı girin.<br> Örneğin: \"Eki 2019\""
 " veya \"Haz 2013\"."
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:18
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:5
-#: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:9
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:5
-#: ../../app/views/paginable/plans/_publicly_visible.html.erb:5
-#: ../../app/views/plans/_show_details.html.erb:4
-msgid "Project Title"
-msgstr "Proje Başlığı"
-
 #: ../../app/views/paginable/plans/_org_admin.html.erb:22
 msgid "Created"
 msgstr "Oluşturuldu"
 
-#: ../../app/views/paginable/plans/_org_admin.html.erb:43
-#: ../../app/views/paginable/plans/_org_admin_other_user.html.erb:28
-#: ../../app/views/paginable/plans/_privately_visible.html.erb:9
-msgid "Test"
-msgstr "Test"
-
 #:
 #: ../../app/views/paginable/plans/_organisationally_or_publicly_visible.html.erb:21
 #: ../../app/views/paginable/plans/_privately_visible.html.erb:63
@@ -4157,10 +4162,10 @@ msgstr "Değişiklikleri yayınla"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
+"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"\"%<template_title>s\" özelleştirmenizi kaldırmak istediğinizden emin misiniz? Ya"
+"\"%{template_title}\" özelleştirmenizi kaldırmak istediğinizden emin misiniz? Ya"
 "yınlanmış sürümlere kullanıcılar tarafından erişilemeyecek."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4177,10 +4182,10 @@ msgstr "Özelleştirmeleri görüntüle"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
+"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"\"%<template_title>s\" öğesini kaldırmak istediğinizden emin misiniz? Yayınlanan "
+"\"%{template_title}\" öğesini kaldırmak istediğinizden emin misiniz? Yayınlanan "
 "sürümlere kullanıcılar tarafından erişilemeyecek."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4238,8 +4243,8 @@ msgstr ""
 " aşağıda listelenen kayıtların sayısının kullanım panosunda gösterilen toplam "
 "kayıt sayısıyla eşleşmeyebileceği anlamına gelir. Örneğin, kullanıcılarınızdan"
 " biri Ekim ayında katıldıysa ve daha sonra farklı bir kuruluşa geçtiyse ya da "
-"hesabını inaktif hale getirdiyse; bu, kullanım panosunun Ekim ayı için toplamı"
-"na dahil edilecek; fakat aşağıdaki listede görünmeyecektir."
+"hesabını inaktif hale getirdiyse; bu, kullanım panosundaki Ekim ayı toplamına "
+"dahil edilecek; fakat aşağıdaki listede görünmeyecektir."
 
 #: ../../app/views/paginable/users/_index.html.erb:13
 msgid ""
@@ -4277,7 +4282,7 @@ msgstr "Biçim"
 
 #: ../../app/views/plans/_download_form.html.erb:12
 msgid "Download settings"
-msgstr "Ayarları indir"
+msgstr "İndirme ayarları"
 
 #: ../../app/views/plans/_download_form.html.erb:16
 msgid "Select phase to download"
@@ -4342,22 +4347,22 @@ msgstr "Yetki"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%<open_in_new_window_text>s</span>"
+"up-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "<em class=\"sr-only\">(yeni pencere)</em> <span class=\"new-window-popup-info\">%{"
 "open_in_new_window_text}</span> planını indir"
 
-#: ../../app/views/plans/_edit_details.html.erb:13
+#: ../../app/views/plans/_edit_details.html.erb:14
 #: ../../app/views/plans/_guidance_selection.html.erb:38
 msgid "Select Guidance"
 msgstr "Rehberlik Seç"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"%<application_name>s, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
+"%{application_name}, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
 "mlardan rehberler gösterebilir."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4378,11 +4383,11 @@ msgstr "Bu şablon için ek rehber yoktur."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %<application_name>s can show you guidance from a "
+"To help you write your plan, %{application_name} can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"%<application_name>s, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
+"%{application_name}, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
 "mlardan rehberler gösterebilir. Lütfen aşağıdaki kurumlardan planınızla ilgili"
 " rehberlik sunan 6 taneye kadarını seçin."
 
@@ -4408,19 +4413,19 @@ msgstr "Plan Yazın"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
+"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
 "."
 msgstr ""
-"Bu plan, %<org_name>s tarafından sağlanan \"%<template_title>s\" şablonunu temel a"
+"Bu plan, %{org_name} tarafından sağlanan \"%{template_title}\" şablonunu temel a"
 "lır."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %<template_version>s, published on %<published_date>s"
-msgstr "Şablon sürümü %<template_version>s, yayınlanma tarihi: %<published_date>s"
+msgid "Template version %{template_version}, published on %{published_date}"
+msgstr "Şablon sürümü %{template_version}, yayınlanma tarihi: %{published_date}"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
-msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4438,11 +4443,11 @@ msgstr[1] "sorular"
 msgid "answered"
 msgstr "cevaplandı"
 
-#: ../../app/views/plans/_project_details.html.erb:3
+#: ../../app/views/plans/_project_details.html.erb:4
 msgid "If applying for funding, state the name exactly as in the grant proposal."
 msgstr "Fon için başvuruyorsanız, ismi tam olarak proje önerisinde olduğu gibi yazın."
 
-#: ../../app/views/plans/_project_details.html.erb:4
+#: ../../app/views/plans/_project_details.html.erb:5
 msgid ""
 "Briefly summarise your research project to help others understand the purposes"
 " for which the data are being collected or created."
@@ -4450,49 +4455,92 @@ msgstr ""
 "Başkalarının verilerin toplanma veya oluşturulma amaçlarını anlamalarına yardı"
 "mcı olmak için araştırma projenizi kısaca özetleyin."
 
-#: ../../app/views/plans/_project_details.html.erb:5
+#: ../../app/views/plans/_project_details.html.erb:6
 msgid "A pertinent ID as determined by the funder and/or organisation."
 msgstr "Fon sağlayıcı ve/veya kuruluş tarafından belirlenen geçerli ID."
 
-#: ../../app/views/plans/_project_details.html.erb:22
+#: ../../app/views/plans/_project_details.html.erb:7
+msgid ""
+"Whether there are any potential ethical issues related to data that this DMP d"
+"escribes"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:8
+msgid "Description of the ethical issues"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:9
+msgid "Link to a protocol from a meeting with an ethics commitee"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:27
 #: ../../app/views/plans/new.html.erb:38
 msgid "mock project for testing, practice, or educational purposes"
 msgstr "test, uygulama veya eğitim amaçlı mock-up proje"
 
-#: ../../app/views/plans/_project_details.html.erb:30
+#: ../../app/views/plans/_project_details.html.erb:35
 msgid "Project abstract"
 msgstr "Proje özeti"
 
-#: ../../app/views/plans/_project_details.html.erb:41
+#: ../../app/views/plans/_project_details.html.erb:47
+msgid "Research domain"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:52
+#: ../../app/views/plans/_project_details.html.erb:173
+msgid "- Please select one -"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:62
 msgid "Project Start"
 msgstr "Proje Başlangıcı"
 
-#: ../../app/views/plans/_project_details.html.erb:44
+#: ../../app/views/plans/_project_details.html.erb:65
 msgid "The estimated date on which you will begin this project."
 msgstr "Bu projeye başlayacağınız tahmini tarih."
 
-#: ../../app/views/plans/_project_details.html.erb:47
+#: ../../app/views/plans/_project_details.html.erb:68
 msgid "Project End"
 msgstr "Proje Sonu"
 
-#: ../../app/views/plans/_project_details.html.erb:50
+#: ../../app/views/plans/_project_details.html.erb:71
 msgid "The estimated date on which you will complete this project."
 msgstr "Bu projeyi tamamlayacağınız tahmini tarih."
 
-#: ../../app/views/plans/_project_details.html.erb:59
+#: ../../app/views/plans/_project_details.html.erb:80
 msgid "Landing page"
 msgstr "Hedef sayfa"
 
-#: ../../app/views/plans/_project_details.html.erb:72
+#: ../../app/views/plans/_project_details.html.erb:93
 #: ../../app/views/plans/_show_details.html.erb:22
 msgid "ID"
 msgstr "ID"
 
 #: ../../app/views/plans/_project_details.html.erb:114
+msgid "Research outputs may have ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:121
+msgid "Describe any ethical concerns"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:134
+msgid "Ethical protocols"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:167
+msgid "Funding status"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:181
 msgid "Grant number/url"
-msgstr "Numara/url ata"
+msgstr "Fon/hibe numarası (grant number) / url"
 
-#: ../../app/views/plans/_project_details.html.erb:128
+#: ../../app/views/plans/_project_details.html.erb:195
+msgid "Grant number:"
+msgstr ""
+
+#: ../../app/views/plans/_project_details.html.erb:199
 msgid ""
 "Provide a URL to the award's landing page if possible, if not please provide t"
 "he award/grant number."
@@ -4532,11 +4580,11 @@ msgstr "Plan görünürlüğünü ayarla"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
+"nswer at least %{percentage}%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Herkese açık olma veya kurumsal görünürlük, tamamlanmış planlar içindir. Bu se"
-"çenekleri etkinleştirmek için soruların en az %%<percentage>s% kadarını yanıtla"
+"çenekleri etkinleştirmek için soruların en az %%{percentage}% kadarını yanıtla"
 "malısınız. Not: Test amaçlı planlar, varsayılan olarak özel görünürlüğe ayarla"
 "nmıştır."
 
@@ -4625,8 +4673,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Başlamak için aşağıdaki 'Plan oluştur' butonuna tıklayın."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%<org_title>s Plans"
-msgstr "%<org_title>s Planlar"
+msgid "%{org_title} Plans"
+msgstr "%{org_title} Planlar"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4708,11 +4756,11 @@ msgstr "Fon sağlayıcınız için birden fazla VYP şablonu bulduk."
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %<application_name>s service and shared"
+"Public DMPs are plans created using the %{application_name} service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Herkese Açık VYPler, %<application_name>s hizmeti kullanılarak oluşturulan ve o"
+"Herkese Açık VYPler, %{application_name} hizmeti kullanılarak oluşturulan ve o"
 "luşturanlar tarafından herkese açık olarak paylaşılan planlardır. Kalite, bütü"
 "nlük veya fon sağlayıcı yönergelerine uygunluk açısından denetlenmezler."
 
@@ -4763,8 +4811,8 @@ msgid "terms and conditions"
 msgstr "şartlar ve koşullar"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%<name>s\" template?"
-msgstr "\"%<name>s\" şablonuna dayalı bir plan oluşturmak ister misiniz?"
+msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgstr "\"%{name}\" şablonuna dayalı bir plan oluşturmak ister misiniz?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4815,41 +4863,46 @@ msgstr "Filtreyi kaldır"
 msgid "Filter plans"
 msgstr "Planları filtrele"
 
+#: ../../app/views/shared/export/_plan.erb:55
+#: ../../app/views/shared/export/_plan_txt.erb:52
+msgid "Question not answered."
+msgstr "Soru cevaplanmadı."
+
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
-#: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %<application_name>s"
-msgstr "%<application_name>s kullanılarak oluşturulan bir Veri Yönetim Planı"
+#: ../../app/views/shared/export/_plan_txt.erb:67
+msgid "A Data Management Plan created using %{application_name}"
+msgstr "%{application_name} kullanılarak oluşturulan bir Veri Yönetim Planı"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:10
+#: ../../app/views/shared/export/_plan_coversheet.erb:8
 #: ../../app/views/shared/export/_plan_txt.erb:5
 msgid "Affiliation: "
 msgstr "Bağlı olunan kurum/kuruluş:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:13
+#: ../../app/views/shared/export/_plan_coversheet.erb:11
 msgid "Funder: "
 msgstr "Fon Sağlayıcı:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:22
+#: ../../app/views/shared/export/_plan_coversheet.erb:20
 msgid "ORCID iD: "
 msgstr "ORCID hesabı:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:31
+#: ../../app/views/shared/export/_plan_coversheet.erb:29
 msgid "ID: "
-msgstr ""
+msgstr "ID:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:35
+#: ../../app/views/shared/export/_plan_coversheet.erb:33
 msgid "Start date: "
-msgstr ""
+msgstr "Başlangıç tarihi: "
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:39
+#: ../../app/views/shared/export/_plan_coversheet.erb:37
 msgid "End date: "
-msgstr ""
+msgstr "Bitiş tarihi:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:45
+#: ../../app/views/shared/export/_plan_coversheet.erb:43
 msgid "Grant number / URL: "
-msgstr ""
+msgstr "Fon/hibe numarası (grant number) / URL:"
 
-#: ../../app/views/shared/export/_plan_coversheet.erb:52
+#: ../../app/views/shared/export/_plan_coversheet.erb:50
 #: ../../app/views/shared/export/_plan_txt.erb:20
 msgid ""
 " The above plan creator(s) have agreed that others may use as much of the text"
@@ -4871,8 +4924,8 @@ msgstr ""
 msgid "Begin typing to see a list of suggestions."
 msgstr "Öneri listesini görmek için yazmaya başlayın."
 
-#: ../../app/views/shared/org_selectors/_combined.html.erb:47
-#: ../../app/views/shared/org_selectors/_external_only.html.erb:42
+#: ../../app/views/shared/org_selectors/_combined.html.erb:48
+#: ../../app/views/shared/org_selectors/_external_only.html.erb:43
 msgid ""
 "A new entry will be created for the organisation you have named above. Please "
 "double check that your organisation does not appear in the list in a slightly "
@@ -4882,14 +4935,14 @@ msgstr ""
 "kuruluşunuzun listede daha farklı bir biçimde görünmediğini tekrar kontrol edi"
 "n."
 
-#: ../../app/views/shared/org_selectors/_local_only.html.erb:45
+#: ../../app/views/shared/org_selectors/_local_only.html.erb:46
 msgid "The name you entered was not one of the listed suggestions!"
 msgstr "Girdiğiniz ad, listelenen önerilerden biri değil!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %<application_name>s"
-msgstr "%<application_name>s hakkında"
+msgid "About %{application_name}"
+msgstr "%{application_name} hakkında"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4971,10 +5024,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%<open_in_new_window_text>s</span>"
+"p-info\">%{open_in_new_window_text}</span>"
 msgstr ""
 "katıl <em class=\"sr-only\">(yeni pencere)</em> <span class=\"new-window-popup-in"
-"fo\">%<open_in_new_window_text>s</span>"
+"fo\">%{open_in_new_window_text}</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -4997,8 +5050,8 @@ msgstr ""
 "e başlayın."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %<application_name>s account, click on"
-msgstr "%<application_name>s hesabınız yoksa, tıklayın"
+msgid "If you do not have a %{application_name} account, click on"
+msgstr "%{application_name} hesabınız yoksa, tıklayın"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5036,14 +5089,10 @@ msgstr ""
 
 #: ../../app/views/static_pages/help.html.erb:11
 msgid ""
-"When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page."
-" From here you can edit, share, download, copy or remove any of your plans. Yo"
-"u will also see plans that have been shared with you by others."
+"When you log in to %{application_name} you will be directed to the 'My Dashboa"
+"rd' page. From here you can edit, share, download, copy or remove any of your "
+"plans. You will also see plans that have been shared with you by others."
 msgstr ""
-"DMRoadmap'e giriş yaptığınızda 'Gösterge Panelim' sayfasına yönlendirileceksin"
-"iz. Buradan planlarınızı düzenleyebilir, paylaşabilir, indirebilir, kopyalayab"
-"ilir veya kaldırabilirsiniz. Sizinle başkaları tarafından paylaşılan planları "
-"da göreceksiniz."
 
 #: ../../app/views/static_pages/help.html.erb:13
 msgid "Create a plan"
@@ -5098,8 +5147,8 @@ msgstr ""
 #: ../../app/views/static_pages/help.html.erb:24
 msgid "'Share' allows you to invite others to read or contribute to your plan."
 msgstr ""
-"'Paylaş', başkalarını planınızı okumaya veya planınıza katkıda bulunmaya davet"
-" etmenize olanak tanır."
+"'Paylaş', başkalarını planınızı okumak veya planınıza katkıda bulunmak için da"
+"vet etmenize imkan sağlar."
 
 #: ../../app/views/static_pages/help.html.erb:25
 msgid ""
@@ -5152,7 +5201,7 @@ msgstr "'Paylaş' sekmesi ayrıca plan görünürlüğünü ayarlayabileceğiniz
 
 #: ../../app/views/static_pages/help.html.erb:38
 msgid "Private: restricted to you and your collaborators."
-msgstr "Özel: sizinle ve ortak çalıştılklarınızla sınırlı."
+msgstr "Özel: sizinle ve ortak çalıştıklarınızla sınırlı."
 
 #: ../../app/views/static_pages/help.html.erb:39
 msgid "Organisational: anyone at your organisation can view your plan."
@@ -5200,14 +5249,8 @@ msgid ""
 " you need to submit your plan as part of a grant application. Choose what form"
 "at you would like to view/download your plan in and click to download. You can"
 " also adjust the formatting (font type, size and margins) for PDF files, which"
-" may be helpful if working to page limits.</p>"
+" may be helpful if working to page limits."
 msgstr ""
-"Buradan planınızı çeşitli formatlarda indirebilirsiniz. Planınızı hibe başvuru"
-"sunun bir eki olarak göndermeniz gerekiyorsa bu yararlı olabilir. Planınızı ha"
-"ngi formatta görüntülemek/indirmek istediğinizi seçin ve indirmek için tıklayı"
-"n. Ayrıca, PDF dosyalarının biçimlendirmesini (yazı tipi, boyutu ve kenar boşl"
-"ukları) ayarlayabilirsiniz; bu, sayfa sınırlarına uyum sağlamaya çalışıyorsanı"
-"z yardımcı olabilir.</p>"
 
 #: ../../app/views/static_pages/privacy.html.erb:10
 msgid "Information about you: how we use it and with whom we share it"
@@ -5215,46 +5258,46 @@ msgstr "Sizinle ilgili bilgileri nasıl kullanıyoruz ve kimlerle paylaşıyoruz
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %<org_name>s to offer you acces"
-"s to and personalisation of the %<application_name>s service."
+"The information you provide will be used by the %{org_name} to offer you acces"
+"s to and personalisation of the %{application_name} service."
 msgstr ""
-"Sağladığınız bilgiler, %<application_name>s hizmetine erişmenizi ve bu hizmeti "
-"kişiselleştirmenizi sağlamak için %<org_name>s tarafından kullanılacaktır."
+"Sağladığınız bilgiler, %{application_name} hizmetine erişmenizi ve bu hizmeti "
+"kişiselleştirmenizi sağlamak için %{org_name} tarafından kullanılacaktır."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %<org_name>s processes the personal data of %<application_name>s users in or"
-"der to deliver and improve the %<application_name>s service in a customised man"
+"The %{org_name} processes the personal data of %{application_name} users in or"
+"der to deliver and improve the %{application_name} service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%<org_name>s, %<application_name>s hizmetini özelleştirilmiş bir şekilde sunmak "
+"%{org_name}, %{application_name} hizmetini özelleştirilmiş bir şekilde sunmak "
 "ve iyileştirmek ve her kullanıcının ilgili bilgileri almasını sağlamak için %{"
 "application_name} kullanıcılarının kişisel verilerini işler."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %<org_name>s is necessary for pursu"
+"The processing of your personal data by the %{org_name} is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Kişisel verilerinizin %<org_name>s tarafından işlenmesi, aşağıdaki meşru menfaa"
+"Kişisel verilerinizin %{org_name} tarafından işlenmesi, aşağıdaki meşru menfaa"
 "tlerin takibi için gereklidir:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %<application_name>s service and personalisation of yo"
+"To provide access to the %{application_name} service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"%<application_name>s hizmetine erişim sağlamak ve kullanıcı deneyiminizi kişise"
+"%{application_name} hizmetine erişim sağlamak ve kullanıcı deneyiminizi kişise"
 "lleştirmek (ör. kuruluşunuz için ilgili şablonların ve rehberliğin sağlanması)"
 "."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %<application_name>s such as new feature"
+"To keep you up to date with news about %{application_name} such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"%<application_name>s hakkındaki yeni özellikler veya iyileştirmeler veya Gizlil"
+"%{application_name} hakkındaki yeni özellikler veya iyileştirmeler veya Gizlil"
 "ik Politikamızdaki değişiklikler gibi haberlerden sizi haberdar etmek."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5264,28 +5307,28 @@ msgstr "Ağ ve bilgi güvenliği amaçlı."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %<application_name>s service. Your personal data can be removed from thi"
-"s service upon request to the %<application_name>s team within a period of 30 d"
+"ng the %{application_name} service. Your personal data can be removed from thi"
+"s service upon request to the %{application_name} team within a period of 30 d"
 "ays."
 msgstr ""
-"%<application_name>s hizmetini kullanmaya devam ettiğiniz sürece bize sağladığı"
-"nız kişisel verileri saklayacağız. Kişisel verileriniz, %<application_name>s ek"
+"%{application_name} hizmetini kullanmaya devam ettiğiniz sürece bize sağladığı"
+"nız kişisel verileri saklayacağız. Kişisel verileriniz, %{application_name} ek"
 "ibinin talebi üzerine 30 günlük bir süre içinde bu hizmetten kaldırılabilir."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %<application_name>s team at: <a "
-"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"If you have any questions, please contact the %{application_name} team at: <a "
+"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 msgstr ""
-"Herhangi bir sorunuz varsa lütfen %<application_name>s ekibiyle şu adresten ile"
-"tişime geçin: <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
+"Herhangi bir sorunuz varsa lütfen %{application_name} ekibiyle şu adresten ile"
+"tişime geçin: <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %<revdate>s and may be revised at any time w"
+"This statement was last revised on %{revdate} and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Bu beyan en son %<revdate>s tarihinde revize edilmiştir ve önceden haber verile"
+"Bu beyan en son %{revdate} tarihinde revize edilmiştir ve önceden haber verile"
 "rek herhangi bir zamanda revize edilebilir."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5295,35 +5338,30 @@ msgid ""
 "ity. We provide services to the UK, US and international higher education sect"
 "or. "
 msgstr ""
-"(CDL) sırasıyla Edinburgh Üniversitesi ve California Üniversitesi tarafından d"
-"esteklenen konsorsiyumlardır. Birincil kullanıcılarımız araştırma toplulukları"
-"dır. İngiltere, ABD ve uluslararası yükseköğretim sektörüne hizmet veriyoruz."
-
-#: ../../app/views/static_pages/termsuse.html.erb:14
-msgid "DMPRoadmap"
-msgstr "DMPRoadmap"
+"(CDL) sırasıyla Edinburgh Üniversitesi ve Kaliforniya Üniversitesi tarafından "
+"desteklenen konsorsiyumlardır. Birincil kullanıcılarımız araştırma topluluklar"
+"ıdır. İngiltere, ABD ve uluslararası yükseköğretim sektörüne çeşitli hizmetler"
+" sağlıyoruz."
 
 #: ../../app/views/static_pages/termsuse.html.erb:16
 msgid ""
-"DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL a"
-"s a shared resource for the research community. It is hosted at CDL by the Uni"
-"versity of California Curation Center."
+"%{application_name} ('the tool', 'the system') is a tool developed by the DCC "
+"and CDL as a shared resource for the research community. It is hosted at CDL b"
+"y the University of California Curation Center."
 msgstr ""
-"DMPRoadmap ('araç', 'sistem'), araştırma topluluğu için paylaşımlı bir kaynak "
-"olarak DCC ve CDL tarafından geliştirilen bir araçtır. Kaliforniya Üniversites"
-"i Küratörlük Merkezi tarafından CDL'de barındırılmaktadır."
 
 #: ../../app/views/static_pages/termsuse.html.erb:18
 msgid ""
 "<h3>Your personal details and consent notice</h3>\n"
 "\n"
-"      <p>In order to help identify and administer your account with DMPRoadmap"
-", we need to store your name and email address. We may also use it to contact "
-"you to obtain feedback on your use of the tool, or to inform you of the latest"
-" developments or releases. The information may be transferred between the DCC "
-"and CDL but only for the following legitimate DCC and CDL purposes: marketing,"
-" improving our services and informing you of relevant content and events. We w"
-"ill not sell, rent, or trade any personal information you provide to us.\n"
+"      <p>In order to help identify and administer your account with %{applicat"
+"ion_name}, we need to store your name and email address. We may also use it to"
+" contact you to obtain feedback on your use of the tool, or to inform you of t"
+"he latest developments or releases. The information may be transferred between"
+" the DCC and CDL but only for the following legitimate DCC and CDL purposes: m"
+"arketing, improving our services and informing you of relevant content and eve"
+"nts. We will not sell, rent, or trade any personal information you provide to "
+"us.\n"
 "\n"
 "\n"
 "        By using this system, you consent to the collection, retention, and us"
@@ -5354,11 +5392,12 @@ msgid ""
 "\n"
 "      <h3>Cookies</h3>\n"
 "\n"
-"      <p>Please note that DMPRoadmap uses Cookies. Further information about C"
-"ookies and how we use them is available on the <a target='_blank' href='http:/"
-"/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
-"indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
+"      <p>Please note that %{application_name} uses Cookies. Further informatio"
+"n about Cookies and how we use them is available on the <a target='_blank' hre"
+"f='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\""
+"has-new-window-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</"
+"em><span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.<"
+"/p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5373,99 +5412,38 @@ msgid ""
 " at any time. Use of the tool indicates that you understand and agree to these"
 " terms and conditions.</p>"
 msgstr ""
-"<h3>Kişisel Bilgileriniz ve Rıza Beyanınız</h3>\n"
-"      <p>DMProadmap ile hesabınızı tanımlamaya ve yönetmeye yardımcı olmak içi"
-"n adınızı ve e-posta adresinizi saklamamız gerekiyor. İlaveten bu bilgileri, b"
-"u aracı kullanımınız hakkında sizden geri bildirim almak veya en son güncellem"
-"eler veya sürümler hakkında sizi bilgilendirmek amacıyla sizinle iletişime geç"
-"mek için de kullanabiliriz. Bilgiler DCC ve CDL arasında, ancak sadece belirti"
-"len şu yasal DCC ve CDL amaçları için aktarılabilir: pazarlama, hizmetlerimizi"
-" geliştirme ve sizi ilgili içerik ve konular hakkında bilgilendirme. Bize sağl"
-"adığınız hiçbir kişisel bilgiyi satmayacağız, kiralamayacağız veya takas etmey"
-"eceğiz.\n"
-"\n"
-"\n"
-"Bu sistemi kullanarak, kişisel bilgilerinizin yukarıdakilere uygun olarak topl"
-"anmasına, saklanmasına ve kullanılmasına izin vermiş olursunuz. Bizden kişisel"
-" bilgilerinizi pazarlama amacıyla işlemememizi isteme hakkına sahipsiniz. </p>"
-"\n"
-"\n"
-"      <h3>Gizlilik Politikası</h3>\n"
-"\n"
-"      <p> Bu sisteme girdiğiniz bilgiler; siz, erişimi paylaşmayı seçtiğiniz k"
-"işiler ve - yalnızca hizmeti sürdürmek amacıyla - DCC ve CDL'deki sistem yönet"
-"icileri tarafından görülebilir. Planlardan anonimleştirilmiş, otomatize edilmi"
-"ş ve kümelenmiş bilgiler derliyoruz, ancak izniniz olmadan içeriğinize doğruda"
-"n erişmeyeceğiz, içeriğinizi kullanmayacağız veya başkalarıyla paylaşmayacağız"
-". Ana kuruluşunuzdaki yetkililer planlarınıza belirli amaçlarla erişebilir- ör"
-"neğin, fon sağlayıcı gereksinimlerine/organizasyonel gereksinimlere uygunluğu "
-"izlemek, depolama gereksinimlerini hesaplamak veya disiplinler arası veri yöne"
-"timi hizmetlerine yönelik talebi değerlendirmek. </p>\n"
-"\n"
-"      <h3> Bilgi Edinme Özgürlüğü </h3>\n"
-"\n"
-"      <p>DCC ve CDL, planlarınızı sizin adınıza saklar, ancak bunlar sizin mül"
-"kiyetinizdir ve sizin sorumluluğunuzdadır. Herhangi bir FOIA başvuru sahibi, s"
-"izin ana kuruluşunuza geri yönlendirilecektir. </p>\n"
-"\n"
-"      <h3>Şifreler</h3>\n"
-"      <p> Parolanız kriptolanmış biçimde saklanır ve açık metin olarak çekilem"
-"ez. Unutulursa sıfırlanması gerekir. </p>\n"
-"\n"
-"      <h3>Çerezler</h3>\n"
-"\n"
-"<p> DMProadmap'in Çerezler kullandığını lütfen dikkate alın. Çerezler ve bunla"
-"rı nasıl kullandığımız hakkında daha fazla bilgi <a target='_blank' href='http"
-"://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new"
-"-window-popup-info\">ana DCC web sitesi<em class=\"sr-only\"> (new window)</em><s"
-"pan class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a> adresi"
-"nde mevcuttur. </p>\n"
-"\n"
-"      <h3>Üçüncü taraf APIleri</h3>\n"
-"\n"
-"<p> Bu web sitesindeki belirli özellikler, InCommon/Shibboleth veya ortak Java"
-"Script kütüphaneleri veya web yazı tipleri gibi üçüncü taraf barındırma hizmet"
-"leri gibi API'ler ve üçüncü taraf hizmetlerinden istifade eder. Harici bir hiz"
-"met tarafından kullanılan bilgiler, o hizmetin gizlilik politikasına tabidir. "
-"</p>\n"
-"\n"
-"     <h3>Revizyonlar</h3>\n"
-"\n"
-"<p> Bu beyan en son 5 Ekim 2017'de revize edilmiştir ve herhangi bir zamanda t"
-"ekrar revize edilebilir. Aracın kullanılması, bu hüküm ve koşulları anladığını"
-"z ve kabul ettiğiniz anlamına gelir. </p>"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:27
+#: ../../app/views/super_admin/api_clients/_form.html.erb:29
 msgid "Contact Name"
 msgstr "Kişi Adı"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:31
+#: ../../app/views/super_admin/api_clients/_form.html.erb:33
 msgid "Contact Email"
 msgstr "İletişim E-posta Adresi"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:45
+#: ../../app/views/super_admin/api_clients/_form.html.erb:47
 msgid "Client ID"
 msgstr "İstemci Kimliği"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:49
+#: ../../app/views/super_admin/api_clients/_form.html.erb:51
 msgid "Client Secret"
 msgstr "İstemci Sırrı"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:56
+#: ../../app/views/super_admin/api_clients/_form.html.erb:58
 msgid "Last accessed on"
 msgstr "Son erişim zamanı:"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:68
+#: ../../app/views/super_admin/api_clients/_form.html.erb:70
 msgid "Refresh client ID and secret"
 msgstr "İstemci Kimliğini ve İstemci Sırrını yenile"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:72
+#: ../../app/views/super_admin/api_clients/_form.html.erb:74
 msgid "Email credentials to contact"
 msgstr "İletişim için e-posta kimlik bilgileri"
 
-#: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%<name>s\""
-msgstr " \"%<name>s\" adlı API istemcisini silmek istediğinizden emin misiniz?"
+#: ../../app/views/super_admin/api_clients/_form.html.erb:83
+msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgstr " \"%{name}\" adlı API istemcisini silmek istediğinizden emin misiniz?"
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5481,8 +5459,8 @@ msgid "View all API clients"
 msgstr "Tüm API istemcilerini görüntüle"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %<email>s."
-msgstr "Kimlik bilgileri %<email>s adresine gönderildi."
+msgid "The credentials have been sent to %{email}."
+msgstr "Kimlik bilgileri %{email} adresine gönderildi."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5529,9 +5507,9 @@ msgstr "Kapatılabilir"
 msgid "Body"
 msgstr "Gövde"
 
-#: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%<title>s\""
-msgstr "\"%<title>s\" bildirimini silmek istediğinizden emin misiniz?"
+#: ../../app/views/super_admin/notifications/_form.html.erb:72
+msgid "Are you sure you want to delete the notification \"%{title}\""
+msgstr "\"%{title}\" bildirimini silmek istediğinizden emin misiniz?"
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5556,18 +5534,20 @@ msgid "New Notification"
 msgstr "Yeni Bildirim"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
-msgstr ""
+msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgstr "'%{from_org_name}', '%{to_org_name}' ile birleştiriliyor"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
-msgstr ""
+msgstr "Özet:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
+"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
+"%{from_org_name} ile bir birleştirme yapılmadan önceki ve yapıldıktan sonraki "
+"'%{to_org_name}' kayıtlarının sayıları."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:44
@@ -5575,62 +5555,72 @@ msgid "Record Type"
 msgstr "Kayıt Türü"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%<to_org_name>s' Count - before merge"
-msgstr ""
+msgid "'%{to_org_name}' Count - before merge"
+msgstr "'%{to_org_name}' Sayısı - birleştirmeden önce"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%<to_org_name>s' Count - after merge"
-msgstr ""
+msgid "'%{to_org_name}' Count - after merge"
+msgstr "'%{to_org_name}' Sayısı - birleştirmeden sonra"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
-msgstr ""
+msgstr "Ayrıntılar:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
+"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
+"Aşağıdaki tablo, birleştirme işlemi sırasında gerçekleşecek belirli değişiklik"
+"leri gösterir. Birleştirme tamamlandıktan sonra '%{from_org_name}' silinecek. "
+"Daha sonra birleştirme nedeniyle oluşmuş herhangi bir sorunu (ör. çoğaltılmış "
+"tüm departmanları kaldırın) toparlayabilir/düzeltebilirsiniz"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%<from_org_name>s - Before"
-msgstr ""
+msgid "%{from_org_name} - Before"
+msgstr "%{from_org_name} - Önce"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%<to_org_name>s - Before"
-msgstr ""
+msgid "%{to_org_name} - Before"
+msgstr "%{to_org_name} - Önce"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
-msgstr ""
+msgstr "Aşağıdaki öznitelikler güncellenecektir"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:91
 msgid ""
 "Warning: The changes proposed above will be committed to the database. '%{org_"
 "name}' will then be deleted."
 msgstr ""
+"Uyarı: Yukarıda önerilen değişiklikler veritabanına uygulanacak ve daha sonra "
+"'%{org_name}' silinecek."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
 msgid "These changes cannot be undone! Do not proceed unless you are certain."
-msgstr ""
+msgstr "Bu değişiklikler geri alınamaz! Emin olmadan işleme devam etmeyin."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:93
 msgid ""
 "You may find it helpful to make a note of the expected number of records for e"
 "ach category that will be merged before continuing."
 msgstr ""
+"Devam etmeden önce birleştirilecek olan her bir kategori için beklenen kayıt s"
+"ayısını not etmeniz önerilir."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
+"Warning: '%{from_org_name}' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
+"Uyarı: '%{from_org_name}', içinde şu anda inceleme sürecinde olan Planlar var."
+" Kuruluş yöneticileri, birleştirmeden sonra bu planları görüntüleyemeyebilir!"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:97
 msgid "Merge records"
-msgstr ""
+msgstr "Kayıtları birleştir"
 
 #: ../../app/views/super_admin/orgs/index.html.erb:8
 msgid "Create Organisation"
@@ -5640,15 +5630,15 @@ msgstr "Kuruluş Oluştur"
 msgid ""
 "Something went wrong and we were unable to analyze a merge between these two o"
 "rganisations."
-msgstr ""
+msgstr "Bir şeyler ters gitti ve bu iki kuruluş arasındaki birleşmeyi analiz edemedik."
 
 #: ../../app/views/super_admin/orgs/new.html.erb:4
 msgid "New organisation"
 msgstr "Yeni kuruluş"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%<title>s\"?"
-msgstr "\"%<title>s\" temasını silmek istediğinizden emin misiniz?"
+msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgstr "\"%{title}\" temasını silmek istediğinizden emin misiniz?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5668,7 +5658,7 @@ msgid ""
 "<br>The selected user's content will be merged into the account for %{user_ema"
 "il}. <br> The selected account will then be removed"
 msgstr ""
-"<br>Seçilen kullanıcının içeriği %<user_email>s hesabıyla birleştirilecektir.<b"
+"<br>Seçilen kullanıcının içeriği %{user_email} hesabıyla birleştirilecektir.<b"
 "r> Seçilen hesap daha sonra kaldırılacaktır"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
@@ -5677,13 +5667,13 @@ msgstr "Arşiv"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %<user_name>s.  This will remove their personal inform"
+"You are about to archive %{user_name}.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"%<user_name>s kullanıcısını arşivlemek üzeresiniz. Bu işlem, %<user_name>s kulla"
+"%{user_name} kullanıcısını arşivlemek üzeresiniz. Bu işlem, %{user_name} kulla"
 "nıcısının kişisel bilgilerini kaldıracak, ancak planlarını, yanıtlarını ve yor"
-"umlarını koruyacaktır. %<user_name>s artık oturum açamayacak. Emin misiniz?"
+"umlarını koruyacaktır. %{user_name} artık oturum açamayacak. Emin misiniz?"
 
 #: ../../app/views/super_admin/users/edit.html.erb:81
 msgid "Merge Accounts"
@@ -5783,95 +5773,94 @@ msgid "You may change your notification preferences on your profile page. "
 msgstr "Bildirim tercihlerinizi profil sayfanızdan değiştirebilirsiniz."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:2
-#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %<username>s"
-msgstr "Merhaba %<username>s"
+msgid "Hello %{username}"
+msgstr "Merhaba %{username}"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %<tool_name>s:"
-msgstr "%<tool_name>s içinde size yönetici ayrıcalıkları verildi:"
+msgid "You have been granted administrator privileges in %{tool_name}:"
+msgstr "%{tool_name} içinde size yönetici ayrıcalıkları verildi:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %<tool_name>s."
-msgstr "%<tool_name>s içinde yönetici ayrıcalıklarınız iptal edildi."
+msgid "You have been revoked administrator privileges in %{tool_name}."
+msgstr "%{tool_name} içinde yönetici ayrıcalıklarınız iptal edildi."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %<tool_name>s for users at your organi"
-"sation is available at the %<help_url>s."
+"More information about administering the %{tool_name} for users at your organi"
+"sation is available at the %{help_url}."
 msgstr ""
-"Kurumunuzdaki kullanıcılar için %<tool_name>s aracını yönetme hakkında daha faz"
-"la bilgiyi %<help_url>s adresinde bulabilirsiniz."
+"Kurumunuzdaki kullanıcılar için %{tool_name} aracını yönetme hakkında daha faz"
+"la bilgiyi %{help_url} adresinde bulabilirsiniz."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %<name>s,"
-msgstr "Merhaba %<name>s,"
+msgid "Hello %{name},"
+msgstr "Merhaba %{name},"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %<tool_name>s API."
-msgstr "%<tool_name>s API'sine erişirken lütfen aşağıdaki kimlik bilgilerini kullanın."
+msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgstr "%{tool_name} API'sine erişirken lütfen aşağıdaki kimlik bilgilerini kullanın."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %<api_documentation_url>s"
-msgstr "Lütfen şu adresteki API belgelerine bakın: %<api_documentation_url>s"
+msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgstr "Lütfen şu adresteki API belgelerine bakın: %{api_documentation_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %<external_application>s "
+"Do not share these credentials. They for use with the %{external_application} "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
-"Bu kimlik bilgilerini paylaşmayın. %<external_application>s uygulamasıyla kulla"
+"Bu kimlik bilgilerini paylaşmayın. %{external_application} uygulamasıyla kulla"
 "nım içindir. Kimlik bilgilerinizi başka bir uygulamayla paylaşırsanız, API'ye "
 "erişiminizi iptal etme hakkını saklı tutarız."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %<tool_name>s API or did not request for y"
-"our credentials to be renewed, please contact us at %<helpdesk_email>s"
+"If you did not request access to the %{tool_name} API or did not request for y"
+"our credentials to be renewed, please contact us at %{helpdesk_email}"
 msgstr ""
-"%<tool_name>s API'sine erişim talebinde bulunmadıysanız veya kimlik bilgilerini"
-"zin yenilenmesini talep etmediyseniz, lütfen %<helpdesk_email>s adresinden bizi"
+"%{tool_name} API'sine erişim talebinde bulunmadıysanız veya kimlik bilgilerini"
+"zin yenilenmesini talep etmediyseniz, lütfen %{helpdesk_email} adresinden bizi"
 "mle iletişime geçin."
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %<recipient_name>s"
-msgstr "Merhaba %<recipient_name>s"
+msgid "Hello %{recipient_name}"
+msgstr "Merhaba %{recipient_name}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
+"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%<commenter>s, \"%<link_html>s\" planı hakkında geri bildirim sağlamayı tamamladı."
+"%{commenter}, \"%{link_html}\" planı hakkında geri bildirim sağlamayı tamamladı."
 " Yorumlar, sayfanın sağ tarafındaki 'Plan yaz' sekmesinde bulunabilir (Rehberl"
 "ik/Yorumlar)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %<user_name>s,"
-msgstr "Merhaba %<user_name>s,"
+msgid "Hello %{user_name},"
+msgstr "Merhaba %{user_name},"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
+"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
 " plan."
 msgstr ""
-"%<requestor>s, %<link_html>s planı hakkında geri bildirim istedi. Yorum eklemek "
-"için lütfen %<tool_name>s içindeki Yönetici menüsü altında yer alan 'Planlar' s"
+"%{requestor}, %{link_html} planı hakkında geri bildirim istedi. Yorum eklemek "
+"için lütfen %{tool_name} içindeki Yönetici menüsü altında yer alan 'Planlar' s"
 "ayfasını ziyaret edin ve planı açın."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
+"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %<tool_name>s."
+" page in %{tool_name}."
 msgstr ""
-"%<commenter_name>s, %<plan_title>s adlı planınız hakkında yorum yaptı. Yorumları"
-" görüntülemek için aşağıdaki VYP bağlantısını takip edin veya %<tool_name>s içi"
+"%{commenter_name}, %{plan_title} adlı planınız hakkında yorum yaptı. Yorumları"
+" görüntülemek için aşağıdaki VYP bağlantısını takip edin veya %{tool_name} içi"
 "ndeki Gösterge Panelim sayfasından plana gidin."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5885,24 +5874,28 @@ msgid ""
 msgstr "Yorumları, her soru için rehberliğin yanında, sağdaki panelde görebilirsiniz."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %<phase_link>s"
-msgstr "VYP: %<phase_link>s"
+msgid "DMP: %{phase_link}"
+msgstr "VYP: %{phase_link}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %<section_title>s"
-msgstr "Bölüm adı: %<section_title>s"
+msgid "Section name: %{section_title}"
+msgstr "Bölüm adı: %{section_title}"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %<question_number>s"
-msgstr "Soru: %<question_number>s"
+msgid "Question: %{question_number}"
+msgstr "Soru: %{question_number}"
+
+#: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
+msgid "Hello %{recepientname}"
+msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
-"access. This means you can %<placeholder1>s %<placeholder2>s"
+"Your permissions relating to %{plan_title} have changed. You now have %{type} "
+"access. This means you can %{placeholder1} %{placeholder2}"
 msgstr ""
-"%<plan_title>s ile ilgili izinleriniz değişti. Artık %<type>s erişiminiz var. Bu"
-", %<placeholder1>s %<placeholder2>s yapabileceğiniz anlamına gelir."
+"%{plan_title} ile ilgili izinleriniz değişti. Artık %{type} erişiminiz var. Bu"
+", %{placeholder1} %{placeholder2} yapabileceğiniz anlamına gelir."
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5917,8 +5910,8 @@ msgid " has been removed by "
 msgstr "şu kişi tarafından kaldırıldı:"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
-msgstr "%<plan_title>s planının görünürlüğü %<plan_visibility>s olarak değiştirildi."
+msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgstr "%{plan_title} planının görünürlüğü %{plan_visibility} olarak değiştirildi."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5935,14 +5928,14 @@ msgstr "Herkese açık: Web üzerinde herkes görüntüleyebilir"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %<tool_name>s"
+" page in %{tool_name}"
 msgstr ""
-"Bu işlemle ilgili sorularınız varsa, lütfen %<tool_name>s'daki Kontrol Panelim "
+"Bu işlemle ilgili sorularınız varsa, lütfen %{tool_name}'daki Kontrol Panelim "
 "sayfasını ziyaret edin."
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %<recipient_name>s,"
-msgstr "Merhaba %<recipient_name>s,"
+msgid "Hello %{recipient_name},"
+msgstr "Merhaba %{recipient_name},"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5962,25 +5955,24 @@ msgstr "Şu şablona dayanarak:"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %<inviter_name>s has invited you to contribute to
-\n"%<tool_name>s
+"Your colleague %{inviter_name} has invited you to contribute to
\n"
 "          their Data Management Plan in %{tool_name}"
-msgstr ""%<inviter_name>s%<tool_name>s
+msgstr ""
 "Meslektaşınız %{inviter_name} sizi kendisinin %{tool_name} aracındaki Veri Yön"
 "etim Planına katkıda bulunmaya davet etti"
 
-#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
-msgid "W%<username>s{t%<tool_name>s{username}"
+#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+msgid "Welcome to %{tool_name}, %{username}"
 msgstr "%{username}, %{tool_name} aracına hoş geldiniz"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-m%<tool_name>s
+msgid ""
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
+"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
-m%<tool_name>s
+msgstr ""
 "%{tool_name}, Veri Yönetim Planınızı oluşturmanıza yardımcı olacaktır. Aracı k"
-"ullanırken herhangi bir sorunuz veya geri bildirim%<contact_us>slütfen %{helpde"
+"ullanırken herhangi bir sorunuz veya geri bildiriminiz olursa, lütfen %{helpde"
 "sk_email} adresinden bizimle iletişime geçin veya %{contact_us} adresini ziyar"
 "et edin."
 
@@ -5988,8 +5980,8 @@ m%<tool_name>s
 msgid "You may change your notification preferences on your profile page."
 msgstr "Bildirim tercihlerinizi profil sayfanızdan değiştirebilirsiniz."
 
-#: ../../app/views/users/_admi%<username>smissions.html.erb:9
-msgid "E%<username>sileges for %{username}"
+#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+msgid "Editing privileges for %{username}"
 msgstr "%{username} için ayrıcalıklar düzenleniyor"
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:19
diff --git a/config/locales/.translation_io b/config/locales/.translation_io
index bed0f0ab69..fbf19e8829 100644
--- a/config/locales/.translation_io
+++ b/config/locales/.translation_io
@@ -1,2 +1,2 @@
 ---
-timestamp: 1633087160
+timestamp: 1644483041
diff --git a/config/locales/translation.de.yml b/config/locales/translation.de.yml
index 2c79e49ded..7281133b2a 100644
--- a/config/locales/translation.de.yml
+++ b/config/locales/translation.de.yml
@@ -117,6 +117,15 @@ de:
           konnte:"
       model_invalid: 'Gültigkeitsprüfung ist fehlgeschlagen: %{errors}'
       required: muss ausgefüllt werden
+    unavailable_session: "Session %{id} ist nicht mehr im Arbeitsspeicher verfügbar.
+      \n\nSollte Ihr System auf einem Multi-Process-Server (wie Unicorn oder Puma)
+      laufen, dann speichert der Prozess, den diese Anfrage ansteuert, keine %{id}
+      im Arbeitspeicher. Sie sollten die Anzahl der Prozesse/Arbeiter auf eins (1)
+      setzen oder einen anderen Server für die Entwicklung verwenden."
+    unacceptable_request: " Im Accept-Header wird eine unterstützte Version erwartet."
+    connection_refused: |-
+      Ups! Konnte keine Verbindung zur Web-Console-Middleware herstellen.
+      Bitte stellen Sie sicher, dass ein Rails-Development-Server läuft.
     template:
       body: 'Bei den folgenden Feldern gibt es Unstimmigkeiten:'
       header:
diff --git a/config/locales/translation.en-CA.yml b/config/locales/translation.en-CA.yml
index d10f8ad442..28b000e488 100644
--- a/config/locales/translation.en-CA.yml
+++ b/config/locales/translation.en-CA.yml
@@ -121,6 +121,9 @@ en-CA:
       header:
         one: 1 error prohibited this %{model} from being saved
         other: "%{count} errors prohibited this %{model} from being saved"
+    unavailable_session:
+    unacceptable_request:
+    connection_refused:
   activerecord:
     errors:
       messages:
diff --git a/config/locales/translation.en-GB.yml b/config/locales/translation.en-GB.yml
index adfd57062c..b304bb3441 100644
--- a/config/locales/translation.en-GB.yml
+++ b/config/locales/translation.en-GB.yml
@@ -116,6 +116,9 @@ en-GB:
         other: "%{count} errors prohibited this %{resource} from being saved:"
       model_invalid: 'Validation failed: %{errors}'
       required: must exist
+    unavailable_session:
+    unacceptable_request:
+    connection_refused:
     template:
       body: 'There were problems with the following fields:'
       header:
diff --git a/config/locales/translation.en-US.yml b/config/locales/translation.en-US.yml
index 2a054b2d80..61dfb56c09 100644
--- a/config/locales/translation.en-US.yml
+++ b/config/locales/translation.en-US.yml
@@ -116,6 +116,9 @@ en-US:
         other: "%{count} errors prohibited this %{resource} from being saved:"
       model_invalid: 'Validation failed: %{errors}'
       required: must exist
+    unavailable_session:
+    unacceptable_request:
+    connection_refused:
     template:
       body: 'There were problems with the following fields:'
       header:
diff --git a/config/locales/translation.es.yml b/config/locales/translation.es.yml
index a3521d3a2b..1adb863ec2 100644
--- a/config/locales/translation.es.yml
+++ b/config/locales/translation.es.yml
@@ -116,6 +116,16 @@ es:
         other: "%{count} errores impidieron que este %{resource} fuese guardado:"
       model_invalid: 'La validación falló: %{errors}'
       required: debe existir
+    unavailable_session: |-
+      Sesión %{id} ya no se encuentra disponible en la memoria.
+
+      Si le sucede a ejecutar en un servidor multi-proceso (como el unicornio o Puma) el proceso de
+      esta solicitud golpe no almacena %{id} en la memoria. Considere girando el número de
+      procesos / trabajadores a uno (1) o el uso de un servidor diferente en el desarrollo.
+    unacceptable_request: Una versión compatible Se espera que en la cabecera Aceptar.
+    connection_refused: |-
+      Ups! No se pudo conectar a la consola Web de middleware.
+      Por favor asegúrese de que un servidor de desarrollo carriles se está ejecutando.
     template:
       body: 'Se encontraron problemas con los siguientes campos:'
       header:
diff --git a/config/locales/translation.fi.yml b/config/locales/translation.fi.yml
index 90349ee736..cc675b245a 100644
--- a/config/locales/translation.fi.yml
+++ b/config/locales/translation.fi.yml
@@ -115,6 +115,13 @@ fi:
         other: "%{count} virhettä estivät kohteen %{resource} tallennuksen:"
       model_invalid: 'Validointi epäonnistui: %{errors}'
       required: täytyy olla
+    unavailable_session: Istunnon %{id} ei ole enää saatavilla muistissa. Jos satut
+      ajaa usean prosessin palvelimen (kuten Unicorn tai Puma) prosessi. Tämä pyyntö
+      osuma ei tallenna %{id} muistiin. Tarkastellaan kääntämällä määrä prosessit
+      / työntekijät yhteen (1) tai käyttämällä eri palvelinta kehittämiseen.
+    unacceptable_request: Pitää olla tuettu versio Hyväksytty otsikossa.
+    connection_refused: Oho! Yhteys nettikonsolin väliohjelmistoon epäonnistui. Varmista,
+      että palvelin on käynnissä.
     template:
       body: 'Seuraavat kentät aiheuttivat ongelmia:'
       header:
@@ -196,7 +203,7 @@ fi:
   flash:
     actions:
       create:
-        notice: "%{resource_name} luominen onnistui."
+        notice: Hei, suunnitelman luominen onnistui.
       update:
         notice: "%{resource_name} päivitys onnistui."
       destroy:
diff --git a/config/locales/translation.fr-CA.yml b/config/locales/translation.fr-CA.yml
index f36b76baec..4d0f914b04 100644
--- a/config/locales/translation.fr-CA.yml
+++ b/config/locales/translation.fr-CA.yml
@@ -121,6 +121,17 @@ fr-CA:
       header:
         one: " 1 erreur a empêché l’enregistrement de %{model}"
         other: "%{count} erreurs ont empêché l’enregistrement de %{model} "
+    unavailable_session: |
+      La session %{id} n’est plus disponible en mémoire.
+
+      S'il vous arrive d’exécuter le processus sur un serveur multi-processus (comme Unicorn ou Puma), le processus cette requête ne stocke pas %{id} en mémoire. Pensez à remettre le nombre de processus ou de travailleurs à un (1) ou à utiliser un autre serveur en développement.
+    unacceptable_request: 'Une version prise en charge est attendue dans l’en-tête
+      Accept.
+
+'
+    connection_refused: |
+      Oups! Échec de la connexion à l’intergiciel de la console Web.
+      Veuillez vous assurer qu’un serveur de développement Rails est en cours d'exécution.
   activerecord:
     errors:
       messages:
diff --git a/config/locales/translation.fr-FR.yml b/config/locales/translation.fr-FR.yml
index 3e4893653d..4462b93bf3 100644
--- a/config/locales/translation.fr-FR.yml
+++ b/config/locales/translation.fr-FR.yml
@@ -116,6 +116,17 @@ fr-FR:
         other: "%{count} erreurs ont empêché d’enregistrer ce(tte) %{resource} :"
       model_invalid: 'Validation échouée : %{errors}'
       required: doit exister
+    unavailable_session: |-
+      La session %{id} n'est plus disponible en mémoire.
+
+      Si vous utilisez un serveur multi-processus (comme Unicorn ou Puma), le processus
+      cet appel de requête ne stocke pas %{id} en mémoire. Pensez à tourner le nombre de
+      processus / travailleurs à un (1) ou en utilisant un serveur différent en développement.
+    unacceptable_request: Une version prise en charge est attendue dans l'en-tête
+      Accept.
+    connection_refused: |-
+      Oops! Impossible de se connecter au middleware Console Web.
+      Assurez-vous que le serveur de développement de rails est en cours d'exécution.
     template:
       body: 'Veuillez vérifier les champs suivants : '
       header:
@@ -217,10 +228,10 @@ fr-FR:
       already_authenticated: Vous êtes déjà connecté(e).
       inactive: Votre compte n'est plus actif. Merci de nous contacter pour réactiver
         votre compte.
-      invalid: Courriel ou mot de passe incorrect.
+      invalid: "%{authentication_keys} ou mot de passe invalide."
       locked: Votre compte est verrouillé.
       last_attempt: Vous avez une autre tentative avant que votre compte soit verrouillé.
-      not_found_in_database: Courriel ou mot de passe incorrect.
+      not_found_in_database: "%{authentication_keys} ou mot de passe invalide."
       timeout: Votre session est expirée. Veuillez vous reconnecter pour continuer.
       unauthenticated: Vous devez vous connecter ou vous inscrire pour continuer.
       unconfirmed: Vous devez confirmer votre compte pour continuer.
@@ -243,10 +254,10 @@ fr-FR:
         someone_invited_you: Quelqu'un vous a invité à %{url}, vous pouvez l'accepter
           via le lien ci-dessous.
         accept: Accepter l'invitation
-        accept_until: Cette invitation sera due dans %{due_date}.
-        ignore: Si vous ne voulez pas accepter l'invitation, veuillez ignorer cet
-          email. <br /> Votre compte ne sera créé que lorsque vous aurez accédé au
-          lien ci-dessus et défini votre mot de passe.
+        accept_until: Cette invitation sera expirée dans %{due_date}.
+        ignore: Si vous ne souhaitez pas accepter cette invitation, ignorez ce courriel.
+          <br /> Votre compte ne sera créé que lorsque vous aurez accédé au lien ci-dessus
+          et défini votre mot de passe.
     omniauth_callbacks:
       failure: Nous n'avons pas pu vous authentifier à partir de %{kind} parce que
         '%{reason}'.
@@ -279,8 +290,8 @@ fr-FR:
         sur le lien de confirmation pour finaliser la validation de votre nouvelle
         adresse électronique.
       updated: Votre compte a bien été modifié.
-      updated_but_not_signed_in: Votre compte a été mis à jour avec succès, mais depuis
-        la modification de votre mot de passe, vous devez vous reconnecter.
+      updated_but_not_signed_in: Votre compte a été mis à jour avec succès, mais comme
+        votre mot de passe a été modifié, vous devez vous reconnecter.
     sessions:
       signed_in: Connecté
       signed_out: Déconnecté
diff --git a/config/locales/translation.pt-BR.yml b/config/locales/translation.pt-BR.yml
index f7d15265ec..92737b48a3 100644
--- a/config/locales/translation.pt-BR.yml
+++ b/config/locales/translation.pt-BR.yml
@@ -116,6 +116,18 @@ pt-BR:
         other: "%{count} erros proibiram que esse %{resource} fosse salvo:"
       model_invalid: 'A validação falhou: %{errors}'
       required: é obrigatório(a)
+    unavailable_session: |
+      A sessão %{id} não está mais disponível na memória.
+
+      Se acontecer de você executar em um servidor com vários processos (como Unicorn ou Puma), o processo
+      esta solicitação não armazena %{id} na memória. Considere transformar o número de
+      processos / trabalhadores para um (1) ou usando um servidor diferente em desenvolvimento.
+    unacceptable_request: 'Uma versão suportada é esperada no cabeçalho Accept.
+
+'
+    connection_refused: |
+      Opa! Falha ao conectar-se ao middleware do console da Web.
+      Por favor, certifique-se de que um servidor de desenvolvimento de trilhos está sendo executado.
     template:
       body: 'Por favor, verifique o(s) seguinte(s) campo(s):'
       header:
diff --git a/config/locales/translation.sv-FI.yml b/config/locales/translation.sv-FI.yml
index c1586645ad..f4d69fecbe 100644
--- a/config/locales/translation.sv-FI.yml
+++ b/config/locales/translation.sv-FI.yml
@@ -116,6 +116,16 @@ sv-FI:
         other: "%{count} fel hindrade detta %{resource} från att sparas:"
       model_invalid: 'Validering misslyckades: %{errors}'
       required: måste finnas
+    unavailable_session: |-
+      Session %{id} är inte längre tillgänglig i minnet.
+
+      Om du råkar köra på en multi-process-server (som Unicorn eller Puma) processen
+      den här förfrågan träffar inte %{id} i minnet. Överväg att vrida antalet
+      processer / arbetare till en (1) eller använder en annan server i utveckling.
+    unacceptable_request: En stödd version förväntas i Accept header.
+    connection_refused: |-
+      hoppsan! Misslyckades att ansluta till middleware-konsolen.
+      Se till att en railsutvecklingsserver körs.
     template:
       body: 'Det var problem med följande fält:'
       header:
diff --git a/config/locales/translation.tr-TR.yml b/config/locales/translation.tr-TR.yml
index 1a312ff16c..bc0a2f5c78 100644
--- a/config/locales/translation.tr-TR.yml
+++ b/config/locales/translation.tr-TR.yml
@@ -116,7 +116,7 @@ tr-TR:
       taken: hali hazırda kullanılmakta
       already_confirmed: zaten onaylanmış, lütfen giriş yapmayı deneyin
       confirmation_period_expired: "%{period} içinde onaylanması gerekmektedir, lütfen
-        yeni bir tane isteyiniz."
+        yeni bir tane talep edin."
       expired: süresi doldu, lütfen yeni bir tane talep edin
       not_found: bulunamadı
       not_locked: kilitlenmemiş
@@ -128,13 +128,21 @@ tr-TR:
       header:
         one: 1 hata oluştuğu için %{model} kaydedilemedi
         other: "%{count} hata oluştuğu için %{model} kaydedilemedi"
+    unavailable_session: |
+      Oturum %{id} artık bellekte mevcut değil.
+
+      Unicorn veya Puma gibi bir çoklu-işlem sunucusunda çalışıyorsanız, bu isteğe karşılık gelen işlem, %{id}'i bellekte saklamaz. İşlem/çalışan sayısını bir (1) olarak ayarlamayı ya da geliştirme ortamında farklı bir sunucu kullanmayı değerlendirin.
+    unacceptable_request: Accept header'da desteklenen bir sürüm bekleniyor.
+    connection_refused: |-
+      Hata! Web Konsolu ara katman yazılımına bağlanılamadı.
+      Lütfen bir Rails geliştirme sunucusunun çalıştığından emin olun.
   activerecord:
     errors:
       messages:
         record_invalid: 'Doğrulama başarısız oldu: %{errors}'
         restrict_dependent_destroy:
-          has_one: Bağlı bir kayıt %{record} bulunduğu için kayıt silinemedi
-          has_many: Bağlı kayıtlar %{record} bulunduğu için kayıt silinemedi
+          has_one: Bağlı bir %{record} bulunduğu için kayıt silinemiyor
+          has_many: Bağlı %{record} bulunduğu için kayıt silinemiyor
   datetime:
     distance_in_words:
       half_a_minute: yarım dakika
@@ -255,7 +263,7 @@ tr-TR:
         accept_until: Bu davetiye %{due_date} tarihine kadar geçerli olacaktır.
         ignore: Daveti kabul etmek istemiyorsanız, lütfen bu e-postayı dikkate almayın.
           Hesabınızın oluşturulması için yukarıdaki bağlantıya tıklayıp şifrenizi
-          belirlemeniz gerekmektedir.
+          oluşturmanız gerekmektedir.
     omniauth_callbacks:
       failure: Hesabınızı %{kind} aracılığıyla doğrulayamadık, çünkü "%{reason}".
       success: "%{kind} aracılığıyla hesabınız onaylandı."
@@ -275,7 +283,7 @@ tr-TR:
       signed_up_but_inactive: Kaydınız başarıyla gerçekleşti. Fakat, hesabınız henüz
         aktive edilmediği için oturumunuzu açamadık.
       signed_up_but_locked: Kaydınız başarıyla gerçekleşti. Fakat, hesabınız kilitlendiği
-        için siteye giriş yapamadınız.
+        için oturumunuzu açamadık.
       signed_up_but_unconfirmed: E-posta adresinize hesap aktifleştirme bağlantısını
         içeren bir e-posta gönderildi. Hesabınızı aktifleştirmek için lütfen e-posta
         ile gönderilen bağlantıyı açın.
@@ -292,8 +300,8 @@ tr-TR:
     unlocks:
       send_instructions: Birkaç dakika içerisinde hesap kilidi açma talimatlarını
         içeren bir e-posta alacaksınız.
-      send_paranoid_instructions: Eğer hesabınız varsa, birkaç dakika içerisinde hesap
-        kilidi açma talimatlarını içeren bir e-posta alacaksınız.
+      send_paranoid_instructions: Eğer hesabınız silinmediyse, birkaç dakika içerisinde
+        hesap kilidi açma talimatlarını içeren bir e-posta alacaksınız.
       unlocked: Hesabınızın kilidi başarıyla kaldırıldı. Devam etmek için lütfen giriş
         yapın.
     invitations:

From 2f068f8286bb21a8e3353ed32f688ab54b70c7ee Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Thu, 10 Feb 2022 10:47:33 +0000
Subject: [PATCH 41/43] DCC Bug #693 - Fix for pagination of plans retreived
 using the REST API V0.

Changes:
- replaced wrongly named param :page_size with :per_page that is used in
pagination in app/controllers/api/v0/base_controller.rb
- added a before_action :page_params to app/controllers/api/v0/plans_controller.rb
- added code to retreive :per_page param to scope in
app/controllers/concerns/paginable.rb.
---
 app/controllers/api/v0/base_controller.rb  | 4 ++--
 app/controllers/api/v0/plans_controller.rb | 1 +
 app/controllers/concerns/paginable.rb      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v0/base_controller.rb b/app/controllers/api/v0/base_controller.rb
index c955adfdab..058babfe1c 100644
--- a/app/controllers/api/v0/base_controller.rb
+++ b/app/controllers/api/v0/base_controller.rb
@@ -30,7 +30,7 @@ def index
         plural_resource_name = "@#{resource_name.pluralize}"
         resources = resource_class.where(query_params)
                                   .page(page_params[:page])
-                                  .per(page_params[:page_size])
+                                  .per(page_params[:per_page])
 
         instance_variable_set(plural_resource_name, resources)
         respond_with instance_variable_get(plural_resource_name)
@@ -71,7 +71,7 @@ def query_params
       #
       # Returns Hash
       def page_params
-        params.permit(:page, :page_size)
+        params.permit(:page, :per_page)
       end
 
       # The resource class based on the controller
diff --git a/app/controllers/api/v0/plans_controller.rb b/app/controllers/api/v0/plans_controller.rb
index 8fa848bffd..51a77456a3 100644
--- a/app/controllers/api/v0/plans_controller.rb
+++ b/app/controllers/api/v0/plans_controller.rb
@@ -7,6 +7,7 @@ class PlansController < Api::V0::BaseController
       include Paginable
 
       before_action :authenticate
+      before_action :page_params, except: %i[heartbeat]
 
       ##
       # Creates a new plan based on the information passed in JSON to the API
diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb
index 0a81985b49..0d3461529c 100644
--- a/app/controllers/concerns/paginable.rb
+++ b/app/controllers/concerns/paginable.rb
@@ -156,6 +156,7 @@ def refine_query(scope)
     if @args[:page] != 'ALL'
       # Can raise error if page is not a number
       scope = scope.page(@args[:page])
+                   .per(@args.fetch(:per_page, Rails.configuration.x.application.api_max_page_size))
     end
     scope
   end

From 8c140f6511ee3c7c9ac8bdec4d71c1b41bdd6de9 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Thu, 10 Feb 2022 07:54:52 -0800
Subject: [PATCH 42/43] removed trailing 's' on sort_field placeholder in
 format command on paginable concern

---
 app/controllers/concerns/paginable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb
index 0d3461529c..62c7af8615 100644
--- a/app/controllers/concerns/paginable.rb
+++ b/app/controllers/concerns/paginable.rb
@@ -180,7 +180,7 @@ def sort_link_name(sort_field)
          style="float: right; font-size: 1.2em;">
 
         <span class="screen-reader-text">
-          #{format(_('Sort by %<sort_field>s'), sort_field: sort_field.split('.').first)}
+          #{format(_('Sort by %<sort_field>'), sort_field: sort_field.split('.').first)}
         </span>
       </i>
     HTML

From 0e2df4e2bc43f7ee915580c614c0173850b9bb39 Mon Sep 17 00:00:00 2001
From: briri <brian.riley@ucop.edu>
Date: Mon, 14 Feb 2022 09:01:23 -0800
Subject: [PATCH 43/43] upgraded karma JS and bumped gem and JS dependencies

---
 Gemfile.lock | 126 +++++----
 package.json |   2 +-
 yarn.lock    | 722 +++++++++++++++++++++++----------------------------
 3 files changed, 381 insertions(+), 469 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 81eca25817..d1a8d1dba1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,51 +1,51 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
+    actioncable (5.2.6.2)
+      actionpack (= 5.2.6.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
+    actionmailer (5.2.6.2)
+      actionpack (= 5.2.6.2)
+      actionview (= 5.2.6.2)
+      activejob (= 5.2.6.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
+    actionpack (5.2.6.2)
+      actionview (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+    actionview (5.2.6.2)
+      activesupport (= 5.2.6.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
+    activejob (5.2.6.2)
+      activesupport (= 5.2.6.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
+    activemodel (5.2.6.2)
+      activesupport (= 5.2.6.2)
+    activerecord (5.2.6.2)
+      activemodel (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       arel (>= 9.0)
-    activestorage (5.2.6)
-      actionpack (= 5.2.6)
-      activerecord (= 5.2.6)
+    activestorage (5.2.6.2)
+      actionpack (= 5.2.6.2)
+      activerecord (= 5.2.6.2)
       marcel (~> 1.0.0)
-    activesupport (5.2.6)
+    activesupport (5.2.6.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    annotate (3.1.1)
-      activerecord (>= 3.2, < 7.0)
+    annotate (3.2.0)
+      activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     annotate_gem (0.0.14)
       bundler (>= 1.1)
@@ -62,7 +62,7 @@ GEM
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.10.2)
+    bootsnap (1.10.3)
       msgpack (~> 1.2)
     brakeman (5.2.1)
     builder (3.2.4)
@@ -131,7 +131,7 @@ GEM
       dragonfly (~> 1.0)
       fog-aws
     erubi (1.10.0)
-    excon (0.90.0)
+    excon (0.91.0)
     execjs (2.8.1)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
@@ -165,11 +165,10 @@ GEM
     faraday-retry (1.0.3)
     ffi (1.15.5)
     flag_shih_tzu (0.3.23)
-    fog-aws (3.12.0)
+    fog-aws (3.13.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
     fog-core (2.2.4)
       builder
       excon (~> 0.71)
@@ -220,7 +219,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    ipaddress (0.8.3)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -246,7 +244,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
-    loofah (2.13.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
@@ -296,7 +294,7 @@ GEM
     omniauth-orcid (2.1.1)
       omniauth-oauth2 (~> 1.3)
       ruby_dig (~> 0.0.2)
-    omniauth-rails_csrf_protection (1.0.0)
+    omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-shibboleth (1.3.0)
@@ -306,7 +304,7 @@ GEM
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
-    pg (1.3.0)
+    pg (1.3.2)
     prime (0.1.2)
       forwardable
       singleton
@@ -317,9 +315,9 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.6.1)
+    puma (5.6.2)
       nio4r (~> 2.0)
-    pundit (2.1.1)
+    pundit (2.2.0)
       activesupport (>= 3.0.0)
     pundit-matchers (1.7.0)
       rspec-rails (>= 3.0.0)
@@ -333,18 +331,18 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.6)
-      actioncable (= 5.2.6)
-      actionmailer (= 5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      activemodel (= 5.2.6)
-      activerecord (= 5.2.6)
-      activestorage (= 5.2.6)
-      activesupport (= 5.2.6)
+    rails (5.2.6.2)
+      actioncable (= 5.2.6.2)
+      actionmailer (= 5.2.6.2)
+      actionpack (= 5.2.6.2)
+      actionview (= 5.2.6.2)
+      activejob (= 5.2.6.2)
+      activemodel (= 5.2.6.2)
+      activerecord (= 5.2.6.2)
+      activestorage (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.6)
+      railties (= 5.2.6.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -355,39 +353,39 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (5.2.6.2)
+      actionpack (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     recaptcha (5.8.1)
       json
-    regexp_parser (2.2.0)
+    regexp_parser (2.2.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
     rollbar (3.3.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-rails (5.1.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -396,8 +394,8 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.3)
-    rubocop (1.25.0)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -406,7 +404,7 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
+    rubocop-ast (1.15.2)
       parser (>= 3.0.1.1)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
@@ -467,7 +465,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.10)
     tomparse (0.4.2)
-    translation (1.28)
+    translation (1.29)
       gettext (~> 3.2, >= 3.2.5, <= 3.4.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
diff --git a/package.json b/package.json
index ec10795639..48386a372f 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "eslint-plugin-import": "^2.21.1",
     "jasmine": "^3.5.0",
     "jasmine-core": "^3.5.0",
-    "karma": "^5.0.9",
+    "karma": "^6.3.14",
     "karma-babel-preprocessor": "^8.0.1",
     "karma-chrome-launcher": "^3.1.0",
     "karma-fixture": "^0.2.6",
diff --git a/yarn.lock b/yarn.lock
index bd73d4e197..0c8eb52e37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.0.0":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.1.tgz#7922fb0817bf3166d8d9e258c57477e3fd1c3610"
+  integrity sha512-Aolwjd7HSC2PyY0fDj/wA/EimQT4HfEnFYNp5s9CQlrdhyvWTtvZ5YzrUPu6R6/1jKiUlxu8bUhkdSnKHNAHMA==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -17,37 +24,37 @@
     "@babel/highlight" "^7.16.7"
 
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
-  integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
+  integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
 
 "@babel/core@^7.15.0":
-  version "7.16.12"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784"
-  integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.2.tgz#2c77fc430e95139d816d39b113b31bf40fb22337"
+  integrity sha512-R3VH5G42VSDolRHyUO4V2cfag8WHcZyxdq5Z/m8Xyb92lW/Erm/6kM+XtRFGf3Mulre3mveni2NHfEUws8wSvw==
   dependencies:
+    "@ampproject/remapping" "^2.0.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
+    "@babel/generator" "^7.17.0"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.12"
+    "@babel/helpers" "^7.17.2"
+    "@babel/parser" "^7.17.0"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.10"
-    "@babel/types" "^7.16.8"
+    "@babel/traverse" "^7.17.0"
+    "@babel/types" "^7.17.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
     semver "^6.3.0"
-    source-map "^0.5.0"
 
-"@babel/generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
+"@babel/generator@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e"
+  integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==
   dependencies:
-    "@babel/types" "^7.16.8"
+    "@babel/types" "^7.17.0"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -77,9 +84,9 @@
     semver "^6.3.0"
 
 "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
-  integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
+  version "7.17.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21"
+  integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-environment-visitor" "^7.16.7"
@@ -90,12 +97,12 @@
     "@babel/helper-split-export-declaration" "^7.16.7"
 
 "@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
-  integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
+  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^4.7.1"
+    regexpu-core "^5.0.1"
 
 "@babel/helper-define-polyfill-provider@^0.3.1":
   version "0.3.1"
@@ -249,14 +256,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
-  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
+"@babel/helpers@^7.17.2":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
+  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.0"
+    "@babel/types" "^7.17.0"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
   version "7.16.10"
@@ -267,10 +274,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7":
-  version "7.16.12"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
-  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
+"@babel/parser@^7.16.7", "@babel/parser@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
+  integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
@@ -714,9 +721,9 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-runtime@^7.15.0":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz#53d9fd3496daedce1dd99639097fa5d14f4c7c2c"
-  integrity sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70"
+  integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==
   dependencies:
     "@babel/helper-module-imports" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -868,9 +875,9 @@
     esutils "^2.0.2"
 
 "@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
-  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
+  integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -883,26 +890,26 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
-  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
+  integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
   dependencies:
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
+    "@babel/generator" "^7.17.0"
     "@babel/helper-environment-visitor" "^7.16.7"
     "@babel/helper-function-name" "^7.16.7"
     "@babel/helper-hoist-variables" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.10"
-    "@babel/types" "^7.16.8"
+    "@babel/parser" "^7.17.0"
+    "@babel/types" "^7.17.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
-  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
@@ -946,6 +953,24 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -968,9 +993,9 @@
     fastq "^1.6.0"
 
 "@npmcli/fs@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.0.tgz#bec1d1b89c170d40e1b73ad6c943b0b75e7d2951"
-  integrity sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
+  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
   dependencies:
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
@@ -1044,6 +1069,11 @@
     webpack-cli "^3.3.12"
     webpack-sources "^1.4.3"
 
+"@socket.io/base64-arraybuffer@~1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
+  integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -1059,6 +1089,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/component-emitter@^1.2.10":
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
+  integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
+
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
@@ -1074,6 +1109,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cookie@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
+
+"@types/cors@^2.8.12":
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.28"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
@@ -1083,7 +1128,7 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@*":
+"@types/express@*", "@types/express@^4.17.13":
   version "4.17.13"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
   integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
@@ -1115,10 +1160,10 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/node@*":
-  version "17.0.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.12.tgz#f7aa331b27f08244888c47b7df126184bc2339c5"
-  integrity sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA==
+"@types/node@*", "@types/node@>=10.0.0":
+  version "17.0.17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c"
+  integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1330,12 +1375,12 @@
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
 
 acorn-jsx@^5.3.1:
   version "5.3.2"
@@ -1352,11 +1397,6 @@ acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
-
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -1400,9 +1440,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
-  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
+  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -1541,11 +1581,6 @@ array.prototype.flat@^1.2.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.0"
 
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
-
 asn1.js@^5.2.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -1640,12 +1675,12 @@ babel-plugin-polyfill-corejs2@^0.3.0:
     semver "^6.1.1"
 
 babel-plugin-polyfill-corejs3@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060"
-  integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
+  integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.1"
-    core-js-compat "^3.20.0"
+    core-js-compat "^3.21.0"
 
 babel-plugin-polyfill-regenerator@^0.3.0:
   version "0.3.1"
@@ -1654,27 +1689,17 @@ babel-plugin-polyfill-regenerator@^0.3.0:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.1"
 
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-arraybuffer@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
-
 base64-js@^1.0.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-base64id@2.0.0:
+base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
@@ -1719,11 +1744,6 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-
 bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -2047,9 +2067,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286:
-  version "1.0.30001302"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001302.tgz#da57ce61c51177ef3661eeed7faef392d3790aaa"
-  integrity sha512-YYTMO+tfwvgUN+1ZnRViE53Ma1S/oETg+J2lISsqi/ZTNThj3ZYBOKP2rHwJc37oCsPqAzJ3w2puZHn0xlLPPw==
+  version "1.0.30001312"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f"
+  integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
@@ -2096,7 +2116,7 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.6.0"
     color-convert "^1.9.3"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.2:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -2177,14 +2197,14 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
+    wrap-ansi "^7.0.0"
 
 clone-deep@^4.0.1:
   version "4.0.1"
@@ -2257,7 +2277,7 @@ colorette@^2.0.10:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
   integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
-colors@^1.4.0:
+colors@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -2272,26 +2292,11 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
 component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -2392,11 +2397,16 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.4.1, cookie@~0.4.1:
+cookie@0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
+cookie@~0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2414,24 +2424,32 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.20.0, core-js-compat@^3.20.2:
-  version "3.20.3"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz#d71f85f94eb5e4bea3407412e549daa083d23bd6"
-  integrity sha512-c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw==
+core-js-compat@^3.20.2, core-js-compat@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885"
+  integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==
   dependencies:
     browserslist "^4.19.1"
     semver "7.0.0"
 
 core-js@^3.16.2, core-js@^3.6.5:
-  version "3.20.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.3.tgz#c710d0a676e684522f3db4ee84e5e18a9d11d69a"
-  integrity sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.0.tgz#f479dbfc3dffb035a0827602dd056839a774aa71"
+  integrity sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==
 
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cors@~2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 cosmiconfig@^5.0.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
@@ -2730,27 +2748,13 @@ debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
   dependencies:
     ms "2.1.2"
 
-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2980,9 +2984,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.4.17:
-  version "1.4.53"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.53.tgz#5d80a91c399b44952ef485857fb5b9d4387d2e60"
-  integrity sha512-rFveSKQczlcav+H3zkKqykU6ANseFwXwkl855jOIap5/0gnEcuIhv2ecz6aoTrXavF6I/CEBeRnBnkB51k06ew==
+  version "1.4.68"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.68.tgz#d79447b6bd1bec9183f166bb33d4bef0d5e4e568"
+  integrity sha512-cId+QwWrV8R1UawO6b9BR1hnkJ4EJPCPAr4h315vliHUtVUJDk39Sg1PMNnaWKfj5x+93ssjeJ9LKL6r8LaMiA==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -3024,45 +3028,28 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.5.0:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa"
-  integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==
-  dependencies:
-    component-emitter "~1.3.0"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.2.0"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~7.4.2"
-    xmlhttprequest-ssl "~1.6.2"
-    yeast "0.1.2"
-
-engine.io-parser@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
-  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
+engine.io-parser@~5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.3.tgz#ca1f0d7b11e290b4bfda251803baea765ed89c09"
+  integrity sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==
   dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.4"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
+    "@socket.io/base64-arraybuffer" "~1.0.2"
 
-engine.io@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
-  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
+engine.io@~6.1.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.2.tgz#e7b9d546d90c62246ffcba4d88594be980d3855a"
+  integrity sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==
   dependencies:
+    "@types/cookie" "^0.4.1"
+    "@types/cors" "^2.8.12"
+    "@types/node" ">=10.0.0"
     accepts "~1.3.4"
     base64id "2.0.0"
     cookie "~0.4.1"
-    debug "~4.1.0"
-    engine.io-parser "~2.2.0"
-    ws "~7.4.2"
+    cors "~2.8.5"
+    debug "~4.3.1"
+    engine.io-parser "~5.0.0"
+    ws "~8.2.3"
 
 enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0:
   version "4.5.0"
@@ -3188,9 +3175,9 @@ eslint-loader@^4.0.2:
     schema-utils "^2.6.5"
 
 eslint-module-utils@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
-  integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
+  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
   dependencies:
     debug "^3.2.7"
     find-up "^2.1.0"
@@ -3591,7 +3578,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -3618,9 +3605,9 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0, flatted@^3.2.2, flatted@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
-  integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
+  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -3636,9 +3623,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -3743,7 +3730,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -3844,9 +3831,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+  version "13.12.1"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.1.tgz#ec206be932e6c77236677127577aa8e50bf1c5cb"
+  integrity sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==
   dependencies:
     type-fest "^0.20.2"
 
@@ -3877,18 +3864,6 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -4044,9 +4019,9 @@ http-parser-js@>=0.5.1:
   integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
 http-proxy-middleware@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.2.tgz#94d7593790aad6b3de48164f13792262f656c332"
-  integrity sha512-XtmDN5w+vdFTBZaYhdJAbMqn0DP/EhkUaAeo963mojwpKMMbw6nivtFKw07D7DDOH745L5k0VL0P8KRYNEVF/g==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz#5df04f69a89f530c2284cd71eeaa51ba52243289"
+  integrity sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -4165,11 +4140,6 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -4539,12 +4509,7 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
-
-isbinaryfile@^4.0.6:
+isbinaryfile@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
   integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
@@ -4689,9 +4654,9 @@ jsonfile@^6.0.1:
     graceful-fs "^4.1.6"
 
 karma-babel-preprocessor@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.1.tgz#63b33cc7b5b3b5c7815ec453f7df58fb88345af1"
-  integrity sha512-5upyawNi3c7Gg6tPH1FWRVTmUijGf3v1GV4ScLM/2jKdDP18SlaKlUpu8eJrRI3STO8qK1bkqFcdgAA364nLYQ==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.2.tgz#4daff4cfbfcd58c635bf321e135525f608d2d621"
+  integrity sha512-6ZUnHwaK2EyhgxbgeSJW6n6WZUYSEdekHIV/qDUnPgMkVzQBHEvd07d2mTL5AQjV8uTUgH6XslhaPrp+fHWH2A==
 
 karma-chrome-launcher@^3.1.0:
   version "3.1.0"
@@ -4739,34 +4704,35 @@ karma-webpack@^4.0.2:
     source-map "^0.7.3"
     webpack-dev-middleware "^3.7.0"
 
-karma@^5.0.9:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4"
-  integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==
+karma@^6.3.14:
+  version "6.3.16"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.16.tgz#76d1a705fd1cf864ee5ed85270b572641e0958ef"
+  integrity sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==
   dependencies:
     body-parser "^1.19.0"
     braces "^3.0.2"
-    chokidar "^3.4.2"
-    colors "^1.4.0"
+    chokidar "^3.5.1"
+    colors "1.4.0"
     connect "^3.7.0"
     di "^0.0.1"
     dom-serialize "^2.2.1"
-    glob "^7.1.6"
-    graceful-fs "^4.2.4"
+    glob "^7.1.7"
+    graceful-fs "^4.2.6"
     http-proxy "^1.18.1"
-    isbinaryfile "^4.0.6"
-    lodash "^4.17.19"
-    log4js "^6.2.1"
-    mime "^2.4.5"
+    isbinaryfile "^4.0.8"
+    lodash "^4.17.21"
+    log4js "^6.4.1"
+    mime "^2.5.2"
     minimatch "^3.0.4"
+    mkdirp "^0.5.5"
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
-    socket.io "^2.3.0"
+    socket.io "^4.2.0"
     source-map "^0.6.1"
-    tmp "0.2.1"
-    ua-parser-js "0.7.22"
-    yargs "^15.3.1"
+    tmp "^0.2.1"
+    ua-parser-js "^0.7.30"
+    yargs "^16.1.1"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -4904,12 +4870,12 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.5:
+lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.5:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log4js@^6.2.1:
+log4js@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.1.tgz#9d3a8bf2c31c1e213fe3fc398a6053f7a2bc53e8"
   integrity sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==
@@ -4985,7 +4951,7 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-memfs@^3.2.2:
+memfs@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
   integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
@@ -5068,7 +5034,7 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24:
+mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.34"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
   integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
@@ -5080,7 +5046,7 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.4.4, mime@^2.4.5:
+mime@^2.4.4, mime@^2.5.2:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
@@ -5111,9 +5077,9 @@ minimalistic-crypto-utils@^1.0.1:
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.1.tgz#879ad447200773912898b46cd516a7abbb5e50b0"
+  integrity sha512-reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -5266,10 +5232,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
@@ -5316,9 +5282,9 @@ node-libs-browser@^2.2.1:
     vm-browserify "^1.0.1"
 
 node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
+  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -5376,7 +5342,7 @@ number-to-text@^0.3.8:
   resolved "https://registry.yarnpkg.com/number-to-text/-/number-to-text-0.3.9.tgz#dda29a3f762e73d9b5a15b3b6a13551813043969"
   integrity sha512-BWJ/e9IJZQWAg43DExXH02GGb30u2Lbd8SB5AWKMw/gbCSqL/J9+Zb5bj5MVZ+RZqhlyNUeUMxuyln12WQuj0g==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5651,16 +5617,6 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
-
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -6271,9 +6227,9 @@ postcss-place@^4.0.1:
     postcss-values-parser "^2.0.0"
 
 postcss-preset-env@^6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5"
-  integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.1.tgz#26563d2e9395d626a45a836450844540694bfcef"
+  integrity sha512-rlRkgX9t0v2On33n7TK8pnkcYOATGQSv48J2RS8GsXhqtg+xk6AummHP88Y5mJo0TLJelBjePvSjScTNkj3+qw==
   dependencies:
     autoprefixer "^9.6.1"
     browserslist "^4.6.4"
@@ -6658,10 +6614,10 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-regenerate-unicode-properties@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
-  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
+regenerate-unicode-properties@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
+  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
   dependencies:
     regenerate "^1.4.2"
 
@@ -6703,27 +6659,27 @@ regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^4.7.1:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
-  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+regexpu-core@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
+  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^9.0.0"
-    regjsgen "^0.5.2"
-    regjsparser "^0.7.0"
+    regenerate-unicode-properties "^10.0.1"
+    regjsgen "^0.6.0"
+    regjsparser "^0.8.2"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-regjsgen@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+regjsgen@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
+  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
 
-regjsparser@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
-  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
+regjsparser@^0.8.2:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
+  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
   dependencies:
     jsesc "~0.5.0"
 
@@ -6901,9 +6857,9 @@ sass-loader@10.1.1:
     semver "^7.3.2"
 
 sass@^1.38.0:
-  version "1.49.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz#65ec1b1d9a6bc1bae8d2c9d4b392c13f5d32c078"
-  integrity sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==
+  version "1.49.7"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49"
+  integrity sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -7120,9 +7076,9 @@ side-channel@^1.0.4:
     object-inspect "^1.9.0"
 
 signal-exit@^3.0.3:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
-  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -7175,57 +7131,31 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+socket.io-adapter@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz#4d6111e4d42e9f7646e365b4f578269821f13486"
+  integrity sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==
 
-socket.io-client@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
-  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
-  dependencies:
-    backo2 "1.0.2"
-    component-bind "1.0.0"
-    component-emitter "~1.3.0"
-    debug "~3.1.0"
-    engine.io-client "~3.5.0"
-    has-binary2 "~1.0.2"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    socket.io-parser "~3.3.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.3.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
-  integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==
+socket.io-parser@~4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
+  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
   dependencies:
+    "@types/component-emitter" "^1.2.10"
     component-emitter "~1.3.0"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io-parser@~3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
-  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    isarray "2.0.1"
+    debug "~4.3.1"
 
-socket.io@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
-  integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==
+socket.io@^4.2.0:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.4.1.tgz#cd6de29e277a161d176832bb24f64ee045c56ab8"
+  integrity sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==
   dependencies:
-    debug "~4.1.0"
-    engine.io "~3.5.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.4.0"
-    socket.io-parser "~3.4.0"
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    debug "~4.3.2"
+    engine.io "~6.1.0"
+    socket.io-adapter "~2.3.3"
+    socket.io-parser "~4.0.4"
 
 sockjs@^0.3.21:
   version "0.3.24"
@@ -7672,18 +7602,13 @@ tinymce@4.9.11:
   resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-4.9.11.tgz#e3dae099722294c5b8d84ba7ef18dd126de6b582"
   integrity sha512-nkSLsax+VY5DBRjMFnHFqPwTnlLEGHCco82FwJF2JNH6W+5/ClvNC1P4uhD5lXPDNiDykSHR0XJdEh7w/ICHzA==
 
-tmp@0.2.1:
+tmp@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
   dependencies:
     rimraf "^3.0.0"
 
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -7781,10 +7706,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-ua-parser-js@0.7.22:
-  version "0.7.22"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
-  integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
+ua-parser-js@^0.7.30:
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
+  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -7960,7 +7885,7 @@ v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-vary@~1.1.2:
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -8046,30 +7971,31 @@ webpack-dev-middleware@^3.7.0:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c"
-  integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==
+webpack-dev-middleware@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
+  integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.2.2"
+    memfs "^3.4.1"
     mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
 webpack-dev-server@^4.7.3:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
-  integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==
+  version "4.7.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945"
+  integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
+    "@types/express" "^4.17.13"
     "@types/serve-index" "^1.9.1"
     "@types/sockjs" "^0.3.33"
     "@types/ws" "^8.2.2"
     ansi-html-community "^0.0.8"
     bonjour "^3.5.0"
-    chokidar "^3.5.2"
+    chokidar "^3.5.3"
     colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^1.6.0"
@@ -8089,8 +8015,8 @@ webpack-dev-server@^4.7.3:
     sockjs "^0.3.21"
     spdy "^4.0.2"
     strip-ansi "^7.0.0"
-    webpack-dev-middleware "^5.3.0"
-    ws "^8.1.0"
+    webpack-dev-middleware "^5.3.1"
+    ws "^8.4.2"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -8202,10 +8128,10 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
@@ -8216,20 +8142,15 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^8.1.0:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
-  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
-
-ws@~7.4.2:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ws@^8.4.2:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
 
-xmlhttprequest-ssl@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
-  integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==
+ws@~8.2.3:
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
+  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
@@ -8241,6 +8162,11 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -8264,13 +8190,10 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs@^13.3.2:
   version "13.3.2"
@@ -8288,27 +8211,18 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^15.3.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+yargs@^16.1.1:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
     string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
 
 yocto-queue@^0.1.0:
   version "0.1.0"