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 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..1c5a065ac8 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,21 @@ +# Changelog + +### 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 popover for org profile page and added explanation for public plan +### Fixed + +- Froze mail gem version [#3254](https://github.com/DMPRoadmap/roadmap/issues/3254) +- Updated the CSV export so that it now includes research outputs +- Updated sans-serif font used in PDF downloads to Roboto since Google API no longer offers Helvetica +- Fixed discrepencies with default/max per_page values for API and UI pagination +- 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. +- Fixed an issue with the Rails 6 keyword arguments change that was causing the `paginable_sort_link` to fail + +### Changed + +- Added scss files to EditorConfig +- Change csv file name for statistics from 'Completed' to 'Created' diff --git a/Dangerfile b/Dangerfile new file mode 100644 index 0000000000..97e283b0e7 --- /dev/null +++ b/Dangerfile @@ -0,0 +1,34 @@ +# 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(/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. \n + Ignore this warning if the PR ONLY contains translation.io synced updates.', + 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 + 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 + ) +end diff --git a/Gemfile b/Gemfile index b66c3e792d..c9990b6313 100644 --- a/Gemfile +++ b/Gemfile @@ -218,6 +218,11 @@ 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 # # ================================= # @@ -292,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 9c48ed2690..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,14 +105,34 @@ 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 + nap + open4 (~> 1.3) coderay (1.1.3) - concurrent-ruby (1.1.10) + colored2 (3.1.2) + concurrent-ruby (1.2.0) 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.2.0) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (>= 0.9.0, < 3.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) @@ -126,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) @@ -143,23 +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 (2.7.1) + 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) @@ -177,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) @@ -186,7 +208,10 @@ GEM locale (>= 2.0.5) prime text (>= 1.3.0) - globalid (1.0.0) + git (1.13.2) + addressable (~> 2.8) + rchardet (~> 1.8) + globalid (1.1.0) activesupport (>= 5.0) guard (2.18.0) formatador (>= 0.2.4) @@ -200,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) @@ -232,13 +257,17 @@ 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) + 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) @@ -254,18 +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) - mysql2 (0.5.4) + mysql2 (0.5.5) + nap (1.1.0) nenv (0.3.0) nio4r (2.5.8) - nokogiri (1.13.9-arm64-darwin) + no_proxy_fix (0.1.2) + 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) @@ -277,7 +308,10 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - omniauth (2.1.0) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection @@ -292,10 +326,11 @@ 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) - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) pg (1.4.5) prime (0.1.2) @@ -304,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) @@ -346,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) @@ -359,22 +394,23 @@ 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) + 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) @@ -386,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) @@ -414,8 +450,10 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.6.1) - childprocess (>= 0.5, < 5.0) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + selenium-webdriver (4.8.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -431,32 +469,34 @@ 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) 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) 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) @@ -475,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) @@ -487,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) @@ -517,6 +557,7 @@ DEPENDENCIES capybara capybara-webmock contact_us + danger (~> 9.0) database_cleaner devise devise_invitable @@ -536,6 +577,7 @@ DEPENDENCIES kaminari ledermann-rails-settings listen + mail (= 2.7.1) mimemagic mocha mysql2 @@ -581,4 +623,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.25 + 2.4.3 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 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..ab3b0b8cee 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 @@ -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 diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb index aed9d383dc..0e1dfcebd8 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 %w[0 organisationally_visible].include?(args.fetch(:visibility, 'publicly_visible')) + Template.visibilities[:organisationally_visible] else - args.fetch(:visibility, '0') == '1' ? 'organisationally_visible' : 'publicly_visible' + Template.visibilities[:publicly_visible] end end 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 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/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/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/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'); } } }; 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) 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/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 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/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/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb index 413906c764..d42a5bdf2c 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 %>
diff --git a/app/views/plans/_share_form.html.erb b/app/views/plans/_share_form.html.erb index da8c51e541..e68cede35a 100644 --- a/app/views/plans/_share_form.html.erb +++ b/app/views/plans/_share_form.html.erb @@ -34,7 +34,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 %>
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 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/config/locale/app.pot b/config/locale/app.pot index f7708a352d..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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 14:11-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:" @@ -1073,6 +1076,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 @@ -1148,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 @@ -1253,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" @@ -1409,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 "" @@ -1863,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 @@ -2227,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 @@ -2746,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 "" @@ -2824,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 @@ -3258,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" @@ -3717,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 "" @@ -4076,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 @@ -4559,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 @@ -5159,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 @@ -5938,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 @@ -6090,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 a2eba675e5..4b9343d91c 100644 Binary files a/config/locale/de/LC_MESSAGES/app.mo and b/config/locale/de/LC_MESSAGES/app.mo differ diff --git a/config/locale/de/app.po b/config/locale/de/app.po index 890cbd1fc8..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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1142,6 +1145,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 @@ -1217,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 @@ -1322,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" @@ -1488,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" @@ -1959,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 @@ -2343,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" @@ -2351,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" @@ -2929,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" @@ -3006,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..." @@ -3465,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" @@ -3988,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" @@ -4006,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)" @@ -4365,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" @@ -4382,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" @@ -4910,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" @@ -5594,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" @@ -6567,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" @@ -6738,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 4d0d6541cb..b5555536d9 100644 Binary files a/config/locale/en/LC_MESSAGES/app.mo and b/config/locale/en/LC_MESSAGES/app.mo differ diff --git a/config/locale/en/app.po b/config/locale/en/app.po index 304062bc2d..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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 14:11-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:" @@ -1122,6 +1125,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 @@ -1197,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 @@ -1302,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" @@ -1468,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" @@ -1935,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 @@ -2318,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" @@ -2326,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" @@ -2889,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" @@ -2966,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..." @@ -3419,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" @@ -3928,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" @@ -3946,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)" @@ -4304,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" @@ -4320,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" @@ -4836,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" @@ -5498,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" @@ -6457,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" @@ -6624,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 be3cfc431d..3930915f25 100644 Binary files a/config/locale/en_CA/LC_MESSAGES/app.mo and b/config/locale/en_CA/LC_MESSAGES/app.mo differ diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po index aa5e9a36b2..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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1073,6 +1076,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 @@ -1148,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 @@ -1253,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" @@ -1409,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 "" @@ -1864,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 @@ -2228,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 @@ -2747,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 "" @@ -2825,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 @@ -3259,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" @@ -3718,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 "" @@ -4077,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 @@ -4560,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 @@ -5160,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 @@ -5939,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 @@ -6091,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 10dba7640f..44a5207f92 100644 Binary files a/config/locale/en_GB/LC_MESSAGES/app.mo and b/config/locale/en_GB/LC_MESSAGES/app.mo differ diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po index 037d483fa4..29ee258673 100644 --- a/config/locale/en_GB/app.po +++ b/config/locale/en_GB/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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1073,6 +1076,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 @@ -1148,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 @@ -1253,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" @@ -1409,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 "" @@ -1864,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 @@ -2228,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 @@ -2747,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 "" @@ -2825,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 @@ -3259,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" @@ -3718,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 "" @@ -4077,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 @@ -4562,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 @@ -5162,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 @@ -5941,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 @@ -6093,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 790f499179..861e3c45fa 100644 Binary files a/config/locale/en_US/LC_MESSAGES/app.mo and b/config/locale/en_US/LC_MESSAGES/app.mo differ diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po index 38ada31519..3073707402 100644 --- a/config/locale/en_US/app.po +++ b/config/locale/en_US/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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1077,6 +1080,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 @@ -1152,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 @@ -1257,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" @@ -1413,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 "" @@ -1868,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 @@ -2232,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 @@ -2765,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 "" @@ -2843,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 @@ -3279,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" @@ -3752,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)" @@ -4111,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 @@ -4609,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 @@ -5227,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 @@ -6030,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 @@ -6188,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 da5bb85252..8efd84aaa6 100644 Binary files a/config/locale/es/LC_MESSAGES/app.mo and b/config/locale/es/LC_MESSAGES/app.mo differ diff --git a/config/locale/es/app.po b/config/locale/es/app.po index a7b3ef820d..93de083a58 100644 --- a/config/locale/es/app.po +++ b/config/locale/es/app.po @@ -1,14 +1,14 @@ -# Spanish 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. +# 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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1129,6 +1132,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 @@ -1204,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 @@ -1309,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" @@ -1475,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" @@ -1946,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 @@ -2329,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" @@ -2337,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" @@ -2906,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" @@ -2983,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..." @@ -3437,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" @@ -3955,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" @@ -3973,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" @@ -4333,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" @@ -4349,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" @@ -4875,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" @@ -5557,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." @@ -6510,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" @@ -6680,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 e44d9f2676..f0173db0e4 100644 Binary files a/config/locale/fi/LC_MESSAGES/app.mo and b/config/locale/fi/LC_MESSAGES/app.mo differ diff --git a/config/locale/fi/app.po b/config/locale/fi/app.po index 8da5834c61..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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1117,6 +1120,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 @@ -1193,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 @@ -1300,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" @@ -1462,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" @@ -1934,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 @@ -2316,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" @@ -2888,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" @@ -2966,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 ..." @@ -3417,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" @@ -3930,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" @@ -3948,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" @@ -4307,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" @@ -4324,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" @@ -4650,7 +4669,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})" @@ -4847,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" @@ -5527,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" @@ -6460,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" @@ -6630,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 8e0eef7271..d4f06e8c1a 100644 Binary files a/config/locale/fr_CA/LC_MESSAGES/app.mo and b/config/locale/fr_CA/LC_MESSAGES/app.mo differ diff --git a/config/locale/fr_CA/app.po b/config/locale/fr_CA/app.po index b19f98dddc..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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1126,6 +1129,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 @@ -1201,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 @@ -1310,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" @@ -1472,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" @@ -1948,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 @@ -2334,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" @@ -2342,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" @@ -2913,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" @@ -2990,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 "" @@ -3447,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" @@ -3971,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" @@ -3989,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" @@ -4352,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" @@ -4368,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" @@ -4889,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" @@ -5560,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" @@ -6464,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" @@ -6637,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 c15ef247c3..55223c6a93 100644 Binary files a/config/locale/fr_FR/LC_MESSAGES/app.mo and b/config/locale/fr_FR/LC_MESSAGES/app.mo differ diff --git a/config/locale/fr_FR/app.po b/config/locale/fr_FR/app.po index 1081ea6372..139a0b1eef 100644 --- a/config/locale/fr_FR/app.po +++ b/config/locale/fr_FR/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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1136,6 +1139,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 "Examiner les plans organisationnels" + #: ../../app/helpers/plans_helper.rb:8 #: ../../app/views/paginable/plans/_index.html.erb:8 #: ../../app/views/paginable/plans/_org_admin.html.erb:21 @@ -1211,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 @@ -1316,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" @@ -1483,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" @@ -1728,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 @@ -1954,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 @@ -2339,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" @@ -2916,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" @@ -2993,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..." @@ -3451,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" @@ -3973,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" @@ -3991,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" @@ -4349,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" @@ -4365,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" @@ -4888,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" @@ -5132,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" @@ -5244,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}" @@ -5573,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" @@ -6479,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 "" @@ -6569,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" @@ -6739,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 d1830d69d1..8f2969b89a 100644 Binary files a/config/locale/pt_BR/LC_MESSAGES/app.mo and b/config/locale/pt_BR/LC_MESSAGES/app.mo differ diff --git a/config/locale/pt_BR/app.po b/config/locale/pt_BR/app.po index 986a3f5d11..aea40ecce0 100644 --- a/config/locale/pt_BR/app.po +++ b/config/locale/pt_BR/app.po @@ -1,14 +1,14 @@ -# Portuguese 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. +# 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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1124,6 +1127,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 @@ -1199,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 @@ -1304,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" @@ -1470,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" @@ -1938,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 @@ -2321,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" @@ -2329,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" @@ -2896,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" @@ -2973,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..." @@ -3428,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" @@ -3941,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" @@ -3959,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" @@ -4319,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" @@ -4336,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" @@ -4859,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" @@ -5531,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" @@ -6483,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" @@ -6651,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 30bf1e1fd7..ae761af459 100644 Binary files a/config/locale/sv_FI/LC_MESSAGES/app.mo and b/config/locale/sv_FI/LC_MESSAGES/app.mo differ diff --git a/config/locale/sv_FI/app.po b/config/locale/sv_FI/app.po index b44c0fa5f2..3144e97409 100644 --- a/config/locale/sv_FI/app.po +++ b/config/locale/sv_FI/app.po @@ -1,14 +1,14 @@ -# Swedish 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. +# 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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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:" @@ -1115,6 +1118,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 @@ -1190,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 @@ -1295,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" @@ -1461,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" @@ -1928,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 @@ -2309,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" @@ -2317,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" @@ -2881,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" @@ -2958,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..." @@ -3410,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" @@ -3919,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" @@ -3937,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)" @@ -4295,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" @@ -4312,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" @@ -4830,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" @@ -5497,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" @@ -6434,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" @@ -6603,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 4d25493f02..429ea4cdb2 100644 Binary files a/config/locale/tr_TR/LC_MESSAGES/app.mo and b/config/locale/tr_TR/LC_MESSAGES/app.mo differ diff --git a/config/locale/tr_TR/app.po b/config/locale/tr_TR/app.po index 940626566f..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-11-30 14:11-0500\n" -"PO-Revision-Date: 2022-11-30 20:11+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" @@ -136,7 +135,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 +183,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 +437,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 @@ -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 @@ -542,7 +541,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 @@ -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}" @@ -627,11 +626,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 +675,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 +707,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 +764,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 +797,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 +808,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" @@ -912,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" @@ -981,7 +988,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 " @@ -1008,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:" @@ -1107,6 +1114,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 @@ -1182,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 @@ -1287,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 "" +msgstr "Başlık:" -#: ../../app/models/concerns/exportable_plan.rb:143 +#: ../../app/models/concerns/exportable_plan.rb:174 msgid "%{title}" -msgstr "" +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 "" +msgstr "Baş araştırmacı:" -#: ../../app/models/concerns/exportable_plan.rb:151 +#: ../../app/models/concerns/exportable_plan.rb:182 msgid "%{investigation}" -msgstr "" +msgstr "%{investigation}" -#: ../../app/models/concerns/exportable_plan.rb:154 +#: ../../app/models/concerns/exportable_plan.rb:185 msgid "Date Manager: " -msgstr "" +msgstr "Tarih Yöneticisi:" -#: ../../app/models/concerns/exportable_plan.rb:155 +#: ../../app/models/concerns/exportable_plan.rb:186 msgid "%{data_curation}" -msgstr "" +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 "" +msgstr "Proje Yöneticisi:" -#: ../../app/models/concerns/exportable_plan.rb:158 +#: ../../app/models/concerns/exportable_plan.rb:189 msgid "%{pa}" -msgstr "" +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 "" +msgstr "katkıda bulunan:" -#: ../../app/models/concerns/exportable_plan.rb:161 +#: ../../app/models/concerns/exportable_plan.rb:192 msgid "%{other}" -msgstr "" +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" @@ -1449,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ı" @@ -1481,15 +1496,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 +1525,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 +1673,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 +1705,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 +1719,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 +1731,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 +1774,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" @@ -1916,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 @@ -2301,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" @@ -2877,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" @@ -2954,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..." @@ -3045,37 +3060,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?" @@ -3407,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" @@ -3917,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" @@ -3935,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 "" +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" @@ -4292,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" @@ -4309,25 +4324,33 @@ 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" #: ../../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 +4499,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 +4535,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 +4646,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 +4701,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 +4723,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 +4759,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 +4779,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 +4798,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." @@ -4824,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" @@ -5025,6 +5052,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 +5062,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 +5077,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 +5178,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 +5311,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 +5321,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 +5365,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 @@ -5486,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" @@ -5518,6 +5562,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 +5724,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 +5828,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 +5894,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 +6205,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 +6226,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 +6381,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 +6423,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 "" @@ -6376,22 +6473,22 @@ msgstr "" msgid "Hello %{recipient_name}," msgstr "Merhaba %{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 "Ş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" @@ -6544,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 bf0d1e74e9..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: 1669835468 +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: 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') 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? 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"