From 15eb3ae8348728735fdf6f56c1422d1a12ff2ea3 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Thu, 17 Nov 2022 11:56:34 -0500 Subject: [PATCH 01/43] add popover for org_profile page --- app/views/orgs/_profile_form.html.erb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb index 8dd20013ba..23ed2d88ec 100644 --- a/app/views/orgs/_profile_form.html.erb +++ b/app/views/orgs/_profile_form.html.erb @@ -3,6 +3,9 @@ <% shared_links_tooltip = _('Links will be displayed next to your organisation\'s logo') org_config_info_tooltip = _('This information can only be changed by a system administrator. Contact the Help Desk if you have questions or to request changes.') + org_types_tooltip = _( + 'This information can only be changed by a system administrator. Contact %{support_email} if you have questions or to request changes.' % { support_email: Rails.configuration.x.organisation.email} + ) %> <%= form_for(org, url: url, html: { multipart: true, method: method, @@ -136,7 +139,13 @@
<% if current_user.can_super_admin? %>
- <%= _('Organisation Types') %> + + <%= _('Organisation Types') %> +   + + + +
<%= f.label :funder do %> <%= f.check_box :funder, { class: 'org_types', value: org.funder? }, "true", "false" %> @@ -159,7 +168,13 @@ <% else %>
-
<%= _('Organisation type(s)') %>
+
+ <%= _('Organisation type(s)') %> +   + + + +
<%= org.org_type_to_s %>
From 5fa3d110855d275f9df66e12d4b5fc801119224d Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Thu, 17 Nov 2022 12:11:29 -0500 Subject: [PATCH 02/43] update message for public plan definition --- app/views/plans/_share_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/plans/_share_form.html.erb b/app/views/plans/_share_form.html.erb index f9ec141049..454ca433de 100644 --- a/app/views/plans/_share_form.html.erb +++ b/app/views/plans/_share_form.html.erb @@ -32,7 +32,7 @@ <%= f.radio_button :visibility, :publicly_visible, data: { url: visibility_plan_path(@plan), remote: true, method: :post } %> - <%= _('Public: anyone can view') %> + <%= _('Public: anyone can view or download from the Public DMPs page') %> <% end %>
From 3e8815e56ce32c68c292dd8dc972a17e4f9ec520 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Thu, 17 Nov 2022 15:44:13 -0500 Subject: [PATCH 03/43] update csv name for statistics --- app/controllers/usage_controller.rb | 4 ++-- spec/controllers/usage_controller_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/usage_controller.rb b/app/controllers/usage_controller.rb index a406828435..c550a31a64 100644 --- a/app/controllers/usage_controller.rb +++ b/app/controllers/usage_controller.rb @@ -84,14 +84,14 @@ def yearly_plans plan_data(args: default_query_args) sep = sep_param send_data(CSV.generate(col_sep: sep) do |csv| - csv << [_('Month'), _('No. Completed Plans')] + csv << [_('Month'), _('No. Created Plans')] total = 0 @plans_per_month.each do |data| csv << [data.date.strftime('%b-%y'), data.count] total += data.count end csv << [_('Total'), total] - end, filename: 'completed_plans.csv') + end, filename: 'created_plans.csv') end # rubocop:enable Metrics/AbcSize diff --git a/spec/controllers/usage_controller_spec.rb b/spec/controllers/usage_controller_spec.rb index 047fa40d60..603292410b 100644 --- a/spec/controllers/usage_controller_spec.rb +++ b/spec/controllers/usage_controller_spec.rb @@ -92,7 +92,7 @@ get :yearly_plans end it 'assigns the correct csv data' do - expected = "Month,No. Completed Plans\n" \ + expected = "Month,No. Created Plans\n" \ "#{@date.strftime('%b-%y')},#{@plan_stat.count}\n" \ "Total,#{@plan_stat.count}\n" expect(response.content_type).to eq('text/csv') From 1feb31baeac4e03069dc1f4ec4c55a0bd467a9b2 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Tue, 6 Dec 2022 15:23:26 +0100 Subject: [PATCH 04/43] Froze mail gem version --- Gemfile | 6 ++++++ Gemfile.lock | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b66c3e792d..26fad0aceb 100644 --- a/Gemfile +++ b/Gemfile @@ -218,6 +218,12 @@ gem 'dotenv-rails' gem 'activerecord_json_validator' +# We need to freeze the mail gem version as the recently released 2.8.0 triggers an exception +# We will need to check if it's fixed when we migrate to Ruby 3.0/3.1 +# See : https://github.com/DMPRoadmap/roadmap/issues/3254 +gem 'mail', '2.7.1' + + # ================================= # # ENVIRONMENT SPECIFIC DEPENDENCIES # # ================================= # diff --git a/Gemfile.lock b/Gemfile.lock index 9c48ed2690..3b3536c010 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -536,6 +536,7 @@ DEPENDENCIES kaminari ledermann-rails-settings listen + mail (= 2.7.1) mimemagic mocha mysql2 @@ -581,4 +582,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.25 + 2.3.26 From c759ba15919cd754b6a28a491d8ed1942d44ba8c Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Tue, 6 Dec 2022 15:36:57 +0100 Subject: [PATCH 05/43] Added scss files to editorconfig --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 3606776e3b..37b3f8a9f7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,7 +11,7 @@ insert_final_newline = true # Matches multiple files with brace expansion notation # Set default charset -[*.{js,rb,erb}] +[*.{js,scss,rb,erb}] charset = utf-8 indent_style = space -indent_size = 2 \ No newline at end of file +indent_size = 2 From 9387356ea45690e392b54e9be3cc75188304fdb9 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 13:28:42 -0500 Subject: [PATCH 06/43] test CHANGELOG file --- .github/workflows/danger.yml | 32 ++++++++++++++++++++++++++++++++ CHANGELOG.md | 9 +++++++++ 2 files changed, 41 insertions(+) create mode 100644 .github/workflows/danger.yml create mode 100644 CHANGELOG.md diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml new file mode 100644 index 0000000000..d4a5fb329a --- /dev/null +++ b/.github/workflows/danger.yml @@ -0,0 +1,32 @@ +name: Danger + +on: [push, pull_request] + +jobs: + danger: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v3 + + - name: 'Determine Ruby and Bundler Versions from Gemfile.lock' + run: | + echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV + echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV + + # Install Ruby - using the version found in the Gemfile.lock + - name: 'Install Ruby' + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ env.RUBY_VERSION }} + + - name: 'Bundle Install' + run: | + gem install bundler -v ${{ env.BUNDLER_VERSION }} + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 --without pgsql rollbar aws + + - name: 'Run Danger' + env: + DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: bundle exec danger \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..b64a2b09ad --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +### Added + +- Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) + +### Fixed + +### Changed From 8a441a43299ce12d97aeb736490ec83c8c5762a2 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 13:36:35 -0500 Subject: [PATCH 07/43] update danger in gemfile --- Gemfile | 3 +++ Gemfile.lock | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index b66c3e792d..9045299f92 100644 --- a/Gemfile +++ b/Gemfile @@ -292,6 +292,9 @@ group :test do # This gem brings back assigns to your controller tests as well as assert_template # to both controller and integration tests. gem 'rails-controller-testing' + + # automating code review + gem "danger", '~> 9.0', require: false end group :ci, :development do diff --git a/Gemfile.lock b/Gemfile.lock index 9c48ed2690..e59b272282 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,13 +106,34 @@ GEM xpath (~> 3.2) capybara-webmock (0.1.0) childprocess (4.1.0) + claide (1.1.0) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) coderay (1.1.3) + colored2 (3.1.2) concurrent-ruby (1.1.10) contact_us (1.2.0) rails (>= 4.2.0) + cork (0.3.0) + colored2 (~> 3.1) crack (0.4.5) rexml crass (1.0.6) + danger (9.1.0) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (>= 0.9.0, < 2.0) + faraday-http-cache (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (~> 5.0) + terminal-table (>= 1, < 4) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) database_cleaner-active_record (2.0.1) @@ -153,10 +174,11 @@ GEM railties (>= 5.0.0) faker (3.0.0) i18n (>= 1.8.11, < 2) - faraday (2.7.1) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (1.2.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-http-cache (2.4.1) + faraday (>= 0.8) ffi (1.15.5) flag_shih_tzu (0.3.23) fog-aws (3.15.0) @@ -186,6 +208,9 @@ GEM locale (>= 2.0.5) prime text (>= 1.3.0) + git (1.12.0) + addressable (~> 2.8) + rchardet (~> 1.8) globalid (1.0.0) activesupport (>= 5.0) guard (2.18.0) @@ -232,6 +257,10 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) ledermann-rails-settings (2.5.0) activerecord (>= 4.2) listen (3.7.1) @@ -260,9 +289,12 @@ GEM msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) + multipart-post (2.2.3) mysql2 (0.5.4) + nap (1.1.0) nenv (0.3.0) nio4r (2.5.8) + no_proxy_fix (0.1.2) nokogiri (1.13.9-arm64-darwin) racc (~> 1.4) nokogiri (1.13.9-x86_64-linux) @@ -277,6 +309,9 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) omniauth (2.1.0) hashie (>= 3.4.6) rack (>= 2.2.3) @@ -292,6 +327,7 @@ GEM omniauth (~> 2.0) omniauth-shibboleth (1.3.0) omniauth (>= 1.0.0) + open4 (1.3.4) options (2.3.2) orm_adapter (0.5.0) parallel (1.22.1) @@ -359,6 +395,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rchardet (1.8.0) recaptcha (5.12.3) json regexp_parser (2.6.1) @@ -414,6 +451,9 @@ GEM sprockets (> 3.0) sprockets-rails tilt + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) selenium-webdriver (4.6.1) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) @@ -444,6 +484,8 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) text (1.3.1) thor (1.2.1) tilt (2.0.11) @@ -517,6 +559,7 @@ DEPENDENCIES capybara capybara-webmock contact_us + danger (~> 9.0) database_cleaner devise devise_invitable From c5b88e64b285d2a26313afbbdad02a18fddece42 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 13:56:14 -0500 Subject: [PATCH 08/43] add danger figuration --- Dangerfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Dangerfile diff --git a/Dangerfile b/Dangerfile new file mode 100644 index 0000000000..7f9a6cd80f --- /dev/null +++ b/Dangerfile @@ -0,0 +1,27 @@ +# Make sure non-trivial amounts of code changes come with corresponding tests +has_app_changes = !git.modified_files.grep(/lib/).empty? || !git.modified_files.grep(/app/).empty? +has_test_changes = !git.modified_files.grep(/test/).empty? + +if git.lines_of_code > 50 && has_app_changes && !has_test_changes + warn('There are code changes, but no corresponding tests. '\ + 'Please include tests if this PR introduces any modifications in '\ + 'behavior.', + sticky: false) +end + +# Mainly to encourage writing up some reasoning about the PR, rather than +# just leaving a title +warn('Please add a detailed summary in the description.') if github.pr_body.length < 3 + +# Warn when there is a big PR +warn('This PR is too big! Consider breaking it down into smaller PRs.') if git.lines_of_code > 1000 + +# Make it more obvious that a PR is a work in progress and shouldn't be merged yet +warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]" + +# Let people say that this isn't worth a CHANGELOG entry in the PR if they choose +declared_trivial = (github.pr_title + github.pr_body).include?("#trivial") || !has_app_changes + +if !git.modified_files.include?("CHANGELOG.md") && !declared_trivial + fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", sticky: false) +end \ No newline at end of file From 157a0d994cd08574480de7cbd9cae57d0845f878 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 14:26:33 -0500 Subject: [PATCH 09/43] fix rubocop --- Dangerfile | 24 +++++++++++++++--------- Gemfile | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Dangerfile b/Dangerfile index 7f9a6cd80f..62385b5955 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1,11 +1,13 @@ +# frozen_string_literal: true + # Make sure non-trivial amounts of code changes come with corresponding tests has_app_changes = !git.modified_files.grep(/lib/).empty? || !git.modified_files.grep(/app/).empty? has_test_changes = !git.modified_files.grep(/test/).empty? -if git.lines_of_code > 50 && has_app_changes && !has_test_changes - warn('There are code changes, but no corresponding tests. '\ - 'Please include tests if this PR introduces any modifications in '\ - 'behavior.', +if git.lines_of_code > 50 && has_app_changes && !has_test_changes + warn('There are code changes, but no corresponding tests. ' \ + 'Please include tests if this PR introduces any modifications in ' \ + 'behavior.', sticky: false) end @@ -17,11 +19,15 @@ warn('Please add a detailed summary in the description.') if github.pr_body.leng warn('This PR is too big! Consider breaking it down into smaller PRs.') if git.lines_of_code > 1000 # Make it more obvious that a PR is a work in progress and shouldn't be merged yet -warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]" +warn('PR is classed as Work in Progress') if github.pr_title.include? '[WIP]' # Let people say that this isn't worth a CHANGELOG entry in the PR if they choose -declared_trivial = (github.pr_title + github.pr_body).include?("#trivial") || !has_app_changes +declared_trivial = (github.pr_title + github.pr_body).include?('#trivial') || !has_app_changes -if !git.modified_files.include?("CHANGELOG.md") && !declared_trivial - fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", sticky: false) -end \ No newline at end of file +if !git.modified_files.include?('CHANGELOG.md') && !declared_trivial + raise( + "Please include a CHANGELOG entry. \n + You can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", + sticky: false + ) +end diff --git a/Gemfile b/Gemfile index 9045299f92..b700dace31 100644 --- a/Gemfile +++ b/Gemfile @@ -294,7 +294,7 @@ group :test do gem 'rails-controller-testing' # automating code review - gem "danger", '~> 9.0', require: false + gem 'danger', '~> 9.0', require: false end group :ci, :development do From 0320a2971969aa734b3661c8935a1717de09eb28 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Thu, 8 Dec 2022 07:57:38 +0100 Subject: [PATCH 10/43] Rubocoped Gemfile --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index 26fad0aceb..295b8d5af3 100644 --- a/Gemfile +++ b/Gemfile @@ -223,7 +223,6 @@ gem 'activerecord_json_validator' # See : https://github.com/DMPRoadmap/roadmap/issues/3254 gem 'mail', '2.7.1' - # ================================= # # ENVIRONMENT SPECIFIC DEPENDENCIES # # ================================= # From 439d642447ec5536fe97b73abb19b68b5b4d5c79 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Thu, 8 Dec 2022 08:49:45 -0500 Subject: [PATCH 11/43] fix test folder name --- Dangerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 62385b5955..628e969b04 100644 --- a/Dangerfile +++ b/Dangerfile @@ -2,7 +2,7 @@ # Make sure non-trivial amounts of code changes come with corresponding tests has_app_changes = !git.modified_files.grep(/lib/).empty? || !git.modified_files.grep(/app/).empty? -has_test_changes = !git.modified_files.grep(/test/).empty? +has_test_changes = !git.modified_files.grep(/spec/).empty? if git.lines_of_code > 50 && has_app_changes && !has_test_changes warn('There are code changes, but no corresponding tests. ' \ From b72e34ddcd91368c65dac35ef98e0333baf19765 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Fri, 9 Dec 2022 11:41:35 -0500 Subject: [PATCH 12/43] sync translation again and update Danger file --- Dangerfile | 2 +- config/locale/app.pot | 8 +- config/locale/de/LC_MESSAGES/app.mo | Bin 154925 -> 154925 bytes config/locale/de/app.po | 8 +- config/locale/en/LC_MESSAGES/app.mo | Bin 142884 -> 142964 bytes config/locale/en/app.po | 8 +- config/locale/en_CA/LC_MESSAGES/app.mo | Bin 649 -> 649 bytes config/locale/en_CA/app.po | 8 +- config/locale/en_GB/LC_MESSAGES/app.mo | Bin 1935 -> 1935 bytes config/locale/en_GB/app.po | 8 +- config/locale/en_US/LC_MESSAGES/app.mo | Bin 21192 -> 21192 bytes config/locale/en_US/app.po | 8 +- config/locale/es/LC_MESSAGES/app.mo | Bin 151868 -> 151868 bytes config/locale/es/app.po | 8 +- config/locale/fi/LC_MESSAGES/app.mo | Bin 146539 -> 146687 bytes config/locale/fi/app.po | 10 +- config/locale/fr_CA/LC_MESSAGES/app.mo | Bin 129140 -> 129140 bytes config/locale/fr_CA/app.po | 8 +- config/locale/fr_FR/LC_MESSAGES/app.mo | Bin 154730 -> 154730 bytes config/locale/fr_FR/app.po | 8 +- config/locale/pt_BR/LC_MESSAGES/app.mo | Bin 150231 -> 150231 bytes config/locale/pt_BR/app.po | 8 +- config/locale/sv_FI/LC_MESSAGES/app.mo | Bin 146258 -> 146258 bytes config/locale/sv_FI/app.po | 8 +- config/locale/tr_TR/LC_MESSAGES/app.mo | Bin 132354 -> 152033 bytes config/locale/tr_TR/app.po | 310 ++++++++++++++++--------- config/locales/.translation_io | 2 +- 27 files changed, 271 insertions(+), 141 deletions(-) diff --git a/Dangerfile b/Dangerfile index 628e969b04..5864039fcc 100644 --- a/Dangerfile +++ b/Dangerfile @@ -25,7 +25,7 @@ warn('PR is classed as Work in Progress') if github.pr_title.include? '[WIP]' declared_trivial = (github.pr_title + github.pr_body).include?('#trivial') || !has_app_changes if !git.modified_files.include?('CHANGELOG.md') && !declared_trivial - raise( + fail( "Please include a CHANGELOG entry. \n You can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", sticky: false diff --git a/config/locale/app.pot b/config/locale/app.pot index f7708a352d..aee3f1366c 100644 --- a/config/locale/app.pot +++ b/config/locale/app.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: DMPRoadmap-Development 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 14:11-0500\n" +"POT-Creation-Date: 2022-12-09 10:34-0500\n" +"PO-Revision-Date: 2022-12-09 10:34-0500\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -1073,6 +1073,10 @@ msgstr "" msgid "Grant API to organisations" msgstr "" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/de/LC_MESSAGES/app.mo b/config/locale/de/LC_MESSAGES/app.mo index a2eba675e5af7e18a8097dc7d03d4b2e9a12c63b..143b6ccff1d8729eda1467b08392acc1c2900553 100644 GIT binary patch delta 72 zcmZ3xi*xNR&W0_F*`7v5x(1dCh6Yx~Cb|Zu1_oRK{<=Y_Wtqj9`FXl7i6yC43PuJ% WMTQV{W6s-UN diff --git a/config/locale/de/app.po b/config/locale/de/app.po index 890cbd1fc8..d52b430953 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: DMPRoadmap-Development 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+0100\n" +"POT-Creation-Date: 2022-12-09 10:34-0500\n" +"PO-Revision-Date: 2022-12-09 16:34+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: German\n" "Language: de\n" @@ -1142,6 +1142,10 @@ msgstr "Verwalten Sie Organisationsdetails" msgid "Grant API to organisations" msgstr "Gewähren Sie API für Organisationen" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/en/LC_MESSAGES/app.mo b/config/locale/en/LC_MESSAGES/app.mo index 4d0d6541cbdc20aa74926fdb7a903d03fb7b230a..fa3d3dd2a722c563630e9eee407e29aa8bd8d4ed 100644 GIT binary patch delta 26249 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 b%2~J|g$n(@a*?|h)^Kf_^uOA<*X(})Hwaja delta 26181 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\n" "Language-Team: English\n" "Language: en\n" @@ -1122,6 +1122,10 @@ msgstr "Manage organisation details" msgid "Grant API to organisations" msgstr "Grant API to organisations" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "Review organisational plans" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/en_CA/LC_MESSAGES/app.mo b/config/locale/en_CA/LC_MESSAGES/app.mo index be3cfc431d0676d7792d14607d83795e3f0c2fb4..847f8d526351f037a424b4e5faf7695240f37d03 100644 GIT binary patch delta 38 ncmeBV?PT3x%E)D;YhbBhXkcY*GTEL{4$3tHayO?lDlq~8rKt!Y delta 38 ocmeBV?PT3x%E)D?YiyukXkuk(IN6?24#G7u0CG2{Gb%9x0Hi?(2LJ#7 diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po index aa5e9a36b2..e606d897b4 100644 --- a/config/locale/en_CA/app.po +++ b/config/locale/en_CA/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: DMPRoadmap-Development 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+0100\n" +"POT-Creation-Date: 2022-12-09 10:34-0500\n" +"PO-Revision-Date: 2022-12-09 16:34+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_CA\n" @@ -1073,6 +1073,10 @@ msgstr "" msgid "Grant API to organisations" msgstr "" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/en_GB/LC_MESSAGES/app.mo b/config/locale/en_GB/LC_MESSAGES/app.mo index 10dba7640fed1180fd790a3a6512aeb4ff20a534..388b2b7d63e0bbe720d537ca125ef4c8dac9ff50 100644 GIT binary patch delta 63 zcmeC@@8{o8!D3{jYhbBhXkcY*qHADkV89jNuN#zFmRX#cpQr1RSdwa`U}OMPWC&4b M22{6s70Xj502Fx;{Qv*} delta 63 zcmeC@@8{o8!D3{nYiyukXkuk(sB2(qV89jNuN#zFmRX#cpQr1RSdwa`U}RuqqzjY= PsxvYGs@uGZ\n" "Language-Team: English\n" "Language: en_GB\n" @@ -1073,6 +1073,10 @@ msgstr "" msgid "Grant API to organisations" msgstr "" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/en_US/LC_MESSAGES/app.mo b/config/locale/en_US/LC_MESSAGES/app.mo index 790f499179fb2f8e8daa1c86d1a34322cce24ba7..3181df30dde0ddb2a290c148bc1a32ca80ca5715 100644 GIT binary patch delta 40 pcmX@Hl<~w;#tkNVTt>PEmI{UjR>mfi?eyfJTr(hdbDCa~3IOvh3daBd delta 40 qcmX@Hl<~w;#tkNVT!y;F1`38IR)&U??eydzTq6S@cXOIvk_rIv#R{$f diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index 38ada31519..12e4fe8e39 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: DMPRoadmap-Development 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+0100\n" +"POT-Creation-Date: 2022-12-09 10:34-0500\n" +"PO-Revision-Date: 2022-12-09 16:34+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_US\n" @@ -1077,6 +1077,10 @@ msgstr "Manage organization details" msgid "Grant API to organisations" msgstr "Grant API to organizations" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/es/LC_MESSAGES/app.mo b/config/locale/es/LC_MESSAGES/app.mo index da5bb85252c7dc022ad0fde441fae0fd8ab5c282..6baa92846d954f55a2583704596bdde98e0c1d62 100644 GIT binary patch delta 72 zcmdn9h;z>(&W0_F*`7v5x(1dCh6Yx~Cb|Zu1_oRK{<=Y_Wtqj9`FXl7i6yC43PuJ% WMTQV{W(&W0_F*`7v*y2b_yh9*{qhPno(1_oRK{<=Y_Wtqj9`FXl7i6yC43PuJ- ZM!G<0pgJQ1pt|\n" "Language-Team: Spanish\n" "Language: es\n" @@ -1129,6 +1129,10 @@ msgstr "Administrar los detalles de la organización" msgid "Grant API to organisations" msgstr "Otorgar API a organizaciones" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/fi/LC_MESSAGES/app.mo b/config/locale/fi/LC_MESSAGES/app.mo index e44d9f26765d1ed62b397b7a08298a7dc1d84938..683d11cb6e08938c0e2e97c1444e649070c9fbf3 100644 GIT binary patch delta 23069 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 J_dIhO{|}d2!lwWL diff --git a/config/locale/fi/app.po b/config/locale/fi/app.po index 8da5834c61..378c15ba98 100644 --- a/config/locale/fi/app.po +++ b/config/locale/fi/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: DMPRoadmap-Development 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+0100\n" +"POT-Creation-Date: 2022-12-09 10:34-0500\n" +"PO-Revision-Date: 2022-12-09 16:34+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -1117,6 +1117,10 @@ msgstr "Hallinnoi organisaation tietoja" msgid "Grant API to organisations" msgstr "Anna API organisaatioille" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 @@ -4650,7 +4654,7 @@ msgstr "" #: ../../app/views/plans/_overview_details.html.erb:17 msgid "Template version %{template_version}, published on %{published_date}" -msgstr "" +msgstr "Mallin versio %{template_version}, julkaistu %{published_date}" #: ../../app/views/plans/_overview_details.html.erb:42 msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})" diff --git a/config/locale/fr_CA/LC_MESSAGES/app.mo b/config/locale/fr_CA/LC_MESSAGES/app.mo index 8e0eef7271d3586e80c45f7812b3b4ca674b9022..63e362dde2fc86b819d1c1546d04bfd43449b69c 100644 GIT binary patch delta 44 ucmezJf&I$|_J%Et>v*_~bPX&O3=OP|O{VYQVU&aN&4B#v4|o`-yaoVXV-8UO delta 44 vcmezJf&I$|_J%Et>v*^fb&U-a3{9*I4X5wmVU&aLjSPVN?GJbur@RILT-pve diff --git a/config/locale/fr_CA/app.po b/config/locale/fr_CA/app.po index b19f98dddc..1f600525bb 100644 --- a/config/locale/fr_CA/app.po +++ b/config/locale/fr_CA/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: DMPRoadmap-Development 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+0100\n" +"POT-Creation-Date: 2022-12-09 10:34-0500\n" +"PO-Revision-Date: 2022-12-09 16:34+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: French\n" "Language: fr_CA\n" @@ -1126,6 +1126,10 @@ msgstr "Gérer les renseignements de l’organisme" msgid "Grant API to organisations" msgstr "Accorder aux organismes l’accès à l’API" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/fr_FR/LC_MESSAGES/app.mo b/config/locale/fr_FR/LC_MESSAGES/app.mo index c15ef247c37b9042d5d20523edbc7686f7f0dc90..82c1cbf30ad527adab4329e09ea379d87142c466 100644 GIT binary patch delta 72 zcmaF0gY(r6&W0_F*`7v5x(1dCh6Yx~Cb|Zu1_oRK{<=Y_Wtqj9`FXl7i6yC43PuJ% WMTQV{W\n" "Language-Team: French\n" "Language: fr_FR\n" @@ -1136,6 +1136,10 @@ msgstr "Gérer les renseignements sur l'organisme" msgid "Grant API to organisations" msgstr "Droit API pour les organismes" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/pt_BR/LC_MESSAGES/app.mo b/config/locale/pt_BR/LC_MESSAGES/app.mo index d1830d69d16597cde547fbcc59af4368955bba3f..34f8e2a7d5b3fdd489624f85258d34930a084931 100644 GIT binary patch delta 72 zcmcaUmGk;k&W0_F*`7v5x(1dCh6Yx~Cb|Zu1_oRK{<=Y_Wtqj9`FXl7i6yC43PuJ% WMTQV{W\n" "Language-Team: Portuguese\n" "Language: pt_BR\n" @@ -1124,6 +1124,10 @@ msgstr "Gerenciar detalhes da organização" msgid "Grant API to organisations" msgstr "Autorizar API para organizações" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/sv_FI/LC_MESSAGES/app.mo b/config/locale/sv_FI/LC_MESSAGES/app.mo index 30bf1e1fd74c32a141b509afb06c75b796215f7a..96927a02a14d8ec2d918b673484503d69708986b 100644 GIT binary patch delta 68 zcmccgjpNccj)pCa*`7v5x(1dCh6Yx~Cb|Zu1_oRK{<=Y_Wtqj9`FXl7i6yC43PuJ% SMTQV{W\n" "Language-Team: Swedish\n" "Language: sv_FI\n" @@ -1115,6 +1115,10 @@ msgstr "Hantera organisationsdetaljer" msgid "Grant API to organisations" msgstr "Bevilja API till organisationer" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 diff --git a/config/locale/tr_TR/LC_MESSAGES/app.mo b/config/locale/tr_TR/LC_MESSAGES/app.mo index 4d25493f021304f70dff7ed3a7223afd2e5d856a..abd94aa76b5d04ce736930f1d1d8a26e8ecf0e9a 100644 GIT binary patch delta 42401 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 JY(uF}^$RFgT#Wz# delta 24601 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 diff --git a/config/locale/tr_TR/app.po b/config/locale/tr_TR/app.po index 940626566f..62bd2bf655 100644 --- a/config/locale/tr_TR/app.po +++ b/config/locale/tr_TR/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: DMPRoadmap-Development 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+0100\n" +"POT-Creation-Date: 2022-12-09 10:34-0500\n" +"PO-Revision-Date: 2022-12-09 16:34+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -136,7 +136,7 @@ msgstr "Devam etmeden önce oturum açmanız veya kaydolmanız gerekir." #: ../../app/controllers/application_controller.rb:108 msgid "Unable to %{action} the %{object}. %{errors}" -msgstr "" +msgstr "%{action} %{object} yapılamıyor. %{errors}" #: ../../app/controllers/application_controller.rb:114 msgid "Successfully %{action} the %{object}." @@ -184,7 +184,7 @@ msgstr "soru seçeneği" #: ../../app/controllers/application_controller.rb:181 msgid "Record Not Found" -msgstr "" +msgstr "Kayıt bulunamadı" #: ../../app/controllers/concerns/paginable.rb:45 msgid "scope should be an ActiveRecord::Relation object" @@ -438,7 +438,7 @@ msgstr "Bir şablonun geçmiş sürümüne aşama ekleyemezsiniz." #: ../../app/controllers/org_admin/phases_controller.rb:126 msgid "Unable to create a new version of this template.
" -msgstr "" +msgstr "Bu şablonun yeni bir sürümü oluşturulamıyor.
" #: ../../app/controllers/org_admin/phases_controller.rb:147 #: ../../app/controllers/org_admin/questions_controller.rb:166 @@ -542,7 +542,7 @@ msgstr "Yeni bir bölüm oluşturulamıyor. Belirttiğiniz aşama mevcut değil. #: ../../app/controllers/org_admin/sections_controller.rb:133 msgid "Unable to delete this version of the template." -msgstr "" +msgstr "Şablonun bu sürümü silinemiyor." #: ../../app/controllers/org_admin/template_copies_controller.rb:20 #: ../../app/controllers/plans_controller.rb:394 @@ -627,11 +627,11 @@ msgstr "Planınız için uygun bir şablon tanımlanamadı." #: ../../app/controllers/plans_controller.rb:84 msgid "My Plan (%{title})" -msgstr "" +msgstr "Planım (%{title})" #: ../../app/controllers/plans_controller.rb:86 msgid "%{user_name} Plan" -msgstr "" +msgstr "%{user_name} Planı" #: ../../app/controllers/plans_controller.rb:124 msgid "This plan is based on the default template." @@ -676,7 +676,7 @@ msgstr "Planın test durumu değiştirilemiyor" #: ../../app/controllers/plans_controller.rb:461 msgid "There is no plan associated with id %{s" -msgstr "" +msgstr "%{ kimliğiyle ilişkilendirilmiş bir plan yok s" #: ../../app/controllers/registrations_controller.rb:34 msgid "" @@ -708,6 +708,8 @@ msgid "" "ble to access\n" " your account with them." msgstr "" +"Hoş geldin! Kurumsal kimlik bilgilerinizle başarıyla kaydoldunuz. Artık onlarl" +"a hesabınıza erişebileceksiniz." #: ../../app/controllers/registrations_controller.rb:173 msgid "Save Unsuccessful. " @@ -763,13 +765,13 @@ msgstr "Şifre ve onay eşleşmelidir" #: ../../app/controllers/research_outputs_controller.rb:217 msgid "research output not found" -msgstr "" +msgstr "araştırma çıktısı bulunamadı" #: ../../app/controllers/roles_controller.rb:26 msgid "" "Cannot share plan with %{email} since that email matches\n" " with the owner of the plan." -msgstr "" +msgstr "Bu e-posta planın sahibiyle eşleştiği için plan %{email} ile paylaşılamıyor." #: ../../app/controllers/roles_controller.rb:36 msgid "Plan is already shared with %{email}." @@ -796,7 +798,7 @@ msgstr "Plan %{email} ile paylaşıldı." msgid "" "You must provide a valid email address and select a permission\n" " level." -msgstr "" +msgstr "Geçerli bir e-posta adresi sağlamalı ve bir izin düzeyi seçmelisiniz." #: ../../app/controllers/roles_controller.rb:71 msgid "Please enter an email address" @@ -807,6 +809,8 @@ msgid "" "Successfully changed the permissions for %{email}. They have been\n" " notified via email." msgstr "" +"%{email} için izinler başarıyla değiştirildi. E-posta yoluyla bilgilendirildil" +"er." #: ../../app/controllers/roles_controller.rb:107 msgid "Access removed" @@ -981,7 +985,7 @@ msgstr "Cevaplıyor" #: ../../app/helpers/conditions_helper.rb:197 msgid " will send an email with subject %{subject_name}" -msgstr "" +msgstr "%{subject_name} konulu bir e-posta gönderecek" #: ../../app/helpers/conditions_helper.rb:203 msgid " will remove question " @@ -1107,6 +1111,10 @@ msgstr "Kuruluş ayrıntılarını yönetin" msgid "Grant API to organisations" msgstr "Kuruluşlara API erişimi ver" +#: ../../app/helpers/perms_helper.rb:17 +msgid "Review organisational plans" +msgstr "" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 @@ -1314,11 +1322,11 @@ msgstr " Özelleştiren:" #: ../../app/models/concerns/exportable_plan.rb:143 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " -msgstr "" +msgstr "Başlık:" #: ../../app/models/concerns/exportable_plan.rb:143 msgid "%{title}" -msgstr "" +msgstr "%{title}" #: ../../app/models/concerns/exportable_plan.rb:145 #: ../../app/views/shared/export/_plan_txt.erb:4 @@ -1334,39 +1342,39 @@ msgstr "%{authors}" #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " -msgstr "" +msgstr "Baş araştırmacı:" #: ../../app/models/concerns/exportable_plan.rb:151 msgid "%{investigation}" -msgstr "" +msgstr "%{investigation}" #: ../../app/models/concerns/exportable_plan.rb:154 msgid "Date Manager: " -msgstr "" +msgstr "Tarih Yöneticisi:" #: ../../app/models/concerns/exportable_plan.rb:155 msgid "%{data_curation}" -msgstr "" +msgstr "%{data_curation}" #: ../../app/models/concerns/exportable_plan.rb:158 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " -msgstr "" +msgstr "Proje Yöneticisi:" #: ../../app/models/concerns/exportable_plan.rb:158 msgid "%{pa}" -msgstr "" +msgstr "%{pa}" #: ../../app/models/concerns/exportable_plan.rb:161 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " -msgstr "" +msgstr "katkıda bulunan:" #: ../../app/models/concerns/exportable_plan.rb:161 msgid "%{other}" -msgstr "" +msgstr "%{other}" #: ../../app/models/concerns/exportable_plan.rb:163 #: ../../app/views/shared/export/_plan_coversheet.erb:26 @@ -1481,15 +1489,15 @@ msgstr "En az bir rol belirtmelisiniz." #: ../../app/models/contributor.rb:132 ../../app/models/contributor.rb:135 msgid "can't be blank." -msgstr "" +msgstr "boş olamaz" #: ../../app/models/contributor.rb:139 msgid "can't be blank if no email is provided." -msgstr "" +msgstr "e-posta sağlanmazsa boş bırakılamaz." #: ../../app/models/contributor.rb:140 msgid "can't be blank if no name is provided." -msgstr "" +msgstr "isim verilmemişse boş bırakılamaz." #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Selected option(s)" @@ -1510,7 +1518,7 @@ msgstr "Ayrıntılar" #: ../../app/models/exported_plan.rb:189 msgid "" "Question not answered.\n" -msgstr "" +msgstr "Soru cevaplanmadı." #: ../../app/models/identifier.rb:141 msgid "already assigned a value" @@ -1658,15 +1666,15 @@ msgstr "İsim" #: ../../app/models/user/at_csv.rb:7 msgid "E-Mail" -msgstr "" +msgstr "E-posta" #: ../../app/models/user/at_csv.rb:7 msgid "Created Date" -msgstr "" +msgstr "Oluşturulma Tarihi" #: ../../app/models/user/at_csv.rb:7 msgid "Last Activity" -msgstr "" +msgstr "son Aktivite" #: ../../app/models/user/at_csv.rb:7 #: ../../app/views/layouts/_branding.html.erb:71 @@ -1690,7 +1698,7 @@ msgstr "Aktif" #: ../../app/models/user/at_csv.rb:8 msgid "Department" -msgstr "" +msgstr "Departman" #: ../../app/policies/api/v0/guidance_group_policy.rb:11 #: ../../app/policies/api/v0/guidance_policy.rb:11 @@ -1704,7 +1712,7 @@ msgstr "planlar API'sine erişimi olmalıdır" #: ../../app/policies/api/v0/template_policy.rb:9 msgid "must have access to templates api" -msgstr "" +msgstr "api şablonlarına erişimi olmalıdır" #: ../../app/policies/research_output_policy.rb:8 msgid "must be logged in" @@ -1716,19 +1724,19 @@ msgstr "kullanıcısının/kullanıcılarının bu planı görme yetkisi yok" #: ../../app/presenters/contributor_presenter.rb:42 msgid "Data Manager" -msgstr "" +msgstr "Veri Yöneticisi" #: ../../app/presenters/contributor_presenter.rb:44 msgid "Project Administrator" -msgstr "" +msgstr "Proje Yöneticisi" #: ../../app/presenters/contributor_presenter.rb:46 msgid "Principal Investigator" -msgstr "" +msgstr "Baş araştırmacı" #: ../../app/presenters/contributor_presenter.rb:48 msgid "Other" -msgstr "" +msgstr "Başka" #: ../../app/presenters/contributor_presenter.rb:56 msgid "" @@ -1759,26 +1767,26 @@ msgstr "" #: ../../app/presenters/research_output_presenter.rb:81 msgid "Generalist (multidisciplinary)" -msgstr "" +msgstr "Genelci (çok disiplinli)" #: ../../app/presenters/research_output_presenter.rb:82 msgid "Discipline specific" -msgstr "" +msgstr "Disipline özgü" #: ../../app/presenters/research_output_presenter.rb:83 msgid "Institutional" -msgstr "" +msgstr "Kurumsal" #: ../../app/presenters/research_output_presenter.rb:119 #: ../../app/presenters/research_output_presenter.rb:126 #: ../../app/presenters/research_output_presenter.rb:133 msgid "None specified" -msgstr "" +msgstr "belirtilmemiş" #: ../../app/presenters/research_output_presenter.rb:140 #: ../../app/presenters/research_output_presenter.rb:147 msgid "Unspecified" -msgstr "" +msgstr "Belirtilmemiş" #: ../../app/services/api/v1/auth/jwt/authentication_service.rb:34 msgid "Invalid grant type" @@ -3045,37 +3053,37 @@ msgstr "Aranıyor ..." #: ../../app/views/layouts/modal_search/_form.html.erb:24 msgid "- Enter a search term %{examples} -" -msgstr "" +msgstr "- Bir arama terimi girin %{examples} -" #: ../../app/views/layouts/modal_search/_form.html.erb:25 #: ../../app/views/layouts/modal_search/_results.html.erb:20 msgid "No results matched your filter criteria." -msgstr "" +msgstr "Filtre kriterlerinizle eşleşen sonuç yok." #: ../../app/views/layouts/modal_search/_form.html.erb:41 #: ../../app/views/layouts/modal_search/_form.html.erb:84 msgid "Close" -msgstr "" +msgstr "Kapat" #: ../../app/views/layouts/modal_search/_form.html.erb:44 msgid "%{topic} search" -msgstr "" +msgstr "%{topic} araması" #: ../../app/views/layouts/modal_search/_form.html.erb:67 msgid "Apply filter(s)" -msgstr "" +msgstr "Filtre(ler) uygula" #: ../../app/views/layouts/modal_search/_result.html.erb:20 msgid "Select" -msgstr "" +msgstr "Seçme" #: ../../app/views/layouts/modal_search/_result.html.erb:22 msgid "Click to select %{item_name}" -msgstr "" +msgstr "%{item_name} seçmek için tıklayın" #: ../../app/views/layouts/modal_search/_result.html.erb:25 msgid "Click to remove %{item_name}" -msgstr "" +msgstr "%{item_name}'u kaldırmak için tıklayın" #: ../../app/views/notes/_archive.html.erb:8 msgid "Are you sure you want to remove this comment?" @@ -3965,7 +3973,7 @@ msgstr "Kuruluş URL'leri" #: ../../app/views/orgs/_profile_form.html.erb:91 #: ../../app/views/orgs/_profile_form.html.erb:96 msgid "Help Desk email" -msgstr "" +msgstr "Yardım Masası e-postası" #: ../../app/views/orgs/_profile_form.html.erb:105 msgid "Administrator contact" @@ -4315,19 +4323,19 @@ msgstr "Uygulanamaz" #: ../../app/views/paginable/research_outputs/_index.html.erb:13 msgid "Repository" -msgstr "" +msgstr "havuz" #: ../../app/views/paginable/research_outputs/_index.html.erb:16 msgid "Release date" -msgstr "" +msgstr "Yayın tarihi" #: ../../app/views/paginable/research_outputs/_index.html.erb:19 msgid "Access level" -msgstr "" +msgstr "Erişim düzeyi" #: ../../app/views/paginable/research_outputs/_index.html.erb:55 msgid "You are about to delete '%{research_output_title}'. Are you sure?" -msgstr "" +msgstr "'%{research_output_title}' öğesini silmek üzeresiniz. Emin misin?" #: ../../app/views/paginable/templates/_customisable.html.erb:6 #: ../../app/views/paginable/templates/_index.html.erb:5 @@ -4476,7 +4484,7 @@ msgstr "Profili Düzenle" #: ../../app/views/phases/_edit_plan_answers.html.erb:77 msgid "Comments & Guidance" -msgstr "" +msgstr "Yorumlar ve Rehberlik" #: ../../app/views/phases/_overview.html.erb:5 msgid "Instructions" @@ -4512,7 +4520,7 @@ msgstr "cevaplanmamış sorular" #: ../../app/views/plans/_download_form.html.erb:49 msgid "research outputs" -msgstr "" +msgstr "araştırma çıktıları" #: ../../app/views/plans/_download_form.html.erb:57 msgid "supplementary section(s) not requested by funding organisation" @@ -4623,7 +4631,7 @@ msgstr "Plan Yazın" #: ../../app/views/plans/_navigation.html.erb:22 msgid "Research Outputs" -msgstr "" +msgstr "Araştırma Çıktıları" #: ../../app/views/plans/_overview_details.html.erb:9 msgid "" @@ -4678,14 +4686,16 @@ msgid "" "Whether there are any potential ethical issues related to data that this DMP d" "escribes" msgstr "" +"Bu VYP'nin tanımladığı verilerle ilgili herhangi bir potansiyel etik sorunun o" +"lup olmadığı" #: ../../app/views/plans/_project_details.html.erb:8 msgid "Description of the ethical issues" -msgstr "" +msgstr "Etik sorunların tanımı" #: ../../app/views/plans/_project_details.html.erb:9 msgid "Link to a protocol from a meeting with an ethics commitee" -msgstr "" +msgstr "Etik komitesi ile yapılan bir toplantıdan bir protokole bağlantı" #: ../../app/views/plans/_project_details.html.erb:27 #: ../../app/views/plans/new.html.erb:38 @@ -4698,14 +4708,14 @@ msgstr "Proje özeti" #: ../../app/views/plans/_project_details.html.erb:47 msgid "Research domain" -msgstr "" +msgstr "Araştırma alanı" #: ../../app/views/plans/_project_details.html.erb:52 #: ../../app/views/plans/_project_details.html.erb:173 #: ../../app/views/research_outputs/_form.html.erb:23 #: ../../app/views/research_outputs/licenses/_form.html.erb:19 msgid "- Please select one -" -msgstr "" +msgstr "- Lütfen birini seçin -" #: ../../app/views/plans/_project_details.html.erb:62 msgid "Project Start" @@ -4734,19 +4744,19 @@ msgstr "ID" #: ../../app/views/plans/_project_details.html.erb:114 msgid "Research outputs may have ethical concerns" -msgstr "" +msgstr "Araştırma çıktılarının etik kaygıları olabilir" #: ../../app/views/plans/_project_details.html.erb:121 msgid "Describe any ethical concerns" -msgstr "" +msgstr "Herhangi bir etik kaygıyı açıklayın" #: ../../app/views/plans/_project_details.html.erb:134 msgid "Ethical protocols" -msgstr "" +msgstr "etik protokoller" #: ../../app/views/plans/_project_details.html.erb:167 msgid "Funding status" -msgstr "" +msgstr "Finansman durumu" #: ../../app/views/plans/_project_details.html.erb:181 msgid "Grant number/url" @@ -4754,7 +4764,7 @@ msgstr "Fon/hibe numarası (grant number) / url" #: ../../app/views/plans/_project_details.html.erb:195 msgid "Grant number:" -msgstr "" +msgstr "Hibe numarası:" #: ../../app/views/plans/_project_details.html.erb:199 msgid "" @@ -4773,6 +4783,8 @@ msgid "" "Click below to give data management staff at %{owner_org}, the Plan Owner's or" "g, access to read and comment on your plan." msgstr "" +"Plan Sahibinin kuruluşu olan %{owner_org}'daki veri yönetimi personeline planı" +"nızı okuma ve yorum yapma erişimi vermek için aşağıyı tıklayın." #: ../../app/views/plans/_request_feedback_form.html.erb:17 msgid "You can continue to edit and download the plan in the interim." @@ -5025,6 +5037,8 @@ msgid "" "Your research output abbreviation can be used as a reference when answering th" "is plan's questions." msgstr "" +"Araştırma çıktınızın kısaltması, bu planın sorularını cevaplarken referans ola" +"rak kullanılabilir." #: ../../app/views/research_outputs/_form.html.erb:7 msgid "" @@ -5033,6 +5047,11 @@ msgid "" "de-anonymizing anonymous data can be considered personally identifiable data. " "(From https://codata.org/rdm-glossary/personally-identifiable-information/)" msgstr "" +"Potansiyel olarak belirli bir kişiyi tanımlayabilecek herhangi bir veri. Bir k" +"işiyi diğerinden ayırt etmek için kullanılabilecek ve anonim verileri anonim h" +"ale getirmek için kullanılabilecek her türlü bilgi, kişisel olarak tanımlanabi" +"lir veri olarak kabul edilebilir. (https://codata.org/rdm-glossary/personally-" +"identifiable-information/ adresinden)" #: ../../app/views/research_outputs/_form.html.erb:8 msgid "" @@ -5043,93 +5062,99 @@ msgid "" "nuing basis. (From https://codata.org/rdm-glossary/personally-identifiable-inf" "ormation/)" msgstr "" +"Depolar, çeşitli biçimlerdeki birçok dijital malzeme türünü korur, yönetir ve " +"bunlara erişim sağlar. Çevrim içi depolardaki materyaller, arama, keşif ve yen" +"iden kullanım sağlamak için derlenmiştir. Dijital materyalin gerçek, güvenilir" +", erişilebilir ve sürekli olarak kullanılabilir olması için yeterli kontrol ol" +"malıdır. (https://codata.org/rdm-glossary/personally-identifiable-information/" +" adresinden)" #: ../../app/views/research_outputs/_form.html.erb:16 msgid "Please describe the output type" -msgstr "" +msgstr "Lütfen çıktı türünü açıklayın" #: ../../app/views/research_outputs/_form.html.erb:27 msgid "Research output type" -msgstr "" +msgstr "Araştırma çıktısı türü" #: ../../app/views/research_outputs/_form.html.erb:44 msgid "Abbreviation" -msgstr "" +msgstr "Kısaltma" #: ../../app/views/research_outputs/_form.html.erb:73 #: ../../app/views/shared/export/_plan_outputs.erb:26 msgid "May contain sensitive data?" -msgstr "" +msgstr "Hassas veriler içerebilir mi?" #: ../../app/views/research_outputs/_form.html.erb:80 msgid "May contain personally identifiable information?" -msgstr "" +msgstr "Kişisel olarak tanımlanabilir bilgiler içerebilir mi?" #: ../../app/views/research_outputs/_form.html.erb:90 msgid "Intended repositories" -msgstr "" +msgstr "Amaçlanan havuzlar" #: ../../app/views/research_outputs/_form.html.erb:99 msgid "Add a repository" -msgstr "" +msgstr "havuz ekle" #: ../../app/views/research_outputs/_form.html.erb:114 msgid "Metadata standards" -msgstr "" +msgstr "Meta veri standartları" #: ../../app/views/research_outputs/_form.html.erb:122 msgid "Add a metadata standard" -msgstr "" +msgstr "Bir meta veri standardı ekleyin" #: ../../app/views/research_outputs/_form.html.erb:136 #: ../../app/views/shared/export/_plan_outputs.erb:20 msgid "Anticipated release date" -msgstr "" +msgstr "Beklenen çıkış tarihi" #: ../../app/views/research_outputs/_form.html.erb:140 #: ../../app/views/shared/export/_plan_outputs.erb:21 msgid "Initial access level" -msgstr "" +msgstr "İlk erişim düzeyi" #: ../../app/views/research_outputs/_form.html.erb:158 #: ../../app/views/research_outputs/_form.html.erb:164 #: ../../app/views/shared/export/_plan_outputs.erb:23 msgid "Anticipated file size" -msgstr "" +msgstr "Beklenen dosya boyutu" #: ../../app/views/research_outputs/_form.html.erb:170 msgid "File size units" -msgstr "" +msgstr "Dosya boyutu birimleri" #: ../../app/views/research_outputs/edit.html.erb:12 msgid "Editing %{research_output_title}" -msgstr "" +msgstr "%{research_output_title} düzenleniyor" #: ../../app/views/research_outputs/edit.html.erb:13 #: ../../app/views/research_outputs/new.html.erb:13 msgid "View all research outputs" -msgstr "" +msgstr "Tüm araştırma çıktılarını görüntüle" #: ../../app/views/research_outputs/index.html.erb:14 msgid "Please list your anticipated research output(s)." -msgstr "" +msgstr "Lütfen beklenen araştırma çıktılarınızı listeleyin." #: ../../app/views/research_outputs/index.html.erb:30 msgid "Add a research output" -msgstr "" +msgstr "Bir araştırma çıktısı ekleyin" #: ../../app/views/research_outputs/licenses/_form.html.erb:20 #: ../../app/views/research_outputs/licenses/_form.html.erb:25 msgid "Initial license" -msgstr "" +msgstr "İlk lisans" #: ../../app/views/research_outputs/licenses/_form.html.erb:31 msgid "For guidance on selecting a license:" -msgstr "" +msgstr "Bir lisans seçme konusunda rehberlik için:" #: ../../app/views/research_outputs/new.html.erb:12 msgid "New research output" -msgstr "" +msgstr "Yeni araştırma çıktısı" #: ../../app/views/research_outputs/repositories/_search.html.erb:5 msgid "" @@ -5138,62 +5163,66 @@ msgid "" "st repositories are a good option and accept all types of data regardless of t" "ype, format, content, or discipline." msgstr "" +"Belirli, kurumsal veya genel veri havuzlarını disipline etmek için aramanızı h" +"assaslaştırın. Etki alanına özgü veri havuzlarının kullanılamadığı durumlarda," +" genel veri havuzları iyi bir seçenektir ve türü, biçimi, içeriği veya disipli" +"ni ne olursa olsun her türlü veriyi kabul eder." #: ../../app/views/research_outputs/repositories/_search.html.erb:6 msgid "Select a subject area to refine your search." -msgstr "" +msgstr "Aramanızı daraltmak için bir konu alanı seçin." #: ../../app/views/research_outputs/repositories/_search.html.erb:12 msgid "- Select a subject area -" -msgstr "" +msgstr "- Bir konu alanı seçin -" #: ../../app/views/research_outputs/repositories/_search.html.erb:14 msgid "Select a subject area" -msgstr "" +msgstr "Bir konu alanı seçin" #: ../../app/views/research_outputs/repositories/_search.html.erb:22 msgid "- Select a repository type -" -msgstr "" +msgstr "- Bir depo türü seçin -" #: ../../app/views/research_outputs/repositories/_search.html.erb:24 msgid "Select a repository type" -msgstr "" +msgstr "Bir havuz türü seçin" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:20 msgid "Click to view repositories related to %{subject}" -msgstr "" +msgstr "%{subject} ile ilgili depoları görüntülemek için tıklayın" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:32 msgid "More info" -msgstr "" +msgstr "Daha fazla bilgi" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:37 msgid "Repository URL" -msgstr "" +msgstr "Havuz URL'si" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:51 msgid "Data access" -msgstr "" +msgstr "veri erişimi" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:54 msgid "Persistent identifier type" -msgstr "" +msgstr "Kalıcı tanımlayıcı türü" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:57 msgid "Policies" -msgstr "" +msgstr "politikalar" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:66 msgid "Data upload" -msgstr "" +msgstr "veri yükleme" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:73 msgid "Provider type" -msgstr "" +msgstr "sağlayıcı türü" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:76 msgid "Repository type" -msgstr "" +msgstr "Depo türü" #: ../../app/views/shared/_create_account_form.html.erb:8 msgid "Last Name" @@ -5267,7 +5296,7 @@ msgstr "Soru cevaplanmadı." #: ../../app/views/shared/export/_plan_coversheet.erb:2 msgid "Plan Overview" -msgstr "" +msgstr "Plana Genel Bakış" #: ../../app/views/shared/export/_plan_coversheet.erb:3 #: ../../app/views/shared/export/_plan_txt.erb:82 @@ -5277,7 +5306,7 @@ msgstr "%{application_name} kullanılarak oluşturulan bir Veri Yönetim Planı" #: ../../app/views/shared/export/_plan_coversheet.erb:17 #: ../../app/views/shared/export/_plan_txt.erb:12 msgid "Data Manager: " -msgstr "" +msgstr "Veri Yöneticisi:" #: ../../app/views/shared/export/_plan_coversheet.erb:29 msgid "Funder: " @@ -5321,27 +5350,27 @@ msgstr "" #: ../../app/views/shared/export/_plan_outputs.erb:3 msgid "Planned Research Outputs" -msgstr "" +msgstr "Planlanan Araştırma Çıktıları" #: ../../app/views/shared/export/_plan_outputs.erb:14 msgid "Planned research output details" -msgstr "" +msgstr "Planlanan araştırma çıktısı ayrıntıları" #: ../../app/views/shared/export/_plan_outputs.erb:22 msgid "Intended repository(ies)" -msgstr "" +msgstr "Amaçlanan havuz(lar)" #: ../../app/views/shared/export/_plan_outputs.erb:24 msgid "License" -msgstr "" +msgstr "Lisans" #: ../../app/views/shared/export/_plan_outputs.erb:25 msgid "Metadata standard(s)" -msgstr "" +msgstr "Meta veri standart(lar)ı" #: ../../app/views/shared/export/_plan_outputs.erb:27 msgid "May contain PII?" -msgstr "" +msgstr "PII içerebilir mi?" #: ../../app/views/shared/org_selectors/_combined.html.erb:15 #: ../../app/views/shared/org_selectors/_external_only.html.erb:13 @@ -5518,6 +5547,10 @@ msgid "" "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 "" +"%{application_name}'da oturum açtığınızda 'Gösterge Panom' sayfasına yönlendir" +"ileceksiniz. Buradan herhangi bir planınızı düzenleyebilir, paylaşabilir, indi" +"rebilir, kopyalayabilir veya kaldırabilirsiniz. Başkaları tarafından sizinle p" +"aylaşılan planları da göreceksiniz." #: ../../app/views/static_pages/help.html.erb:13 msgid "Create a plan" @@ -5676,6 +5709,12 @@ msgid "" " also adjust the formatting (font type, size and margins) for PDF files, which" " may be helpful if working to page limits." msgstr "" +"Buradan planınızı çeşitli biçimlerde indirebilirsiniz. Bu, planınızı bir hibe " +"başvurusunun parçası olarak göndermeniz gerektiğinde faydalı olabilir. Planını" +"zı hangi formatta görüntülemek/indirmek istediğinizi seçin ve indirmek için tı" +"klayın. Ayrıca PDF dosyaları için biçimlendirmeyi (yazı tipi türü, boyutu ve k" +"enar boşlukları) ayarlayabilirsiniz; bu, sayfa sınırlarına göre çalışıyorsanız" +" yardımcı olabilir." #: ../../app/views/static_pages/privacy.html.erb:10 msgid "Information about you: how we use it and with whom we share it" @@ -5774,6 +5813,9 @@ msgid "" "and CDL as a shared resource for the research community. It is hosted at CDL b" "y the University of California Curation Center." msgstr "" +"%{application_name} ('araç', 'sistem'), araştırma topluluğu için paylaşılan bi" +"r kaynak olarak DCC ve CDL tarafından geliştirilmiş bir araçtır. CDL'de Califo" +"rnia Üniversitesi Küratörlük Merkezi tarafından barındırılmaktadır." #: ../../app/views/static_pages/termsuse.html.erb:18 msgid "" @@ -5837,6 +5879,43 @@ msgid "" " at any time. Use of the tool indicates that you understand and agree to these" " terms and conditions.

" msgstr "" +"

Kişisel bilgileriniz ve onay bildiriminiz

%{application_name} hesa" +"bınızı tanımlamaya ve yönetmenize yardımcı olması için adınızı ve e-posta adre" +"sinizi kaydetmemiz gerekiyor. Aracı kullanımınızla ilgili geri bildirim almak " +"veya en son gelişmeler veya sürümler hakkında sizi bilgilendirmek için sizinle" +" iletişim kurmak için de kullanabiliriz. Bilgiler, DCC ve CDL arasında ancak y" +"alnızca şu meşru DCC ve CDL amaçları için aktarılabilir: pazarlama, hizmetleri" +"mizi geliştirme ve sizi ilgili içerik ve olaylar hakkında bilgilendirme. Bize " +"sağladığınız hiçbir kişisel bilgiyi satmayacağız, kiralamayacağız veya ticaret" +"ini yapmayacağız. Bu sistemi kullanarak, kişisel bilgilerinizin yukarıdakilere" +" uygun olarak toplanmasına, saklanmasına ve kullanılmasına izin vermiş olursun" +"uz. Kişisel bilgilerinizi pazarlama amaçlarıyla işlemememizi isteme hakkına sa" +"hipsiniz.

Gizlilik Politikası

Bu sisteme girdiğiniz bilgiler s" +"iz, erişimi paylaşmayı seçtiğiniz kişiler ve - yalnızca hizmetin sürdürülmesi " +"amacıyla - DCC ve CDL'deki sistem yöneticileri tarafından görülebilir. Planlar" +"dan anonimleştirilmiş, otomatikleştirilmiş ve birleştirilmiş bilgiler derleriz" +", ancak izniniz olmadan içeriğinize doğrudan erişmez, içeriğinizi kullanmaz ve" +"ya başka hiç kimseyle paylaşmayız. Ana kuruluşunuzun yetkili görevlileri, plan" +"larınıza belirli amaçlar için erişebilir - örneğin, fon sağlayıcı/kurum gerekl" +"iliklerine uyumu izlemek, depolama gereksinimlerini hesaplamak veya disiplinle" +"r arası veri yönetimi hizmetlerine olan talebi değerlendirmek.

Bilgi Ö" +"zgürlüğü

DCC ve CDL, planlarınızı sizin adınıza tutar, ancak bunlar si" +"zin mülkünüz ve sorumluluğunuzdur. Herhangi bir FOIA başvuru sahibi, ev organi" +"zasyonunuza geri yönlendirilecektir.

şifreler

Parolanız şifrel" +"enmiş biçimde saklanır ve geri alınamaz. Unutulursa sıfırlanması gerekir.

<" +"h3> Kurabiye

Lütfen %{application_name}'in Tanımlama Bilgileri kulland" +"ığını unutmayın. Çerezler ve bunları nasıl kullandığımız hakkında daha fazla b" +"ilgi ana DCC web sitesinde (yeni pencere) %{op" +"en_in_new_window_text} mevcuttur .

Üçüncü taraf API'leri

Bu web sitesindeki belirli özellikler, InCommon/Shibboleth gibi üçüncü t" +"araf hizmetleri ve API'leri veya ortak JavaScript kitaplıklarının veya web yaz" +"ı tiplerinin üçüncü tarafça barındırılmasını kullanır. Harici bir hizmet taraf" +"ından kullanılan bilgiler, o hizmetin gizlilik politikasına tabidir.

r" +"evizyonlar

Bu bildirim en son 5 Ekim 2017'de revize edilmiştir ve herh" +"angi bir zamanda revize edilebilir. Aracın kullanımı, bu hüküm ve koşulları an" +"ladığınızı ve kabul ettiğinizi gösterir.

" #: ../../app/views/super_admin/api_clients/_form.html.erb:29 msgid "Contact Name" @@ -6111,7 +6190,7 @@ msgstr "Önce, bir kullanıcıyı e-posta ile aratın, sonra listeden seçin." #: ../../app/views/template_exports/template_export.docx.erb:29 #: ../../app/views/template_exports/template_export.pdf.erb:73 msgid "default" -msgstr "" +msgstr "varsayılan" #: ../../app/views/template_exports/template_export.docx.erb:39 #: ../../app/views/template_exports/template_export.pdf.erb:81 @@ -6132,11 +6211,11 @@ msgstr "Şablonlarınızla ilgili İstatistikler" #: ../../app/views/usage/_total_usage.html.erb:7 msgid "Total users" -msgstr "" +msgstr "Toplam kullanıcı" #: ../../app/views/usage/_total_usage.html.erb:11 msgid "Total plans" -msgstr "" +msgstr "Toplam planlar" #: ../../app/views/usage/_total_usage.html.erb:15 msgid "Excluding Test Plans" @@ -6287,10 +6366,13 @@ msgid "" "lease visit the \"Plans\" page under the Admin menu in %{tool_name} and open the" " plan." msgstr "" +"%{requestor}, %{link_html} planı hakkında geri bildirim istedi. Yorum eklemek " +"için lütfen %{tool_name}'deki Yönetici menüsü altındaki \"Planlar\" sayfasını zi" +"yaret edin ve planı açın." #: ../../app/views/user_mailer/feedback_notification.html.erb:17 msgid "Alternatively, you can click the link below:" -msgstr "" +msgstr "Alternatif olarak, aşağıdaki bağlantıyı tıklayabilirsiniz:" #: ../../app/views/user_mailer/new_comment.html.erb:5 msgid "" @@ -6326,7 +6408,7 @@ msgstr "Soru: %{question_number}" #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2 msgid "Hello %{recepientname}" -msgstr "" +msgstr "Merhaba %{recepientname}" #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5 msgid "" @@ -6378,7 +6460,7 @@ msgstr "Merhaba %{recipient_name}," #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " to " -msgstr "" +msgstr "ile" #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " based on the template " diff --git a/config/locales/.translation_io b/config/locales/.translation_io index bf0d1e74e9..43b6f1b641 100644 --- a/config/locales/.translation_io +++ b/config/locales/.translation_io @@ -5,4 +5,4 @@ # ignore the conflicts and "sync" again, it will fix this file for you. --- -timestamp: 1669835468 +timestamp: 1670600093 From 9cf7dbd9add8dd9a75b441ce83648794538471d2 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Fri, 9 Dec 2022 12:06:12 -0500 Subject: [PATCH 13/43] use failure instead of fail to aovid rubocop complain --- Dangerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 5864039fcc..9744e06f13 100644 --- a/Dangerfile +++ b/Dangerfile @@ -25,7 +25,7 @@ warn('PR is classed as Work in Progress') if github.pr_title.include? '[WIP]' declared_trivial = (github.pr_title + github.pr_body).include?('#trivial') || !has_app_changes if !git.modified_files.include?('CHANGELOG.md') && !declared_trivial - fail( + failure( "Please include a CHANGELOG entry. \n You can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", sticky: false From bdb07f234df73adb3a3271dada7b94ad5b68d422 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Fri, 9 Dec 2022 13:22:24 -0500 Subject: [PATCH 14/43] add exception message for translation.io changes --- Dangerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 9744e06f13..6bf2c00f9c 100644 --- a/Dangerfile +++ b/Dangerfile @@ -7,7 +7,8 @@ has_test_changes = !git.modified_files.grep(/spec/).empty? if git.lines_of_code > 50 && has_app_changes && !has_test_changes warn('There are code changes, but no corresponding tests. ' \ 'Please include tests if this PR introduces any modifications in ' \ - 'behavior.', + 'behavior. \n + 'Ignore this warning if the PR ONLY contains translation.io synced updates.', sticky: false) end From 3f64a7733bee6f6094575dd510f5cc0b7b43d2f0 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Fri, 9 Dec 2022 13:24:58 -0500 Subject: [PATCH 15/43] fix Dangerfile --- Dangerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 6bf2c00f9c..97e283b0e7 100644 --- a/Dangerfile +++ b/Dangerfile @@ -8,7 +8,7 @@ if git.lines_of_code > 50 && has_app_changes && !has_test_changes warn('There are code changes, but no corresponding tests. ' \ 'Please include tests if this PR introduces any modifications in ' \ 'behavior. \n - 'Ignore this warning if the PR ONLY contains translation.io synced updates.', + Ignore this warning if the PR ONLY contains translation.io synced updates.', sticky: false) end From 482f355c4d513495abed4be43c00074e15b92a33 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 13:28:42 -0500 Subject: [PATCH 16/43] test CHANGELOG file --- .github/workflows/danger.yml | 32 ++++++++++++++++++++++++++++++++ CHANGELOG.md | 9 +++++++++ 2 files changed, 41 insertions(+) create mode 100644 .github/workflows/danger.yml create mode 100644 CHANGELOG.md diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml new file mode 100644 index 0000000000..d4a5fb329a --- /dev/null +++ b/.github/workflows/danger.yml @@ -0,0 +1,32 @@ +name: Danger + +on: [push, pull_request] + +jobs: + danger: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v3 + + - name: 'Determine Ruby and Bundler Versions from Gemfile.lock' + run: | + echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV + echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV + + # Install Ruby - using the version found in the Gemfile.lock + - name: 'Install Ruby' + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ env.RUBY_VERSION }} + + - name: 'Bundle Install' + run: | + gem install bundler -v ${{ env.BUNDLER_VERSION }} + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 --without pgsql rollbar aws + + - name: 'Run Danger' + env: + DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: bundle exec danger \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..b64a2b09ad --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +### Added + +- Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) + +### Fixed + +### Changed From eeab22e679ed87c3df91d40d53797713996f99b1 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 13:36:35 -0500 Subject: [PATCH 17/43] update danger in gemfile --- Gemfile | 3 +++ Gemfile.lock | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 295b8d5af3..caf2cc73bb 100644 --- a/Gemfile +++ b/Gemfile @@ -297,6 +297,9 @@ group :test do # This gem brings back assigns to your controller tests as well as assert_template # to both controller and integration tests. gem 'rails-controller-testing' + + # automating code review + gem "danger", '~> 9.0', require: false end group :ci, :development do diff --git a/Gemfile.lock b/Gemfile.lock index 3b3536c010..2b2d5f5898 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,13 +106,34 @@ GEM xpath (~> 3.2) capybara-webmock (0.1.0) childprocess (4.1.0) + claide (1.1.0) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) coderay (1.1.3) + colored2 (3.1.2) concurrent-ruby (1.1.10) contact_us (1.2.0) rails (>= 4.2.0) + cork (0.3.0) + colored2 (~> 3.1) crack (0.4.5) rexml crass (1.0.6) + danger (9.1.0) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (>= 0.9.0, < 2.0) + faraday-http-cache (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (~> 5.0) + terminal-table (>= 1, < 4) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) database_cleaner-active_record (2.0.1) @@ -153,10 +174,11 @@ GEM railties (>= 5.0.0) faker (3.0.0) i18n (>= 1.8.11, < 2) - faraday (2.7.1) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (1.2.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-http-cache (2.4.1) + faraday (>= 0.8) ffi (1.15.5) flag_shih_tzu (0.3.23) fog-aws (3.15.0) @@ -186,6 +208,9 @@ GEM locale (>= 2.0.5) prime text (>= 1.3.0) + git (1.12.0) + addressable (~> 2.8) + rchardet (~> 1.8) globalid (1.0.0) activesupport (>= 5.0) guard (2.18.0) @@ -232,6 +257,10 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) ledermann-rails-settings (2.5.0) activerecord (>= 4.2) listen (3.7.1) @@ -260,9 +289,12 @@ GEM msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) + multipart-post (2.2.3) mysql2 (0.5.4) + nap (1.1.0) nenv (0.3.0) nio4r (2.5.8) + no_proxy_fix (0.1.2) nokogiri (1.13.9-arm64-darwin) racc (~> 1.4) nokogiri (1.13.9-x86_64-linux) @@ -277,6 +309,9 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) omniauth (2.1.0) hashie (>= 3.4.6) rack (>= 2.2.3) @@ -292,6 +327,7 @@ GEM omniauth (~> 2.0) omniauth-shibboleth (1.3.0) omniauth (>= 1.0.0) + open4 (1.3.4) options (2.3.2) orm_adapter (0.5.0) parallel (1.22.1) @@ -359,6 +395,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rchardet (1.8.0) recaptcha (5.12.3) json regexp_parser (2.6.1) @@ -414,6 +451,9 @@ GEM sprockets (> 3.0) sprockets-rails tilt + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) selenium-webdriver (4.6.1) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) @@ -444,6 +484,8 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) text (1.3.1) thor (1.2.1) tilt (2.0.11) @@ -517,6 +559,7 @@ DEPENDENCIES capybara capybara-webmock contact_us + danger (~> 9.0) database_cleaner devise devise_invitable From 2e761b5006d856b4f53d3d8b882f595beca951cc Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 13:56:14 -0500 Subject: [PATCH 18/43] add danger figuration --- Dangerfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Dangerfile diff --git a/Dangerfile b/Dangerfile new file mode 100644 index 0000000000..7f9a6cd80f --- /dev/null +++ b/Dangerfile @@ -0,0 +1,27 @@ +# Make sure non-trivial amounts of code changes come with corresponding tests +has_app_changes = !git.modified_files.grep(/lib/).empty? || !git.modified_files.grep(/app/).empty? +has_test_changes = !git.modified_files.grep(/test/).empty? + +if git.lines_of_code > 50 && has_app_changes && !has_test_changes + warn('There are code changes, but no corresponding tests. '\ + 'Please include tests if this PR introduces any modifications in '\ + 'behavior.', + sticky: false) +end + +# Mainly to encourage writing up some reasoning about the PR, rather than +# just leaving a title +warn('Please add a detailed summary in the description.') if github.pr_body.length < 3 + +# Warn when there is a big PR +warn('This PR is too big! Consider breaking it down into smaller PRs.') if git.lines_of_code > 1000 + +# Make it more obvious that a PR is a work in progress and shouldn't be merged yet +warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]" + +# Let people say that this isn't worth a CHANGELOG entry in the PR if they choose +declared_trivial = (github.pr_title + github.pr_body).include?("#trivial") || !has_app_changes + +if !git.modified_files.include?("CHANGELOG.md") && !declared_trivial + fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", sticky: false) +end \ No newline at end of file From e7231abe01dbc062a82f21af8ad020d97f09aa7f Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Tue, 6 Dec 2022 14:26:33 -0500 Subject: [PATCH 19/43] fix rubocop --- Dangerfile | 24 +++++++++++++++--------- Gemfile | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Dangerfile b/Dangerfile index 7f9a6cd80f..62385b5955 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1,11 +1,13 @@ +# frozen_string_literal: true + # Make sure non-trivial amounts of code changes come with corresponding tests has_app_changes = !git.modified_files.grep(/lib/).empty? || !git.modified_files.grep(/app/).empty? has_test_changes = !git.modified_files.grep(/test/).empty? -if git.lines_of_code > 50 && has_app_changes && !has_test_changes - warn('There are code changes, but no corresponding tests. '\ - 'Please include tests if this PR introduces any modifications in '\ - 'behavior.', +if git.lines_of_code > 50 && has_app_changes && !has_test_changes + warn('There are code changes, but no corresponding tests. ' \ + 'Please include tests if this PR introduces any modifications in ' \ + 'behavior.', sticky: false) end @@ -17,11 +19,15 @@ warn('Please add a detailed summary in the description.') if github.pr_body.leng warn('This PR is too big! Consider breaking it down into smaller PRs.') if git.lines_of_code > 1000 # Make it more obvious that a PR is a work in progress and shouldn't be merged yet -warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]" +warn('PR is classed as Work in Progress') if github.pr_title.include? '[WIP]' # Let people say that this isn't worth a CHANGELOG entry in the PR if they choose -declared_trivial = (github.pr_title + github.pr_body).include?("#trivial") || !has_app_changes +declared_trivial = (github.pr_title + github.pr_body).include?('#trivial') || !has_app_changes -if !git.modified_files.include?("CHANGELOG.md") && !declared_trivial - fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", sticky: false) -end \ No newline at end of file +if !git.modified_files.include?('CHANGELOG.md') && !declared_trivial + raise( + "Please include a CHANGELOG entry. \n + You can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).", + sticky: false + ) +end diff --git a/Gemfile b/Gemfile index caf2cc73bb..c9990b6313 100644 --- a/Gemfile +++ b/Gemfile @@ -299,7 +299,7 @@ group :test do gem 'rails-controller-testing' # automating code review - gem "danger", '~> 9.0', require: false + gem 'danger', '~> 9.0', require: false end group :ci, :development do From f6a13bdeebe5236859bb4d2aa78e1f846e1c5080 Mon Sep 17 00:00:00 2001 From: pengyin-shan Date: Thu, 8 Dec 2022 08:49:45 -0500 Subject: [PATCH 20/43] fix test folder name --- Dangerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 62385b5955..628e969b04 100644 --- a/Dangerfile +++ b/Dangerfile @@ -2,7 +2,7 @@ # Make sure non-trivial amounts of code changes come with corresponding tests has_app_changes = !git.modified_files.grep(/lib/).empty? || !git.modified_files.grep(/app/).empty? -has_test_changes = !git.modified_files.grep(/test/).empty? +has_test_changes = !git.modified_files.grep(/spec/).empty? if git.lines_of_code > 50 && has_app_changes && !has_test_changes warn('There are code changes, but no corresponding tests. ' \ From 54797daca56ab47c48b9ce46b09a7a7972d48240 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Mon, 12 Dec 2022 11:19:57 +0100 Subject: [PATCH 21/43] Updated CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a2b09ad..735d642996 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,6 @@ ### Fixed +- Froze mail gem version [#3254](https://github.com/DMPRoadmap/roadmap/issues/3254) + ### Changed From 951bae23410088f636f0c614ab4eddde565440c5 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Wed, 14 Dec 2022 08:07:38 +0100 Subject: [PATCH 22/43] Updated CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a2b09ad..25f027bf36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,3 +7,5 @@ ### Fixed ### Changed + +- Added scss files to EditorConfig From 257236362a029222cbef57ac669f8bfbb882ac8e Mon Sep 17 00:00:00 2001 From: gjacob24 Date: Mon, 9 Jan 2023 13:17:39 +0000 Subject: [PATCH 23/43] added validation with error message when user enters very large value for file size --- app/models/research_output.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/research_output.rb b/app/models/research_output.rb index 9ecfdf49fe..7059cfb38e 100644 --- a/app/models/research_output.rb +++ b/app/models/research_output.rb @@ -64,6 +64,8 @@ class ResearchOutput < ApplicationRecord allow_nil: true, allow_blank: true, message: UNIQUENESS_MESSAGE } + validates_numericality_of :byte_size, greater_than: 0, less_than_or_equal_to: 2**63, + message: '(Anticipated file size) is too large. Please enter a smaller value.' # Ensure presence of the :output_type_description if the user selected 'other' validates_presence_of :output_type_description, if: -> { other? }, message: PRESENCE_MESSAGE From b8cc5aba8a86eb33185f4e23e41bc30305a00662 Mon Sep 17 00:00:00 2001 From: gjacob24 Date: Mon, 9 Jan 2023 17:07:01 +0000 Subject: [PATCH 24/43] edited CHANGELOG.md to add details of the previous PR --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a2b09ad..79953fcf2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ### Added - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) - +- Added validation with custom error message in research_output.rb to ensure a user does not enter a very large value as 'Anticipated file size'. [#3161] (https://github.com/DMPRoadmap/roadmap/issues/3161) ### Fixed ### Changed From e861efb76d147d04f47f3f40472fbffc1127a6ae Mon Sep 17 00:00:00 2001 From: briri Date: Mon, 9 Jan 2023 15:10:18 -0800 Subject: [PATCH 25/43] added research outputs to the CSV download of the plan --- app/models/concerns/exportable_plan.rb | 48 +++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb index f754802a8d..6fa5c10278 100644 --- a/app/models/concerns/exportable_plan.rb +++ b/app/models/concerns/exportable_plan.rb @@ -22,7 +22,8 @@ def as_csv(user, unanswered = true, selected_phase = nil, show_custom_sections = true, - show_coversheet = false) + show_coversheet = false, + show_research_outputs = false) hash = prepare(user, show_coversheet) CSV.generate do |csv| prepare_coversheet_for_csv(csv, headings, hash) if show_coversheet @@ -50,6 +51,10 @@ def as_csv(user, end end end + csv << [] + csv << [] + + prepare_research_outputs_for_csv(csv, headings, hash) if show_research_outputs end end # rubocop:enable Style/OptionalBooleanParameter @@ -93,6 +98,9 @@ def prepare(user, coversheet = false) end hash[:phases] = phases + # include any research outputs + hash[:research_outputs] = prepare_research_outputs + record_plan_export(user, :pdf) hash @@ -138,6 +146,29 @@ def prepare_coversheet end # rubocop:enable Metrics/AbcSize + # rubocop:disable Metrics/AbcSize + def prepare_research_outputs + research_outputs.map do |research_output| + presenter = ResearchOutputPresenter.new(research_output: research_output) + size_hash = presenter.converted_file_size(size: research_output.byte_size) + + { + title: research_output.title, + description: research_output.description, + type: presenter.display_type, + anticipated_release_date: presenter.display_release, + initial_access_level: presenter.display_access, + intended_repositories: presenter.display_repository&.join(', '), + anticipated_file_size: "#{size_hash[:size]} #{size_hash[:unit]&.upcase}", + initial_license: presenter.display_license, + metadata_standards: presenter.display_metadata_standard&.join(', '), + may_contain_sensitive_data: presenter.display_boolean(value: research_output.sensitive_data), + may_contain_pii: presenter.display_boolean(value: research_output.personal_data) + } + end + end + # rubocop:enable Metrics/AbcSize + # rubocop:disable Metrics/AbcSize def prepare_coversheet_for_csv(csv, _headings, hash) csv << [_('Title: '), format(_('%{title}'), title: title)] @@ -183,6 +214,21 @@ def prepare_coversheet_for_csv(csv, _headings, hash) end # rubocop:enable Metrics/MethodLength, Metrics/AbcSize + # rubocop:disable Metrics/AbcSize + def prepare_research_outputs_for_csv(csv, _headings, hash) + return false unless hash[:research_outputs].present? && hash[:research_outputs].any? + + csv << [_('Research Outputs: ')] + # Convert the hash keys to column headers + csv << hash[:research_outputs].first.keys.map { |key| key.to_s.capitalize.gsub('_', ' ') } + hash[:research_outputs].each do |research_output| + csv << research_output.values + end + csv << [] + csv << [] + end + # rubocop:enable Metrics/AbcSize + # rubocop:disable Metrics/AbcSize, Metrics/BlockLength, Metrics/MethodLength # rubocop:disable Metrics/ParameterLists def show_section_for_csv(csv, phase, section, headings, unanswered, hash) From 9cfce0d51c765dc90b03272ad9e1db2e9cec453f Mon Sep 17 00:00:00 2001 From: briri Date: Mon, 9 Jan 2023 15:12:58 -0800 Subject: [PATCH 26/43] updated JS that interacts with TinyMCE so that it stops using deprecated setMode function --- app/javascript/src/answers/edit.js | 2 +- app/javascript/src/orgs/adminEdit.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/src/answers/edit.js b/app/javascript/src/answers/edit.js index 766ccc9386..7376e40a4d 100644 --- a/app/javascript/src/answers/edit.js +++ b/app/javascript/src/answers/edit.js @@ -180,7 +180,7 @@ $(() => { } else { // Sets the editor mode for each editor to readonly Tinymce.findEditorsByClassName(editorClass).forEach((editor) => { - editor.setMode('readonly'); + editor.mode.set('readonly'); }); } diff --git a/app/javascript/src/orgs/adminEdit.js b/app/javascript/src/orgs/adminEdit.js index c393c39c27..cd10a2fdb8 100644 --- a/app/javascript/src/orgs/adminEdit.js +++ b/app/javascript/src/orgs/adminEdit.js @@ -10,9 +10,9 @@ $(() => { const editor = Tinymce.findEditorById('org_feedback_msg'); if (isObject(editor)) { if ($('#org_feedback_enabled_true').is(':checked')) { - editor.setMode('code'); + editor.mode.set('design'); } else { - editor.setMode('readonly'); + editor.mode.set('readonly'); } } }; From 44667f88435a8f9be4d7e99a87ec86dd21bfeaa4 Mon Sep 17 00:00:00 2001 From: briri Date: Tue, 10 Jan 2023 07:49:07 -0800 Subject: [PATCH 27/43] updated changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a2b09ad..00c72ea221 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog -### Added +### Added - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) ### Fixed +- Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated. + ### Changed From f089114187a875cd436b59d84d3da2538c002d45 Mon Sep 17 00:00:00 2001 From: briri Date: Tue, 10 Jan 2023 07:52:04 -0800 Subject: [PATCH 28/43] updated changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a2b09ad..ae5f74203e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog -### Added +### Added - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) ### Fixed +- Updated the CSV export so that it now includes research outputs + ### Changed From d10406031483a38f3bbce84b61cfd91bc36e7ddf Mon Sep 17 00:00:00 2001 From: briri Date: Wed, 11 Jan 2023 09:06:36 -0800 Subject: [PATCH 29/43] fix to properly use max per page settings --- app/controllers/api/v1/base_api_controller.rb | 5 +++-- app/controllers/concerns/paginable.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/base_api_controller.rb b/app/controllers/api/v1/base_api_controller.rb index e25a6740a7..c1ddc36547 100644 --- a/app/controllers/api/v1/base_api_controller.rb +++ b/app/controllers/api/v1/base_api_controller.rb @@ -60,9 +60,10 @@ def base_response_content # Retrieve the requested pagination params or use defaults # only allow 100 per page as the max def pagination_params + max_per_page = Rails.configuration.x.application.api_max_page_size @page = params.fetch('page', 1).to_i - @per_page = params.fetch('per_page', 20).to_i - @per_page = 100 if @per_page > 100 + @per_page = params.fetch('per_page', max_per_page).to_i + @per_page = max_per_page if @per_page > max_per_page end # Parse the body of the incoming request diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb index 71d3eacb01..aed2366725 100644 --- a/app/controllers/concerns/paginable.rb +++ b/app/controllers/concerns/paginable.rb @@ -156,7 +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)) + .per(@args.fetch(:per_page, Rails.configuration.x.results_per_page)) end scope end From ffbe90ce87738ef438edb37db272392a1be08899 Mon Sep 17 00:00:00 2001 From: briri Date: Wed, 11 Jan 2023 09:48:55 -0800 Subject: [PATCH 30/43] added changelog entry --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a2b09ad..e54ff8efda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog -### Added +### Added - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) ### Fixed +- Fixed discrepencies with default/max per_page values for API and UI pagination + ### Changed From d6ee0ff6b0cf23655b136c489762c9aa4fcfaded Mon Sep 17 00:00:00 2001 From: briri Date: Mon, 23 Jan 2023 07:47:41 -0800 Subject: [PATCH 31/43] updated api v0 to use max_pages config value for api --- app/controllers/api/v0/base_controller.rb | 1 + app/controllers/api/v0/plans_controller.rb | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v0/base_controller.rb b/app/controllers/api/v0/base_controller.rb index fb8309bd39..ca6a1abe7e 100644 --- a/app/controllers/api/v0/base_controller.rb +++ b/app/controllers/api/v0/base_controller.rb @@ -6,6 +6,7 @@ module V0 class BaseController < ApplicationController protect_from_forgery with: :null_session before_action :define_resource, only: %i[destroy show update] + before_action :pagination_params, only: %i[index] respond_to :json # POST /api/{plural_resource_name} diff --git a/app/controllers/api/v0/plans_controller.rb b/app/controllers/api/v0/plans_controller.rb index 374d5401d9..0ea43ba707 100644 --- a/app/controllers/api/v0/plans_controller.rb +++ b/app/controllers/api/v0/plans_controller.rb @@ -98,7 +98,11 @@ def index plan_ids = extract_param_list(params, 'plan') @plans = @plans.where(id: plan_ids) if plan_ids.present? # apply pagination after filtering - @args = { per_page: params[:per_page], page: params[:page] } + max_per_page = Rails.configuration.x.application.api_max_page_size + page = params.fetch('page', 1).to_i + per_page = params.fetch('per_page', max_per_page).to_i + per_page = max_per_page if @per_page > max_per_page + @args = { per_page: per_page, page: page } @plans = refine_query(@plans) respond_with @plans end From 16c2f27492446faa3ab56725e23ed2be79f5527e Mon Sep 17 00:00:00 2001 From: briri Date: Mon, 23 Jan 2023 09:07:17 -0800 Subject: [PATCH 32/43] Updated PDF font selector to use Roboto instead of Helvetica since Google no longer has Helvetica updated changelog --- CHANGELOG.md | 4 +++- app/helpers/exports_helper.rb | 2 +- app/models/settings/template.rb | 2 +- app/views/shared/export/_plan_styling.erb | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a2b09ad..da7e21a9ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog -### Added +### Added - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) ### Fixed +- Updated sans-serif font used in PDF downloads to Roboto since Google API no longer offers Helvetica + ### Changed diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb index a288457477..192ae49914 100644 --- a/app/helpers/exports_helper.rb +++ b/app/helpers/exports_helper.rb @@ -10,7 +10,7 @@ module ExportsHelper }.freeze def font_face - @formatting[:font_face].presence || 'Arial, Helvetica, Sans-Serif' + @formatting[:font_face].presence || 'Roboto, Arial, Sans-Serif' end def font_size diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb index a0ee4c6377..dbffe03c23 100644 --- a/app/models/settings/template.rb +++ b/app/models/settings/template.rb @@ -18,7 +18,7 @@ module Settings class Template < RailsSettings::SettingObject VALID_FONT_FACES = [ '"Times New Roman", Times, Serif', - 'Arial, Helvetica, Sans-Serif' + 'Roboto, Arial, Sans-Serif' ].freeze VALID_FONT_SIZE_RANGE = (8..14).freeze diff --git a/app/views/shared/export/_plan_styling.erb b/app/views/shared/export/_plan_styling.erb index 7ed339fecc..d8c0f3d059 100644 --- a/app/views/shared/export/_plan_styling.erb +++ b/app/views/shared/export/_plan_styling.erb @@ -1,5 +1,5 @@ \ No newline at end of file From 68ac8a723615afa8eab51cab91833e996f868a26 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Tue, 24 Jan 2023 15:05:37 +0100 Subject: [PATCH 33/43] Update CHANGELOG.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5426cdc782..d0cbe0dd5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ### Added - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) -- Added validation with custom error message in research_output.rb to ensure a user does not enter a very large value as 'Anticipated file size'. [#3161] (https://github.com/DMPRoadmap/roadmap/issues/3161) +- Added validation with custom error message in research_output.rb to ensure a user does not enter a very large value as 'Anticipated file size'. [#3161](https://github.com/DMPRoadmap/roadmap/issues/3161) +- Added popover for org profile page and added explanation for public plan ### Fixed - Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated. @@ -11,3 +12,4 @@ ### Changed - Added scss files to EditorConfig +- Change csv file name for statistics from 'Completed' to 'Created' From 67340566b13b3a1cef3d741931ab39e87551952e Mon Sep 17 00:00:00 2001 From: briri Date: Tue, 24 Jan 2023 08:51:38 -0800 Subject: [PATCH 34/43] updated paginable concern to fix issue with keyword args --- 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 71d3eacb01..fccc485b2b 100644 --- a/app/controllers/concerns/paginable.rb +++ b/app/controllers/concerns/paginable.rb @@ -200,7 +200,7 @@ def sort_link_url(sort_field) end base_url = paginable_base_url(query_params[:page]) sort_url = URI(base_url) - sort_url.query = stringify_query_params(query_params) + sort_url.query = stringify_query_params(**query_params) sort_url.to_s "#{sort_url}&#{stringify_nonpagination_query_params}" end From 1d026786ed9e1b82eeefabc3357b513b394116f5 Mon Sep 17 00:00:00 2001 From: briri Date: Tue, 24 Jan 2023 13:23:08 -0800 Subject: [PATCH 35/43] fixed an issue that was causing templates.visibility to get set to organizationally_visible even when the org is a funder --- CHANGELOG.md | 3 ++- app/controllers/org_admin/templates_controller.rb | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0cbe0dd5e..3055cec3c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,11 @@ - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) - Added validation with custom error message in research_output.rb to ensure a user does not enter a very large value as 'Anticipated file size'. [#3161](https://github.com/DMPRoadmap/roadmap/issues/3161) -- Added popover for org profile page and added explanation for public plan +- Added popover for org profile page and added explanation for public plan ### Fixed - Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated. +- Patched an issue that was causing a template's visibility to change to 'organizationally_visible' when saving on the template details page. ### Changed diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb index aed9d383dc..40cf6fb94a 100644 --- a/app/controllers/org_admin/templates_controller.rb +++ b/app/controllers/org_admin/templates_controller.rb @@ -385,9 +385,11 @@ def parse_visibility(args, org) # If nil and the org is not a funder, we default to organisational # If present, we parse to retrieve the value if args[:visibility].nil? - org.funder? ? 'publicly_visible' : 'organisationally_visible' + org.funder? ? Template.visibilities[:publicly_visible] : Template.visibilities[:organisationally_visible] + elsif args.fetch(:visibility, '0') == '1' + Template.visibilities[:organisationally_visible] else - args.fetch(:visibility, '0') == '1' ? 'organisationally_visible' : 'publicly_visible' + Template.visibilities[:publicly_visible] end end From 5246ce3f1f2bacfb4a63efbe7b02ff2add74b22a Mon Sep 17 00:00:00 2001 From: briri Date: Tue, 24 Jan 2023 13:24:48 -0800 Subject: [PATCH 36/43] updated change log --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0cbe0dd5e..aae8621de2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,11 @@ - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257) - Added validation with custom error message in research_output.rb to ensure a user does not enter a very large value as 'Anticipated file size'. [#3161](https://github.com/DMPRoadmap/roadmap/issues/3161) -- Added popover for org profile page and added explanation for public plan +- Added popover for org profile page and added explanation for public plan ### Fixed - Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated. +- Fixed an issue with the Rails 6 keyword arguments change that was causing the `paginable_sort_link` to fail ### Changed From f90fc88b5029222c2f8b0df62ecd503a412c41ba Mon Sep 17 00:00:00 2001 From: briri Date: Tue, 24 Jan 2023 13:30:39 -0800 Subject: [PATCH 37/43] fixed typo --- app/controllers/org_admin/templates_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb index 40cf6fb94a..1fde789418 100644 --- a/app/controllers/org_admin/templates_controller.rb +++ b/app/controllers/org_admin/templates_controller.rb @@ -386,7 +386,7 @@ def parse_visibility(args, org) # If present, we parse to retrieve the value if args[:visibility].nil? org.funder? ? Template.visibilities[:publicly_visible] : Template.visibilities[:organisationally_visible] - elsif args.fetch(:visibility, '0') == '1' + elsif ['0', 'organisationally_visible'].include?(args.fetch(:visibility, 'publicly_visible')) Template.visibilities[:organisationally_visible] else Template.visibilities[:publicly_visible] From beaaa934d2baf501218bd4aa601bdd3be2895222 Mon Sep 17 00:00:00 2001 From: briri Date: Tue, 24 Jan 2023 13:34:39 -0800 Subject: [PATCH 38/43] make rubocop happy --- app/controllers/org_admin/templates_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb index 1fde789418..0e1dfcebd8 100644 --- a/app/controllers/org_admin/templates_controller.rb +++ b/app/controllers/org_admin/templates_controller.rb @@ -386,7 +386,7 @@ def parse_visibility(args, org) # If present, we parse to retrieve the value if args[:visibility].nil? org.funder? ? Template.visibilities[:publicly_visible] : Template.visibilities[:organisationally_visible] - elsif ['0', 'organisationally_visible'].include?(args.fetch(:visibility, 'publicly_visible')) + elsif %w[0 organisationally_visible].include?(args.fetch(:visibility, 'publicly_visible')) Template.visibilities[:organisationally_visible] else Template.visibilities[:publicly_visible] From b66478039f4a0a2f648540b97b4d5cfa4671e01e Mon Sep 17 00:00:00 2001 From: briri Date: Wed, 25 Jan 2023 08:56:31 -0800 Subject: [PATCH 39/43] removed before action from api v0 base_controller. opted to just include functionality in the plans controller --- app/controllers/api/v0/base_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/api/v0/base_controller.rb b/app/controllers/api/v0/base_controller.rb index ca6a1abe7e..fb8309bd39 100644 --- a/app/controllers/api/v0/base_controller.rb +++ b/app/controllers/api/v0/base_controller.rb @@ -6,7 +6,6 @@ module V0 class BaseController < ApplicationController protect_from_forgery with: :null_session before_action :define_resource, only: %i[destroy show update] - before_action :pagination_params, only: %i[index] respond_to :json # POST /api/{plural_resource_name} From 7e2e5638230db61249e26a3a476e09086092811e Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Fri, 27 Jan 2023 09:13:42 +0100 Subject: [PATCH 40/43] Added missing show_research_outputs option into as_csv method --- app/controllers/plan_exports_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/plan_exports_controller.rb b/app/controllers/plan_exports_controller.rb index edb15b3843..4a3d5c1bbb 100644 --- a/app/controllers/plan_exports_controller.rb +++ b/app/controllers/plan_exports_controller.rb @@ -73,7 +73,8 @@ def show_csv @show_unanswered, @selected_phase, @show_custom_sections, - @show_coversheet), + @show_coversheet, + @show_research_outputs), filename: "#{file_name}.csv" end From af32bbe6d64663915cd586b2707370e6c276e0b8 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Fri, 3 Feb 2023 09:05:19 +0100 Subject: [PATCH 41/43] Updated translations --- config/locale/app.pot | 187 +++++++++++--------- config/locale/de/LC_MESSAGES/app.mo | Bin 154925 -> 154840 bytes config/locale/de/app.po | 219 ++++++++++++----------- config/locale/en/LC_MESSAGES/app.mo | Bin 142964 -> 143439 bytes config/locale/en/app.po | 221 ++++++++++++----------- config/locale/en_CA/LC_MESSAGES/app.mo | Bin 649 -> 634 bytes config/locale/en_CA/app.po | 189 +++++++++++--------- config/locale/en_GB/LC_MESSAGES/app.mo | Bin 1935 -> 1920 bytes config/locale/en_GB/app.po | 189 +++++++++++--------- config/locale/en_US/LC_MESSAGES/app.mo | Bin 21192 -> 21177 bytes config/locale/en_US/app.po | 189 +++++++++++--------- config/locale/es/LC_MESSAGES/app.mo | Bin 151868 -> 151782 bytes config/locale/es/app.po | 219 ++++++++++++----------- config/locale/fi/LC_MESSAGES/app.mo | Bin 146687 -> 146574 bytes config/locale/fi/app.po | 219 ++++++++++++----------- config/locale/fr_CA/LC_MESSAGES/app.mo | Bin 129140 -> 129045 bytes config/locale/fr_CA/app.po | 215 ++++++++++++----------- config/locale/fr_FR/LC_MESSAGES/app.mo | Bin 154730 -> 155334 bytes config/locale/fr_FR/app.po | 234 +++++++++++++------------ config/locale/pt_BR/LC_MESSAGES/app.mo | Bin 150231 -> 150141 bytes config/locale/pt_BR/app.po | 219 ++++++++++++----------- config/locale/sv_FI/LC_MESSAGES/app.mo | Bin 146258 -> 146178 bytes config/locale/sv_FI/app.po | 219 ++++++++++++----------- config/locale/tr_TR/LC_MESSAGES/app.mo | Bin 152033 -> 151935 bytes config/locale/tr_TR/app.po | 219 ++++++++++++----------- config/locales/.translation_io | 2 +- config/locales/localization.es.yml | 2 +- config/locales/localization.fr-CA.yml | 2 +- config/locales/localization.fr-FR.yml | 2 +- 29 files changed, 1473 insertions(+), 1273 deletions(-) diff --git a/config/locale/app.pot b/config/locale/app.pot index aee3f1366c..c5e051c1e7 100644 --- a/config/locale/app.pot +++ b/config/locale/app.pot @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2022 DMPRoadmap-Development -# This file is distributed under the same license as the DMPRoadmap-Development package. -# FIRST AUTHOR , 2022. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 10:34-0500\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -70,7 +70,6 @@ msgid "users_joined" msgstr "" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "" @@ -90,7 +89,7 @@ msgstr "" msgid "Missing or invalid JSON" msgstr "" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "" @@ -494,7 +493,7 @@ msgstr "" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -603,7 +602,7 @@ msgstr "" msgid "Your organisation does not seem to be properly configured." msgstr "" -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "" @@ -892,6 +891,10 @@ msgstr "" msgid "merge" msgstr "" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -980,7 +983,7 @@ msgid "Creators:" msgstr "" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1152,7 +1155,7 @@ msgid "Plan Description" msgstr "" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1257,149 +1260,149 @@ msgstr "" msgid "%{tool_name} API changes" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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 +1416,11 @@ msgid "" " your project or proposal" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "" @@ -1867,7 +1874,7 @@ msgstr "" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2231,13 +2238,13 @@ msgid "Hello" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "" -"account has been locked due to an excessive number of unsuccessful sign in att" -"empts." +msgid "Your" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" +msgid "" +"account has been locked due to an excessive number of unsuccessful sign in att" +"empts." msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 @@ -2750,7 +2757,7 @@ msgid "GitHub" msgstr "" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "" @@ -2828,11 +2835,11 @@ msgid "%{application_name}" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" +msgid "Error:" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Error:" +msgid "Notice:" msgstr "" #: ../../app/views/layouts/application.html.erb:102 @@ -3262,6 +3269,8 @@ msgid "Order" msgstr "" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3721,83 +3730,89 @@ msgid "" "lp Desk if you have questions or to request changes." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" "ed/selected it." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "" @@ -4080,14 +4095,14 @@ msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." +"Are you sure you wish to remove this public plan? This will remove it from the" +" Public DMPs page but any collaborators will still be able to access it." msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this public plan? This will remove it from the" -" Public DMPs page but any collaborators will still be able to access it." +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." msgstr "" #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 @@ -4563,7 +4578,7 @@ msgid "Organisation: anyone at my organisation can view" msgstr "" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" +msgid "Public: anyone can view or download from the Public DMPs page" msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 @@ -5163,11 +5178,11 @@ msgid "on the homepage." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." +msgid "Please visit the" msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "Please visit the" +msgid "page for guidance." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:37 @@ -5942,19 +5957,19 @@ msgid "Hello %{recipient_name}," msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " +msgid " is creating a Data Management Plan and has answered " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " +msgid " to " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " is creating a Data Management Plan and has answered " +msgid " in a plan called " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " in a plan called " +msgid " based on the template " msgstr "" #: ../../app/views/user_mailer/sharing_notification.html.erb:5 @@ -6094,11 +6109,11 @@ msgid "Download users" msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." +msgid "Successfully regenerate your API token." msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Successfully regenerate your API token." +msgid "Unable to regenerate your API token." msgstr "" #: i18n_placeholders.rb:4 diff --git a/config/locale/de/LC_MESSAGES/app.mo b/config/locale/de/LC_MESSAGES/app.mo index 143b6ccff1d8729eda1467b08392acc1c2900553..4b9343d91c5626f010db3ee7461af16ea2395a5c 100644 GIT binary patch delta 24215 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 R7S(ojU%Dgmo-4z^{{v!WJ5vAv delta 24237 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 diff --git a/config/locale/de/app.po b/config/locale/de/app.po index d52b430953..aa1343a7a8 100644 --- a/config/locale/de/app.po +++ b/config/locale/de/app.po @@ -1,14 +1,14 @@ -# German translations for DMPRoadmap-Development package. -# Copyright (C) 2022 DMPRoadmap-Development -# This file is distributed under the same license as the DMPRoadmap-Development package. -# FIRST AUTHOR , 2022. +# German translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: German\n" "Language: de\n" @@ -74,7 +74,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "Nein. Abgeschlossene Pläne" @@ -94,7 +93,7 @@ msgstr "Pläne" msgid "Missing or invalid JSON" msgstr "Fehlender oder ungültiger JSON" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Ungültiges JSON-Format" @@ -514,7 +513,7 @@ msgstr "Template" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -627,7 +626,7 @@ msgstr "Bitte wählen Sie eine Organisation" 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:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Erstellt mit %{application_name}. Zuletzt geändert am %{date}" @@ -946,6 +945,10 @@ msgstr "zusammengeführt" msgid "merge" msgstr "Verschmelzen" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1042,7 +1045,7 @@ msgid "Creators:" msgstr "Erzeuger:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1221,7 +1224,7 @@ msgid "Plan Description" msgstr "Beschreibung" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1326,149 +1329,149 @@ msgstr "Administratorrechte in erteilt %{tool_name}" msgid "%{tool_name} API changes" msgstr "%{tool_name} API-Änderungen" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Phase" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Abschnitt" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Frage" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Antwort" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Angepasst von:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Titel:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Erzeuger:" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Hauptermittler:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Datumsmanager:" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Projektleiter:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "Mitwirkender:" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Zugehörigkeit:" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Vorlage:" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Grant Nummer:" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Projekt Zusammenfassung:" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Zuletzt bearbeitet:" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Informationen zu Urheberrechten:" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1492,7 +1495,11 @@ msgstr "" "             bedeutet nicht, dass der (die) Schöpfer (s) sich mit\n" "             Ihr Projekt oder Vorschlag" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Nicht beantwortet" @@ -1963,7 +1970,7 @@ msgstr "Bitte warten Sie, die Standards werden geladen" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2347,6 +2354,10 @@ msgstr "" msgid "Hello" msgstr "Hello" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Ihre" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" @@ -2355,10 +2366,6 @@ msgstr "" "Das Konto wurde aufgrund einer übermäßigen Anzahl fehlgeschlagener Anmeldevers" "uche gesperrt." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Ihre" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Klicken Sie auf den Link unten, Ihr Konto zu entsperren" @@ -2933,7 +2940,7 @@ msgid "GitHub" msgstr "Github" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "Logo" @@ -3010,14 +3017,14 @@ msgstr "Abmelden" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Beachten:" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Error:" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Beachten:" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Laden..." @@ -3469,6 +3476,8 @@ msgid "Order" msgstr "Reihenfolge" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3992,15 +4001,21 @@ msgstr "" "en Sie sich an den Helpdesk, wenn Sie Fragen haben oder Änderungen anfordern m" "öchten." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Vollständiger Name der Organisation" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Kurzname der Organisation" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -4010,68 +4025,68 @@ msgstr "" ". Eine nicht verwaltete Organisation wurde vom System automatisch erstellt, al" "s ein Benutzer sie eingegeben / ausgewählt hat." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "Gelang es? (Ermöglicht Org Admins den Zugriff auf das Admin-Menü)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Organisationslogo" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Dadurch wird das Logo Ihrer Organisation entfernt" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Entfernen Sie das Logo" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "oder" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "Organisations-URLs" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "Helpdesk-E-Mail" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Kontakt zum Administrator" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Kontakt-E-Mail" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Link Text" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Google Analytics Tracker" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Tracker-Code" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Organisationstypen" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Institution" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Organisationstyp (en)" @@ -4369,14 +4384,6 @@ msgstr "Kopieren" msgid "View" msgstr "Ansicht" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Sind Sie sicher, dass Sie diesen Plan entfernen möchten? Alle Mitarbeiter könn" -"en weiterhin darauf zugreifen." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4386,6 +4393,14 @@ msgstr "" "er öffentlichen DMP-Seite entfernt, aber alle Mitarbeiter können weiterhin dar" "auf zugreifen." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Sind Sie sicher, dass Sie diesen Plan entfernen möchten? Alle Mitarbeiter könn" +"en weiterhin darauf zugreifen." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Unzutreffend" @@ -4914,8 +4929,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organisation: Jeder in meiner Organisation kann anzeigen" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Öffentlich: Jeder kann sehen" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5598,14 +5613,14 @@ msgstr "Einloggen" msgid "on the homepage." msgstr "auf der Startseite." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "Seite zur Orientierung." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Bitte besuchen Sie die" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "Seite zur Orientierung." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Customizing für Ihre Organisation" @@ -6571,22 +6586,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Hallo %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " zu" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " basierend auf der Vorlage" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " erstellt einen Datenverwaltungsplan und hat geantwortet" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " zu" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " in einem Plan namens" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " basierend auf der Vorlage" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6742,14 +6757,14 @@ msgstr "" msgid "Download users" msgstr "Nutzer herunterladen" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "Ihr API-Token kann nicht neu generiert werden." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "Generieren Sie Ihr API-Token erfolgreich neu." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "Ihr API-Token kann nicht neu generiert werden." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locale/en/LC_MESSAGES/app.mo b/config/locale/en/LC_MESSAGES/app.mo index fa3d3dd2a722c563630e9eee407e29aa8bd8d4ed..b5555536d99f2a8925430702018f4c14a76a2517 100644 GIT binary patch delta 26469 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 X;s2Hkr`+y4HC>~7{U6WGSp0tgnE7)3 diff --git a/config/locale/en/app.po b/config/locale/en/app.po index 891eb10b29..9da8429aae 100644 --- a/config/locale/en/app.po +++ b/config/locale/en/app.po @@ -1,14 +1,14 @@ -# English translations for DMPRoadmap-Development package. -# Copyright (C) 2022 DMPRoadmap-Development -# This file is distributed under the same license as the DMPRoadmap-Development package. -# FIRST AUTHOR , 2022. +# English translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 10:35-0500\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en\n" @@ -72,7 +72,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "No. Completed Plans" @@ -92,7 +91,7 @@ msgstr "plans" msgid "Missing or invalid JSON" msgstr "Missing or invalid JSON" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Invalid JSON format" @@ -500,7 +499,7 @@ msgstr "Template" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -609,7 +608,7 @@ msgstr "Please choose an organisation" msgid "Your organisation does not seem to be properly configured." msgstr "Your organisation does not seem to be properly configured." -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Created using %{application_name}. Last modified %{date}" @@ -925,6 +924,10 @@ msgstr "merged" msgid "merge" msgstr "merge" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "No. Created Plans" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1020,7 +1023,7 @@ msgid "Creators:" msgstr "Creators:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1201,7 +1204,7 @@ msgid "Plan Description" msgstr "Plan Description" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1306,149 +1309,149 @@ msgstr "Administrator privileges granted in %{tool_name}" msgid "%{tool_name} API changes" msgstr "%{tool_name} API changes" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Phase" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Section" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Question" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Answer" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Customised By: " -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Title: " -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Creators: " -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Principal Investigator: " -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Date Manager: " -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Project Administrator: " -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "Contributor: " -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Affiliation: " -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Template: " -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Grant number: " -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Project abstract: " -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Last modified: " -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Copyright information:" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1472,7 +1475,11 @@ msgstr "" "hip to,\n" " your project or proposal" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "Research Outputs: " + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Not Answered" @@ -1939,7 +1946,7 @@ msgstr "Please wait, Standards are loading" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2322,6 +2329,10 @@ msgstr "" msgid "Hello" msgstr "Hello" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Your" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" @@ -2330,10 +2341,6 @@ msgstr "" "account has been locked due to an excessive number of unsuccessful sign in att" "empts." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Your" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Click the link below to unlock your account" @@ -2893,7 +2900,7 @@ msgid "GitHub" msgstr "GitHub" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "logo" @@ -2970,14 +2977,14 @@ msgstr "Logout" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Notice:" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Error:" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Notice:" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Loading..." @@ -3423,6 +3430,8 @@ msgid "Order" msgstr "Order" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3932,15 +3941,23 @@ msgstr "" "This information can only be changed by a system administrator. Contact the He" "lp Desk if you have questions or to request changes." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Organisation full name" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Organisation abbreviated name" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3950,68 +3967,68 @@ msgstr "" "aged Org is one that was automatically created by the system when a user enter" "ed/selected it." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "Managed? (allows Org Admins to access the Admin menu)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Organization logo" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "This will remove your organisation's logo" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Remove logo" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "or" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "Organisation URLs" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "Help Desk email" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Administrator contact" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Contact email" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Link text" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Google Analytics Tracker" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Tracker Code" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Organisation Types" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Institution" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Organisation type(s)" @@ -4308,14 +4325,6 @@ msgstr "Copy" msgid "View" msgstr "View" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4324,6 +4333,14 @@ msgstr "" "Are you sure you wish to remove this public plan? This will remove it from the" " Public DMPs page but any collaborators will still be able to access it." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Not Applicable" @@ -4840,8 +4857,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organisation: anyone at my organisation can view" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Public: anyone can view" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "Public: anyone can view or download from the Public DMPs page" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5502,14 +5519,14 @@ msgstr "Sign up" msgid "on the homepage." msgstr "on the homepage." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "page for guidance." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Please visit the" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "page for guidance." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Customising for your Organisation" @@ -6461,22 +6478,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Hello %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " to " - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " based on the template " - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " is creating a Data Management Plan and has answered " +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " to " + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " in a plan called " +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " based on the template " + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6628,14 +6645,14 @@ msgstr "" msgid "Download users" msgstr "Download users" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "Unable to regenerate your API token." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "Successfully regenerate your API token." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "Unable to regenerate your API token." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locale/en_CA/LC_MESSAGES/app.mo b/config/locale/en_CA/LC_MESSAGES/app.mo index 847f8d526351f037a424b4e5faf7695240f37d03..3930915f25a8d51122d7e75d14cab2c1f7796c37 100644 GIT binary patch delta 109 zcmeBV{lzlDMz)BNf#CoH0|P4%8#6I57y@ZaAk7D)vnNJYvlrzjrsO6TOnl{GYOHHu wq-$WTU|?xwV5DteXkfq<;IA8$T9#RynV+ZYl30>zrC?-WgraV9I-?RJ0125G<^TWy delta 124 zcmeyx(#bl(Mz)cWf#CoH0|P4%J25dZ7y@YzAk7D)t0qQPi@Ep)1m!2Dg4Qi4g!I`yQ46 diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po index e606d897b4..d2329a360d 100644 --- a/config/locale/en_CA/app.po +++ b/config/locale/en_CA/app.po @@ -1,14 +1,14 @@ -# English translations for DMPRoadmap-Development package. -# Copyright (C) 2022 DMPRoadmap-Development -# This file is distributed under the same license as the DMPRoadmap-Development package. -# FIRST AUTHOR , 2022. +# English translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_CA\n" @@ -70,7 +70,6 @@ msgid "users_joined" msgstr "" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "" @@ -90,7 +89,7 @@ msgstr "" msgid "Missing or invalid JSON" msgstr "" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "" @@ -494,7 +493,7 @@ msgstr "" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -603,7 +602,7 @@ msgstr "" msgid "Your organisation does not seem to be properly configured." msgstr "" -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "" @@ -892,6 +891,10 @@ msgstr "" msgid "merge" msgstr "" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -980,7 +983,7 @@ msgid "Creators:" msgstr "" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1152,7 +1155,7 @@ msgid "Plan Description" msgstr "" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1257,149 +1260,149 @@ msgstr "" msgid "%{tool_name} API changes" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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 +1416,11 @@ msgid "" " your project or proposal" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "" @@ -1868,7 +1875,7 @@ msgstr "" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2232,13 +2239,13 @@ msgid "Hello" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "" -"account has been locked due to an excessive number of unsuccessful sign in att" -"empts." +msgid "Your" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" +msgid "" +"account has been locked due to an excessive number of unsuccessful sign in att" +"empts." msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 @@ -2751,7 +2758,7 @@ msgid "GitHub" msgstr "" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "" @@ -2829,11 +2836,11 @@ msgid "%{application_name}" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" +msgid "Error:" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Error:" +msgid "Notice:" msgstr "" #: ../../app/views/layouts/application.html.erb:102 @@ -3263,6 +3270,8 @@ msgid "Order" msgstr "" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3722,83 +3731,89 @@ msgid "" "lp Desk if you have questions or to request changes." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" "ed/selected it." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "" @@ -4081,14 +4096,14 @@ msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." +"Are you sure you wish to remove this public plan? This will remove it from the" +" Public DMPs page but any collaborators will still be able to access it." msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this public plan? This will remove it from the" -" Public DMPs page but any collaborators will still be able to access it." +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." msgstr "" #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 @@ -4564,7 +4579,7 @@ msgid "Organisation: anyone at my organisation can view" msgstr "" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" +msgid "Public: anyone can view or download from the Public DMPs page" msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 @@ -5164,11 +5179,11 @@ msgid "on the homepage." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." +msgid "Please visit the" msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "Please visit the" +msgid "page for guidance." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:37 @@ -5943,19 +5958,19 @@ msgid "Hello %{recipient_name}," msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " +msgid " is creating a Data Management Plan and has answered " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " +msgid " to " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " is creating a Data Management Plan and has answered " +msgid " in a plan called " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " in a plan called " +msgid " based on the template " msgstr "" #: ../../app/views/user_mailer/sharing_notification.html.erb:5 @@ -6095,11 +6110,11 @@ msgid "Download users" msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." +msgid "Successfully regenerate your API token." msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Successfully regenerate your API token." +msgid "Unable to regenerate your API token." msgstr "" #: i18n_placeholders.rb:4 diff --git a/config/locale/en_GB/LC_MESSAGES/app.mo b/config/locale/en_GB/LC_MESSAGES/app.mo index 388b2b7d63e0bbe720d537ca125ef4c8dac9ff50..44a5207f927a1d78a931aa77bb5d4a4467fd5471 100644 GIT binary patch delta 257 zcmeC@Z{VMBroM=gfq|KYfkA|UfuW3*fuR{lcLQlIAkELlz@P%8rGPYuZx5u!fV3Bo z76#IZKpLo&p%h571LA64}q;5Ts1|o*-Yz%q~8bHQA zAWsoUKZnwsKvf_Mw1KoCkhTZXAcG1wS2E6HVlT>1Ovz0wn5@gvV5DnctYBbi pWniRjU}#{#72vNMlvylWKYNcRgV1%M>^D367OaRGmBq9I+ delta 272 zcmX}lzY76j7zgkNhcb{zri(H#yn65aC^z3=@uS;}SKi^uxhqm8gvCNEBK`u~?M4%S zhJV5AdnNVM=lRyR=b0zAiQRLy2oQxNqBIe$!$eDXf-xvZhzhU-{oIBb*n=tPLR4u5 zqj2-fdx(>CgmHL*NqB>P?+!8ah)|h|SYAkZ`1zSd%YUFj1-7AoXzon|*I-6(bq&Yt z+osEOF%bjDwZ(9Jkfml#Ws1spBd2h!Qf0ixd92%EhL~6*%Na7=91AU{a`oS, 2022. +# English translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_GB\n" @@ -70,7 +70,6 @@ msgid "users_joined" msgstr "" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "" @@ -90,7 +89,7 @@ msgstr "" msgid "Missing or invalid JSON" msgstr "" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "" @@ -494,7 +493,7 @@ msgstr "" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -603,7 +602,7 @@ msgstr "" msgid "Your organisation does not seem to be properly configured." msgstr "" -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "" @@ -892,6 +891,10 @@ msgstr "" msgid "merge" msgstr "" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -980,7 +983,7 @@ msgid "Creators:" msgstr "" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1152,7 +1155,7 @@ msgid "Plan Description" msgstr "" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1257,149 +1260,149 @@ msgstr "" msgid "%{tool_name} API changes" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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 +1416,11 @@ msgid "" " your project or proposal" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "" @@ -1868,7 +1875,7 @@ msgstr "" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2232,13 +2239,13 @@ msgid "Hello" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "" -"account has been locked due to an excessive number of unsuccessful sign in att" -"empts." +msgid "Your" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" +msgid "" +"account has been locked due to an excessive number of unsuccessful sign in att" +"empts." msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 @@ -2751,7 +2758,7 @@ msgid "GitHub" msgstr "" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "" @@ -2829,11 +2836,11 @@ msgid "%{application_name}" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" +msgid "Error:" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Error:" +msgid "Notice:" msgstr "" #: ../../app/views/layouts/application.html.erb:102 @@ -3263,6 +3270,8 @@ msgid "Order" msgstr "" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3722,83 +3731,89 @@ msgid "" "lp Desk if you have questions or to request changes." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" "ed/selected it." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Organisation logo" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "" @@ -4081,14 +4096,14 @@ msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." +"Are you sure you wish to remove this public plan? This will remove it from the" +" Public DMPs page but any collaborators will still be able to access it." msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this public plan? This will remove it from the" -" Public DMPs page but any collaborators will still be able to access it." +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." msgstr "" #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 @@ -4566,7 +4581,7 @@ msgid "Organisation: anyone at my organisation can view" msgstr "" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" +msgid "Public: anyone can view or download from the Public DMPs page" msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 @@ -5166,11 +5181,11 @@ msgid "on the homepage." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." +msgid "Please visit the" msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "Please visit the" +msgid "page for guidance." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:37 @@ -5945,19 +5960,19 @@ msgid "Hello %{recipient_name}," msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " +msgid " is creating a Data Management Plan and has answered " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " +msgid " to " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " is creating a Data Management Plan and has answered " +msgid " in a plan called " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " in a plan called " +msgid " based on the template " msgstr "" #: ../../app/views/user_mailer/sharing_notification.html.erb:5 @@ -6097,11 +6112,11 @@ msgid "Download users" msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." +msgid "Successfully regenerate your API token." msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Successfully regenerate your API token." +msgid "Unable to regenerate your API token." msgstr "" #: i18n_placeholders.rb:4 diff --git a/config/locale/en_US/LC_MESSAGES/app.mo b/config/locale/en_US/LC_MESSAGES/app.mo index 3181df30dde0ddb2a290c148bc1a32ca80ca5715..861e3c45fa1caab72102d7377e956075214ef2c1 100644 GIT binary patch delta 1039 zcmY+@Pe{{Y9LMp`G&hQAma+0r+SV$Y%zkb&(^jUEsr}K)qNpGx3c;{e(jjV8AQWK- zAv;viK|=HpSck}nqQXmr{qth$pacf)5@B?R-jBasg0a{0e4qc{=lP8dIGzqT9!;mm zV-D#>P|B7R+8~{!UWe7xpICPM7k;MhER&YtBz9mDd+<=mu7AT4>WyKk9J`T_hOiqG zxExy}(iQBCD6T0ANdk-T1Ec)-6>~6cqvSyk7GMwyu?ZJq2QJ2Q=*4U3!2w)~qiE)N zj~O_HuW$z0yM`;`_P|61ixbc$DGxqkFPTVUC-qBJ^G*7JW&^7?OGQ|V`Phywyo_d{ z9yBMuiDu(zQE34dp~>n9)1=hM^U2P{$x1H&m2{vShgH|YL ag;!aXRaU6PD(kB$U6J`;aO7lZyZ;|j$Bxke delta 1073 zcmX}rOGs2v9LMpWW)6yGnog8yDpsc4>CX5z%dDv^^EF^4MWHr?ppKGR5HwiPLMo_; zf~cK^L?9SZx(KR8WI+!rXc4_|W40)Q0tfn@t^~t;&iUVS&*Ojo_x@1SlcA`Quk*qK zQPKlTS}3V{jnqp&fK~J#+fF>jE4`tghRHaM9T>sWc+ltczheRY-Gx#yoX6I(D2k75#@z-+vLZoGpjIDuxK z4>%ux;6wb4>|NufVduq}Qt1_eq%vtKe#UcTB7&Xt&s0b>^#{!cd~2oU*o5iWi!MBi zW}!=HPJ9*3#*-_h81$gYbRp)WKTKmUjSw!uXSe{TFadv|NqO`-DHT)EoNP6kcqL|F zJ(}m8=*EG$_?5Z%UF0@3f#&41bMdfey>r)_Fp&o*@dzhBk7j|m4Wu8_F$1fSceNkO z@fwm8y~74fsg|0t4PW9t+>V1A*=#g*gwM^m&Hv^N>m!X=7L47(WIRaRDy_m>n1`>C zy3s7U(5_)DmSHAVAwTWoFAr~G4!*#*_!9^5={Bc`o7v4})+?wbi`1VU?Vy4gFoToW zTqg}Xi`3e%%w3jsgG@RiY^10QeHGEKaM+b1oxn;iOiV+ z?KI4tUq^EVx6u^GIC^jj6EH2{jLSi8M_%MZQ4eP0jnQFO{z|vMt}zg5J, 2022. +# English translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_US\n" @@ -70,7 +70,6 @@ msgid "users_joined" msgstr "" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "" @@ -90,7 +89,7 @@ msgstr "" msgid "Missing or invalid JSON" msgstr "" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "" @@ -494,7 +493,7 @@ msgstr "" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -603,7 +602,7 @@ msgstr "Please choose an organization" msgid "Your organisation does not seem to be properly configured." msgstr "Your organization does not seem to be properly configured." -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "" @@ -896,6 +895,10 @@ msgstr "" msgid "merge" msgstr "" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -984,7 +987,7 @@ msgid "Creators:" msgstr "" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1156,7 +1159,7 @@ msgid "Plan Description" msgstr "" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1261,149 +1264,149 @@ msgstr "" msgid "%{tool_name} API changes" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Customized By: " -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1417,7 +1420,11 @@ msgid "" " your project or proposal" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "" @@ -1872,7 +1879,7 @@ msgstr "" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2236,13 +2243,13 @@ msgid "Hello" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "" -"account has been locked due to an excessive number of unsuccessful sign in att" -"empts." +msgid "Your" msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" +msgid "" +"account has been locked due to an excessive number of unsuccessful sign in att" +"empts." msgstr "" #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 @@ -2769,7 +2776,7 @@ msgid "GitHub" msgstr "" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "" @@ -2847,11 +2854,11 @@ msgid "%{application_name}" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" +msgid "Error:" msgstr "" #: ../../app/views/layouts/application.html.erb:91 -msgid "Error:" +msgid "Notice:" msgstr "" #: ../../app/views/layouts/application.html.erb:102 @@ -3283,6 +3290,8 @@ msgid "Order" msgstr "" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3756,83 +3765,89 @@ msgid "" "lp Desk if you have questions or to request changes." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Organization full name" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Organization abbreviated name" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" "ed/selected it." msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Organization logo" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "This will remove your organization's logo" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "Organization URLs" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Organization Types" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Organization type(s)" @@ -4115,14 +4130,14 @@ msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." +"Are you sure you wish to remove this public plan? This will remove it from the" +" Public DMPs page but any collaborators will still be able to access it." msgstr "" #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" -"Are you sure you wish to remove this public plan? This will remove it from the" -" Public DMPs page but any collaborators will still be able to access it." +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." msgstr "" #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 @@ -4613,7 +4628,7 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organization: anyone at my organization can view" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" +msgid "Public: anyone can view or download from the Public DMPs page" msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 @@ -5231,11 +5246,11 @@ msgid "on the homepage." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." +msgid "Please visit the" msgstr "" #: ../../app/views/static_pages/about_us.html.erb:35 -msgid "Please visit the" +msgid "page for guidance." msgstr "" #: ../../app/views/static_pages/about_us.html.erb:37 @@ -6034,19 +6049,19 @@ msgid "Hello %{recipient_name}," msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " +msgid " is creating a Data Management Plan and has answered " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " +msgid " to " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " is creating a Data Management Plan and has answered " +msgid " in a plan called " msgstr "" #: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " in a plan called " +msgid " based on the template " msgstr "" #: ../../app/views/user_mailer/sharing_notification.html.erb:5 @@ -6192,11 +6207,11 @@ msgid "Download users" msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." +msgid "Successfully regenerate your API token." msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Successfully regenerate your API token." +msgid "Unable to regenerate your API token." msgstr "" #: i18n_placeholders.rb:4 diff --git a/config/locale/es/LC_MESSAGES/app.mo b/config/locale/es/LC_MESSAGES/app.mo index 6baa92846d954f55a2583704596bdde98e0c1d62..8efd84aaa617f53c970fc491ab982a877467407d 100644 GIT binary patch delta 24216 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�CrtKs&2y3K^j zm=kkhJStx+RE0aChNv5=$2^z{zd_~m+Vr`Yo%j;eyJU~`h;GPD!WmRSuTgt<%9?B> zm;-~cCaU1>sGb;tdf-g!0@Mbz9F_kJsshhY4}6E}fkd^;bK=lT+*6Z4H3BzK1s14n zx-16uwo5>z_d$)_V4FS`HHjA4^tCp=13Qp@7^`4p9n(_-FfZ|;sL8n;3sN6vOC9gK z>RGd=OT^OVJjwZ-^WWn)h9{-BP!0d4+y9d~m2f@ZjB%W@R^7qxJ-&T8h_oy={|0Se z99M}qwc(@Wt4CTo-0z)VBOrTj?g%GEpHFuyI|qBFvzhn>@97%xp+m{>kTPm>)+CjW zc1{iZ4CQ{|jjS0ImYrNnNd21g4^FLzCgj#pifh{mzwvgj8SnXvtIavDab+}D-s4K_ zLt1ZgeZ;D|%^uBg8)>zf37B6bUi22Kl`C)@q4pGUo2)O%QlIl2=NI1YwSod~5z57>V>mfdqa3oLxv;#hI40_vDSm6r9D$m)VxOi0e9fk*1>|>P@C25%(ms z`AQJ(Yx4}kw&p{V$yk9x|0Y9KE+ppc;%!m8c=sfPMsh_*F0TH2)FOQd@rwT@U>nkO zWU?y!kw^25!TISw_eK*hNuE>xNekl{-My|l0j0*1n(jX(R3fac_a1kR{p(vuP%&9&-;_3lf8led#${6gKAbM<`C;kt^ouW5}!ag zA89KHFQ=q)%EK|1b0*hD<5`?f`f9G9CftW}pm%Cr|G)({x9+IJ)lf<*hZnrR)(!Wp zA~cxuTT*XwkG8IS+;Pm_)sOfd8-78!A9?GNPoFrxChX$oT_l0p!!M zpZEt!T58gocn{Xg?@Ho*S}&;FL#{O^eGb(~gPpjpSIIbZaV?0n&BPmVUB_I5bB1e4 zIB$Au)(PE8&BLb!5X8+_#?aI+e#+n0r1EblW^dmCkXLvjX=&;(A`L^&s6t z8h=Cay>}jQZ5#2Gn827iKat@W35PiOk<52w;>JHXE0XEoBbj$<1OHMrRh)fPH*)Y9 z&$&jf_M|-`>uk>4l=3BMi#gX2--&HW%jCV$AlMb`bu|q4d_n#uq~GFPuKeWN%h{Ru zF5*`xS4R-%bmC1(-;MejrX!fRjvJ(HA@5pFehP4!kse0+EXps-wfck?k(Qrp(@48Y zTI$6AR}7UR;S(4CJ+gWCHZ16QYm48;EqMqh<1ETKfVhtGgx}&cd*@Q(-MBUg``bKU zQu27txy1cR*Z+|xKdCw2a9>Zt{Kdj~LwZNb7)$uE3g(!sSHM0JvvD!jJGfD}$Di!k ziMcrMaV{pF6@TOWiCeOA`@hFy(sU#ukB$#EK7>3T!YfU(?|)wr&-0&qukqBITq$Ss ztiW#*`Q{H_sceDzNM4rn8*bJo8y){6tRn)mQ;3dLg!zu*yt8qW%CB6u9K{!N{y@I6 z_WpR{>FsqFe$RQ^_qmG;lc?zy?0|vZjg9?1lemrFUG-_@|Bf`=(u1^dq=XWFz~iUb z>;9xiapojmi?bKu##ov&(3UWt{GW;I*unkJa4Y$4l6Kjq^Re8S938+5`%TCO(aG3GwY**D;2?{~j4hdu-!B<0J3lCjOopq@E&6Qq)g; zcPU{e=X~Ppu^MUo#OxF!eAd=NCH5rkJ#l?B)Ul82-*V3mbmJ7x37n0H>(EETy5#Rk zJcfI9lu69Dhg2loH*qJB3lZF;;|b|}Wpuu`nOov((w2KWG%c89FQNM0*-e8}ry$gd zQ^#8G!KMXMG^d1=q|EewY#JQ8nNT%S7IM}k{G~0w2jNDP-`iU%Av~}xsl|ChQO-J) zw1%q#2&eT9O9*mZ_0CQx=o;=lk`SEaXL7dn{*w^U^bmPolIJJR5u}E4Ut_G#8NxY> z(u;7d4Eg?hbmv+N&hJU=ggQ$8C(l%Gi)P`T@3<1lxzJ?r{okYvqqKpP`hrtOWqVg` z@{O@2MUY2FajvB#T%PoM#9N^s=N<0dh^K8CWw@4w_(aZ=glCfeh52QjK3^|t8wK6rA#4bYn)?q#!%uY;?2Bu zTLeeeAvJ>7UCtbwxrzT`pQCb15pTd9g*az>=eGz-@*|;!-d|e;ml{S$M>w`2-)QbD zP5e*7?d-LwwyZGH+=PF%@w48*mbpApr0ST(Igs#jU(Ec^Vc12D=Gr`$2~Xr~PYIhS zy#r@g`;-E>)#lUPKa)?#7}8o`JlBiaH2wzRJ1X(tuk2`<$<^9>x}|@T^W+@qz1K20 z{RZ;xB+pKqhuyq^t%6e*A@=X_&ReNfaAfcQJg+6;j+~Rp-;lF7&zeQNug%lNJGE7= z$o|CmgM{zcMfg0qvJk&z(<<_eJoY(3-W#p_GmRoPfSf(Zxyt4$=S|VNVAK1yHGks_ zdrxxALGC=ZqBjU1;;ymEi;wL+W64*5cmb||&$-9uPfuD-@6^^op24L4$oV%Z&Fo!i zhz}-QfxCYvoj=9+j#&HjWj3zFRHRkL1@_*hHcuR7v?A?0tWN&<I zhO-xO4@Qu-guENc^D}9G6Hkvi266p0=|hQ61=eufo;)oL5Lm;LbDNhHc}E79*6Gl-78KtJAn=0-hjk zDd8oYafCB)y&d7aoa?;@+lHs_OiE?We~;@6YXudtMR>Aw@@! zy|b$=sW7=al3tH^Me?*H{?O))CvOSjD~NX@%wH#+b>usPd5F)&ZMM8iSjm>@C0$2S z(jFx8{b*qmY=(F;d`r@2d-Hk1t4Rwcp4jH8Vhg!zEo{?O(q!+i?Sox^datz)N*zcA z(<+hUxi?9NT!B?cnQRiA5%vlEM&|spxm<^lqc>lI?qKe|wKbjmulBkOe-(4}veo;@Nfw&~X)E~IdD;r}n+*7;RkC+BRP KaLcu^+y4U>K2|OO delta 24243 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, 2022. +# Spanish translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Spanish\n" "Language: es\n" @@ -72,7 +72,6 @@ msgid "users_joined" msgstr "usuarios_ unidos" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "No. Planes completados" @@ -92,7 +91,7 @@ msgstr "Planes" msgid "Missing or invalid JSON" msgstr "JSON faltante o inválido" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Formato JSON no válido" @@ -504,7 +503,7 @@ msgstr "Modelo" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -615,7 +614,7 @@ msgstr "Por favor elige una organización" 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:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Creado usando %{application_name}. Última modificación %{date}" @@ -933,6 +932,10 @@ msgstr "fusionado" msgid "merge" msgstr "Unir" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1029,7 +1032,7 @@ msgid "Creators:" msgstr "Creadores:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1208,7 +1211,7 @@ msgid "Plan Description" msgstr "Descripción" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1313,149 +1316,149 @@ msgstr "Privilegios de administrador otorgados en %{tool_name}" msgid "%{tool_name} API changes" msgstr "%{tool_name} Cambios de API" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Fase" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Sección" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Pregunta" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "responder" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Personalizado por:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Título:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Creadores:" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Investigador principal:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Administrador de fechas:" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Administrador de Proyectos:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "Contribuyente:" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Afiliación:" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Modelo:" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Conceder número:" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Resumen del proyecto:" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Última modificación:" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Informacion registrada:" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1479,7 +1482,11 @@ msgstr "" "alguna con\n" "             tu proyecto o propuesta" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Sin respuesta" @@ -1950,7 +1957,7 @@ msgstr "Por favor espere, los estándares se están cargando." #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2333,6 +2340,10 @@ msgstr "" msgid "Hello" msgstr "Hola" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Tu" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" @@ -2341,10 +2352,6 @@ msgstr "" "la cuenta se ha bloqueado debido a un número excesivo de intentos de inicio de" " sesión fallidos." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Tu" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Haga clic en el enlace de abajo para desbloquear su cuenta" @@ -2910,7 +2917,7 @@ msgid "GitHub" msgstr "Github" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "Logo" @@ -2987,14 +2994,14 @@ msgstr "Cerrar Sesión" msgid "%{application_name}" msgstr "DMPonline" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Darse cuenta:" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Error:" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Darse cuenta:" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Cargando..." @@ -3441,6 +3448,8 @@ msgid "Order" msgstr "Orden" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3959,15 +3968,21 @@ msgstr "" "óngase en contacto con el servicio de asistencia si tiene preguntas o para sol" "icitar cambios." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Nombre completo de la organización" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Nombre abreviado de la organización" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3977,70 +3992,70 @@ msgstr "" "tillas. Una Org no administrada es aquella que fue creada automáticamente por " "el sistema cuando un usuario la ingresó / seleccionó." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "" "Gestionado? (permite a los administradores de la organización acceder al menú " "Admin)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Logotipo de la organización" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Esto eliminará el logotipo de su organización." -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Quitar logo" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "o" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "URLs de organización" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "Correo electrónico de la mesa de ayuda" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Contacto del administrador" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Email de contacto" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Texto del enlace" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Rastreador de Google Analytics" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Código de seguimiento" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Tipos de organizacion" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "institución" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Tipo (s) de organización" @@ -4337,14 +4352,6 @@ msgstr "Dupdo" msgid "View" msgstr "Ver" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"¿Estás seguro de que deseas eliminar este plan? Cualquier colaborador podrá se" -"guir accediendo." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4353,6 +4360,14 @@ msgstr "" "¿Estás seguro de que deseas eliminar este plan público? Esto lo eliminará de l" "a página de DMP públicos, pero cualquier colaborador podrá acceder a él." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"¿Estás seguro de que deseas eliminar este plan? Cualquier colaborador podrá se" +"guir accediendo." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "No aplica" @@ -4879,8 +4894,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organización: cualquiera en mi organización puede ver" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Público: cualquiera puede ver" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5561,14 +5576,14 @@ msgstr "Contratar" msgid "on the homepage." msgstr "en la página de inicio." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "página de orientación." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Por favor visite el" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "página de orientación." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Personalización para su organización." @@ -6514,22 +6529,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Hola %{recipient_name}" -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " a" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " basado en la plantilla" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " está creando un plan de gestión de datos y ha respondido" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " a" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " en un plan llamado" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " basado en la plantilla" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6684,14 +6699,14 @@ msgstr "" msgid "Download users" msgstr "Descargar usuarios" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "No se puede volver a generar su token de API." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "Regenere con éxito su token de API." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "No se puede volver a generar su token de API." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locale/fi/LC_MESSAGES/app.mo b/config/locale/fi/LC_MESSAGES/app.mo index 683d11cb6e08938c0e2e97c1444e649070c9fbf3..f0173db0e4e28031100851853fa752bf1310aaf4 100644 GIT binary patch delta 24215 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 PmTTU$ZGA4ergi*3h>9+( delta 24237 zcmYk^1$Y(5!p8AE2^K6sfDi&CA%O%51b26Lid%4s6_<9g;(nk&ad(QRSScyW<4o8r1V2F$12% zba)S|IgabRBT$5diai`BGY&@D;&?GD&c$rF6N}*`R0C3d?l?i11%JXgoJ0dYU|Hhh zdpS;WJccvzJZ{BKy&Y#AX6mDcxsG#)KvEJeq6+>ML-2nXfQkD$P9O$i8VtiF7>8-` z9I9t`P(6EV<0-#zoMgnaV`9vMb+7=|Ko^%$zjJ~>3jDmEd0{YW=tg2DoQDax6^ml` z{*F@tm!cYW2i1`0SP~NtaGWSCk2$at&csPL1+xuwoZ`3vUFN{~gTP~q9mLT4F{Fdd zNJI=}J&+!U8L0v}R1YVk z8a5AE29EzMwwlsW>EGLU_St69)y0COkHHGs{|N;0lJFKQV$N?Irv!GxlDHf-PlH46ri9)lUMAZiU%$08h5?Qt6QJ9Flm7o+Ey?NJC-VI>@Z zwXg&pKn?ACEP}cEhRH%$0pbgJK|2Pi=oRL=QHe%%6|}t;4i2}*1@p`C^Hp7898kPT@OTbs~YO|Wtpjw_4l^%mpSk$JswCSButG_=c!jY(kj>T*^ z9o2yEFe4tqUU&@~VvRL+|1Th*jGHhs9z?B)8#cpBR6~-kH7{g9t%+#V&=$oQY>rwp zqc99-qISzxR6~D2t^S`dDc&{duJe$9di>TTIEmJoGdnFNBfTaDU?WV9tx;>GD{65K zL-lYnX2IpC5%>}H-fyUe-Ny)gi^?CmUL9fn3ldNdD_{<+hpJ!zs^#NRJ)VszaD{cV zP2Y>^(N8vh0ae~@OoC5Q<-Eq^m}rAptbrIq{Z15ttXKzAU=LJF2VqK_hpJ!|YD6|+ zE=<5k{N1J}-e{&WHC7}&JF2`+7><4MC!C47vCSrSL@ELk2$aJ)s0w~T4bd$ejIS{z z_W917WM5)x;$GBtTZTIOvurl$`7kl@GN?6D2{jU(QH!-Fs=O~YGyYmUE(sd)HK@h7 z2Q^e@tk+O4{DE4e&rk)X+G2W`9>a-;qspmZZHzh>x}eG(j%v_!)FR!sh4EKG7f4Wx zuc1cdmh~}eQGGx)C}gV{!YE`XIZv@4&fVrXKVr)5W-3qNZsPw#9bl_=n6-5mRbTR* zX2jCE1T>V9)`F-OS3p(R6tyVZqlRuAX2i)heL3bNegf6dr>GG~m0(tVIBMkLumF}p zt*zdu4!bi5sG>P|9+%npfbY#B8iA_#5Jur~%!iLK4QAP8)wJ|AZjuz&u#(1mmw3_9I~` zjz={h_@prklMyd~nzNFqxi5z*sIIk@wYzn&bu0#uZx*WDMW{u&-ag;!6420`#N>Dl z^}-*h7oMOh{(xG99u9D=iKM7}fmi}VFcKSK6&!@hzYmM!AxwcEFgYgs*(_!^h(Iis^&1s0w3Go2e~<+9i!p<@CTf z?f>BfRKZ46i%(!`JcF9+o2a3FhP>dbMHLsIHeZ8Lb6pozL3>pGA*k}kp+;&74!}9M z2veO^2bup31X7alGpeAgm<1oA3JN&Kip5~mRD_}m4o5XKr?m*CAzm3(UK48v3?$y$ zK6kCt^_=>hr36&bCRC62qFQ_wRpB+%KK~6hCAU!(`<*x6_tRo_;^nX`cEH@Y6g3q; zV+`iHU~GtWi4Q|J9f6Ysg75~a;=fTnd5_vYDKDA=v!jmOIv9anQ4O4k>hUyGM;4$O zxXz~Uvhky+axY;B{&|t{S4QU&^8$gm8du{QtasVG@CG&K0l%2@AT6q*+*k&Sqo!ma zYIP5{j>7@OXQHMs*%dRADNzjxyu$crAP`Q1MxZDr!J3!}8=&T{JF0@As24||3Y>xJ z`E1nt%P=kO#PoO^HNrP+`cuqG-0!M+9_|v*b}E8;P}@G}j&a2GyZ~;t>9?^Q@ziyDz)|of90%W}F_;T$;4IXT-o)(q1T~fE{xG{H6cvv|t+l)u ziIvb*#a#%f;1Q^8HWTyVx7HI_koX&Hf_eTlt9>M@;@PORvI>K7FKX9ZM6I2>sHuHw z{fK%mqq2M&K}(Bz_Oo z!R!xA$4a3ZRtW>J(F4X`i=;IP$?*%!gk`mVOu!WQt$nZx^_6Ths(}3uO}<}ItN#&dSG+@wOu!@a zei~E-Sy1KX!|9Y$4wDl<``Em99n~TC0fDjv-l1M7@x=6~CMw&4Gn&3wqq0~BA(mE^CRWCP7wlXab?sCO|d4%qh8pAiE$fhDt2LB zJcZ-%9jbw&{^qN;A3qtP8g$~h$$t|yLeDT2zQv@N^o2UW{09=qMnV{B&dZ{DS`ANO zQ{0SEFHJ))VSeKGP(2QQWh$tM%3lKmmHyf+zG&3$D35A*Q`A(9#vI!JQwbEn?U;nQ z`V$utfAq!_FzK!NrSuAnA^m48gfCGA=6Yv7WSXKztQ)F=UKoT!P$M`6wZ^=t5m}7B zpZ`}8P>;8xUOa>vqSF|HmoX1Mwdq;jn~I{aJL$QwCC)Iun;TbCe+A0M=iFGSRIpnGCga68u~WYcvQZw zsQ13W()cB6ckD(@6aNcK zVMHR2@58G#s^C$07T4ofI6Se(nTYRE?~P@l={oQ%BU9e+|{* zQ~@5REf&K|I0v_3Pk#N$I&>mZc$`WYn$qK2{cTZG*&Fp?GZ59VZ!ruHA?3Ty9RgbY z8B>{_RYz4k1e@Uo)GANRaaa`#Vt+lyIW+t+s^YO}%=432gm~Jt9^W}o4I_xR!eIOg zN8vXZp#2|`&f{CIW$-u`@i2~}erH}rkFyrD1bcjo@hJKezlbX63Tidqv_3#>r&p-e z@1M!zTYQ;O?}ed;I1)8-l~5zx2ixN^)GkUC;&EK{Brkz#*bU=w3l_%PsQn+D+2dQJ z1yI|pG3o#sjVd?+o8x`dP*(~yQ_u-DGV@XSkD#XZt&Qi+;&GkwB(%$7TDlaYh@VDP z{2a4ls;p+!=0O$M5jC_^F+F~RnQ=Xq#iOWQlsKEmsfD4K7Q0{o4nd9R=xnYT!f7^P z6>8OPMOCm1H3bJy=fN?Xeg$=I+_KLf+w>QxbKnCeLl0X^4NQ(|P?(JuK{cqROF(nj z%GwXr^NFa{x&qVTUet%m8Prkz8|rL-jOvkJxW{*-rbHb$IZ*G%;Y_TK-SIk>!Kx8v zQM+RZJSO2ds>cc0J-#DyKdOM6s401c$1yb0ES|e~o_NYAkFytl!@Ia3hsSA(BXgRm zx`O42`$e0ERkGGaI^;Ud324=J!*bXYx8g?ZjO}8~b~}bDI8iQ-?>k{j)Z*QVTCC5p z0>sa(jEXg@dnrC<|6V{X zu7mkKzMls?ai#$=sPm!|YWK{*^2&!AYX1Tr-=E(qU=_+)j7tBbARX5Jk1S+*9*;V! zmt#fDUfA@Y6OJUl7S(_}{Pj>LTz4#iORyteLls=EsK@vFzArJ7_({|@eT+RZyqH;} zQ_hWUYv+JI_IHIu$8DDCZGRESG1Bam+HUf3vjJ3}ba0v0^s1dAK%`C!^s41R^ z`Y_srD(4Wo+D6CigY&5PJyb*fMm6LO>Z_Pj-5fm4Q3Xsx^<)-mh<9Q^JcM6)_{_ir z98lBa+`-t|W+c%4p1XJ) zQ#bMWeir-%H6`Plnh~0ZDtIaCVA+fs$rGr#zkter2Y2BMRKqs8pPB7)0+sL=>cH`D zX67ywHP=z7lPovtj310gaVKhVe%ajQpMV*O&qS5C78B92!&sU4i5BLwC3Q=4p12JN zsKsru0uDy)``s9e4=@2UwKCuF&SC@Nxm$aj`Zydf<0;(6zFX18^t4%fQ$aUWhX$b* z-!$tAjL`nyML-R>j+)ySsElbkm=BX2sI$92s;7fd4IG0NaXVJW*H{V5$D4+a!NSD1 z;^%k|TTwvcjvi+c@h!bQ{6i=9Uzt80=Lrdk`V zm&QWG8>2o%#-m1HHHPDM)CgU|9C!z{W&(y8b6`>86;SUDwtkK3=uFgFTVdTdjQ!u0 zgv%s+gXK7d@+yvV(4Rvg56(v|wqvM+Bss@hJXS_kxCYDPZ&(_`DYpQ&Mh*2eRD-@n zP2Fl6|IQ_#x!G$yVm*yo1HYh#_71A$Z;_9DC*25-?_aSt8fix4BWj9LjxrU5V@u*O zsLz5isF6K{`S3Mrd%HPDdz@he8l!rC7AN38sPkal81r@e1a2oD^|hJ1tEee@h?;^F zV@(61Q6J}}P;03f>Ukf`jgwJpAptp%TqoB!Gc>(Wt9cmK!cnL>JB@zy_!esD?u<7> z|3B0a*PCGSjYKU*uXQ;#BEAh9V$z8or#H61@^}*4YyYR1WRA?9xR?iHP`e>&viWo? zge8eL!Qwa_HH0T{3%d32L!sn`%zPyr>SAL6u(_hclf{BLdo&XQvsj zq2}@~>V-ELiJ!11Mou>c%s`zBOHliKH>$!js0Q7@oaoFj>Cvb~Sj1WpT~$!eW@w5! zNIIe#Fd4P@mY^!$iS03JrWxw7s86+TP}_Jls%N`V4LX6ElAAXE7}Y?3uUU*~z3l&T zBvc_myWnfocAAQM@rd;js)9dIpN4Nx4f|;0>1UaOGouz?463{;sFAH}ZH5}L4yd&? zd=}#$LtrWi+Fl8$0?wiq+apwqUt$FM&o=pUpia2DsMXyM3*t0XLl2^c`jU;`MpgI{ z)v=`Cm<|NH1T+P)sEP`s4vdO6y$-6N#x~v_HRN3}7KdOiTy3A9LpA6MX2cgZJ;fYT zaXQpzLw3{}aVrwgP<2AJuopJP5vZ2_f-3MHK0yDuW*n%i%<{NpoV@AYDf>E3V3DH{pXtxp%kcXnG^M1d(@)s zk6Ih!Q6seo^`Z40YKl*yI(!FxzyE(oKp!R_P%Y2Cz*qs*;&wJZ$oh?S2dd#0Q4PF_ zYRLc4w>VMTFa1K(uu`~&cs-neZ*UPq;EY=2ajs&-V)NpA+)F&|67!wyG{zART58rx zWz_bnh3a8D)YSDw&FN^=)T}~vY&)uf*HAw}-9zO|yo@Q(evcubv${TN2)m+sJ{(n% z7YpGU)TiOEsJTwI+)Pz!JViXCjo-zZ#2=y-cd->_SCz&5#9N|9XwnMyzXD51P>U0= zDjq@Yf|M)Gr(m!(64m4UsHrNCdcQ5I!2?hgPDb_EYvW5$YhX31g9lOPz~zUn8Y#kEj#-U>C>oly-Pf+~0nPRF^Ze7RPeFRz8H#ZV0^g&NuF zE&=tRHLBu%sJWbos&IjgZ$ve4KPJL6s42UMTFno!ExtrGxXBum-VwE%dfNB^RKvc) zqUesd8TO-kattTqd2EVp*P5UGcH$%Af$KcZT>J-X;5X}Oh(4aN81Xk7Jib56#clNM zZ|8e#NqX^3=GSnuum|zr?>JACWi){jB=p*19;`vW7&z&-dYo`ZsKr$PwN0y{)=X{tya8$vwm`Q4fi47c;yi4DKca>*^m}sz zXGguz#M%M1U3;SrlrJ$1=c9VI2UXrVoBjs%8Ioz2u`p^x>hEIz*CNn@gh1wY6*eTk zbGKRT0ej3hpAb|JA2Jg2co7fClb$x*?f${ZK$EY zi{Th@(2QJ3WKp|LTLL=SdZ2nd%*JP+Mq(+dXPZ#F-~eiyoS@1f?Z*-`UiH`LG#K=pK< zbqngf6Q~cTi>Ph*+@>cxW;z&z{-ozZ-@pHhC7>RbL={j6HRR1~dVkcMjk7LA6}$(v z*v_I3s;8(guNjYfeE)S^A*@9_0ac#=2@?-PE%F}dGTqKl0=@?PWWL+gLA7u&s)xf- zi)j|>1Y3wIV7v8@eSRLb$gZPSee$2pd)cr6@o3ch%~9|7`I-H%p?7V<*Qhz2g<53G zP;+$?)q@A9f|HywLzx*hr*Wtes)!}A73RS?HvJH4&D^l@R~SP)jegA5!BXP1Ik7%N zExNBzFHAxW^$OJD+=Wqi237G3)W{_{W8xvG5zB*`no6kr@u;a8j~#I(s)Nbhv*wpf zRZ-u`=HfZrg9~xWIr9sJJm<~t{kozS<0@1`6Hp^|79KQ0lLo#=wzyL(X_B8Dq|PaV(gDPv0T*9Pe6S-E<{!QJ!&M5qViwCVt5BjVCW_D zQ*#q+OnfRT{~cs4xXw!g>QTzeX2`Rm;zd#0u^MWzd}i&8T0{d-Lp|B1ufR6Mx1pvk z-7n@q%Y$0HBT*wX5ntjKoT~l5`ig03(W~af>VqA~uoTsUMAu9KWl?io4K*SyP-~+j zs^>#6FOETd<=TS2HG}H$8C1u9N3Dftn2GwG!0RSM460`(ZM*?$)yJbMa8W})5j8R^ zQ3dX>@uR4QUB*&u>szSBm*s|OXa&@JO;L-!Gx~o1A45RfY?93|2Q{~=aSsLUK=r8a zZ)RwRpbDCaHEOBjX|i-?+{c2!Z94d-A7=v2UDO;^cw{PQfm;3TQ5AoQ+HSK^YhxX%pdYPAP#rjl+UFNg zJ%5LdF!N)xID26%@#&aN`~L?5`uMzo+6Dek%svl96__2>(>$mnx->>&Tbn)_RnaVL zf!k3d82Hru>NOW?gt}UXVqM~sF%|VY*9mCx+(!-V6V!fxr3~o#+x+1n5VgIUpmxb1 zR6~~GAv}tj%8AcB&J|pQ!?g&Xn|v=`m_OfTdTDk+U380)aWnx9*&ftL+{QbY?3MXh z@F9*SKIFCeeE$cvi1NPSPcKvuk2Q&Jcxyi0UZX~&)jP9>hNBwl#jfN}z_rA~Kd}Gb z6FB+7{M>)^A2ZacKAMrphBbJe1Iu7<)au`eMQ|_X!)I6sBR-kW^(NSm_*bZrI)}~h z1F9oU_)ff-hFo=AKVMIV`1$#MO}-g*fILC1{yhGEzJe>Fj?95L3TL7Ad2k{>-=d5_ zRag{N;RNiD+p!YnO6=$BNKaJ56HtrrkxM||R6>)O0;{3Ug9fO@*BmR-(hk^__{yYy z&exbanV-`hXW=S*h5B$>7+~JtjB4QbsE!=8UPY~`r>I5kek7np7nt17w|Fw5)n80A9DIO6lkOlq-jNzZGhYjmMJs9oEtQe?Xuq z3B^;HA(@6c(e_~+KEkq?Ew!KT&J^h9`?RZxT5P>h=Y? z-!VBRPvgf4$^OegK>IZgt71*mK{Nwv;W|`7uTWEyBCQ$1AXL5x)V3>$D!4ADz~-na z?1b9?y--K{2-MI|LErvgL_kxp0ad{^)GFVD`l4_WbrRk~&82@j6VHq~^ziKVT>BNJ=&HF1b58o^9 zUABI}}xl!A$5$b5}hT09oQ4QaU zL7YF%?*!Ddm(~o0%>FN8t&D1MBh>b3jT-WvsD_P0P04ih$8T)Wfi00<~yYS}&m%W#S@!zJEJb998aS zRC#-B{74b@zZTJ164cV$m=oWjzS~6Y$61&icVGlw!5a7u)v?OO z%;Ig1xrk3h4gGf1HojAg{a>CyrsAf8=BOd;Y~$UngHUrh1~r%8qCO=zqDJBZ>de25 znwrO`1}7_FdYl1$YXjBc+^CT(?Gn%&*0DB4jX+yeMPpGf%tKYU9(Bf_L#>4;sH6H5 zYRW=OnhLX{J`?hy%Bg{>rxmK9olv{X?Mpx{TZuYAHlv29cqx2Ew~3|9rK!k5VX4Q3%N#OB}Zrzd>fC*ItKPm-@8 zX=(7VcS`NxtT}i?dnJ;T{mRb8$T-`G|KdGRyHvz*ay+7p`rLI$P0!OhwhrZf>CIXv zG)FdaEhlv(_ix<8c+!mAy2|owH{rM5)^$p`cX-;G`vyhUZuda0i;fzDCFx}I~dA^wc`Sn>qmF3RgqxDDY+g!vxtY$s1#BHtR|>>}}s zH==H2$V5UNDdJDEz9LH_?n~U&yshhohWtT@Pb%N#l0#QVyyl%zH`487Qx;OjW}f86 z(NxuwH$u3(k+z0AkhBlvEsg=)#mSe^mb!%Jy84o)t0@jOK_?OKB(?cU67FyF48acO zJCVs*i9+v@p(YO!b9eXFsaLFL5<;VRqAQB0|6cV-A4a_LzX{lZG+i033V)>PwA?%X z^DdtqP8sr?`%hX9>geVDyIydaNu;LzPYG2CYtud8tG=MC+SHDf6cSngm;jdop65A{-*SPq{Wjq+qh0 zc}VL*T5j^ppU4?n?Dt8^?4ZR@^LhIBf#*a!)KXU2AdkOJLg!ycDRuf)DNtcv| zYdrTHo{d3%r|2vqeLc_55&nXEuy1s&Y zE$(3IvX`cWvz^2*y{#JtR|q0hkH-snMThA~)M2da4(W@z*OHcre7X)1{~$?AOr*G=ws z#N&83f$$N+y0YME-usU5CiHL@q-FG;YaHeY_x{~D+O09|{wu21KAlwY1_jR-F#O<(=Jr2R@->O}uv z3_o*{@QH{2URk|cn&fxi+2VKeN;KhQ+(o$u5!Y3T@LQZ|-&{ewC(nl9K%1vKB~RpD zKs-I^`v3Lh*D=0-f!c>Kza4kplHQpz#uI+xE155k`Up5kVpblO@OEn&?WQMtHe!C< z54e{R55-g5+j%WBum5{JB~4c%^62`<#)pz;1mV>t+4sM%iRb*!yEm!z4o@oBJgacL zzi<8UmCqJfg2eLN<9InQ>N-JKS1#lSHQ%+CFyADc_cm@)nQmK-;!C;Lk*|V%zZCIw z_PHN^!~KWvXL=q?rKLNu6K3`<{Vd3x#%ug4&GFdRdFTZ4N-xqT5YA5cA=S^Y&x1(M z#~n$$9(NzY&9EGIh+gJesOIvXuJ7>~CXnwgd9HKosz#n~{rDrt03IAC@uclzed0B^ z)9~VBoB2GFUWj*f zl~2SE52;9aVB$^)4|4I6uD?ky#|yJ<<~I0-v{l|F&GRQdNT{)QLi4ax$qBXN*0s^Q zqj~;-)|8Nfl)2tV&BG$L6RJhZ67IT$d)V@O6K+cRUwC6%M2EzaT8tWsaM!1#4Llu4 zIE}Ywi%`!E?}QflJ+60Gi?GD!cqiU_qeXD@W8`^Bp6%SDct3*onqgywx#yCzFwe@9 z@4r_sp0(kgO=4HnRpvi=W_s(ijCQB;Bp>%;lfn1flP@W45T(B4)>YlURiAugZAmfY z(N&yh$q82?{XX$_n3DT1-rb7lZ5icw7D9Xq_Zh--NUv&s*~-GCkaQGsmBa~n(pGpH z!%54;OLZ}yH=B-=|)GFHJ@BOD$WJE2V{6i_z$=MF)6W3Lk+@p!N@>Xaa7TbVS ze%;~R=jInTP7dPV+j^9{Eb%71QIPvv@08Y|iN7P%)Vr~DSedT~>59P)vualGr>Wbm~29%vJk_%b<1d#|<$OS^@< zd(~20fIYndZNpL(A@=X}-dm(?SnL=7sjn^JF5J_|--NpubyXxzdsr=^fcF)E!FdciexH($c;aNPGz4 z%DjDrbp9^kyGq#FSJ=1`Q;}8;7uk1L*gT~uqb+Guu@?CklBXSBA?*#}QQTbK(DrF_ zatC@OBE~<+%G2 zcafj9o#o`+LY|$Z{Yg9>>Ke@RH>3|IK7~6a_cN8n{e#Vulsu#S`Q|puHnk@&_Tk<} zh66m*)fvljrzbqdo3=w_+8R9lANO@qTJq)vZ=+qRgOq6|!5L|rR|_9+E6{1w81E1FL$+GR%wdUop7f6o2tp6Y1|#ug|T8&@K{KwQZ}g=6E2%&AbrlPT5zrxqnOp>qw-ylHd1 OS3PAD{I7Z@#s447bsd=i diff --git a/config/locale/fi/app.po b/config/locale/fi/app.po index 378c15ba98..2c3379e9dd 100644 --- a/config/locale/fi/app.po +++ b/config/locale/fi/app.po @@ -1,14 +1,14 @@ -# Finnish translations for DMPRoadmap-Development package. -# Copyright (C) 2022 DMPRoadmap-Development -# This file is distributed under the same license as the DMPRoadmap-Development package. -# FIRST AUTHOR , 2022. +# Finnish translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -74,7 +74,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "Valmiiden suunnitelmien määrä" @@ -94,7 +93,7 @@ msgstr "suunnitelmat" msgid "Missing or invalid JSON" msgstr "Puuttuu tai on virheellinen JSON" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Virheellinen JSON-muoto" @@ -502,7 +501,7 @@ msgstr "Suunnitelmapohja" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -613,7 +612,7 @@ msgstr "Valitse organisaatio" msgid "Your organisation does not seem to be properly configured." msgstr "Organisaatiotasi määrittelyssä on ongelmia." -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Luotu käyttäen DMPTuulia. " @@ -923,6 +922,10 @@ msgstr "yhdistyivät" msgid "merge" msgstr "yhdistää" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1018,7 +1021,7 @@ msgid "Creators:" msgstr "Tekijät:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1197,7 +1200,7 @@ msgid "Plan Description" msgstr "Suunnitelman kuvaus" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1304,150 +1307,150 @@ msgstr "Minulle myönnetyt ylläpito-oikeudet %{tool_name}:ssa" msgid "%{tool_name} API changes" msgstr "%{tool_name} API-muutokset" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Vaihe" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Osio" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Kysymys" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Vastaus" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr "Muokkaaja:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Otsikko:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Tekijät:" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Päätutkija:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Päivänpäällikkö:" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Projektin ylläpitäjä:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "Osallistuja:" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Affiliaatio:" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Suunnitelmapohja:" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "" "Rahoitusnumero:\n" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Projektin tiivistelmä:" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Viimeksi muokattu:" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Tekijänoikeustiedot:" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1466,7 +1469,11 @@ 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:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Ei vastausta" @@ -1938,7 +1945,7 @@ msgstr "Odota, standardit latautuvat" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2320,16 +2327,16 @@ msgstr "" msgid "Hello" msgstr "Hei" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Sinun" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" "empts." msgstr "tili on suljettu liiallisten epäonnistuneiden kirjautumisyritysten vuoksi." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Sinun" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Klikkaa alla olevaa linkkiä ja tilisi avautuu" @@ -2892,7 +2899,7 @@ msgid "GitHub" msgstr "GitHub" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "logo" @@ -2970,14 +2977,14 @@ msgstr "Kirjaudu ulos" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Hei!" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Virhe:" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Hei!" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Ladataan ..." @@ -3421,6 +3428,8 @@ msgid "Order" msgstr "Järjestys" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3934,15 +3943,21 @@ msgstr "" "Vain ylläpito voi muuttaa tämän tiedon, Ota yhteyttä käyttötukeen, jos sinulla" " on kysyttävää tai haluat tehdä muutoksia." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Organisaation täydellinen nimi" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Organisaation nimilyhenne" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3952,68 +3967,68 @@ msgstr "" "ematon Org on järjestelmä, jonka järjestelmä loi automaattisesti käyttäjän syö" "ttäessä / valitessaan." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "Johdetaan? (antaa Org Admins: lle pääsyn Järjestelmänvalvoja-valikkoon)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Organisaation logo" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Tämä toiminto poistaa organisaation logon" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Poista logo" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "tai" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "Organisaation nettiosoite" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "Help Desk -sähköposti" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Ylläpitäjän yhteystiedot" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Yhteyshenkilön sähköpostiosoite" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Linkkiteksti" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Google Analytics -seuranta" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Seurantakoodi" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Organisaatiotyypit" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Instituutio" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "" "Organisaation tyyppi/tyypit\n" @@ -4311,14 +4326,6 @@ msgstr "Kopioi" msgid "View" msgstr "Näytä" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Haluatko varmasti poistaa suunnitelman? Yhteistyökumppaneilla on edelleen pääs" -"y siihen." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4328,6 +4335,14 @@ msgstr "" "sten aineistonhallintasuunnitelmien sivulta mutta yhteistyökumppaneilla on ede" "lleen pääsy siihen." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Haluatko varmasti poistaa suunnitelman? Yhteistyökumppaneilla on edelleen pääs" +"y siihen." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Ei sovellettavissa" @@ -4851,8 +4866,8 @@ msgstr "" "isaatio perustuu käyttäjän omaan ilmoitukseen)" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Avattu: näkyvissä kaikille ilman DMPTuuli-kirjautumista" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5531,14 +5546,14 @@ msgstr "Rekisteröidy" msgid "on the homepage." msgstr "kotisivulla." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "ohjeistuksen sivu." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Mene" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "ohjeistuksen sivu." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Mukauta organisaatiosi tarpeisiin" @@ -6464,22 +6479,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Hei %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " että" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " perustuu malliin" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " on luomassa tiedonhallintasuunnitelmaa ja on vastannut" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " että" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " suunnitelmassa nimeltään" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " perustuu malliin" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6634,14 +6649,14 @@ msgstr "" msgid "Download users" msgstr "Lataa käyttäjät" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "API-tunnuksen luominen epäonnistui." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "Luo API-tunnuksesi onnistuneesti." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "API-tunnuksen luominen epäonnistui." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locale/fr_CA/LC_MESSAGES/app.mo b/config/locale/fr_CA/LC_MESSAGES/app.mo index 63e362dde2fc86b819d1c1546d04bfd43449b69c..d4f06e8c1a287d423b25db0fb98d924afcb278c7 100644 GIT binary patch delta 20676 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 BFS7su delta 20724 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 Vg6FsblOF!*O1C}J99Oy?{|Cs3M`Hj0 diff --git a/config/locale/fr_CA/app.po b/config/locale/fr_CA/app.po index 1f600525bb..179af06aa9 100644 --- a/config/locale/fr_CA/app.po +++ b/config/locale/fr_CA/app.po @@ -1,14 +1,14 @@ -# French translations for DMPRoadmap-Development package. -# Copyright (C) 2022 DMPRoadmap-Development -# This file is distributed under the same license as the DMPRoadmap-Development package. -# FIRST AUTHOR , 2022. +# French translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: French\n" "Language: fr_CA\n" @@ -74,7 +74,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "Nombre de plans terminés" @@ -94,7 +93,7 @@ msgstr "plans" msgid "Missing or invalid JSON" msgstr "Format JSON manquant ou invalide" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Format JSON invalide" @@ -512,7 +511,7 @@ msgstr "Modèle" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -625,7 +624,7 @@ msgstr "Veuillez choisir un organisme" msgid "Your organisation does not seem to be properly configured." msgstr "Votre organisme ne semble pas être correctement configuré." -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Créé(e) avec %{application_name}. Dernière modification : %{date}" @@ -929,6 +928,10 @@ msgstr "fusionné" msgid "merge" msgstr "fusionner" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1026,7 +1029,7 @@ msgid "Creators:" msgstr "Créateurs :" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1205,7 +1208,7 @@ msgid "Plan Description" msgstr "Description du plan" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1314,149 +1317,149 @@ msgstr "Privilèges d’administrateur accordés dans %{tool_name}" msgid "%{tool_name} API changes" msgstr "Modifications de l'API pour %{tool_name}" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Phase" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Section" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Question" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Réponse" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Personnalisé par:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Créateurs :" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Affiliation :" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Modèle :" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Numéro de subvention :" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Résumé du projet :" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Dernière modification :" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Renseignements sur le droit d’auteur :" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1476,7 +1479,11 @@ 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:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Pas de réponse" @@ -1952,7 +1959,7 @@ msgstr "Veuillez patienter. Le chargement des normes est en cours." #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2338,6 +2345,10 @@ msgstr "" msgid "Hello" msgstr "Bonjour" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Votre" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" @@ -2346,10 +2357,6 @@ msgstr "" "le compte a été verrouillé en raison d’un nombre excessif de tentatives de con" "nexion infructueuses." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Votre" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Cliquez sur le lien ci-dessous pour déverrouiller votre compte" @@ -2917,7 +2924,7 @@ msgid "GitHub" msgstr "GitHub" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "logo" @@ -2994,14 +3001,14 @@ msgstr "Se déconnecter" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Remarque :" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Erreur :" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Remarque :" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "" @@ -3451,6 +3458,8 @@ msgid "Order" msgstr "Classer" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3975,15 +3984,21 @@ msgstr "" " Communiquez avec le service d’assistance pour poser des questions ou demander" " des modifications." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Nom complet de l’organisme" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Nom abrégé de l’organisme" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3993,68 +4008,68 @@ msgstr "" "les. Un organisme non géré en est un qui a été automatiquement créé par le sys" "tème lorsqu’un utilisateur l’a entré/sélectionné." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "Géré? (permet aux administrateurs de l’organisme d’accéder au menu Admin)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Logo de l’organisme" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Le logo de votre organisme sera retiré" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Supprimer le logo" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "ou" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "Adresse URL de l’organisme" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Contact administrateur" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Courriel du contact" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Texte du lien" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Suivi – Google Analytics" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Code de suivi" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Types d’organisme" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Établissement" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Types d’organisme" @@ -4356,14 +4371,6 @@ msgstr "Copier" msgid "View" msgstr "Voir" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Souhaitez-vous vraiment supprimer ce plan? Les collaborateurs pourront toujour" -"s y accéder." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4372,6 +4379,14 @@ msgstr "" "Souhaitez-vous vraiment supprimer ce plan public? Les PGD publics seront suppr" "imés, tout en demeurant accessibles aux collaborateurs." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Souhaitez-vous vraiment supprimer ce plan? Les collaborateurs pourront toujour" +"s y accéder." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Sans objet" @@ -4893,8 +4908,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organisme : Visible pour tous les membres de mon organisme" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Public : Tous peuvent consulter le plan" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5564,14 +5579,14 @@ msgstr "S’inscrire" msgid "on the homepage." msgstr "sur la page d’accueil." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "page pour obtenir des directives." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Veuillez visiter le site" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "page pour obtenir des directives." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Effectuer une personnalisation pour votre organisme" @@ -6468,22 +6483,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Bonjour %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " à" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " basé sur le modèle" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " crée un plan de gestion des données et a répondu" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " à" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " dans un plan appelé" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " basé sur le modèle" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6641,11 +6656,11 @@ msgid "Download users" msgstr "Télécharger les utilisateurs" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." +msgid "Successfully regenerate your API token." msgstr "" #: ../../app/views/users/refresh_token.js.erb:1 -msgid "Successfully regenerate your API token." +msgid "Unable to regenerate your API token." msgstr "" #: i18n_placeholders.rb:4 diff --git a/config/locale/fr_FR/LC_MESSAGES/app.mo b/config/locale/fr_FR/LC_MESSAGES/app.mo index 82c1cbf30ad527adab4329e09ea379d87142c466..55223c6a93af2489c95610955a41979b32973962 100644 GIT binary patch delta 26687 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 jn(~ilV08XBp11MiL, 2022. +# French translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -75,7 +75,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "Nombre de plans terminés" @@ -95,7 +94,7 @@ msgstr "plans" msgid "Missing or invalid JSON" msgstr "JSON manquant ou invalide" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Format JSON non valide" @@ -511,7 +510,7 @@ msgstr "Template" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -622,7 +621,7 @@ msgstr "Veuillez choisir un organisme" msgid "Your organisation does not seem to be properly configured." msgstr "Votre organisme ne semble pas être correctement configurée." -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Créé avec %{application_name}. Dernière modification %{date}" @@ -940,6 +939,10 @@ msgstr "fusionné" msgid "merge" msgstr "fusionner" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "Nombre de plans créés" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1036,7 +1039,7 @@ msgid "Creators:" msgstr "Créateurs:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1138,7 +1141,7 @@ msgstr "Droit API pour les organismes" #: ../../app/helpers/perms_helper.rb:17 msgid "Review organisational plans" -msgstr "" +msgstr "Examiner les plans organisationnels" #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 @@ -1215,7 +1218,7 @@ msgid "Plan Description" msgstr "Description" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1320,149 +1323,149 @@ msgstr "Droits administrateur attribués dans %{tool_name}" msgid "%{tool_name} API changes" msgstr "Modifications de l'API %{tool_name}" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Phase" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Section" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Question" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Réponse" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Personnalisé par : " -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Titre:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Créateurs : " -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Chercheur principal:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Gestionnaire de dates :" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Administrateur de projet:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " -msgstr "Donateur:" +msgstr "Contributeur :" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Affiliation : " -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Modèle : " -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Numéro de subvention : " -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Résumé du projet : " -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Dernière modification : " -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Droits d'auteur" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1487,7 +1490,11 @@ msgstr "" "n quelconque avec,\n" "             votre projet ou proposition" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "Produits de recherche :" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Non répondues" @@ -1732,7 +1739,7 @@ msgstr "Actif" #: ../../app/models/user/at_csv.rb:8 msgid "Department" -msgstr "département" +msgstr "Département" #: ../../app/policies/api/v0/guidance_group_policy.rb:11 #: ../../app/policies/api/v0/guidance_policy.rb:11 @@ -1958,7 +1965,7 @@ msgstr "Merci de patienter, les standards sont en cours de chargement" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2343,16 +2350,16 @@ msgstr "" msgid "Hello" msgstr "Bonjour" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Votre" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" "empts." msgstr "compte a été bloqué suite à un nombre de tentatives de connexions excessif " -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Votre" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Cliquez sur le lien ci-dessous pour déverrouiller votre compte" @@ -2920,7 +2927,7 @@ msgid "GitHub" msgstr "GitHub" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "logo" @@ -2997,14 +3004,14 @@ msgstr "Déconnexion" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Note :" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Erreur :" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Note :" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Chargement..." @@ -3455,6 +3462,8 @@ msgid "Order" msgstr "Ordre" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3977,15 +3986,24 @@ msgstr "" "illez contacter le service d'assistance pour toutes questions ou demandes de m" "odifications." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" +"Cette information ne peut être modifiée que par un administrateur système. Veu" +"illez contacter %{support_email} pour toutes questions ou demandes de modifica" +"tions." + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Nom complet de l'organisme" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Nom abrégé de l'organisme" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3995,68 +4013,68 @@ msgstr "" " et / ou modèles. Un organisme non gérée est un organisme qui a été automatiqu" "ement créée par le système lorsqu'un utilisateur l'a saisi / sélectionnée." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "Géré? (permet aux administrateurs de l'organisme d'accéder au menu Admin)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Logo de l'organisme" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Cela supprimera le logo de votre organisme" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Supprimer le logo" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "ou" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "URLs de l'organisme" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "Courriel du service d'assistance" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Contact administrateur" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Courriel de contact" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Texte du lien" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Suivi de Google Analytics" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Code de suivi" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Types d'organismes" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Institution" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Type(s) d'organismes" @@ -4353,14 +4371,6 @@ msgstr "Copier" msgid "View" msgstr "Visualiser" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Souhaitez-vous vraiment supprimer ce plan ? Vos collaborateurs continueront à " -"pouvoir y accéder. " - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4369,6 +4379,14 @@ msgstr "" "Souhaitez-vous vraiment supprimer ce plan public? Il sera supprimé de la page " "DMPs publics mais vos collaborateurs continueront à pouvoir y accéder." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Souhaitez-vous vraiment supprimer ce plan ? Vos collaborateurs continueront à " +"pouvoir y accéder. " + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Non applicable" @@ -4892,8 +4910,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organisme : toute personne de mon organisme peut consulter mon plan" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Public : visible par tous" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "Public: votre plan visible par tous dans le liste des DMPs publics." #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5136,7 +5154,7 @@ msgstr "Veuillez décrire le type de produit" #: ../../app/views/research_outputs/_form.html.erb:27 msgid "Research output type" -msgstr "Type de résultat de la recherche" +msgstr "Type de produit de recherche" #: ../../app/views/research_outputs/_form.html.erb:44 msgid "Abbreviation" @@ -5248,7 +5266,7 @@ msgstr "- Sélectionnez un type d’entrepôt -" #: ../../app/views/research_outputs/repositories/_search.html.erb:24 msgid "Select a repository type" -msgstr "Sélectionnez un type de dépôt" +msgstr "Sélectionnez un type d'entropôt" #: ../../app/views/research_outputs/repositories/_search_result.html.erb:20 msgid "Click to view repositories related to %{subject}" @@ -5577,14 +5595,14 @@ msgstr "Créer un compte" msgid "on the homepage." msgstr "sur la page d'accueil." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "page de recommandations." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Veuillez visiter le" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "page de recommandations." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Personnalisation pour votre organisme" @@ -6483,7 +6501,7 @@ msgstr "" #: ../../app/views/user_mailer/feedback_notification.html.erb:17 msgid "Alternatively, you can click the link below:" -msgstr "Alternativement, vous pouvez cliquer sur le lien ci-dessous :" +msgstr "Vous pouvez également cliquer sur le lien ci-dessous :" #: ../../app/views/user_mailer/new_comment.html.erb:5 msgid "" @@ -6573,22 +6591,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Bonjour %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " à" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " basé sur le modèle" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " crée un plan de gestion des données et a répondu" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " à" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " dans un plan appelé" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " basé sur le modèle" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6743,14 +6761,14 @@ msgstr "" msgid "Download users" msgstr "Télécharger les utilisateurs" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "Impossible de régénérer votre jeton API." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "Régénérez votre jeton API avec succès." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "Impossible de régénérer votre jeton API." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locale/pt_BR/LC_MESSAGES/app.mo b/config/locale/pt_BR/LC_MESSAGES/app.mo index 34f8e2a7d5b3fdd489624f85258d34930a084931..8f2969b89af4f17b68d4cae51d3613753d8c4975 100644 GIT binary patch delta 24215 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 delta 24242 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 tJb7c|^35()$(1(X|5Njmx~p9!muJ@O, 2022. +# Portuguese translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Portuguese\n" "Language: pt_BR\n" @@ -72,7 +72,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "Núm. Planos Concluídos" @@ -92,7 +91,7 @@ msgstr "planos" msgid "Missing or invalid JSON" msgstr "JSON ausente ou inválido" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Formato JSON inválido" @@ -506,7 +505,7 @@ msgstr "Modelo" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -615,7 +614,7 @@ msgstr "Por favor, escolha uma organização." 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:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Criado usando %{application_name}. Última modificação %{date}" @@ -929,6 +928,10 @@ msgstr "mesclado" msgid "merge" msgstr "mesclar" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1025,7 +1028,7 @@ msgid "Creators:" msgstr "Criadores:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1203,7 +1206,7 @@ msgid "Plan Description" msgstr "Descrição do Plano" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1308,149 +1311,149 @@ msgstr "Privilégios de administrador atribuídos em %{tool_name}" msgid "%{tool_name} API changes" msgstr "Alterações na API %{tool_name}" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Fase" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Seção" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Pergunta" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Resposta" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Customizado Por: " -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Título:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Criadores:" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Investigador principal:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Gerenciador de datas:" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Administrador de projetos:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "Contribuinte:" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Afiliação: " -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Modelo: " -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Número da Concessão" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Resumo do projeto:" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Última modificação: " -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Informação de copyright" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1474,7 +1477,11 @@ msgstr "" "relação com\n" "             seu projeto ou proposta" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Não Respondido" @@ -1942,7 +1949,7 @@ msgstr "Por favor, espere enquanto os Padrões são carregados." #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2325,6 +2332,10 @@ msgstr "" msgid "Hello" msgstr "Olá" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Seu(sua)" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" @@ -2333,10 +2344,6 @@ msgstr "" "conta foi bloqueada devido a um número execessivos de tentativas de entrar fra" "cassadas." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Seu(sua)" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Clique no link abaixo para desbloquear sua conta" @@ -2900,7 +2907,7 @@ msgid "GitHub" msgstr "GitHub" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "Logotipo" @@ -2977,14 +2984,14 @@ msgstr "Sair" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Nota:" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Erro" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Nota:" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Carregando..." @@ -3432,6 +3439,8 @@ msgid "Order" msgstr "Ordem" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3945,15 +3954,21 @@ msgstr "" "Esta informação só pode ser modificada por um administrador do sistema. Entre " "em contato com a Help Desk se quiser fazer perguntas ou pedir mudanças." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Nome completo da organização" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Nome abrevidado da organização" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3963,70 +3978,70 @@ msgstr "" " ou modelos. Uma organização não gerenciada é aquela criada automaticamente pe" "lo sistema quando um usuário a inseriu / selecionou." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "" "Gerenciou? (permite que os administradores da organização acessem o menu Admin" ")" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Logo da organização" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Isso removerá o logo da sua organização" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Remover logo" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "ou" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "URLs da organização" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "E-mail do Help Desk" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Contato com Administrador" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Email de contato" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Linkar texto" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Rastreador do Google Analytics" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Código do Rastreador" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Tipos de Organização" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Instituição" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Tipo(s) de organização" @@ -4323,14 +4338,6 @@ msgstr "Copiar" msgid "View" msgstr "Ver" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Tem certeza de que deseja remover esse plano? Quaisquer outros colaboradores a" -"inda conseguirão acessá-lo." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4340,6 +4347,14 @@ msgstr "" "a de PGDs Públicos, mas quaisquer outros colaboradores ainda conseguirão acess" "á-lo." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Tem certeza de que deseja remover esse plano? Quaisquer outros colaboradores a" +"inda conseguirão acessá-lo." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Não Aplicável" @@ -4863,8 +4878,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organização: qualquer pessoa em minha organização pode ver" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Público: qualquer pessoa pode ver" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5535,14 +5550,14 @@ msgstr "Inscrever-se" msgid "on the homepage." msgstr "na página inicial." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "página para orientação." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Por favor, visite o" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "página para orientação." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Customizing para sua organização" @@ -6487,22 +6502,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Olá %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " para" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " com base no modelo" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " está criando um plano de gerenciamento de dados e respondeu" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " para" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " em um plano chamado" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " com base no modelo" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6655,14 +6670,14 @@ msgstr "" msgid "Download users" msgstr "Download de usuários" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "Não foi possível regenerar seu token de API." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "Gere novamente seu token de API com sucesso." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "Não foi possível regenerar seu token de API." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locale/sv_FI/LC_MESSAGES/app.mo b/config/locale/sv_FI/LC_MESSAGES/app.mo index 96927a02a14d8ec2d918b673484503d69708986b..ae761af4593cbbb74ec3d712772fe0b3b8af6f4e 100644 GIT binary patch delta 24216 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, 2022. +# Swedish translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Swedish\n" "Language: sv_FI\n" @@ -72,7 +72,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "Nej. Slutförda planer" @@ -92,7 +91,7 @@ msgstr "Plans" msgid "Missing or invalid JSON" msgstr "JSON saknas eller ogiltig" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Ogiltigt JSON-format" @@ -504,7 +503,7 @@ msgstr "Mall" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -613,7 +612,7 @@ msgstr "Välj en organisation" msgid "Your organisation does not seem to be properly configured." msgstr "Din organisation verkar inte vara korrekt konfigurerad." -#: ../../app/controllers/plan_exports_controller.rb:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "Skapat med hjälp av %{application_name}. Senast ändrad %{date}" @@ -921,6 +920,10 @@ msgstr "fusione" msgid "merge" msgstr "sammanfoga" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1016,7 +1019,7 @@ msgid "Creators:" msgstr "skapare:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1194,7 +1197,7 @@ msgid "Plan Description" msgstr "Planbeskrivning" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1299,149 +1302,149 @@ msgstr "Administratörsbehörighet beviljas i %{tool_name}" msgid "%{tool_name} API changes" msgstr "%{tool_name} API-ändringar" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Fas" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Sektion" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Fråga" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Svar" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Anpassad av:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Titel:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "skapare:" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Huvudutredare:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Datumansvarig:" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Projektadministratör:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "Bidragsgivare:" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Anslutning:" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "%{affiliation}" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Mall:" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Bidragsnummer:" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Projektens abstrakt:" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Senast ändrad:" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Upphovsrättsinformation:" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1465,7 +1468,11 @@ msgstr "" "amband med,\n" "             ditt projekt eller förslag" -#: ../../app/models/concerns/exportable_plan.rb:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Inte besvarad" @@ -1932,7 +1939,7 @@ msgstr "Vänligen vänta, Standarder laddas" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2313,6 +2320,10 @@ msgstr "" msgid "Hello" msgstr "Hej" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Din" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" @@ -2321,10 +2332,6 @@ msgstr "" "Kontot har blivit låsat på grund av ett alltför stort antal misslyckade inlogg" "ningsförsök." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Din" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Klicka på länken nedan för att låsa upp ditt konto" @@ -2885,7 +2892,7 @@ msgid "GitHub" msgstr "github" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "logotyp" @@ -2962,14 +2969,14 @@ msgstr "Logga ut" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Lägga märke till:" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Fel:" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Lägga märke till:" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Läser in..." @@ -3414,6 +3421,8 @@ msgid "Order" msgstr "Ordning" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3923,15 +3932,21 @@ msgstr "" "Denna information kan bara ändras av en systemadministratör. Kontakta helpdesk" "en om du har frågor eller att begära ändringar." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Organisation fullständigt namn" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Organisation förkortat namn" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3941,68 +3956,68 @@ msgstr "" "ar. En okontrollerad organisation är en som skapades automatiskt av systemet n" "är en användare angav / valde den." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "Hanteras? (gör att Org Admins kan komma åt Admin-menyn)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Organisationslogotyp" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Detta kommer att ta bort organisationens logotyp" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Ta bort logotypen" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "eller" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "Organisationsadresser" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "Help Desk e-post" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Administratörskontakt" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "Kontakta email" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Länktext" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Google Analytics Tracker" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "Spårningskod" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Organisationstyper" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Institution" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Organisationstyp (er)" @@ -4299,14 +4314,6 @@ msgstr "kopia" msgid "View" msgstr "Se" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Är du säker på att du vill ta bort den här planen? Alla medarbetare kan fortfa" -"rande komma åt det." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4316,6 +4323,14 @@ msgstr "" " ta bort det från Public DMPs-sidan, men alla medarbetare kommer fortfarande a" "tt kunna komma åt den." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Är du säker på att du vill ta bort den här planen? Alla medarbetare kan fortfa" +"rande komma åt det." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Inte tillämpbar" @@ -4834,8 +4849,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Organisation: Alla i min organisation kan visa" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Offentlig: alla kan visa" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5501,14 +5516,14 @@ msgstr "Bli Medlem" msgid "on the homepage." msgstr "på hemsidan." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "sida för vägledning." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Vänligen besök" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "sida för vägledning." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Anpassa för din organisation" @@ -6438,22 +6453,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Hej %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr " till" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr " baserat på mallen" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " skapar en datahanteringsplan och har svarat" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr " till" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr " i en plan som heter" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr " baserat på mallen" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6607,14 +6622,14 @@ msgstr "" msgid "Download users" msgstr "Hämta användare" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "Det gick inte att regenerera din API-token." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "Återskapa din API-token." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "Det gick inte att regenerera din API-token." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locale/tr_TR/LC_MESSAGES/app.mo b/config/locale/tr_TR/LC_MESSAGES/app.mo index abd94aa76b5d04ce736930f1d1d8a26e8ecf0e9a..429ea4cdb2e5f58bc8486e19c756979ff9220610 100644 GIT binary patch delta 24215 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 delta 24242 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 diff --git a/config/locale/tr_TR/app.po b/config/locale/tr_TR/app.po index 62bd2bf655..ffa4d46f93 100644 --- a/config/locale/tr_TR/app.po +++ b/config/locale/tr_TR/app.po @@ -1,14 +1,14 @@ -# Turkish translations for DMPRoadmap-Development package. -# Copyright (C) 2022 DMPRoadmap-Development -# This file is distributed under the same license as the DMPRoadmap-Development package. -# FIRST AUTHOR , 2022. +# Turkish translations for roadmap package. +# Copyright (C) 2023 roadmap +# This file is distributed under the same license as the roadmap package. +# FIRST AUTHOR , 2023. # msgid "" msgstr "" -"Project-Id-Version: DMPRoadmap-Development 1.0\n" +"Project-Id-Version: roadmap 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2022-12-09 10:34-0500\n" -"PO-Revision-Date: 2022-12-09 16:34+0100\n" +"POT-Creation-Date: 2023-02-03 09:02+0100\n" +"PO-Revision-Date: 2023-02-03 09:02+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -72,7 +72,6 @@ msgid "users_joined" msgstr "users_joined" #: ../../app/controllers/api/v0/statistics_controller.rb:89 -#: ../../app/controllers/usage_controller.rb:87 msgid "No. Completed Plans" msgstr "Tamamlanmış plan sayısı" @@ -92,7 +91,7 @@ msgstr "planlar" msgid "Missing or invalid JSON" msgstr "Eksik veya geçersiz JSON" -#: ../../app/controllers/api/v1/base_api_controller.rb:79 +#: ../../app/controllers/api/v1/base_api_controller.rb:80 msgid "Invalid JSON format" msgstr "Geçersiz JSON biçimi" @@ -498,7 +497,7 @@ msgstr "Şablon" #: ../../app/helpers/plans_helper.rb:22 #: ../../app/helpers/settings_template_helper.rb:16 #: ../../app/views/devise/registrations/_password_confirmation.html.erb:22 -#: ../../app/views/orgs/_profile_form.html.erb:155 +#: ../../app/views/orgs/_profile_form.html.erb:164 #: ../../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 @@ -609,7 +608,7 @@ msgstr "Lütfen bir kuruluş seçin" 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:99 +#: ../../app/controllers/plan_exports_controller.rb:100 msgid "Created using %{application_name}. Last modified %{date}" msgstr "%{application_name} kullanılarak oluşturuldu. Son değiştirildiği tarih %{date}" @@ -916,6 +915,10 @@ msgstr "birleştirildi" msgid "merge" msgstr "birleştir" +#: ../../app/controllers/usage_controller.rb:87 +msgid "No. Created Plans" +msgstr "" + #: ../../app/controllers/users/invitations_controller.rb:33 msgid "" "You are already signed in as another user. Please log out to activate your inv" @@ -1012,7 +1015,7 @@ msgid "Creators:" msgstr "Oluşturanlar:" #: ../../app/helpers/exports_helper.rb:38 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:178 #: ../../app/views/shared/export/_plan_coversheet.erb:8 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creator:" @@ -1190,7 +1193,7 @@ msgid "Plan Description" msgstr "Plan Açıklaması" #: ../../app/helpers/settings_template_helper.rb:15 -#: ../../app/views/orgs/_profile_form.html.erb:143 +#: ../../app/views/orgs/_profile_form.html.erb:152 #: ../../app/views/paginable/templates/_customisable.html.erb:7 #: ../../app/views/paginable/templates/_organisational.html.erb:12 #: ../../app/views/plans/_project_details.html.erb:156 @@ -1295,149 +1298,149 @@ msgstr "%{tool_name} içinde verilen yönetici ayrıcalıkları" msgid "%{tool_name} API changes" msgstr "%{tool_name} API değişiklikleri" -#: ../../app/models/concerns/exportable_plan.rb:30 +#: ../../app/models/concerns/exportable_plan.rb:31 msgid "Phase" msgstr "Aşama" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Section" msgstr "Bölüm" -#: ../../app/models/concerns/exportable_plan.rb:32 +#: ../../app/models/concerns/exportable_plan.rb:33 #: ../../app/models/exported_plan.rb:116 msgid "Question" msgstr "Soru" -#: ../../app/models/concerns/exportable_plan.rb:32 -#: ../../app/models/concerns/exportable_plan.rb:34 +#: ../../app/models/concerns/exportable_plan.rb:33 +#: ../../app/models/concerns/exportable_plan.rb:35 #: ../../app/models/exported_plan.rb:116 ../../app/models/exported_plan.rb:119 msgid "Answer" msgstr "Cevap" -#: ../../app/models/concerns/exportable_plan.rb:134 +#: ../../app/models/concerns/exportable_plan.rb:142 msgid " Customised By: " msgstr " Özelleştiren:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 #: ../../app/views/shared/export/_plan_coversheet.erb:6 msgid "Title: " msgstr "Başlık:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" msgstr "%{title}" -#: ../../app/models/concerns/exportable_plan.rb:145 +#: ../../app/models/concerns/exportable_plan.rb:176 #: ../../app/views/shared/export/_plan_txt.erb:4 msgid "Creators: " msgstr "Oluşturanlar:" -#: ../../app/models/concerns/exportable_plan.rb:145 -#: ../../app/models/concerns/exportable_plan.rb:147 +#: ../../app/models/concerns/exportable_plan.rb:176 +#: ../../app/models/concerns/exportable_plan.rb:178 msgid "%{authors}" msgstr "%{authors}" -#: ../../app/models/concerns/exportable_plan.rb:150 +#: ../../app/models/concerns/exportable_plan.rb:181 #: ../../app/views/shared/export/_plan_coversheet.erb:14 #: ../../app/views/shared/export/_plan_txt.erb:9 msgid "Principal Investigator: " msgstr "Baş araştırmacı:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " msgstr "Tarih Yöneticisi:" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" msgstr "%{data_curation}" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 #: ../../app/views/shared/export/_plan_coversheet.erb:20 #: ../../app/views/shared/export/_plan_txt.erb:15 msgid "Project Administrator: " msgstr "Proje Yöneticisi:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" msgstr "%{pa}" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 #: ../../app/views/shared/export/_plan_coversheet.erb:23 #: ../../app/views/shared/export/_plan_txt.erb:18 msgid "Contributor: " msgstr "katkıda bulunan:" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" msgstr "%{other}" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 #: ../../app/views/shared/export/_plan_coversheet.erb:26 #: ../../app/views/shared/export/_plan_txt.erb:20 msgid "Affiliation: " msgstr "Bağlı olunan kurum/kuruluş:" -#: ../../app/models/concerns/exportable_plan.rb:163 +#: ../../app/models/concerns/exportable_plan.rb:194 msgid "%{affiliation}" msgstr "Bağlı olunan kurum/kuruluş:" -#: ../../app/models/concerns/exportable_plan.rb:165 -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:196 +#: ../../app/models/concerns/exportable_plan.rb:198 #: ../../app/views/shared/export/_plan_coversheet.erb:32 #: ../../app/views/shared/export/_plan_txt.erb:22 #: ../../app/views/shared/export/_plan_txt.erb:24 msgid "Template: " msgstr "Şablon:" -#: ../../app/models/concerns/exportable_plan.rb:165 +#: ../../app/models/concerns/exportable_plan.rb:196 msgid "%{funder}" msgstr "%{funder}" -#: ../../app/models/concerns/exportable_plan.rb:167 +#: ../../app/models/concerns/exportable_plan.rb:198 msgid "%{template}" msgstr "%{template}" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 #: ../../app/views/shared/export/_plan_txt.erb:27 msgid "Grant number: " msgstr "Fon/hibe numarası:" -#: ../../app/models/concerns/exportable_plan.rb:169 +#: ../../app/models/concerns/exportable_plan.rb:200 msgid "%{grant_number}" msgstr "%{grant_number}" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 #: ../../app/views/shared/export/_plan_coversheet.erb:42 #: ../../app/views/shared/export/_plan_txt.erb:30 msgid "Project abstract: " msgstr "Proje özeti:" -#: ../../app/models/concerns/exportable_plan.rb:171 +#: ../../app/models/concerns/exportable_plan.rb:202 msgid "%{description}" msgstr "%{description}" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 #: ../../app/views/shared/export/_plan_coversheet.erb:58 #: ../../app/views/shared/export/_plan_txt.erb:33 msgid "Last modified: " msgstr "Son düzenleme:" -#: ../../app/models/concerns/exportable_plan.rb:173 +#: ../../app/models/concerns/exportable_plan.rb:204 msgid "%{date}" msgstr "%{date}" -#: ../../app/models/concerns/exportable_plan.rb:174 +#: ../../app/models/concerns/exportable_plan.rb:205 #: ../../app/views/shared/export/_plan_coversheet.erb:65 #: ../../app/views/shared/export/_plan_txt.erb:34 msgid "Copyright information:" msgstr "Telif hakkı bilgileri:" -#: ../../app/models/concerns/exportable_plan.rb:175 +#: ../../app/models/concerns/exportable_plan.rb:206 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" @@ -1457,7 +1460,11 @@ 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:198 +#: ../../app/models/concerns/exportable_plan.rb:221 +msgid "Research Outputs: " +msgstr "" + +#: ../../app/models/concerns/exportable_plan.rb:244 msgid "Not Answered" msgstr "Cevaplanmadı" @@ -1924,7 +1931,7 @@ msgstr "Lütfen bekleyin, Standartlar yükleniyor" #: ../../app/views/org_admin/templates/_form.html.erb:82 #: ../../app/views/org_admin/users/edit.html.erb:54 #: ../../app/views/orgs/_feedback_form.html.erb:38 -#: ../../app/views/orgs/_profile_form.html.erb:182 +#: ../../app/views/orgs/_profile_form.html.erb:197 #: ../../app/views/plans/_edit_details.html.erb:11 #: ../../app/views/plans/_guidance_selection.html.erb:23 #: ../../app/views/questions/_preview_question.html.erb:111 @@ -2309,16 +2316,16 @@ msgstr "" msgid "Hello" msgstr "Merhaba" +#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 +msgid "Your" +msgstr "Sizin" + #: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 msgid "" "account has been locked due to an excessive number of unsuccessful sign in att" "empts." msgstr "çok sayıda başarısız oturum açma girişimi nedeniyle hesap kilitlendi." -#: ../../app/views/devise/mailer/unlock_instructions.html.erb:4 -msgid "Your" -msgstr "Sizin" - #: ../../app/views/devise/mailer/unlock_instructions.html.erb:6 msgid "Click the link below to unlock your account" msgstr "Hesabınızın kilidini kaldırmak için aşağıdaki bağlantıya tıklayın" @@ -2885,7 +2892,7 @@ msgid "GitHub" msgstr "GitHub" #: ../../app/views/layouts/_navigation.html.erb:12 -#: ../../app/views/orgs/_profile_form.html.erb:55 +#: ../../app/views/orgs/_profile_form.html.erb:58 msgid "logo" msgstr "logo" @@ -2962,14 +2969,14 @@ msgstr "Çıkış Yap" msgid "%{application_name}" msgstr "%{application_name}" -#: ../../app/views/layouts/application.html.erb:91 -msgid "Notice:" -msgstr "Bildiri:" - #: ../../app/views/layouts/application.html.erb:91 msgid "Error:" msgstr "Hata:" +#: ../../app/views/layouts/application.html.erb:91 +msgid "Notice:" +msgstr "Bildiri:" + #: ../../app/views/layouts/application.html.erb:102 msgid "Loading..." msgstr "Yükleniyor..." @@ -3415,6 +3422,8 @@ msgid "Order" msgstr "Sıra" #: ../../app/views/org_admin/question_options/_option_fields.html.erb:6 +#: ../../app/views/orgs/_profile_form.html.erb:144 +#: ../../app/views/orgs/_profile_form.html.erb:173 #: ../../app/views/paginable/guidances/_index.html.erb:6 #: ../../app/views/shared/_links.html.erb:13 msgid "Text" @@ -3925,15 +3934,21 @@ msgstr "" "rınız varsa veya değişiklik talep ediyorsanız Yardım Masası ile iletişime geçi" "n." -#: ../../app/views/orgs/_profile_form.html.erb:21 +#: ../../app/views/orgs/_profile_form.html.erb:6 +msgid "" +"This information can only be changed by a system administrator. Contact %{supp" +"ort_email} if you have questions or to request changes." +msgstr "" + +#: ../../app/views/orgs/_profile_form.html.erb:24 msgid "Organisation full name" msgstr "Kuruluşun tam adı" -#: ../../app/views/orgs/_profile_form.html.erb:27 +#: ../../app/views/orgs/_profile_form.html.erb:30 msgid "Organisation abbreviated name" msgstr "Kuruluşun kısaltılmış adı" -#: ../../app/views/orgs/_profile_form.html.erb:38 +#: ../../app/views/orgs/_profile_form.html.erb:41 msgid "" "A managed Org is one that can have its own Guidance and/or Templates. An unman" "aged Org is one that was automatically created by the system when a user enter" @@ -3943,68 +3958,68 @@ msgstr "" "ruluştur. Yönetilmeyen bir Kuruluş, bir kullanıcı girdiğinde/seçtiğinde sistem" " tarafından otomatik olarak oluşturulan kuruluştur." -#: ../../app/views/orgs/_profile_form.html.erb:39 +#: ../../app/views/orgs/_profile_form.html.erb:42 msgid "Managed? (allows Org Admins to access the Admin menu)" msgstr "Yönetilen? (Kuruluş Yöneticilerinin Yönetici menüsüne erişmesine izin verir)" -#: ../../app/views/orgs/_profile_form.html.erb:51 +#: ../../app/views/orgs/_profile_form.html.erb:54 msgid "Organization logo" msgstr "Kuruluş logosu" -#: ../../app/views/orgs/_profile_form.html.erb:59 +#: ../../app/views/orgs/_profile_form.html.erb:62 msgid "This will remove your organisation's logo" msgstr "Bu işlem kuruluşunuzun logosunu kaldıracak" -#: ../../app/views/orgs/_profile_form.html.erb:60 +#: ../../app/views/orgs/_profile_form.html.erb:63 msgid "Remove logo" msgstr "Logoyu kaldır" -#: ../../app/views/orgs/_profile_form.html.erb:62 +#: ../../app/views/orgs/_profile_form.html.erb:65 #: ../../app/views/orgs/shibboleth_ds.html.erb:34 #: ../../app/views/plans/new.html.erb:64 ../../app/views/plans/new.html.erb:93 #: ../../app/views/shared/_sign_in_form.html.erb:23 msgid "or" msgstr "veya" -#: ../../app/views/orgs/_profile_form.html.erb:79 +#: ../../app/views/orgs/_profile_form.html.erb:82 msgid "Organisation URLs" msgstr "Kuruluş URL'leri" -#: ../../app/views/orgs/_profile_form.html.erb:91 -#: ../../app/views/orgs/_profile_form.html.erb:96 +#: ../../app/views/orgs/_profile_form.html.erb:94 +#: ../../app/views/orgs/_profile_form.html.erb:99 msgid "Help Desk email" msgstr "Yardım Masası e-postası" -#: ../../app/views/orgs/_profile_form.html.erb:105 +#: ../../app/views/orgs/_profile_form.html.erb:108 msgid "Administrator contact" msgstr "Yönetici iletişim bilgileri" -#: ../../app/views/orgs/_profile_form.html.erb:110 +#: ../../app/views/orgs/_profile_form.html.erb:113 msgid "Contact email" msgstr "İletişim e-posta adresi" -#: ../../app/views/orgs/_profile_form.html.erb:114 +#: ../../app/views/orgs/_profile_form.html.erb:117 #: ../../app/views/shared/_links.html.erb:35 msgid "Link text" msgstr "Bağlantı metni" -#: ../../app/views/orgs/_profile_form.html.erb:122 +#: ../../app/views/orgs/_profile_form.html.erb:125 msgid "Google Analytics Tracker" msgstr "Google Analytics İzleyici" -#: ../../app/views/orgs/_profile_form.html.erb:128 +#: ../../app/views/orgs/_profile_form.html.erb:131 msgid "Tracker Code" msgstr "İzleyici Kodu" -#: ../../app/views/orgs/_profile_form.html.erb:139 +#: ../../app/views/orgs/_profile_form.html.erb:143 msgid "Organisation Types" msgstr "Kuruluş Türleri" -#: ../../app/views/orgs/_profile_form.html.erb:149 +#: ../../app/views/orgs/_profile_form.html.erb:158 msgid "Institution" msgstr "Kurum" -#: ../../app/views/orgs/_profile_form.html.erb:162 +#: ../../app/views/orgs/_profile_form.html.erb:172 msgid "Organisation type(s)" msgstr "Kuruluş tür(ler)i" @@ -4300,14 +4315,6 @@ msgstr "Kopyala" msgid "View" msgstr "Görüntüle" -#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 -msgid "" -"Are you sure you wish to remove this plan? Any collaborators will still be abl" -"e to access it." -msgstr "" -"Bu planı kaldırmak istediğinizden emin misiniz? Tüm ortak çalışanlar plana eri" -"şmeye devam edebilir." - #: ../../app/views/paginable/plans/_privately_visible.html.erb:77 msgid "" "Are you sure you wish to remove this public plan? This will remove it from the" @@ -4317,6 +4324,14 @@ msgstr "" "erkese Açık VYP'ler sayfasından kaldıracak, ancak tüm ortak çalışanlar buna er" "işmeye devam edebilecektir." +#: ../../app/views/paginable/plans/_privately_visible.html.erb:77 +msgid "" +"Are you sure you wish to remove this plan? Any collaborators will still be abl" +"e to access it." +msgstr "" +"Bu planı kaldırmak istediğinizden emin misiniz? Tüm ortak çalışanlar plana eri" +"şmeye devam edebilir." + #: ../../app/views/paginable/plans/_publicly_visible.html.erb:17 msgid "Not Applicable" msgstr "Uygulanamaz" @@ -4836,8 +4851,8 @@ msgid "Organisation: anyone at my organisation can view" msgstr "Kuruluş: kuruluşumdaki herkes görüntüleyebilir" #: ../../app/views/plans/_share_form.html.erb:37 -msgid "Public: anyone can view" -msgstr "Herkese açık: herkes görüntüleyebilir" +msgid "Public: anyone can view or download from the Public DMPs page" +msgstr "" #: ../../app/views/plans/_share_form.html.erb:44 msgid "Manage collaborators" @@ -5515,14 +5530,14 @@ msgstr "Kaydol" msgid "on the homepage." msgstr "ana sayfada." -#: ../../app/views/static_pages/about_us.html.erb:35 -msgid "page for guidance." -msgstr "rehberlik sayfası." - #: ../../app/views/static_pages/about_us.html.erb:35 msgid "Please visit the" msgstr "Lütfen şu adresi ziyaret edin:" +#: ../../app/views/static_pages/about_us.html.erb:35 +msgid "page for guidance." +msgstr "rehberlik sayfası." + #: ../../app/views/static_pages/about_us.html.erb:37 msgid "Customising for your Organisation" msgstr "Kuruluşunuz için özelleştiriliyor" @@ -6458,22 +6473,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Merhaba %{recipient_name}," -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " to " -msgstr "ile" - -#: ../../app/views/user_mailer/question_answered.html.erb:5 -msgid " based on the template " -msgstr "Şu şablona dayanarak:" - #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " is creating a Data Management Plan and has answered " msgstr " bir Veri Yönetim Planı oluşturuyor ve şunları yanıtladı:" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " to " +msgstr "ile" + #: ../../app/views/user_mailer/question_answered.html.erb:5 msgid " in a plan called " msgstr "şu plan içinde:" +#: ../../app/views/user_mailer/question_answered.html.erb:5 +msgid " based on the template " +msgstr "Şu şablona dayanarak:" + #: ../../app/views/user_mailer/sharing_notification.html.erb:5 msgid "" "Your colleague %{inviter_name} has invited you to contribute to \n" @@ -6626,14 +6641,14 @@ msgstr "" msgid "Download users" msgstr "Kullanıcıları indir" -#: ../../app/views/users/refresh_token.js.erb:1 -msgid "Unable to regenerate your API token." -msgstr "API Tokenınız yeniden oluşturulamıyor." - #: ../../app/views/users/refresh_token.js.erb:1 msgid "Successfully regenerate your API token." msgstr "API tokenınızı başarıyla yeniden oluşturun." +#: ../../app/views/users/refresh_token.js.erb:1 +msgid "Unable to regenerate your API token." +msgstr "API Tokenınız yeniden oluşturulamıyor." + #: i18n_placeholders.rb:4 msgid "activerecord.errors.messages.record_invalid" msgstr "activerecord.errors.messages.record_invalid" diff --git a/config/locales/.translation_io b/config/locales/.translation_io index 43b6f1b641..71b1726f92 100644 --- a/config/locales/.translation_io +++ b/config/locales/.translation_io @@ -5,4 +5,4 @@ # ignore the conflicts and "sync" again, it will fix this file for you. --- -timestamp: 1670600093 +timestamp: 1675411357 diff --git a/config/locales/localization.es.yml b/config/locales/localization.es.yml index 8cdb64e0d5..8fcf539f13 100644 --- a/config/locales/localization.es.yml +++ b/config/locales/localization.es.yml @@ -78,7 +78,7 @@ es: á: a é: e í: i - ñ: n + ñ: "n" ó: o ú: u ü: u diff --git a/config/locales/localization.fr-CA.yml b/config/locales/localization.fr-CA.yml index 49165411d4..a1710adda9 100644 --- a/config/locales/localization.fr-CA.yml +++ b/config/locales/localization.fr-CA.yml @@ -85,7 +85,7 @@ fr-CA: ù: u û: u ü: u - ÿ: y + ÿ: "y" œ: oe spree: date_picker: diff --git a/config/locales/localization.fr-FR.yml b/config/locales/localization.fr-FR.yml index 665fa2d1b7..e7ff3752f1 100644 --- a/config/locales/localization.fr-FR.yml +++ b/config/locales/localization.fr-FR.yml @@ -85,7 +85,7 @@ fr-FR: ù: u û: u ü: u - ÿ: y + ÿ: "y" œ: oe spree: date_picker: From 203a1c217a9abefa9355bfc8d5b8f362ace22d38 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Fri, 3 Feb 2023 09:06:41 +0100 Subject: [PATCH 42/43] Updated Ruby & JS dependencies --- Gemfile.lock | 230 +++++++------- yarn.lock | 826 +++++++++++++++++++++++++++++---------------------- 2 files changed, 584 insertions(+), 472 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2b2d5f5898..3a254d4c6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,63 +1,63 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + actioncable (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actionmailbox (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) + actionmailer (6.1.7.2) + actionpack (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) + actionpack (6.1.7.2) + actionview (= 6.1.7.2) + activesupport (= 6.1.7.2) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actiontext (6.1.7.2) + actionpack (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (6.1.7.2) + activesupport (= 6.1.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7) - activesupport (= 6.1.7) + activejob (6.1.7.2) + activesupport (= 6.1.7.2) globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) + activemodel (6.1.7.2) + activesupport (= 6.1.7.2) + activerecord (6.1.7.2) + activemodel (= 6.1.7.2) + activesupport (= 6.1.7.2) activerecord_json_validator (2.1.3) activerecord (>= 4.2.0, < 8) json_schemer (~> 0.2.18) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) + activestorage (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activesupport (= 6.1.7.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -82,11 +82,11 @@ GEM bindex (0.8.1) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.15.0) + bootsnap (1.16.0) msgpack (~> 1.2) brakeman (5.4.0) builder (3.2.4) - bullet (7.0.4) + bullet (7.0.7) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundle-audit (0.1.0) @@ -105,7 +105,6 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) capybara-webmock (0.1.0) - childprocess (4.1.0) claide (1.1.0) claide-plugins (0.9.2) cork @@ -113,7 +112,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) contact_us (1.2.0) rails (>= 4.2.0) cork (0.3.0) @@ -121,12 +120,12 @@ GEM crack (0.4.5) rexml crass (1.0.6) - danger (9.1.0) + danger (9.2.0) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) + faraday (>= 0.9.0, < 3.0) faraday-http-cache (~> 2.0) git (~> 1.7) kramdown (~> 2.3) @@ -147,7 +146,7 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise_invitable (2.0.6) + devise_invitable (2.0.7) actionmailer (>= 5.0) devise (>= 4.6) diff-lcs (1.5.0) @@ -164,24 +163,25 @@ GEM fog-aws ecma-re-validator (0.4.0) regexp_parser (~> 2.2) - erubi (1.11.0) - excon (0.94.0) + erubi (1.12.0) + excon (0.98.0) execjs (2.8.1) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.0.0) + faker (3.1.0) i18n (>= 1.8.11, < 2) - faraday (1.2.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) faraday-http-cache (2.4.1) faraday (>= 0.8) + faraday-net_http (3.0.2) ffi (1.15.5) flag_shih_tzu (0.3.23) - fog-aws (3.15.0) + fog-aws (3.16.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -199,7 +199,7 @@ GEM font-awesome-sass (5.15.1) sassc (>= 1.11) formatador (1.1.0) - forwardable (1.3.2) + forwardable (1.3.3) fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -208,10 +208,10 @@ GEM locale (>= 2.0.5) prime text (>= 1.3.0) - git (1.12.0) + git (1.13.2) addressable (~> 2.8) rchardet (~> 1.8) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) guard (2.18.0) formatador (>= 0.2.4) @@ -225,26 +225,26 @@ GEM hana (1.3.7) hashdiff (1.0.1) hashie (5.0.0) - highline (2.0.3) + highline (2.1.0) htmltoword (1.1.1) actionpack nokogiri rubyzip (>= 1.0) - httparty (0.20.0) - mime-types (~> 3.0) + httparty (0.21.0) + mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) i18n (1.12.0) concurrent-ruby (~> 1.0) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) - json (2.6.2) - json_schemer (0.2.23) + json (2.6.3) + json_schemer (0.2.24) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.5.0) + jwt (2.7.0) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -263,11 +263,11 @@ GEM kramdown (~> 2.0) ledermann-rails-settings (2.5.0) activerecord (>= 4.2) - listen (3.7.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) locale (2.1.3) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) @@ -283,21 +283,20 @@ GEM nokogiri (~> 1) rake mini_mime (1.1.2) - minitest (5.16.3) + minitest (5.17.0) mocha (2.0.2) ruby2_keywords (>= 0.0.5) msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.2.3) - mysql2 (0.5.4) + mysql2 (0.5.5) nap (1.1.0) nenv (0.3.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.9-arm64-darwin) + nokogiri (1.14.1-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.9-x86_64-linux) + nokogiri (1.14.1-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -312,7 +311,7 @@ GEM octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) - omniauth (2.1.0) + omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection @@ -331,7 +330,7 @@ GEM options (2.3.2) orm_adapter (0.5.0) parallel (1.22.1) - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) pg (1.4.5) prime (0.1.2) @@ -340,40 +339,40 @@ GEM progress_bar (1.3.3) highline (>= 1.6, < 3) options (~> 2.3.0) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.0) - puma (6.0.0) + public_suffix (5.0.1) + puma (6.0.2) nio4r (~> 2.0) - pundit (2.2.0) + pundit (2.3.0) activesupport (>= 3.0.0) pundit-matchers (1.8.4) rspec-rails (>= 3.0.0) - racc (1.6.0) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (3.0.4) + rack-protection (3.0.5) rack - rack-proxy (0.7.4) + rack-proxy (0.7.6) rack rack-test (2.0.2) rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + rails (6.1.7.2) + actioncable (= 6.1.7.2) + actionmailbox (= 6.1.7.2) + actionmailer (= 6.1.7.2) + actionpack (= 6.1.7.2) + actiontext (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activemodel (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) bundler (>= 1.15.0) - railties (= 6.1.7) + railties (= 6.1.7.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -382,11 +381,11 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -398,20 +397,20 @@ GEM rchardet (1.8.0) recaptcha (5.12.3) json - regexp_parser (2.6.1) + regexp_parser (2.6.2) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) rexml (3.2.5) - rollbar (3.3.2) + rollbar (3.4.0) rspec-collection_matchers (1.2.0) rspec-expectations (>= 2.99.0.beta1) rspec-core (3.12.0) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.1) @@ -423,17 +422,17 @@ GEM rspec-mocks (~> 3.11) rspec-support (~> 3.11) rspec-support (3.12.0) - rubocop (1.39.0) + rubocop (1.44.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.23.0, < 2.0) + rubocop-ast (>= 1.24.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.23.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) rubocop-i18n (3.0.0) rubocop (~> 1.0) @@ -454,8 +453,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - selenium-webdriver (4.6.1) - childprocess (>= 0.5, < 5.0) + selenium-webdriver (4.8.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -471,15 +469,15 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - spring (4.1.0) + spring (4.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) spring (>= 4) - sprockets (4.1.1) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -490,15 +488,15 @@ GEM thor (1.2.1) tilt (2.0.11) tomparse (0.4.2) - translation (1.34) + translation (1.35) gettext (~> 3.2, >= 3.2.5, <= 3.4.3) - turbo-rails (1.3.2) + turbo-rails (1.3.3) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) uniform_notifier (1.16.0) uri_template (0.7.0) version_gem (1.1.1) @@ -517,7 +515,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (5.4.3) + webpacker (5.4.4) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) @@ -529,7 +527,7 @@ GEM websocket-extensions (0.1.5) wicked_pdf (2.6.3) activesupport - wkhtmltopdf-binary (0.12.6.5) + wkhtmltopdf-binary (0.12.6.6) xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.28) @@ -625,4 +623,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.26 + 2.4.3 diff --git a/yarn.lock b/yarn.lock index 6ec55c5b5b..8aeffc2755 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17,38 +17,38 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" - integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5": + version "7.20.14" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.14.tgz#4106fc8b755f3e3ee0a0a7c27dde5de1d2b2baf8" + integrity sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw== "@babel/core@^7.11.6", "@babel/core@^7.15.0": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113" - integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ== + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" + integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" - "@babel/helper-compilation-targets" "^7.20.0" - "@babel/helper-module-transforms" "^7.20.2" - "@babel/helpers" "^7.20.5" - "@babel/parser" "^7.20.5" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.12" + "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95" - integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA== +"@babel/generator@^7.20.7": + version "7.20.14" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.14.tgz#9fa772c9f86a46c6ac9b321039400712b96f64ce" + integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg== dependencies: - "@babel/types" "^7.20.5" + "@babel/types" "^7.20.7" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -67,27 +67,29 @@ "@babel/helper-explode-assignable-expression" "^7.18.6" "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" - integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: - "@babel/compat-data" "^7.20.0" + "@babel/compat-data" "^7.20.5" "@babel/helper-validator-option" "^7.18.6" browserslist "^4.21.3" + lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.5.tgz#327154eedfb12e977baa4ecc72e5806720a85a06" - integrity sha512-3RCdA/EmEaikrhayahwToF0fpweU/8o2p8vhc1c/1kftHOdTKuC65kik/TLc+qfbS8JKw4qqJbne4ovICDhmww== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819" + integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" - "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.20.7" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.19.1" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": @@ -137,12 +139,12 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" - integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== +"@babel/helper-member-expression-to-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05" + integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw== dependencies: - "@babel/types" "^7.18.9" + "@babel/types" "^7.20.7" "@babel/helper-module-imports@^7.18.6": version "7.18.6" @@ -151,19 +153,19 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712" - integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA== +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" "@babel/helper-simple-access" "^7.20.2" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.1" - "@babel/types" "^7.20.2" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.10" + "@babel/types" "^7.20.7" "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" @@ -177,7 +179,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== -"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": +"@babel/helper-remap-async-to-generator@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== @@ -187,25 +189,26 @@ "@babel/helper-wrap-function" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78" - integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw== +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" + integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.20.7" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/traverse" "^7.19.1" - "@babel/types" "^7.19.0" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2": +"@babel/helper-simple-access@^7.20.2": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: "@babel/types" "^7.20.2" -"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": version "7.20.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== @@ -244,14 +247,14 @@ "@babel/traverse" "^7.20.5" "@babel/types" "^7.20.5" -"@babel/helpers@^7.20.5": - version "7.20.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763" - integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w== +"@babel/helpers@^7.20.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2" + integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg== dependencies: - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.13" + "@babel/types" "^7.20.7" "@babel/highlight@^7.18.6": version "7.18.6" @@ -262,10 +265,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.18.10", "@babel/parser@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8" - integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA== +"@babel/parser@^7.20.13", "@babel/parser@^7.20.7": + version "7.20.15" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89" + integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -275,21 +278,21 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50" - integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" + integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-proposal-optional-chaining" "^7.20.7" "@babel/plugin-proposal-async-generator-functions@^7.20.1": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9" - integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" + integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-syntax-async-generators" "^7.8.4" @@ -302,12 +305,12 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-proposal-class-static-block@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020" - integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz#92592e9029b13b15be0f7ce6a7aedc2879ca45a7" + integrity sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import@^7.18.6": @@ -335,11 +338,11 @@ "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-proposal-logical-assignment-operators@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23" - integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" + integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": @@ -359,15 +362,15 @@ "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d" - integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" + integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== dependencies: - "@babel/compat-data" "^7.20.1" - "@babel/helper-compilation-targets" "^7.20.0" + "@babel/compat-data" "^7.20.5" + "@babel/helper-compilation-targets" "^7.20.7" "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.20.1" + "@babel/plugin-transform-parameters" "^7.20.7" "@babel/plugin-proposal-optional-catch-binding@^7.18.6": version "7.18.6" @@ -377,13 +380,13 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993" - integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w== +"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz#49f2b372519ab31728cc14115bb0998b15bfda55" + integrity sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-proposal-private-methods@^7.18.6": @@ -518,20 +521,20 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-arrow-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe" - integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" + integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-async-to-generator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615" - integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" + integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== dependencies: "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-remap-async-to-generator" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-transform-block-scoped-functions@^7.18.6": version "7.18.6" @@ -541,38 +544,39 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-block-scoping@^7.20.2": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz#401215f9dc13dc5262940e2e527c9536b3d7f237" - integrity sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA== + version "7.20.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz#3e1b2aa9cbbe1eb8d644c823141a9c5c2a22392d" + integrity sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA== dependencies: "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-classes@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2" - integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz#f438216f094f6bb31dc266ebfab8ff05aecad073" + integrity sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.0" + "@babel/helper-compilation-targets" "^7.20.7" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-optimise-call-expression" "^7.18.6" "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.19.1" + "@babel/helper-replace-supers" "^7.20.7" "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e" - integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" + integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/template" "^7.20.7" "@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792" - integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454" + integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA== dependencies: "@babel/helper-plugin-utils" "^7.20.2" @@ -630,30 +634,30 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-modules-amd@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd" - integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg== + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" + integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== dependencies: - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-modules-commonjs@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c" - integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ== + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz#8cb23010869bf7669fd4b3098598b6b2be6dc607" + integrity sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw== dependencies: - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-simple-access" "^7.19.4" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-simple-access" "^7.20.2" "@babel/plugin-transform-modules-systemjs@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d" - integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ== + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" + integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== dependencies: "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-validator-identifier" "^7.19.1" "@babel/plugin-transform-modules-umd@^7.18.6": @@ -687,10 +691,10 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/helper-replace-supers" "^7.18.6" -"@babel/plugin-transform-parameters@^7.20.1": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.5.tgz#f8f9186c681d10c3de7620c916156d893c8a019e" - integrity sha512-h7plkOmcndIUWXZFLgpbrh2+fXAi47zcUX7IrOQuZdLD0I0KvjJ6cvo3BEcAOsDOcZhVKGJqv07mkSqK0y2isQ== +"@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f" + integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA== dependencies: "@babel/helper-plugin-utils" "^7.20.2" @@ -736,12 +740,12 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-spread@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6" - integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" + integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-transform-sticky-regex@^7.18.6": version "7.18.6" @@ -872,41 +876,41 @@ esutils "^2.0.2" "@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.20.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3" - integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA== + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b" + integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA== dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== +"@babel/template@^7.18.10", "@babel/template@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133" - integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ== +"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473" + integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" + "@babel/generator" "^7.20.7" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/parser" "^7.20.13" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.4": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84" - integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg== +"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.4.4": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -922,15 +926,15 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== -"@eslint/eslintrc@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95" - integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg== +"@eslint/eslintrc@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" + integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== dependencies: ajv "^6.12.4" debug "^4.3.2" espree "^9.4.0" - globals "^13.15.0" + globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -943,22 +947,22 @@ integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== "@hotwired/turbo-rails@^7.1.3": - version "7.2.4" - resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.2.4.tgz#d155533e79c4ebdac23e8fe12697d821d5c06307" - integrity sha512-givDUQqaccd19BvErz1Cf2j6MXF74m0G6I75oqFJGeXAa7vwkz9nDplefVNrALCR9Xi9j9gy32xmSI6wD0tZyA== + version "7.2.5" + resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.2.5.tgz#74fc3395a29a76df2bb8835aa88c86885cffde4c" + integrity sha512-F8ztmARxd/XBdevRa//HoJGZ7u+Unb0J7cQUeUP+pBvt9Ta2TJJ7a2TORAOhjC8Zgxx+LKwm/1UUHqN3ojjiGw== dependencies: - "@hotwired/turbo" "^7.2.4" + "@hotwired/turbo" "^7.2.5" "@rails/actioncable" "^7.0" -"@hotwired/turbo@^7.2.4": - version "7.2.4" - resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.2.4.tgz#0d35541be32cfae3b4f78c6ab9138f5b21f28a21" - integrity sha512-c3xlOroHp/cCZHDOuLp6uzQYEbvXBUVaal0puXoGJ9M8L/KHwZ3hQozD4dVeSN9msHWLxxtmPT1TlCN7gFhj4w== +"@hotwired/turbo@^7.2.5": + version "7.2.5" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.2.5.tgz#2d9d6bde8a9549c3aea8970445ade16ffd56719a" + integrity sha512-o5PByC/mWkmTe4pWnKrixhPECJUxIT/NHtxKqjq7n9Fj6JlNza1pgxdTCJVIq+PI0j95U+7mA3N4n4A/QYZtZQ== -"@humanwhocodes/config-array@^0.11.6": - version "0.11.7" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f" - integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw== +"@humanwhocodes/config-array@^0.11.8": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" + integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" @@ -1171,9 +1175,11 @@ 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== + version "2.8.13" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" + integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA== + dependencies: + "@types/node" "*" "@types/eslint@^7.29.0": version "7.29.0" @@ -1188,22 +1194,22 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.31" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" - integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.31": + version "4.17.33" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" + integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@*", "@types/express@^4.17.13": - version "4.17.14" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" - integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== + version "4.17.16" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.16.tgz#986caf0b4b850611254505355daa24e1b8323de8" + integrity sha512-LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" + "@types/express-serve-static-core" "^4.17.31" "@types/qs" "*" "@types/serve-static" "*" @@ -1230,9 +1236,9 @@ integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== "@types/node@*", "@types/node@>=10.0.0": - version "18.11.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" - integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== + version "18.11.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" + integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1282,9 +1288,9 @@ "@types/node" "*" "@types/ws@^8.5.1": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== + version "8.5.4" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" + integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== dependencies: "@types/node" "*" @@ -1462,9 +1468,9 @@ acorn@^6.4.1: integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== acorn@^8.5.0, acorn@^8.8.0: - version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" - integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== aggregate-error@^3.0.0: version "3.1.0" @@ -1509,9 +1515,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.8.0: - version "8.11.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78" - integrity sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1615,7 +1621,7 @@ array-flatten@^2.1.2: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.4: +array-includes@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== @@ -1631,7 +1637,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.flat@^1.2.5: +array.prototype.flat@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== @@ -1641,6 +1647,16 @@ array.prototype.flat@^1.2.5: es-abstract "^1.20.4" es-shim-unscopables "^1.0.0" +array.prototype.flatmap@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" + integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-shim-unscopables "^1.0.0" + array.prototype.reduce@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac" @@ -1681,9 +1697,9 @@ assign-symbols@^1.0.0: integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== async-each@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + version "1.0.5" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.5.tgz#6eea184b2df0ec09f3deebe165c97c85c911d7b8" + integrity sha512-5QzqtU3BlagehwmdoqwaS2FBQF2P5eL6vFqXwNsb5jwoEsmtfAXg1ocFvW7I6/gGLFhBMKwcMwZuy7uv/Bo9jA== atob@^2.1.2: version "2.1.2" @@ -1703,6 +1719,11 @@ autoprefixer@^9.6.1: postcss "^7.0.32" postcss-value-parser "^4.1.0" +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== + babel-loader@^8.2.2: version "8.3.0" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" @@ -1842,9 +1863,9 @@ body-parser@1.20.1, body-parser@^1.19.0: unpipe "1.0.0" bonjour-service@^1.0.11: - version "1.0.14" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.14.tgz#c346f5bc84e87802d08f8d5a60b93f758e514ee7" - integrity sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.0.tgz#424170268d68af26ff83a5c640b95def01803a13" + integrity sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q== dependencies: array-flatten "^2.1.2" dns-equal "^1.0.0" @@ -1974,14 +1995,14 @@ browserify-zlib@^0.2.0: pako "~1.0.5" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.6.4: - version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" - integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001400" - electron-to-chromium "^1.4.251" - node-releases "^2.0.6" - update-browserslist-db "^1.0.9" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" buffer-from@^1.0.0: version "1.1.2" @@ -2124,10 +2145,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400: - version "1.0.30001435" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001435.tgz#502c93dbd2f493bee73a408fe98e98fb1dad10b2" - integrity sha512-kdCkUTjR+v4YAJelyiDTqiu82BDr4W4CP5sgTA0ZBmqn30XfS2ZghPLMowik9TPhS+psWJiUNxsqLyurDbmutA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001449: + version "1.0.30001450" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz#022225b91200589196b814b51b1bbe45144cf74f" + integrity sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" @@ -2416,9 +2437,9 @@ content-disposition@0.5.4: safe-buffer "5.2.1" content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== convert-source-map@^1.7.0: version "1.9.0" @@ -2458,16 +2479,16 @@ copy-descriptor@^0.1.0: integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== core-js-compat@^3.25.1: - version "3.26.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df" - integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A== + version "3.27.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.27.2.tgz#607c50ad6db8fd8326af0b2883ebb987be3786da" + integrity sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg== dependencies: browserslist "^4.21.4" core-js@^3.16.2, core-js@^3.6.5: - version "3.26.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.1.tgz#7a9816dabd9ee846c1c0fe0e8fcad68f3709134e" - integrity sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA== + version "3.27.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.27.2.tgz#85b35453a424abdcacb97474797815f4d62ebbf7" + integrity sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w== core-util-is@~1.0.0: version "1.0.3" @@ -2766,7 +2787,7 @@ date-format@^4.0.14: resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg== -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2793,9 +2814,9 @@ decamelize@^1.2.0: integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== deep-is@^0.1.3: version "0.1.4" @@ -2980,10 +3001,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.251: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== +electron-to-chromium@^1.4.284: + version "1.4.285" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.285.tgz#803a776dc24ce1bf5c2752630e0443d51002b95d" + integrity sha512-47o4PPgxfU1KMNejz+Dgaodf7YTcg48uOfV1oM6cs3adrl2+7R+dHkt3Jpxqo0LRCbGJEzTKMUt0RdvByb/leg== elliptic@^6.5.3: version "6.5.4" @@ -3026,9 +3047,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: once "^1.4.0" engine.io-parser@~5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" - integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== + version "5.0.6" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45" + integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== engine.io@~6.2.1: version "6.2.1" @@ -3080,40 +3101,58 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.20.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" - integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== + version "1.21.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6" + integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg== dependencies: + available-typed-arrays "^1.0.5" call-bind "^1.0.2" + es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" function-bind "^1.1.1" function.prototype.name "^1.1.5" get-intrinsic "^1.1.3" get-symbol-description "^1.0.0" + globalthis "^1.0.3" + gopd "^1.0.1" has "^1.0.3" has-property-descriptors "^1.0.0" + has-proto "^1.0.1" has-symbols "^1.0.3" - internal-slot "^1.0.3" + internal-slot "^1.0.4" + is-array-buffer "^3.0.1" is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" + is-typed-array "^1.1.10" is-weakref "^1.0.2" object-inspect "^1.12.2" object-keys "^1.1.1" object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" safe-regex-test "^1.0.0" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" + string.prototype.trimend "^1.0.6" + string.prototype.trimstart "^1.0.6" + typed-array-length "^1.0.4" unbox-primitive "^1.0.2" + which-typed-array "^1.1.9" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== +es-set-tostringtag@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" + integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== + dependencies: + get-intrinsic "^1.1.3" + has "^1.0.3" + has-tostringtag "^1.0.0" + es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -3160,15 +3199,16 @@ eslint-config-airbnb-base@^15.0.0: object.entries "^1.1.5" semver "^6.3.0" -eslint-import-resolver-node@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" - integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== +eslint-import-resolver-node@^0.3.7: + version "0.3.7" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" + integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== dependencies: debug "^3.2.7" - resolve "^1.20.0" + is-core-module "^2.11.0" + resolve "^1.22.1" -eslint-module-utils@^2.7.3: +eslint-module-utils@^2.7.4: version "2.7.4" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== @@ -3176,22 +3216,24 @@ eslint-module-utils@^2.7.3: debug "^3.2.7" eslint-plugin-import@^2.26.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" - integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== + version "2.27.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" + integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== dependencies: - array-includes "^3.1.4" - array.prototype.flat "^1.2.5" - debug "^2.6.9" + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + array.prototype.flatmap "^1.3.1" + debug "^3.2.7" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" + eslint-import-resolver-node "^0.3.7" + eslint-module-utils "^2.7.4" has "^1.0.3" - is-core-module "^2.8.1" + is-core-module "^2.11.0" is-glob "^4.0.3" minimatch "^3.1.2" - object.values "^1.1.5" - resolve "^1.22.0" + object.values "^1.1.6" + resolve "^1.22.1" + semver "^6.3.0" tsconfig-paths "^3.14.1" eslint-scope@^4.0.3: @@ -3240,12 +3282,12 @@ eslint-webpack-plugin@^2.6.0: schema-utils "^3.1.1" eslint@^8.18.0: - version "8.28.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e" - integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ== + version "8.33.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7" + integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA== dependencies: - "@eslint/eslintrc" "^1.3.3" - "@humanwhocodes/config-array" "^0.11.6" + "@eslint/eslintrc" "^1.4.1" + "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -3264,7 +3306,7 @@ eslint@^8.18.0: file-entry-cache "^6.0.1" find-up "^5.0.0" glob-parent "^6.0.2" - globals "^13.15.0" + globals "^13.19.0" grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" @@ -3472,9 +3514,9 @@ fast-levenshtein@^2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -3635,6 +3677,13 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -3744,10 +3793,10 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" - integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -3846,13 +3895,27 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0: - version "13.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.18.0.tgz#fb224daeeb2bb7d254cd2c640f003528b8d0c1dc" - integrity sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A== +globals@^13.19.0: + version "13.20.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" + integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== dependencies: type-fest "^0.20.2" +globalthis@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + dependencies: + define-properties "^1.1.3" + +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" @@ -3890,6 +3953,11 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" @@ -4089,14 +4157,14 @@ iferr@^0.1.5: integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA== ignore@^5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.1.tgz#c2b1f76cb999ede1502f3a226a9310fdfe88d46c" - integrity sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== immutable@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef" - integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ== + version "4.2.3" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.3.tgz#a203cdda37a5a30bc351b982a1794c1930198815" + integrity sha512-IHpmvaOIX4VLJwPOuQr1NpeBr2ZG6vpIj3blsLVxXRWJscLioaJRStqC+NcBsLeCDsnGlPpXd5/WZmnE7MbsKA== import-cwd@^2.0.0: version "2.1.0" @@ -4184,12 +4252,12 @@ ini@^1.3.4, ini@^1.3.5: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== +internal-slot@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" + integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== dependencies: - get-intrinsic "^1.1.0" + get-intrinsic "^1.1.3" has "^1.0.3" side-channel "^1.0.4" @@ -4227,6 +4295,15 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-array-buffer@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a" + integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + is-typed-array "^1.1.10" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4271,7 +4348,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.2.7: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -4288,7 +4365,7 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.8.1, is-core-module@^2.9.0: +is-core-module@^2.11.0, is-core-module@^2.9.0: version "2.11.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== @@ -4475,6 +4552,17 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" +is-typed-array@^1.1.10, is-typed-array@^1.1.9: + version "1.1.10" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" + integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -4570,9 +4658,9 @@ jquery-ui@^1.12.1: jquery ">=1.8.0 <4.0.0" "jquery@>=1.8.0 <4.0.0", jquery@^3.5.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" - integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== + version "3.6.3" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6" + integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg== js-cookie@^3.0.1: version "3.0.1" @@ -4580,9 +4668,9 @@ js-cookie@^3.0.1: integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw== js-sdsl@^4.1.4: - version "4.2.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" - integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" + integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== js-tokens@^4.0.0: version "4.0.0" @@ -4640,16 +4728,16 @@ json-stable-stringify-without-jsonify@^1.0.1: integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@^2.1.2, json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^4.0.0: version "4.0.0" @@ -4764,9 +4852,9 @@ kind-of@^6.0.0, kind-of@^6.0.2: integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== klona@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" - integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" + integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== last-call-webpack-plugin@^3.0.0: version "3.0.0" @@ -4951,9 +5039,9 @@ media-typer@0.3.0: integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== memfs@^3.4.3: - version "3.4.12" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.12.tgz#d00f8ad8dab132dc277c659dc85bfd14b07d03bd" - integrity sha512-BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw== + version "3.4.13" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345" + integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg== dependencies: fs-monkey "^1.0.3" @@ -5110,6 +5198,11 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minipass@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.1.tgz#2b9408c6e81bb8b338d600fb3685e375a370a057" + integrity sha512-V9esFpNbK0arbN3fm2sxDKqMYgIp7XtVdE4Esj+PE4Qaaxdg1wIw48ITQIOn1sc8xXSmUviVL3cyjMqPlrVkiA== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -5265,10 +5358,10 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" - integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== +node-releases@^2.0.8: + version "2.0.9" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.9.tgz#fe66405285382b0c4ac6bcfbfbe7e8a510650b4d" + integrity sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA== normalize-path@^2.1.1: version "2.1.1" @@ -5341,9 +5434,9 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.12.2, object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== object-keys@^1.1.1: version "1.1.1" @@ -5393,7 +5486,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.5: +object.values@^1.1.0, object.values@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== @@ -6442,9 +6535,9 @@ punycode@^1.2.4: integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== q@^1.1.2: version "1.5.1" @@ -6704,7 +6797,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== -resolve@^1.1.7, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0: +resolve@^1.1.7, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.22.1: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -6822,9 +6915,9 @@ sass-loader@10.1.1: semver "^7.3.2" sass@^1.38.0: - version "1.56.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.1.tgz#94d3910cd468fd075fa87f5bb17437a0b617d8a7" - integrity sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ== + version "1.58.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.0.tgz#ee8aea3ad5ea5c485c26b3096e2df6087d0bb1cc" + integrity sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -7083,9 +7176,9 @@ socket.io-adapter@~2.4.0: integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== socket.io-parser@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" - integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== + version "4.2.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" + integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" @@ -7277,9 +7370,9 @@ stream-shift@^1.0.0: integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== streamroller@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.3.tgz#d95689a8c29b30d093525d0baffe6616fd62ca7e" - integrity sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w== + version "3.1.4" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.4.tgz#844a18e795d39c1089a8216e66a1cf1151271df0" + integrity sha512-Ha1Ccw2/N5C/IF8Do6zgNe8F3jQo8MPBnMBGvX0QjNv/I97BcNRzK6/mzOpZHHK7DjMLTI3c7Xw7Y1KvdChkvw== dependencies: date-format "^4.0.14" debug "^4.3.4" @@ -7308,7 +7401,7 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.trimend@^1.0.5: +string.prototype.trimend@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== @@ -7317,7 +7410,7 @@ string.prototype.trimend@^1.0.5: define-properties "^1.1.4" es-abstract "^1.20.4" -string.prototype.trimstart@^1.0.5: +string.prototype.trimstart@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== @@ -7444,13 +7537,13 @@ tapable@^1.0.0, tapable@^1.1.3: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tar@^6.0.2: - version "6.1.12" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" - integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^4.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -7495,9 +7588,9 @@ terser@^4.1.2: source-map-support "~0.5.12" terser@^5.3.4: - version "5.16.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.0.tgz#29362c6f5506e71545c73b069ccd199bb28f7f54" - integrity sha512-KjTV81QKStSfwbNiwlBXfcgMcOloyuRdb62/iLFPGBcVNF4EXjhdYBhYHmbJpiBrVxZhDvltE11j+LBQUxEEJg== + version "5.16.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.2.tgz#8f495819439e8b5c150e7530fc434a6e70ea18b2" + integrity sha512-JKuM+KvvWVqT7muHVyrwv7FVRPnmHDwF6XwoIxdbF5Witi0vu99RYpxDexpJndXt3jbZZmmWr2/mQa6HvSNdSg== dependencies: "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" @@ -7540,9 +7633,9 @@ timsort@^0.3.0: integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A== tinymce@^5.10.0: - version "5.10.6" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.6.tgz#ea03927e9d20c035619dfd32ec4fd471c55e32c5" - integrity sha512-bnF2LUoycDsoZZLQBNHbOijrmoJuEeR1rQdqgo4s77BedufpOVnDh00OZKbseHeTMCxhVH05wvOqxLsi6vpeZw== + version "5.10.7" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.7.tgz#d89d446f1962f2a1df6b2b70018ce475ec7ffb80" + integrity sha512-9UUjaO0R7FxcFo0oxnd1lMs7H+D0Eh+dDVo5hKbVe1a+VB0nit97vOqlinj+YwgoBDt6/DSCUoWqAYlLI8BLYA== tmp@^0.2.1: version "0.2.1" @@ -7638,15 +7731,24 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typed-array-length@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" + integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + is-typed-array "^1.1.9" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== ua-parser-js@^0.7.30: - version "0.7.32" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211" - integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw== + version "0.7.33" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" + integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== unbox-primitive@^1.0.2: version "1.0.2" @@ -7743,7 +7845,7 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-browserslist-db@^1.0.9: +update-browserslist-db@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== @@ -8032,6 +8134,18 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== +which-typed-array@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" + integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.10" + which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -8082,9 +8196,9 @@ wrappy@1: integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^8.4.2: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" + integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== ws@~8.2.3: version "8.2.3" From 27c3c4ad3a204f9ee7919cafa45a4bf4a5a98e7c Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Fri, 3 Feb 2023 09:11:49 +0100 Subject: [PATCH 43/43] Make rubocop happy --- app/controllers/plans_controller.rb | 2 +- app/models/contributor.rb | 4 ++-- app/models/plan.rb | 2 +- app/services/external_apis/ror_service.rb | 6 +++--- config/environments/production.rb | 2 +- spec/support/capybara.rb | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 623cf2477f..aba411fdf2 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -524,7 +524,7 @@ def render_phases_edit(plan, phase, guidance_groups) readonly = !plan.editable_by?(current_user.id) # Since the answers have been pre-fetched through plan (see Plan.load_for_phase) # we create a hash whose keys are question id and value is the answer associated - answers = plan.answers.each_with_object({}) { |a, m| m[a.question_id] = a; } + answers = plan.answers.each_with_object({}) { |a, m| m[a.question_id] = a } render('/phases/edit', locals: { base_template_org: phase.template.base_org, plan: plan, diff --git a/app/models/contributor.rb b/app/models/contributor.rb index b462efc610..739d40aae7 100644 --- a/app/models/contributor.rb +++ b/app/models/contributor.rb @@ -135,12 +135,12 @@ def name_or_email_presence _("can't be blank.")) end - if name.blank? && email.blank? && errors.size.zero? + if name.blank? && email.blank? && errors.empty? 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.size.zero? + errors.empty? end # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity end diff --git a/app/models/plan.rb b/app/models/plan.rb index 0cf221887b..73071f1ec0 100644 --- a/app/models/plan.rb +++ b/app/models/plan.rb @@ -441,7 +441,7 @@ def latest_update def owner r = roles.select { |rr| rr.active && rr.administrator } .min { |a, b| a.created_at <=> b.created_at } - r.nil? ? nil : r.user + r&.user end # Creates a role for the specified user (will update the user's diff --git a/app/services/external_apis/ror_service.rb b/app/services/external_apis/ror_service.rb index fba6f4e4ba..e639bf2b94 100644 --- a/app/services/external_apis/ror_service.rb +++ b/app/services/external_apis/ror_service.rb @@ -105,7 +105,7 @@ def query_string(term:, page: 1, filters: []) end # Recursive method that can handle multiple ROR result pages if necessary - # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity + # rubocop:disable Metrics/AbcSize def process_pages(term:, json:, filters: []) return [] if json.blank? @@ -117,7 +117,7 @@ def process_pages(term:, json:, filters: []) return results unless pages > 1 # Gather the results from the additional page (only up to the max) - (2..(pages > max_pages ? max_pages : pages)).each do |page| + (2..([pages, max_pages].min)).each do |page| json = query_ror(term: term, page: page, filters: filters) results += parse_results(json: json) end @@ -129,7 +129,7 @@ def process_pages(term:, json:, filters: []) log_error(method: 'ROR search', error: e) results || [] end - # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity + # rubocop:enable Metrics/AbcSize # Convert the JSON items into a hash # rubocop:disable Metrics/AbcSize diff --git a/config/environments/production.rb b/config/environments/production.rb index 9d17aeffdc..8e1c4099fc 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -87,7 +87,7 @@ config.active_support.disallowed_deprecation_warnings = [] # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new + config.log_formatter = Logger::Formatter.new # Use a different logger for distributed setups. # require 'syslog/logger' diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 8165a74595..88cf3f65af 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -17,7 +17,7 @@ # https://docs.travis-ci.com/user/chrome#sandboxing Capybara.register_driver :selenium_chrome_headless do |app| Capybara::Selenium::Driver.load_selenium - browser_options = ::Selenium::WebDriver::Chrome::Options.new + browser_options = Selenium::WebDriver::Chrome::Options.new browser_options.args << '--headless' browser_options.args << '--no-sandbox' browser_options.args << '--disable-gpu' if Gem.win_platform?