From: Andy Allan Date: Sun, 22 Dec 2019 10:21:14 +0000 (+0000) Subject: Merge pull request #2464 from hikemaniac/fix-comment-textarea X-Git-Tag: live~3397 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/281d7992f857e7e7c64947a06470898c35035bb6?hp=75d09e2233632be708da314496f8cd44fc6c0c75 Merge pull request #2464 from hikemaniac/fix-comment-textarea Improve textarea behaviour --- diff --git a/.erb-lint.yml b/.erb-lint.yml index ca95fb0d7..7737aee06 100644 --- a/.erb-lint.yml +++ b/.erb-lint.yml @@ -10,6 +10,8 @@ linters: - .rubocop.yml Layout/InitialIndentation: Enabled: false + Layout/LineLength: + Enabled: false Layout/TrailingEmptyLines: Enabled: false Layout/TrailingWhitespace: @@ -18,8 +20,6 @@ linters: Enabled: false Style/FrozenStringLiteralComment: Enabled: false - Metrics/LineLength: - Enabled: false Lint/UselessAssignment: Enabled: false Rails/OutputSafety: diff --git a/.rubocop.yml b/.rubocop.yml index c211cc2fd..1ae01086a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -61,6 +61,9 @@ Rails/SkipsModelValidations: Style/BracesAroundHashParameters: EnforcedStyle: context_dependent +Style/Documentation: + Enabled: false + Style/FormatStringToken: EnforcedStyle: template diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 054e10cda..c1923e982 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -6,6 +6,13 @@ # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. +# Offense count: 3338 +# Cop supports --auto-correct. +# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# URISchemes: http, https +Layout/LineLength: + Max: 260 + # Offense count: 35 # Configuration parameters: AllowSafeAssignment. Lint/AssignmentInCondition: @@ -31,6 +38,7 @@ Lint/SuppressedException: Exclude: - 'app/controllers/api/amf_controller.rb' - 'app/controllers/users_controller.rb' + - 'app/controllers/site_controller.rb' # Offense count: 701 Metrics/AbcSize: @@ -173,10 +181,6 @@ Style/AsciiComments: Exclude: - 'test/models/message_test.rb' -# Offense count: 263 -Style/Documentation: - Enabled: false - # Offense count: 27 # Configuration parameters: EnforcedStyle. # SupportedStyles: annotated, template, unannotated @@ -208,10 +212,3 @@ Style/IfUnlessModifier: # Configuration parameters: Strict. Style/NumericLiterals: MinDigits: 11 - -# Offense count: 3338 -# Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. -# URISchemes: http, https -Metrics/LineLength: - Max: 307 diff --git a/Gemfile b/Gemfile index 983bf9f92..60c155459 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.2" +gem "rails", "6.0.2.1" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -43,6 +43,7 @@ gem "image_optim_rails" gem "actionpack-page_caching", ">= 1.2.0" gem "active_record_union" gem "activerecord-import" +gem "bootstrap", "~> 4.3.1" gem "cancancan" gem "composite_primary_keys", "~> 12.0.0" gem "config" diff --git a/Gemfile.lock b/Gemfile.lock index 0c1707be3..3ea9cd6fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,62 +4,62 @@ GEM SystemTimer (1.2.3) aasm (5.0.6) concurrent-ruby (~> 1.0) - actioncable (6.0.2) - actionpack (= 6.0.2) + actioncable (6.0.2.1) + actionpack (= 6.0.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.2) - actionpack (= 6.0.2) - activejob (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + actionmailbox (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) mail (>= 2.7.1) - actionmailer (6.0.2) - actionpack (= 6.0.2) - actionview (= 6.0.2) - activejob (= 6.0.2) + actionmailer (6.0.2.1) + actionpack (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.2) - actionview (= 6.0.2) - activesupport (= 6.0.2) - rack (~> 2.0) + actionpack (6.0.2.1) + actionview (= 6.0.2.1) + activesupport (= 6.0.2.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-page_caching (1.2.0) actionpack (>= 5.0.0) - actiontext (6.0.2) - actionpack (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + actiontext (6.0.2.1) + actionpack (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) nokogiri (>= 1.8.5) - actionview (6.0.2) - activesupport (= 6.0.2) + actionview (6.0.2.1) + activesupport (= 6.0.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (6.0.2) - activesupport (= 6.0.2) + activejob (6.0.2.1) + activesupport (= 6.0.2.1) globalid (>= 0.3.6) - activemodel (6.0.2) - activesupport (= 6.0.2) - activerecord (6.0.2) - activemodel (= 6.0.2) - activesupport (= 6.0.2) + activemodel (6.0.2.1) + activesupport (= 6.0.2.1) + activerecord (6.0.2.1) + activemodel (= 6.0.2.1) + activesupport (= 6.0.2.1) activerecord-import (1.0.3) activerecord (>= 3.2) - activestorage (6.0.2) - actionpack (= 6.0.2) - activejob (= 6.0.2) - activerecord (= 6.0.2) + activestorage (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) marcel (~> 0.3.1) - activesupport (6.0.2) + activesupport (6.0.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -74,8 +74,8 @@ GEM autoprefixer-rails (9.7.3) execjs aws-eventstream (1.0.3) - aws-partitions (1.254.0) - aws-sdk-core (3.85.1) + aws-partitions (1.257.0) + aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -83,7 +83,7 @@ GEM aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.59.0) + aws-sdk-s3 (1.60.0) aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -106,6 +106,10 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.4.5) msgpack (~> 1.0) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) browser (2.7.1) builder (3.2.4) bzip2-ffi (1.0.0) @@ -172,11 +176,11 @@ GEM dry-initializer (~> 3.0) dry-logic (~> 1.0) dry-types (~> 1.2) - dry-types (1.2.1) + dry-types (1.2.2) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.2, >= 0.2.2) + dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) dynamic_form (1.1.4) @@ -319,13 +323,14 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) + popper_js (1.14.5) progress (3.5.2) psych (3.1.0) public_suffix (4.0.1) puma (3.12.2) quad_tile (1.0.1) r2 (0.2.7) - rack (2.0.7) + rack (2.0.8) rack-cors (1.1.0) rack (>= 2.0.0) rack-openid (1.3.1) @@ -334,20 +339,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - rails (6.0.2) - actioncable (= 6.0.2) - actionmailbox (= 6.0.2) - actionmailer (= 6.0.2) - actionpack (= 6.0.2) - actiontext (= 6.0.2) - actionview (= 6.0.2) - activejob (= 6.0.2) - activemodel (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + rails (6.0.2.1) + actioncable (= 6.0.2.1) + actionmailbox (= 6.0.2.1) + actionmailer (= 6.0.2.1) + actionpack (= 6.0.2.1) + actiontext (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) + activemodel (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) bundler (>= 1.3.0) - railties (= 6.0.2) + railties (= 6.0.2.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -361,9 +366,9 @@ GEM rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (6.0.2) - actionpack (= 6.0.2) - activesupport (= 6.0.2) + railties (6.0.2.1) + actionpack (= 6.0.2.1) + activesupport (= 6.0.2.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -378,7 +383,7 @@ GEM rinku (2.0.6) rotp (5.1.0) addressable (~> 2.5) - rubocop (0.77.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -423,11 +428,11 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.5.0) + strong_migrations (0.5.1) activerecord (>= 5) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) tins (1.22.2) @@ -466,6 +471,7 @@ DEPENDENCIES bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.4.2) + bootstrap (~> 4.3.1) browser bzip2-ffi cancancan @@ -516,7 +522,7 @@ DEPENDENCIES r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 6.0.2) + rails (= 6.0.2.1) rails-controller-testing rails-i18n (~> 4.0.0) rinku (>= 2.0.6) diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss new file mode 100644 index 000000000..0cbec1a27 --- /dev/null +++ b/app/assets/stylesheets/_bootstrap-custom.scss @@ -0,0 +1,44 @@ +/*! + * Bootstrap v4.3.1 (https://getbootstrap.com/) + * Copyright 2011-2019 The Bootstrap Authors + * Copyright 2011-2019 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +@import "bootstrap/functions"; +@import "bootstrap/variables"; +@import "bootstrap/mixins"; +@import "bootstrap/root"; +@import "bootstrap/reboot"; +@import "bootstrap/type"; +// @import "bootstrap/images"; +// @import "bootstrap/code"; +// @import "bootstrap/grid"; +// @import "bootstrap/tables"; +// @import "bootstrap/forms"; +// @import "bootstrap/buttons"; +// @import "bootstrap/transitions"; +// @import "bootstrap/dropdown"; +// @import "bootstrap/button-group"; +// @import "bootstrap/input-group"; +// @import "bootstrap/custom-forms"; +// @import "bootstrap/nav"; +// @import "bootstrap/navbar"; +@import "bootstrap/card"; +// @import "bootstrap/breadcrumb"; +// @import "bootstrap/pagination"; +// @import "bootstrap/badge"; +// @import "bootstrap/jumbotron"; +// @import "bootstrap/alert"; +// @import "bootstrap/progress"; +// @import "bootstrap/media"; +// @import "bootstrap/list-group"; +// @import "bootstrap/close"; +// @import "bootstrap/toasts"; +// @import "bootstrap/modal"; +// @import "bootstrap/tooltip"; +// @import "bootstrap/popover"; +// @import "bootstrap/carousel"; +// @import "bootstrap/spinners"; +@import "bootstrap/utilities"; +// @import "bootstrap/print"; diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap-tooltips.css similarity index 100% rename from app/assets/stylesheets/bootstrap.css rename to app/assets/stylesheets/bootstrap-tooltips.css diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index e8db49b7a..c3b7dca67 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,4 +1,5 @@ @import "parameters"; +@import "bootstrap-custom"; /* Styles common to large and small screens */ @@ -108,23 +109,6 @@ body { height: 100%; } -h1, h2, h3 { - font-weight: 600; - line-height: 1.2; -} - -h4, h5 { - font-weight: 500; -} - -h1 { - font-size: 18px; -} - -h2, h3 { - font-size: 16px; -} - p > img { width: auto; max-width: 100%; @@ -280,12 +264,19 @@ header { } h1 { + font-size: 18px; + font-weight: 600; + line-height: 1.2; margin: 0; padding-top: 15px; a { color: #000; } + + a:hover { + color: #000; + } } } diff --git a/app/assets/stylesheets/screen-ltr.css b/app/assets/stylesheets/screen-ltr.css index d074f6881..ff93bc5a5 100644 --- a/app/assets/stylesheets/screen-ltr.css +++ b/app/assets/stylesheets/screen-ltr.css @@ -1,5 +1,5 @@ /* *= require ltr/common - *= require bootstrap + *= require bootstrap-tooltips *= require ltr/small */ diff --git a/app/assets/stylesheets/screen-rtl.css b/app/assets/stylesheets/screen-rtl.css index 18d3d7c5a..d5cd9f10d 100644 --- a/app/assets/stylesheets/screen-rtl.css +++ b/app/assets/stylesheets/screen-rtl.css @@ -1,5 +1,5 @@ /* *= require rtl/common - *= require bootstrap + *= require bootstrap-tooltips *= require rtl/small */ diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 57ac07501..3a69eed12 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -77,26 +77,30 @@ class SiteController < ApplicationController ) end - if params[:node] - bbox = Node.find(params[:node]).bbox.to_unscaled - @lat = bbox.centre_lat - @lon = bbox.centre_lon - @zoom = 18 - elsif params[:way] - bbox = Way.find(params[:way]).bbox.to_unscaled - @lat = bbox.centre_lat - @lon = bbox.centre_lon - @zoom = 17 - elsif params[:note] - note = Note.find(params[:note]) - @lat = note.lat - @lon = note.lon - @zoom = 17 - elsif params[:gpx] && current_user - trace = Trace.visible_to(current_user).find(params[:gpx]) - @lat = trace.latitude - @lon = trace.longitude - @zoom = 16 + begin + if params[:node] + bbox = Node.visible.find(params[:node]).bbox.to_unscaled + @lat = bbox.centre_lat + @lon = bbox.centre_lon + @zoom = 18 + elsif params[:way] + bbox = Way.visible.find(params[:way]).bbox.to_unscaled + @lat = bbox.centre_lat + @lon = bbox.centre_lon + @zoom = 17 + elsif params[:note] + note = Note.visible.find(params[:note]) + @lat = note.lat + @lon = note.lon + @zoom = 17 + elsif params[:gpx] && current_user + trace = Trace.visible_to(current_user).find(params[:gpx]) + @lat = trace.latitude + @lon = trace.longitude + @zoom = 16 + end + rescue ActiveRecord::RecordNotFound + # don't try and derive a location from a missing/deleted object end end diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index f68dfbe2e..2389598bc 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -12,7 +12,7 @@
- <%= note_event("open", @note.created_at, @note.author) %> + <%= note_event("opened", @note.created_at, @note.author) %> <% if @note.status == "closed" %>
<%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %> diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb index dcb8142bd..88cc3f58e 100644 --- a/app/views/site/help.html.erb +++ b/app/views/site/help.html.erb @@ -4,15 +4,29 @@

<%= t ".introduction" %>

-<% %w[welcome beginners_guide help mailing_lists forums irc switch2osm welcomemat wiki].each do |site| %> - <% unless site == 'welcome' && !current_user %> -
-

- - <%= t ".#{site}.title" %> - -

-

<%= t ".#{site}.description" %>

+<% sites = %w[beginners_guide help mailing_lists forums irc switch2osm welcomemat wiki] %> +<% sites.prepend("welcome") if current_user %> + +<% sites.in_groups_of(3, false) do |group| %> +
+ <% group.each do |site| %> +
+
+
+ + <%= t ".#{site}.title" %> + +
+

<%= t ".#{site}.description" %>

+
+
+ + + <%= t ".#{site}.url" %> + + +
+
+ <% end %>
- <% end %> <% end %> diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 6e0930017..266e41cbb 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -42,6 +42,12 @@ I18n.fallbacks.map("no" => "nb") I18n.enforce_available_locales = false +if Rails.env.test? + I18n.exception_handler = proc do |exception| + raise exception.to_exception + end +end + Rails.configuration.after_initialize do I18n.available_locales end diff --git a/config/locales/af.yml b/config/locales/af.yml index 03b4a9d57..3579b1c53 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -215,7 +215,7 @@ af: title: 'Nota: %{id}' new_note: Nuwe Nota description: Beskrywing - open_by_anonymous: Anoniem het %{when} ago + opened_by_anonymous: Anoniem het %{when} ago geskep commented_by: Kommentaar deur %{user} %{when} ago commented_by_anonymous: Kommentaar deur anoniem %{when} @@ -1223,7 +1223,7 @@ af: tagged_with: gemerk met %{tags} upload_trace: Laai 'n GPS-spoor op see_all_traces: Wys alle spore - delete: + destroy: scheduled_for_deletion: Spoor is vir verwydering geoormerk make_public: made_public: Spoor is openbaar gemaak diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 495c79cea..3d1e46843 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -1024,7 +1024,7 @@ aln: public_traces_from: Të dhana publike të GPS-it pej %{user} tagged_with: ' e etikume me %{tags}' see_all_traces: Kshyri kejt të dhanat - delete: + destroy: scheduled_for_deletion: Gjurma u parapa për fshirje make_public: made_public: Gjurma u ba publike diff --git a/config/locales/ar.yml b/config/locales/ar.yml index ae4e7c05d..886e9c649 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -326,8 +326,9 @@ ar: open_title: 'ملاحظة لم يتم حلها: %{note_name}' closed_title: 'ملاحظات محلولة: %{note_name}' hidden_title: 'ملاحظة مخفيّة #%{note_name}' - open_by: أنشأه المستخدم %{user} %{when} - open_by_anonymous: أنشأه مستخدم مجهول %{when} + opened_by: أنشأه المستخدم %{user} %{when} + opened_by_anonymous: أنشأه مستخدم مجهول %{when} + commented_by: تعليق من %{user} %{when} commented_by_anonymous: تعليق من مجهول %{when} closed_by: تم الحل بواسطة %{user} %{when} @@ -1945,7 +1946,7 @@ ar: upload_trace: حمل أثر see_all_traces: شاهد كل الآثار see_my_traces: شاهد كل آثاري - delete: + destroy: scheduled_for_deletion: تم جدولة الأثر للحذف make_public: made_public: تم جعل الأثر عمومي diff --git a/config/locales/arz.yml b/config/locales/arz.yml index b9190caab..cf7e57cca 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -848,7 +848,7 @@ arz: public_traces_from: آثار جى بى إس عموميه من %{user} tagged_with: ' موسوم مع %{tags}' see_all_traces: شاهد كل الآثار - delete: + destroy: scheduled_for_deletion: تم جدوله الأثر للحذف make_public: made_public: تم جعل الأثر عمومي diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 757b8682b..1f88dcd99 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -293,8 +293,8 @@ ast: open_title: 'Nota ensin resolver #%{note_name}' closed_title: 'Nota resuelta #%{note_name}' hidden_title: 'Nota tapecida #%{note_name}' - open_by: Creáu por %{user} %{when} - open_by_anonymous: Creáu por un anónimu %{when} + opened_by: Creáu por %{user} %{when} + opened_by_anonymous: Creáu por un anónimu %{when} commented_by: Comentariu de %{user} %{when} commented_by_anonymous: Comentariu d'un anónimu %{when} closed_by: Resuelto por %{user} %{when} @@ -1917,7 +1917,7 @@ ast: upload_trace: Xubir una traza see_all_traces: Ver toles traces see_my_traces: Ver les mios traces - delete: + destroy: scheduled_for_deletion: Traza marcada pa desaniciar make_public: made_public: Traza fecha pública diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 646655b26..019fc49b0 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1199,7 +1199,7 @@ be-Tarask: tagged_with: ' пазначаныя %{tags}' upload_trace: Загрузіць трэк see_all_traces: Паказаць усе трэкі - delete: + destroy: scheduled_for_deletion: Трэк заплянаваны на выдаленьне make_public: made_public: Трэк зроблены публічным diff --git a/config/locales/be.yml b/config/locales/be.yml index d02caab33..d4e985732 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -254,8 +254,8 @@ be: open_title: 'Нявырашаная заўвага #%{note_name}' closed_title: 'Вырашаная заўвага #%{note_name}' hidden_title: 'Схаваная заўвага #%{note_name}' - open_by: Створана %{user} %{when} таму - open_by_anonymous: Створана ананімным карыстальнікам %{when} + opened_by: Створана %{user} %{when} таму + opened_by_anonymous: Створана ананімным карыстальнікам %{when} таму commented_by: Каментар ад %{user} %{when} таму commented_by_anonymous: Ананінмы каментар %{when} @@ -1881,7 +1881,7 @@ be: upload_trace: Адаслаць GPS-след see_all_traces: Паглядзець усе сляды see_my_traces: Паглядзець мае сляды - delete: + destroy: scheduled_for_deletion: След запланаваны на выдаленне make_public: made_public: След апублікаваны diff --git a/config/locales/bg.yml b/config/locales/bg.yml index f52404543..88e282ee3 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -280,8 +280,8 @@ bg: open_title: Нерешена бележка № %{note_name} closed_title: Решена бележка № %{note_name} hidden_title: Скрита бележка № %{note_name} - open_by: Създадена от %{user} %{when} - open_by_anonymous: Създадена от анонимен %{when} + opened_by: Създадена от %{user} %{when} + opened_by_anonymous: Създадена от анонимен %{when} commented_by: Коментар от %{user} %{when} commented_by_anonymous: Коментар от анонимен %{when} closed_by: Решена от %{user} %{when} diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 935bdbf2d..103de7e1b 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -281,8 +281,8 @@ bn: open_title: 'অমীমাংসিত টীকা #%{note_name}' closed_title: 'মীমাংসিত টীকা #%{note_name}' hidden_title: 'লুকানো টীকা #%{note_name}' - open_by: '%{user} কর্তৃক %{when} তৈরিকৃত' - open_by_anonymous: বেনামী ব্যবহারকারী কর্তৃক %{when} + opened_by: '%{user} কর্তৃক %{when} তৈরিকৃত' + opened_by_anonymous: বেনামী ব্যবহারকারী কর্তৃক %{when} তৈরিকৃত commented_by: '%{user} কর্তৃক %{when} করা মন্তব্য' diff --git a/config/locales/br.yml b/config/locales/br.yml index 681ac3ce2..bbcd9a524 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -265,8 +265,8 @@ br: open_title: 'Notenn n''eo ket diskoulmet : %{note_name}' closed_title: 'Notenn diskoulmet : %{note_name}' hidden_title: 'Notenn kuzhet #%{note_name}' - open_by: Krouet gant %{user} %{when} zo - open_by_anonymous: Krouet gant un den dianav %{when} + opened_by: Krouet gant %{user} %{when} zo + opened_by_anonymous: Krouet gant un den dianav %{when} zo commented_by: Addispleg gant %{user} %{when} zo commented_by_anonymous: Addispleg gant un den dianv %{when} @@ -1900,7 +1900,7 @@ br: upload_trace: Kas ur roud see_all_traces: Gwelet an holl roudoù see_my_traces: Gwelet ma roudennoù - delete: + destroy: scheduled_for_deletion: Roudenn da vezañ dilamet make_public: made_public: Roudenn lakaet da vezañ foran diff --git a/config/locales/bs.yml b/config/locales/bs.yml index a02492ee7..8677cbabd 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1357,7 +1357,7 @@ bs: stranici. upload_trace: Poslati GPS trasu see_all_traces: Pogledati sve trase - delete: + destroy: scheduled_for_deletion: Trasa raspoređena za brisanje make_public: made_public: Trasa za javnost diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 3b2351e05..695b82c22 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -320,8 +320,8 @@ ca: open_title: 'Nota no resolta: #%{note_name}' closed_title: 'Nota resolta #%{note_name}' hidden_title: 'Nota oculta #%{note_name}' - open_by: Creat per %{user} a %{when} - open_by_anonymous: Creat per un anònim a %{when} + opened_by: Creat per %{user} a %{when} + opened_by_anonymous: Creat per un anònim a %{when} commented_by: Comentari de %{user} a %{when} commented_by_anonymous: Comentari d'un anònim a %{when} closed_by: Resolt per %{user} a %{when} @@ -1403,7 +1403,7 @@ ca: site: about: next: Següent - copyright_html: ©Col·laboradors d'
OpenStreetMap + copyright_html: © Col·laboradors
d’OpenStreetMap used_by: '%{name} proporciona dades cartogràfiques a milers de llocs web, aplicacions per a mòbils i dispositius' lede_text: OpenStreetMap està fet per una comunitat de cartògrafs que aporten @@ -1955,7 +1955,7 @@ ca: upload_trace: Puja una traça see_all_traces: Mostra totes les traces see_my_traces: Veure les meves traces - delete: + destroy: scheduled_for_deletion: Traça programada per a ser suprimida make_public: made_public: Traça feta pública @@ -2161,32 +2161,29 @@ ca: about: header: Lliure i editable html: |- -

A diferència d'altres mapes, OpenStreetMap ha estat completament creat per gent com vostè - i està obert a qualsevol modificació, actualització, descàrrega i utilització.

-

Registreu-vos i començeu a contribuir. Us enviarem un e-mail per confirmar el vostre compte.

+

A diferència d'altres mapes, OpenStreetMap el crea gent com vós i qualsevol persona el pot modificar, actualitzar, descarregar i usar.

+

Registreu-vos i comenceu a col·laborar. Us enviarem un e-mail per confirmar el vostre compte.

license_agreement: Quan confirmeu el compte, heu d'acceptar els termes - de col·laboracio. + de col·laboració. email address: 'Adreça de correu:' confirm email address: 'Confirmeu l''adreça de correu electrònic:' not displayed publicly: La vostra adreça no es mostrarà públicament (vegeu la - nostra política de privadesa + nostra política de privadesa per a més informació) - display name: 'Nom visible:' - display name description: El nom d'usuari que es motrarà públicament. El podeu + display name: 'Nom que es mostrarà:' + display name description: El nom d'usuari que es mostrarà públicament. El podeu canviar més endavant a les preferències. external auth: 'Autenticació mitjançant tercers:' password: 'Contrasenya:' confirm password: 'Confirmeu la contrasenya:' - use external auth: Alternativament, inicieu una sessió mitjançant un tercer - auth no password: Amb l'autentificació per tercers no es requereix una contrasenya, - però alguns servidors o eines extres poden encara necessitar una. - continue: Crear un compte - terms accepted: Gràcies per a l'acceptació de les condicions de col. laborador - nou! - terms declined: Lamentem que vostè ha decidit no acceptar els nous termes de - col. laborador. Per a més informació, si us plau vegi aquesta - pàgina de wiki. + use external auth: 'Alternativament, inicieu la sessió mitjançant un tercer:' + auth no password: Amb l'autenticació per tercers cal contrasenya, però alguns + servidors o eines extres sí que en poden demanar una. + continue: Creeu un compte + terms accepted: Gràcies per acceptar els nous termes de col·laboració. + terms declined: Heu decidit no acceptar els nous termes de col·laboració. Per + a més informació, consulteu aquesta pàgina wiki. terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: Termes @@ -2204,14 +2201,14 @@ ca: de domini públic consider_pd_why: què és això? consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain - guidance: 'Informació per ajudar a entendre aquestes condicions: un resum - llegible humà i algunes traduccions informals' + guidance: 'Informació per ajudar a entendre aquests termes: un resum + llegible per humans i algunes traduccions informals' continue: Continua declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined - decline: Ho rebutjo - you need to accept or decline: Llegiu i després accepteu o rebutgeu els termes - per a nous col·laboradors per continuar. - legale_select: 'Seleccioneu el vostre estat de residència:' + decline: Rebutja + you need to accept or decline: Per a poder continuar, llegiu i després accepteu + o rebutgeu els nous termes de col·laboració . + legale_select: 'País de residència:' legale_names: france: França italy: Itàlia @@ -2219,13 +2216,13 @@ ca: no_such_user: title: Aquest usuari no existeix heading: L'usuari %{user} no existeix - body: No hi ha cap usuari amb el nom %{user}. Comproveu l'ortografia, o potser + body: No hi ha cap usuari amb el nom %{user}. Comproveu l'ortografia; o potser l'enllaç on heu fet clic és incorrecte. deleted: esborrat show: my diary: El meu diari - new diary entry: Nova entrada del diari - my edits: Les meves edicions + new diary entry: entrada de diari nova + my edits: Les meves modificacions my traces: Les meves traces my notes: Les meves notes de mapa my messages: Els meus missatges @@ -2243,25 +2240,25 @@ ca: remove as friend: Deixa l'amistat add as friend: Afegeix com a amic mapper since: 'Cartografiant des de:' - ct status: 'Termes del col·laborador:' + ct status: 'Termes de col·laboració:' ct undecided: No decidit - ct declined: Declinats + ct declined: Rebutjat latest edit: 'Darrer edició fa (%{ago}):' email address: 'Adreça de correu:' created from: 'Creat a partir de:' status: 'Estat:' - spam score: 'Spam Puntuació:' + spam score: 'Puntuació Spam:' description: Descripció user location: Ubicació de l'usuari if set location: Podeu configurar la vostra ubicació a la pàgina %{settings_link} - per veure els usuaris propers a vostè. + per veure usuaris propers. settings_link_text: preferències my friends: Les meves amistats - no friends: No has afegit cap amics encara. + no friends: Encara no has afegit cap amic. km away: '%{count}km de distància' m away: '%{count}m de distància' nearby users: Altres usuaris propers - no nearby users: Encra no hi ha cap altre usuari reconegui cartografiar prop. + no nearby users: Cap usuari manifesta cartografiar a prop. role: administrator: Aquest usuari és administrador moderator: Aquest usuari és moderador @@ -2269,65 +2266,64 @@ ca: administrator: Concedeix accés d'administrador moderator: Concedeix accés de moderador revoke: - administrator: Revocar l'accés d'administrador + administrator: Revoca l'accés d'administrador moderator: Revocar l'accés de moderador block_history: Blocatges actius - moderator_history: Blocatges imposats + moderator_history: Blocatges fets comments: Comentaris create_block: Bloca aquest usuari activate_user: Activa aquest usuari deactivate_user: Desactiva aquest usuari confirm_user: Confirma aquest usuari hide_user: Amaga aquest usuari - unhide_user: No amagar d'aquest usuari + unhide_user: No amaguis aquest usuari delete_user: Suprimeix aquest usuari confirm: Confirma friends_changesets: conjunts de canvis dels vostres amics - friends_diaries: entrades de diari dels amics - nearby_changesets: conjunts de canvis dels usuaris propers - nearby_diaries: entrades de diari dels usuaris propers + friends_diaries: entrades de diari dels vostres amics + nearby_changesets: conjunts de canvis d'usuaris propers + nearby_diaries: entrades de diari d'usuaris propers report: Denuncieu aquest usuari popup: your location: La vostra ubicació - nearby mapper: «Mapador» proper + nearby mapper: Cartògraf proper friend: Amic account: title: Edita el compte my settings: Preferències - current email address: 'Adreça de correu electrònic actual:' + current email address: 'Adreça electrònica actual:' new email address: 'Nova adreça electrònica:' - email never displayed publicly: (no es mostrarà mai en públic) + email never displayed publicly: (no es mostrarà mai públicament) external auth: 'Autenticació externa:' openid: - link: http://wiki.OpenStreetMap.org/wiki/OpenID + link: https://wiki.OpenStreetMap.org/wiki/OpenID link text: què és això? public editing: heading: 'Edició pública:' - enabled: Permès. No anònims i editar les dades. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled: Activades. No anònim i amb permís per editar dades. + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: què és això? - disabled: Impossibilitat i no es pot editar les dades, totes les anteriors - edicions són anònims. - disabled link text: per què no es pot editar? + disabled: Desactivades i sense permís per a editar; les modificacions anteriors + són anònimes. + disabled link text: per què no puc editar? public editing note: heading: Modificació pública - text: Actualment les vostres modificacions estan anònims i la gent no pot - enviar missatges o veure la vostra ubicació. Per mostrar el que editat i - permetre que la gent en contacte amb vostè a través del web, feu clic al - botó de sota. Des de canvi de l'API 0.6, només els usuaris públics pot - editar les dades de mapa. (esbrinar - per què).
  • Adreces de correu electrònic no serà revelada per convertir-se - en públic.
  • Aquesta acció no es pot fer la inversió i els nous usuaris - ara són públics per defecte.
+ text: Actualment, les vostres modificacions són anònimes i la gent no us pot + enviar missatges o veure la vostra ubicació. Per mostrar el que heu editat + i permetre que la gent us pugui contactar a través del web, feu clic al + botó de sota. Des de canvi de l'API 0.6, només els usuaris públics poden + editar les dades de mapa. (sapigueu + per què).
  • La vostra adreça de correu electrònic no serà revelada + quan sigueu usuari públic.
  • Aquesta acció no es pot desfer i tots + els nous usuaris seran públics per defecte.
contributor terms: heading: 'Termes de col·laboració:' - agreed: Que han accedit a les noves condicions de col. laborador. - not yet agreed: Que han no encara s'ha accedit a les noves condicions de col. - laborador. - review link text: Seguiu aquest enllaç pel vostre interès per revisar i acceptar - els termes de col·laborador nou. - agreed_with_pd: També heu declarat que considereu que les vostres modificacions - han d'estar en el domini públic. + agreed: Heu acceptat els nous termes de col·laboració. + not yet agreed: Encara no heu acceptat els nous termes de col·laboració. + review link text: Seguiu aquest enllaç per revisar i acceptar els nous termes + de col·laboració. + agreed_with_pd: També declareu que considereu que les vostres modificacions + són de domini públic. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: què és això? profile description: 'Descripció del perfil:' @@ -2336,7 +2332,7 @@ ca: image: 'Imatge:' gravatar: gravatar: Usa Gravatar - link: http://wiki.openstreetmap.org/wiki/Gravatar + link: https://wiki.openstreetmap.org/wiki/Gravatar link text: què és això? disabled: S'ha inhabilitat Gravatar. enabled: S'ha habilitat que es mostri el vostre Gravatar. diff --git a/config/locales/ce.yml b/config/locales/ce.yml index d51c209a9..3e242b9ac 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -287,8 +287,9 @@ ce: open_title: 'Кечйина йоцу билгало #%{note_name}' closed_title: 'Кечйина билгало #%{note_name}' hidden_title: 'Къайлаяьккхина билгало #%{note_name}' - open_by: Кхоьллина декъашхочо %{user} %{when} хьалха - open_by_anonymous: Кхоьллина цӀе хьулйина декъашхочо %{when} + opened_by: Кхоьллина декъашхочо %{user} %{when} + хьалха + opened_by_anonymous: Кхоьллина цӀе хьулйина декъашхочо %{when} хьалха commented_by: Декъашхочун коммент %{user} %{when} хьалха diff --git a/config/locales/cs.yml b/config/locales/cs.yml index fdab78343..8d57c2608 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -285,8 +285,8 @@ cs: open_title: 'NevyřeÅ¡ená poznámka #%{note_name}' closed_title: 'VyřeÅ¡ená poznámka #%{note_name}' hidden_title: 'Skrytá poznámka #%{note_name}' - open_by: Vytvořil %{user} %{when} - open_by_anonymous: Vytvořil anonym %{when} + opened_by: Vytvořil %{user} %{when} + opened_by_anonymous: Vytvořil anonym %{when} commented_by: %{when} okomentoval %{user} commented_by_anonymous: %{when} okomentoval anonym @@ -1890,7 +1890,7 @@ cs: upload_trace: Nahrát stopu see_all_traces: Zobrazit vÅ¡echny stopy see_my_traces: Zobrazit mé stopy - delete: + destroy: scheduled_for_deletion: Stopa označena ke smazání make_public: made_public: Stopa zveřejněna diff --git a/config/locales/cy.yml b/config/locales/cy.yml index d3c45a017..3a620f41f 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -15,15 +15,27 @@ cy: create: Cadw diary_entry: create: Cyhoeddi + update: Uwchraddio + issue_comment: + create: Ychwanegu sylw message: create: Anfon client_application: create: Cofrestru update: Golygu + redaction: + create: Creu golygiadau + update: Cadw golygiadau trace: create: Uwchlwytho update: Cadw Newidiadau + user_block: + create: Creu bloc + update: Uwchraddio'r bloc activerecord: + errors: + messages: + invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad ebost dilys models: acl: Rhestr Rheoli Mynediad changeset: Changeset @@ -91,6 +103,24 @@ cy: description: Disgrifiad languages: Ieithoedd pass_crypt: Cyfrinair + datetime: + distance_in_words_ago: + about_x_hours: + one: tuag awr yn ôl + other: tua %{count} awr yn ôl + about_x_months: + one: tuag un fis yn ôl + other: tua %{count} mis yn ôl + about_x_years: + one: tuag un blynedd yn ôl + other: tua %{count} blynedd yn ôl ago + almost_x_years: + one: oddeutu un mlynedd yn ôl + other: bron i %{count} blynedd yn ôl + half_a_minute: hanner munud yn ôl + less_than_x_seconds: + one: llai nag eiliad yn ôl + other: llai nag %{count} eiliad yn ôl editor: default: (currently %{name}) diofyn potlatch: @@ -108,6 +138,8 @@ cy: api: notes: comment: + opened_at_html: Creewyd %{when} + opened_at_by_html: Creewyd %{when} gan %{user} commented_at_html: Diweddarwyd %{when} commented_at_by_html: Diweddarwyd %{when}gan %{user} rss: @@ -219,20 +251,17 @@ cy: open_title: '#%{note_name} heb ei ddatrus' closed_title: '#%{note_name} wedi''i ddatrus' hidden_title: Nodyn cudd %{note_name} - open_by: Crëwyd gan %{user} %{when} yn ôl - open_by_anonymous: Crëwyd yn ddienw %{when} yn ôl - commented_by: Sylw gan %{user} %{when} yn ôl - commented_by_anonymous: Sylw yn ddienw %{when} yn - ôl - closed_by: Wedi'i ddatrus gan %{user} %{when} yn + opened_by: Crëwyd gan %{user} %{when} yn ôl + opened_by_anonymous: Crëwyd yn ddienw %{when} yn ôl - closed_by_anonymous: Wedi ei ddatrus gan olygydd heb fewngofnodi %{when} - ago - reopened_by: Gwnaed yn weithredol gan %{user} %{when} - yn ôl - reopened_by_anonymous: Gwnaed yn weithredol gan olygydd heb fewngofnodi %{when} yn ôl - hidden_by: Cuddwyd gan %{user} %{when} yn ôl + commented_by: Sylw gan %{user} %{when} + commented_by_anonymous: Sylw dienw %{when} + closed_by: Wedi'i ddatrus gan %{user} %{when} + closed_by_anonymous: Wedi ei ddatrus gan %{when} + reopened_by: Gwnaed yn weithredol gan %{user} %{when} + reopened_by_anonymous: Gwnaed yn weithredol gan olygydd dienw %{when} + hidden_by: Cuddwyd gan %{user} %{when} + report: Adroddwch am y nodyn hwn query: title: Nodweddion Ymholiad introduction: Cliciwch ar y map i ddarganfod nodweddion gerllaw. @@ -245,11 +274,11 @@ cy: previous: « Blaenorol changeset: anonymous: Dienw - no_edits: (dim newid) + no_edits: (dim golygiadau) view_changeset_details: Dangos y newidiadau changesets: id: ID - saved_at: Cadwyd + saved_at: Cyhoeddwyd user: Defnyddiwr comment: Sylw area: Maes @@ -868,14 +897,18 @@ cy: stationery: Siop Offer Swyddfa supermarket: Archfarchnad tailor: Teiliwr + ticket: Siop Docynau + tobacco: Siop Dybaco toys: Siop Degannau travel_agency: Asiantaeth Deithio + tyres: Siop Teiars + vacant: Siop Wag video: Siop Fideos - wine: Siop Drwyddedig + wine: Siop Win "yes": Siop tourism: alpine_hut: Cwt Mynydd - apartment: Rhandai neu fflatiau + apartment: Fflatiau Gwyliau artwork: Gwaith Celf attraction: Atyniad bed_and_breakfast: Gweldy a Brecwast @@ -926,7 +959,7 @@ cy: level10: Ffin Maesdref description: title: - osm_nominatim: Lleoliad o OpenStreetMap + osm_nominatim: Lleoliad o OpenStreetMap Nominatim geonames: Lleoliad o GeoNames types: @@ -936,6 +969,27 @@ cy: results: no_results: Dim canlyniadau more_results: Mwy o ganlyniadau + issues: + index: + title: Pryderon + select_status: Statws a ddewisiwyd + select_type: Dewisiwch y Math + search: Chwilio + user_not_found: Nid yw'r defnyddiwr yn bodoli + issues_not_found: Nid oes y fath broblemau + status: Statws + reports: Adroddiadau + last_updated: Diweddariad Diwethaf + last_updated_time_html: %{time} + last_updated_time_user_html: %{time} gan %{user} + link_to_reports: Gweld yr Adroddiadau + reports_count: + one: 1 Report + other: '%{count} Adroddiadau' + reported_item: Eitem dan sylw + states: + open: Agor + resolved: Datruswyd layouts: logo: alt_text: Logo OpenStreetMap @@ -1065,6 +1119,7 @@ cy: copyright_html: ©cyfrannwyr
OpenStreetMap local_knowledge_title: Gwybodaeth Leol open_data_title: Data Agored + legal_title: Cyfreithiol partners_title: Partneriaid copyright: foreign: @@ -1087,9 +1142,9 @@ cy: title: Enghraifft o gydnabyddiaeth more_title_html: Darganfod rhagor contributors_title_html: Ein cyfrannwyr - contributors_gb_html: "Y Deyrnas Gyfunol: Cynhwysir data + contributors_gb_html: 'Y Deyrnas Gyfunol: Cynhwysir data a thestun gan yr Arolwg Ordnans; hawlfraint y Goron a hawl cronfa ddata - \n2010-12." + 2010-19.' infringement_title_html: Torrwyd yr hawlfraint index: shortlink: Dolen Fyr @@ -1139,18 +1194,31 @@ cy: title: Cael Cymorth welcome: url: /croeso - title: Croeso i OSM + title: Croeso i OpenStreetMap beginners_guide: title: Llawlyfr Dechreuwyr + description: Canllaw'r gymuned i ddechreuwyr + help: + url: https://help.openstreetmap.org/ + title: Fforwm Cymorth + mailing_lists: + title: Rhestr Gohebiaeth + forums: + title: Fforymau sidebar: search_results: Canlyniadau Chwilio close: Cau search: search: Chwilio + get_directions: Cael cyfeiriadau + get_directions_title: Cael cyfeiriadau rhwng dau bwynt + from: O + to: I where_am_i: Ble mae hwn? where_am_i_title: Disgrifiwch eich lleoliad presennol gan ddefnyddio peiriant chwilio. submit_text: Mynd + reverse_directions_text: Newid y cyfeiriad key: table: entry: @@ -1240,6 +1308,8 @@ cy: title: Beth sydd ar y Map basic_terms: title: Termau syml mapio + rules: + title: Rheolau! questions: title: Unrhyw gwestiwn? start_mapping: Dechrau Mapio @@ -1284,7 +1354,9 @@ cy: trace_paging_nav: showing_page: Tudalen %{page} trace: - count_points: '%{count} pwynt' + count_points: + one: 1 point + other: '%{count} pwynt' more: mwy view_map: Gweld Map edit: golygu diff --git a/config/locales/da.yml b/config/locales/da.yml index 94890f346..2247bd900 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -315,8 +315,8 @@ da: open_title: 'Uløst bemærkning #%{note_name}' closed_title: 'Løst bemærkning #%{note_name}' hidden_title: 'Skjult bemærkning #%{note_name}' - open_by: Oprettet af %{user} %{when} - open_by_anonymous: Oprettet af anonym %{when} + opened_by: Oprettet af %{user} %{when} + opened_by_anonymous: Oprettet af anonym %{when} commented_by: Kommentar fra %{user} %{when} commented_by_anonymous: Kommentar fra anonym %{when} closed_by: Løst af %{user} %{when} @@ -1950,7 +1950,7 @@ da: upload_trace: Upload et spor see_all_traces: Vis alle spor see_my_traces: Se mine spor - delete: + destroy: scheduled_for_deletion: Spor planlagt til at blive slettet make_public: made_public: Spor gjort offentlig diff --git a/config/locales/de.yml b/config/locales/de.yml index ed36779ae..e28ff0e90 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -352,8 +352,8 @@ de: open_title: Unerledigter Kartenfehler Nr. %{note_name} closed_title: Erledigter Kartenfehler Nr. %{note_name} hidden_title: Versteckter Kartenfehler Nr. %{note_name} - open_by: Erstellt von %{user} %{when} - open_by_anonymous: Erstellt von Anonym %{when} + opened_by: Erstellt von %{user} %{when} + opened_by_anonymous: Erstellt von Anonym %{when} commented_by: Kommentar von %{user} %{when} commented_by_anonymous: Kommentar von Anonym %{when} closed_by: Erledigt von %{user} %{when} @@ -2014,7 +2014,7 @@ de: upload_trace: Lade einen Track hoch see_all_traces: Alle Tracks ansehen see_my_traces: Meine Tracks ansehen - delete: + destroy: scheduled_for_deletion: Für die Löschung vorgesehener Track make_public: made_public: Track (öffentlich) diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index ca0aa6598..c93e916d2 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -234,8 +234,8 @@ dsb: open_title: 'Njedocynjona pokazka #%{note_name}' closed_title: 'Docynjona pokazka #%{note_name}' hidden_title: 'Schowana pokazka #%{note_name}' - open_by: Napórany wót %{user} pśed %{when} - open_by_anonymous: Napórany wót anonymnego pśed + opened_by: Napórany wót %{user} pśed %{when} + opened_by_anonymous: Napórany wót anonymnego pśed %{when} commented_by: Komentar wót %{user} pśed %{when} commented_by_anonymous: Komentar wót anonymnego pśed @@ -1500,7 +1500,7 @@ dsb: boku. upload_trace: Slěd nagraś see_all_traces: Wšykne slědy pokazaś - delete: + destroy: scheduled_for_deletion: Za wulašowanje pśedwiźona cera make_public: made_public: Wózjawjona cera diff --git a/config/locales/el.yml b/config/locales/el.yml index f45f37695..3d9c74887 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -321,8 +321,8 @@ el: open_title: 'Ανοικτή σημείωση #%{note_name}' closed_title: 'Επιλυμένη σημείωση: #%{note_name}' hidden_title: 'Κρυφή σημείωση #%{note_name}' - open_by: Δημιουργήθηκε από τον %{user} %{when} - open_by_anonymous: Δημιουργήθηκε από ανώνυμο χρήστη %{when} + opened_by: Δημιουργήθηκε από τον %{user} %{when} + opened_by_anonymous: Δημιουργήθηκε από ανώνυμο χρήστη %{when} commented_by: Σχόλιο από τον %{user} %{when} commented_by_anonymous: Σχόλιο από ανώνυμο χρήστη %{when} closed_by: Επιλύθηκε από τον %{user} %{when} @@ -1962,7 +1962,7 @@ el: upload_trace: Αποστολή ίχνους see_all_traces: Δείτε όλα τα ίχνη see_my_traces: Δες τα ίχνη μου - delete: + destroy: scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή make_public: made_public: Το ίχνος έγινε δημόσιο diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index a5157a12d..aac204a73 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -39,6 +39,9 @@ en-GB: create: Save diary_entry: create: Publish + update: Update + issue_comment: + create: Add Comment message: create: Send client_application: @@ -54,6 +57,10 @@ en-GB: create: Create block update: Update block activerecord: + errors: + messages: + invalid_email_address: does not appear to be a valid e-mail address + email_address_not_routable: is not routable models: acl: Access Control List changeset: Changeset @@ -121,6 +128,45 @@ en-GB: description: Description languages: Languages pass_crypt: Password + datetime: + distance_in_words_ago: + about_x_hours: + one: about 1 hour ago + other: about %{count} hours ago + about_x_months: + one: about 1 month ago + other: about %{count} months ago + about_x_years: + one: about 1 year ago + other: about %{count} years ago + almost_x_years: + one: almost 1 year ago + other: almost %{count} years ago + half_a_minute: half a minute ago + less_than_x_seconds: + one: less than 1 second ago + other: less than %{count} seconds ago + less_than_x_minutes: + one: less than a minute ago + other: less than %{count} minutes ago + over_x_years: + one: over 1 year ago + other: over %{count} years ago + x_seconds: + one: 1 second ago + other: '%{count} seconds ago' + x_minutes: + one: 1 minute ago + other: '%{count} minutes ago' + x_days: + one: 1 day ago + other: '%{count} days ago' + x_months: + one: 1 month ago + other: '%{count} months ago' + x_years: + one: 1 year ago + other: '%{count} years ago' printable_name: with_version: '%{id}, v%{version}' with_name_html: '%{name} (%{id})' @@ -198,6 +244,8 @@ en-GB: title_comment: Changeset %{id} - %{comment} join_discussion: Log in to join the discussion discussion: Discussion + still_open: Changeset still open - discussion will open once the changeset is + closed. node: title: 'Node: %{name}' history_title: 'Node History: %{name}' @@ -258,7 +306,9 @@ en-GB: tag: The wiki description page for the %{key}=%{value} tag wikidata_link: The %{page} item on Wikidata wikipedia_link: The %{page} article on Wikipedia + wikimedia_commons_link: The %{page} item on Wikimedia Commons telephone_link: Call %{phone_number} + colour_preview: Colour %{colour_value} preview note: title: 'Note: %{id}' new_note: New Note @@ -266,8 +316,8 @@ en-GB: open_title: 'Unresolved note #%{note_name}' closed_title: 'Resolved note #%{note_name}' hidden_title: 'Hidden note #%{note_name}' - open_by: Created by %{user} %{when} - open_by_anonymous: Created by anonymous %{when} + opened_by: Created by %{user} %{when} + opened_by_anonymous: Created by anonymous %{when} commented_by: Comment from %{user} %{when} commented_by_anonymous: Comment from anonymous %{when} closed_by: Resolved by %{user} %{when} @@ -314,9 +364,14 @@ en-GB: comment: comment: 'New comment on changeset #%{changeset_id} by %{author}' commented_at_by_html: Updated %{when} by %{user} + comments: + comment: 'New comment on changeset #%{changeset_id} by %{author}' index: title_all: OpenStreetMap changeset discussion title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion' + timeout: + sorry: Sorry, the list of changeset comments you requested took too long to + retrieve. diary_entries: new: title: New Diary Entry @@ -364,11 +419,15 @@ en-GB: other: '%{count} comments' edit_link: Edit this entry hide_link: Hide this entry + unhide_link: Unhide this entry confirm: Confirm + report: Report this entry diary_comment: comment_from: Comment from %{link_user} on %{comment_created_at} hide_link: Hide this comment + unhide_link: Unhide this comment confirm: Confirm + report: Report this comment location: location: 'Location:' view: View @@ -409,12 +468,19 @@ en-GB: chair_lift: Chairlift drag_lift: Drag Lift gondola: Gondola Lift + platter: Platter Lift + pylon: Pylon station: Aerialway Station + t-bar: T-Bar Lift aeroway: aerodrome: Aerodrome + airstrip: Airstrip apron: Apron gate: Gate + hangar: Hangar helipad: Helipad + holding_position: Holding Position + parking_position: Parking Position runway: Runway taxiway: Taxiway terminal: Terminal @@ -460,6 +526,7 @@ en-GB: fuel: Fuel gambling: Gambling grave_yard: Graveyard + grit_bin: Grit Bin hospital: Hospital hunting_stand: Hunting Stand ice_cream: Ice Cream @@ -473,6 +540,7 @@ en-GB: office: Office parking: Parking parking_entrance: Parking Entrance + parking_space: Parking Space pharmacy: Pharmacy place_of_worship: Place of Worship police: Police @@ -506,6 +574,7 @@ en-GB: village_hall: Village Hall waste_basket: Waste Bin waste_disposal: Waste Disposal + water_point: Water Point youth_centre: Youth Centre boundary: administrative: Administrative Boundary @@ -534,9 +603,12 @@ en-GB: "yes": Craft Shop emergency: ambulance_station: Ambulance Station + assembly_point: Assembly Point defibrillator: Defibrillator landing_site: Emergency Landing Site phone: Emergency Phone + water_tank: Emergency Water Tank + "yes": Emergency highway: abandoned: Abandoned Highway bridleway: Bridleway @@ -1689,7 +1761,7 @@ en-GB: page. upload_trace: Upload a trace see_all_traces: See all traces - delete: + destroy: scheduled_for_deletion: Trace scheduled for deletion make_public: made_public: Trace made public diff --git a/config/locales/en.yml b/config/locales/en.yml index 917c06a95..b99e068b8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -288,8 +288,8 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" - open_by: "Created by %{user} %{when}" - open_by_anonymous: "Created by anonymous %{when}" + opened_by: "Created by %{user} %{when}" + opened_by_anonymous: "Created by anonymous %{when}" commented_by: "Comment from %{user} %{when}" commented_by_anonymous: "Comment from anonymous %{when}" closed_by: "Resolved by %{user} %{when}" @@ -1882,7 +1882,7 @@ en: upload_trace: "Upload a trace" see_all_traces: "See all traces" see_my_traces: "See my traces" - delete: + destroy: scheduled_for_deletion: "Trace scheduled for deletion" make_public: made_public: "Trace made public" diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 22a4584c7..6e2b9d776 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -307,8 +307,8 @@ eo: open_title: 'Nesolvita rimarko #%{note_name}' closed_title: 'Solvita rimarko #%{note_name}' hidden_title: 'Kaŝita rimarko #%{note_name}' - open_by: Kreita de %{user} %{when} - open_by_anonymous: Kreita de anonimulo %{when} + opened_by: Kreita de %{user} %{when} + opened_by_anonymous: Kreita de anonimulo %{when} commented_by: Komento de %{user} de %{when} commented_by_anonymous: Anonima komento de %{when} closed_by: Solvita de %{user} %{when} @@ -1907,7 +1907,7 @@ eo: upload_trace: Alŝuti spuron see_all_traces: Vidi ĉiujn spurojn see_my_traces: Montri miajn spurojn - delete: + destroy: scheduled_for_deletion: Spuro forviŝota make_public: made_public: Publikigita spuro @@ -2454,9 +2454,9 @@ eo: revoke: Malbloki! flash: Ĉi tiu blokado estas nuligita. helper: - time_future: Finiĝos %{time}. + time_future: Finiĝos post %{time}. until_login: Aktiva ĝis la uzanto ensalutos. - time_future_and_until_login: Finiĝos dum %{time} kaj post la uzanto ensalutos. + time_future_and_until_login: Finiĝos post %{time} kaj post la uzanto ensalutos. time_past: Finiĝis %{time}. block_duration: hours: diff --git a/config/locales/es.yml b/config/locales/es.yml index ac5740664..2f46a51a7 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -349,8 +349,8 @@ es: open_title: 'Nota sin resolver #%{note_name}' closed_title: 'Nota resuelta #%{note_name}' hidden_title: 'Nota oculta #%{note_name}' - open_by: Creado por %{user} %{when} - open_by_anonymous: Creado por un anónimo %{when} + opened_by: Creado por %{user} %{when} + opened_by_anonymous: Creado por un anónimo %{when} commented_by: Comentario de %{user} %{when} commented_by_anonymous: Comentario de anónimo %{when} closed_by: Resuelto por %{user} %{when} @@ -1987,7 +1987,7 @@ es: upload_trace: Subir una traza see_all_traces: Ver todas las trazas see_my_traces: Ver mis rastros - delete: + destroy: scheduled_for_deletion: Traza programada para eliminación make_public: made_public: Traza hecha pública diff --git a/config/locales/et.yml b/config/locales/et.yml index 4b3b69b2a..572f3df81 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -286,8 +286,8 @@ et: open_title: 'Lahendamata märkus: #%{note_name}' closed_title: 'Lahendatud märkus: #%{note_name}' hidden_title: 'Peidetud märkus #%{note_name}' - open_by: Loonud %{user} %{when} - open_by_anonymous: Loonud anonüümne kasutaja %{when} + opened_by: Loonud %{user} %{when} + opened_by_anonymous: Loonud anonüümne kasutaja %{when} commented_by: Kommentaar kasutajalt %{user} %{when} commented_by_anonymous: Kommentaar anonüümselt kasutajalt %{when} closed_by: Lahendanud %{user} %{when} @@ -1636,7 +1636,7 @@ et: upload_trace: Lisa GPS-rada see_all_traces: Vaata kõiki GPS-radasid see_my_traces: Vaata minu radu - delete: + destroy: scheduled_for_deletion: Raja kustutamine kantud tööplaani. offline_warning: message: GPX-failide üleslaadimise süsteem pole praegu saadaval. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 43b43d3a3..cc415301f 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -265,9 +265,9 @@ eu: open_title: 'Konpondugabeko #%{note_name} oharra' closed_title: 'Konpondutako #%{note_name} oharra' hidden_title: 'Ezkutatuko #%{note_name} oharra' - open_by: '%{user} erabiltzaileak duela %{when} + opened_by: '%{user} erabiltzaileak duela %{when} sortua' - open_by_anonymous: Erabiltzaile ezezagun batek duela %{when} + opened_by_anonymous: Erabiltzaile ezezagun batek duela %{when} sortua commented_by: '%{user} erabiltzaileak duela %{when} egindako iruzkina' @@ -1887,7 +1887,7 @@ eu: upload_trace: Aztarna bat igo see_all_traces: Aztarna guztiak ikusi see_my_traces: Nire aztarnak ikusi - delete: + destroy: scheduled_for_deletion: Ezabatzear dauden aztarnak make_public: made_public: Publikoak egindako aztarnak diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 6df12a0b7..f22a817bb 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -319,8 +319,8 @@ fa: open_title: 'یادداشت حل‌نشده #%{note_name}' closed_title: 'یادداشت حل‌شده #%{note_name}' hidden_title: 'یادداشت پنهان #%{note_name}' - open_by: %{when} %{user} آن را ایجاد کرد - open_by_anonymous: %{when} فرد ناشناس آن + opened_by: %{when} %{user} آن را ایجاد کرد + opened_by_anonymous: %{when} فرد ناشناس آن را ایجاد کرد. commented_by: نظر از %{user}،‏ %{when} commented_by_anonymous: نظر از ناشناس، %{when} @@ -1159,10 +1159,10 @@ fa: sign_up_tooltip: ایجاد یک حساب کاربری برای ویرایش edit: ویرایش history: تاریخچه - export: برون‌ریزی + export: برون‌برد issues: موضوع‌ها data: داده‌ها - export_data: برون‌ریزی داده‌ها + export_data: برون‌برد داده‌ها gps_traces: ردهای GPS gps_traces_tooltip: مدیریت ردهای GPS user_diaries: روزنوشت‌های کاربر @@ -1225,14 +1225,13 @@ fa: and_the_tags: 'و برچسب‌های زیر:' and_no_tags: و بدون برچسب. failure: - subject: شکست درون‌ریزی GPX‏ [OpenStreetMap] + subject: شکست درون‌برد GPX‏ [OpenStreetMap] failed_to_import: 'درون‌ریزی با شکست مواجه شد. این خطا رخ داد:' - more_info_1: اطلاعات بیشتر دربارهٔ شکست درون‌ریزی GPX و چگونگی پیشگیری از - آن + more_info_1: اطلاعات بیشتر دربارهٔ شکست درون‌برد GPX و چگونگی پیشگیری از آن more_info_2: 'آن را در اینجا خواهید یافت:' import_failures_url: https://wiki.openstreetmap.org/wiki/Fa:GPX_Import_Failures success: - subject: موفقیت درون‌ریزی GPX‏ [OpenStreetMap] + subject: موفقیت درون‌برد GPX‏ [OpenStreetMap] loaded_successfully: با موفقیت و با %{trace_points} نقطه از %{possible_points} نقطهٔ ممکن روی وبسایت قرار گرفته است. signup_confirm: @@ -1581,10 +1580,10 @@ fa: no_iframe_support: مرورگر شما فریم‌های HTML را، که برای این ویژگی لازم است، پشتیبانی نمی‌کند. export: - title: برون‌ریزی - area_to_export: محدوده برای برون‌ریزی + title: برون‌برد + area_to_export: محدوده برای برون‌برد manually_select: به‌صورت دستی منطقه دیگری را انتخاب کنید - format_to_export: قالب برون‌ریزی + format_to_export: قالب برون‌برد osm_xml_data: OpenStreetMap XML Data map_image: تصویر نقشه (لایهٔ استاندارد را نشان می‌دهد) embeddable_html: HTML توکار @@ -1592,9 +1591,8 @@ fa: export_details: داده‌های OpenStreetMap تحت پروانهٔ داده‌های همگانی باز، پایگاه‌دادهٔ باز (ODbL) قرار دارد. too_large: - advice: 'اگر برون‌ریزی بالا ناموفق بود، لطفاً یکی از منابع زیر را استفاده - کنید:' - body: این محدوده برای برون‌ریزی در قالب OpenStreetMap XML خیلی بزرگ است. لطفاً + advice: 'اگر برون‌برد بالا ناموفق بود، لطفاً یکی از منابع زیر را استفاده کنید:' + body: این محدوده برای برون‌برد در قالب OpenStreetMap XML خیلی بزرگ است. لطفاً بزرگنمایی کنید یا منطقهٔ کوچکتری را انتخاب کنید، یا برای دریافت داده‌های انبوه یکی از منابع فهرست زیر را استفاده کنید. planet: @@ -1606,7 +1604,7 @@ fa: description: دریافت این محدوده از یکی از آینه‌های پایگاه‌دادهٔ OpenStreetMap geofabrik: title: دانلودهای Geofabrik - description: استخراج اطلاعات قاره‌ها، کشورها، و شهرهای منتخب که به‌طور منظم + description: گزیدهٔ اطلاعات قاره‌ها، کشورها، و شهرهای منتخب که به‌طور منظم روزآمد می‌شود metro: title: خلاصه های مترو @@ -1625,7 +1623,7 @@ fa: longitude: 'طول:' output: خروجی paste_html: برای استفادهٔ توکار در وب‌سایت، HTML را کپی و درج کنید - export_button: برون‌ریزی + export_button: برون‌برد fixthemap: title: گزارش مشکل / اصلاح نقشه how_to_help: @@ -1817,7 +1815,7 @@ fa: paragraph_1_html: قوانین رسمی OpenStreetMap تنها چند مورد است، اما از همهٔ مشارکت‌کنندگان انتظار داریم با جامعه همکاری کنند و ارتباط داشته باشند. اگر می‌خواهید هرگونه فعالیتی به غیر از ویرایش دستی انجام دهید، لطفاً رهنمودهای - مربوط به درون‌ریزی + مربوط به درون‌برد (Import) و ویرایش‌های خودکار را بخوانید و از آن‌ها پیروی کنید. questions: @@ -1939,7 +1937,7 @@ fa: upload_trace: بارگذاری یک رد see_all_traces: دیدن همه ردها see_my_traces: ردهای من - delete: + destroy: scheduled_for_deletion: این رد در زمان‌بندی حذف قرار گرفت make_public: made_public: رد عمومی شد @@ -2560,7 +2558,7 @@ fa: center_marker: مرکز نقشه در نشانگر paste_html: برای درج در وب سایت HTML را جایگذاری کنید view_larger_map: نمایش نقشه بزرگتر - only_standard_layer: فقط لایهٔ استاندارد را می‌توان در قالب عکس برون‌ریزی کرد. + only_standard_layer: فقط لایهٔ استاندارد را می‌توان در قالب عکس برون‌برد کرد. embed: report_problem: گزارش مشکل key: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 34326536e..5c56cf2cd 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -316,6 +316,7 @@ fi: tag: Wikisivu tietueelle %{key}=%{value} wikidata_link: '%{page} Wikidatassa' wikipedia_link: Artikkeli %{page} Wikipediassa + wikimedia_commons_link: '%{page} Wikimedia Commonsissa' telephone_link: Soita %{phone_number} colour_preview: Värin %{colour_value} esikatselu note: @@ -325,8 +326,8 @@ fi: open_title: 'Ratkaisematon karttailmoitus #%{note_name}' closed_title: 'Ratkaistu karttailmoitus #%{note_name}' hidden_title: 'Piilotettu karttailmoitus #%{note_name}' - open_by: Lähettänyt käyttäjä %{user} %{when} - open_by_anonymous: Luonut tuntematon käyttäjä %{when} + opened_by: Lähettänyt käyttäjä %{user} %{when} + opened_by_anonymous: Luonut tuntematon käyttäjä %{when} commented_by: Kommentti käyttäjältä %{user} %{when} commented_by_anonymous: Kommentti tuntemattomalta käyttäjältä %{when} closed_by: Ratkaissut käyttäjä %{user} %{when} @@ -1213,19 +1214,19 @@ fi: notifier: diary_comment_notification: subject: '[OpenStreetMap] %{user} on lisännyt kommentin päiväkirjamerkintääsi' - hi: Hei %{to_user}, + hi: Hei %{to_user}! header: '%{from_user} kommentoi kirjoittamaasi päiväkirjamerkintää OpenStreetMapissa otsikolla %{subject}:' footer: Lue kommentti sivulla %{readurl}. Jatkokommentin voi lähettää sivulla %{commenturl} tai vastausviestin sivulla %{replyurl}. message_notification: - hi: Hei %{to_user}, + hi: Hei %{to_user}! header: '%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikkolla %{subject}:' footer_html: Lue viesti osoitteessa %{readurl} ja vastaa siihen osoitteessa %{replyurl}. friend_notification: - hi: Hei %{to_user}, + hi: Hei %{to_user}! subject: '[OpenStreetMap] %{user} lisäsi sinut kaverikseen' had_added_you: Käyttäjä %{user} lisäsi sinut kaverikseen OpenStreetMapissa. see_their_profile: Voit tutustua hänen käyttäjäsivuunsa osoitteessa %{userurl}. @@ -1308,20 +1309,20 @@ fi: on lähellä paikkaa %{place}.' details: Lisätietoja merkinnästä löytyy osoitteesta %{url}. changeset_comment_notification: - hi: Hei %{to_user}, + hi: Hei %{to_user}! greeting: Hei, commented: subject_own: '[OpenStreetMap] %{commenter} on kommentoinut muutoskokoelmaasi' subject_other: '[OpenStreetMap] %{commenter} on kommentoinut sinua kiinnostavaa muutoskokoelmaa' - your_changeset: '%{commenter} jätti %{time} kommentin yhteen muutoskokoelmistasi' + your_changeset: '%{commenter} kommentoi %{time} muutoskokoelmaasi' commented_changeset: '%{commenter} jätti %{time} kommentin kartan muutoskokoelmaan jota katselet jonka on luonut %{changeset_author}' - partial_changeset_with_comment: kommentin kanssa '%{changeset_comment}' + partial_changeset_with_comment: 'seuraavasti: "%{changeset_comment}"' partial_changeset_without_comment: ei kommenttia details: 'Lisätietoja muutoskokoelmasta: %{url}' - unsubscribe: Peruaksesi tilauksen päivityksistä tähän muutoskokoelmaan, vieraile - sivulla %{url} ja klikkaa "Unsubscribe". + unsubscribe: Peru tämän muutoskokoelman sähköposti-ilmoitukset siirtymällä osoitteeseen + %{url} ja napsauttamalla Lopeta tilaus. messages: inbox: title: Saapuneet @@ -1941,7 +1942,7 @@ fi: upload_trace: Lisää GPS-jälki see_all_traces: Näytä kaikki jäljet see_my_traces: Katsele jälkiäni - delete: + destroy: scheduled_for_deletion: Jälki on poistojonossa. make_public: made_public: Jäljestä tehtiin julkinen diff --git a/config/locales/fit.yml b/config/locales/fit.yml index 563ec8122..d66ec41fa 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -288,8 +288,8 @@ fit: open_title: 'Ratkaisematon karttailmotus #%{note_name}' closed_title: 'Ratkaistu karttailmotus #%{note_name}' hidden_title: 'Piilotettu karttailmotus #%{note_name}' - open_by: Lähättänyt käyttäjä %{user} %{when} - open_by_anonymous: Luonut tuntematon käyttäjä %{when} + opened_by: Lähättänyt käyttäjä %{user} %{when} + opened_by_anonymous: Luonut tuntematon käyttäjä %{when} commented_by: Kommentti käyttäjältä %{user} %{when} commented_by_anonymous: Kommentti tuntemattomalta käyttäjältä %{when} closed_by: Ratkaissut käyttäjä %{user} %{when} diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4ad3a0a87..b2b6a7993 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -61,6 +61,7 @@ # Author: Sherbrooke # Author: Syl # Author: The RedBurn +# Author: Thibaut120094 # Author: Trial # Author: Tuxxic # Author: Urhixidur @@ -239,7 +240,7 @@ fr: rss: title: Notes OpenStreetMap description_area: Une liste de notes, signalées, commentées ou fermées dans - votre zone [(%{min_lat} ; %{min_lon}) – (%{max_lat} ; %{max_lon})] + votre zone [(%{min_lat} ; %{min_lon}) – (%{max_lat} ; %{max_lon})] description_item: Un fil RSS pour la note %{id} opened: nouvelle note (près de %{place}) commented: nouveau commentaire (près de %{place}) @@ -358,8 +359,8 @@ fr: open_title: Note non résolue nº %{note_name} closed_title: Note résolue nº %{note_name} hidden_title: Note masquée nº %{note_name} - open_by: Créée par %{user}, %{when} - open_by_anonymous: Créée par un utilisateur anonyme, %{when} + opened_by: Créée par %{user}, %{when} + opened_by_anonymous: Créée par un utilisateur anonyme, %{when} commented_by: Commenté par %{user} %{when} commented_by_anonymous: Commenté par un utilisateur anonyme %{when} closed_by: Résolu par %{user} %{when} @@ -405,15 +406,15 @@ fr: met trop de temps pour être chargée. changeset_comments: comment: - comment: Nouveau commentaire sur le groupe de modifications nº %{changeset_id} + comment: Nouveau commentaire sur le groupe de modifications nº %{changeset_id} par %{author} commented_at_by_html: Mis à jour le %{when} par %{user} comments: - comment: Nouveau commentaire sur le groupe de modifications nº %{changeset_id} + comment: Nouveau commentaire sur le groupe de modifications nº %{changeset_id} par %{author} index: title_all: Discussion sur le groupe de modifications OpenStreetMap - title_particular: Discussion sur le groupe de modifications OpenStreetMap nº %{changeset_id} + title_particular: Discussion sur le groupe de modifications OpenStreetMap nº %{changeset_id} timeout: sorry: Désolé, la liste des commentaires d’ensembles de modifications que vous avez demandée est trop longue à récupérer. @@ -421,12 +422,12 @@ fr: new: title: Nouvelle entrée du journal form: - subject: 'Sujet :' - body: 'Corps :' - language: 'Langue :' - location: 'Lieu :' - latitude: 'Latitude :' - longitude: 'Longitude :' + subject: 'Sujet :' + body: 'Corps :' + language: 'Langue :' + location: 'Lieu :' + latitude: 'Latitude :' + longitude: 'Longitude :' use_map_link: utiliser la carte index: title: Journaux des utilisateurs @@ -451,7 +452,7 @@ fr: login: Se connecter no_such_entry: title: Aucune entrée du journal correspondante - heading: 'Aucune entrée avec l’id : %{id}' + heading: 'Aucune entrée avec l’id : %{id}' body: Désolé, il n’y a aucune entrée ou commentaire dans le journal avec l’id %{id}. Veuillez vérifier votre orthographe ou la validité du lien que vous avez cliqué. @@ -475,7 +476,7 @@ fr: confirm: Confirmer report: Signaler ce commentaire location: - location: 'Lieu :' + location: 'Lieu :' view: Afficher edit: Modifier feed: @@ -667,7 +668,7 @@ fr: emergency_access_point: Point d’accès d’urgence footway: Chemin piéton ford: Gué - give_way: Panneau « Cédez le passage » + give_way: Panneau « Cédez le passage » living_street: Rue en zone de rencontre milestone: Borne kilométrique motorway: Autoroute @@ -690,7 +691,7 @@ fr: services: Services autoroutiers speed_camera: Radar de vitesse steps: Escalier - stop: Panneau « Stop / Arrêt » + stop: Panneau « Stop / Arrêt » street_lamp: Lampadaire tertiary: Route tertiaire tertiary_link: Route tertiaire @@ -1102,7 +1103,7 @@ fr: reported_user: Utilisateur signalé not_updated: Non mis à jour search: Rechercher - search_guidance: 'Problèmes de recherche :' + search_guidance: 'Problèmes de recherche :' user_not_found: L’utilisateur n’existe pas issues_not_found: Aucun problème trouvé de ce type status: État @@ -1125,7 +1126,7 @@ fr: successful_update: Votre rapport a bien été mis à jour provide_details: Veuillez fournir les détails demandés show: - title: Problème %{status} nº %{issue_id} + title: Problème %{status} nº %{issue_id} reports: zero: Aucun rapport one: 1 rapport @@ -1143,21 +1144,21 @@ fr: no_other_issues: Aucun autre problème avec cet utilisateur. comments_on_this_issue: Commentaires sur ce problème resolve: - resolved: L’état du problème a été mis à « Résolu » + resolved: L’état du problème a été mis à « Résolu » ignore: - ignored: L’état du problème a été mis à « Ignoré » + ignored: L’état du problème a été mis à « Ignoré » reopen: - reopened: L’état du problème a été mis à « Ouvert » + reopened: L’état du problème a été mis à « Ouvert » comments: created_at: Le %{datetime} - reassign_param: Réaffecter le problème ? + reassign_param: Réaffecter le problème ? reports: updated_at: Le %{datetime} reported_by_html: Signalé comme %{category} par %{user} helper: reportable_title: - diary_comment: '%{entry_title}, commentaire nº %{comment_id}' - note: Note nº %{note_id} + diary_comment: '%{entry_title}, commentaire nº %{comment_id}' + note: Note nº %{note_id} issue_comments: create: comment_created: Votre commentaire a bien été créé @@ -1166,13 +1167,13 @@ fr: title_html: Rapport %{link} missing_params: Impossible de créer un nouveau rapport details: Veuillez fournir plus de détails sur le problème (obligatoire). - select: 'Sélectionnez un motif pour votre rapport :' + select: 'Sélectionnez un motif pour votre rapport :' disclaimer: intro: 'Avant d’envoyer votre rapport aux modérateurs du site, veuillez vous - assurer que :' - not_just_mistake: vous êtes certain que le problème n’est pas juste une erreur ; - unable_to_fix: vous êtes incapable de régler le problème par vous-même ou - avec l’aide des membres de votre proche communauté ; + assurer que :' + not_just_mistake: Vous êtes certain que le problème n’est pas juste une erreur + unable_to_fix: Vous ne pouvez pas régler le problème par vous-même ou avec + l’aide des membres de votre proche communauté resolve_with_user: vous avez déjà essayé de résoudre le problème avec l’utilisateur concerné. categories: @@ -1222,7 +1223,7 @@ fr: user_diaries_tooltip: Voir les journaux d’utilisateurs edit_with: Modifier avec %{editor} tag_line: La carte wiki libre du monde - intro_header: Bienvenue dans OpenStreetMap ! + intro_header: Bienvenue dans OpenStreetMap ! intro_text: OpenStreetMap est une carte du monde, créée par des gens comme vous et libre d’utilisation sous licence libre. intro_2_create_account: Créez un compte d’utilisateur @@ -1256,44 +1257,44 @@ fr: journal' hi: Bonjour %{to_user}, header: '%{from_user} a publié un commentaire sur un article récent du journal - OpenStreetMap avec le sujet %{subject} :' + OpenStreetMap avec le sujet %{subject} :' footer: Vous pouvez également lire le commentaire sur %{readurl}, le commenter sur %{commenturl} ou répondre sur %{replyurl} message_notification: hi: Bonjour %{to_user}, header: '%{from_user} vous a envoyé un message depuis OpenStreetMap avec le - sujet %{subject} :' + sujet %{subject} :' footer_html: Vous pouvez aussi lire le message à %{readurl} et vous pouvez y répondre à %{replyurl} friend_notification: hi: Bonjour %{to_user}, subject: '[OpenStreetMap] %{user} vous a ajouté comme ami' had_added_you: '%{user} vous a ajouté comme ami dans OpenStreetMap.' - see_their_profile: 'Vous pouvez voir son profil ici : %{userurl}.' - befriend_them: 'Vous pouvez également l''ajouter comme ami ici : %{befriendurl}.' + see_their_profile: 'Vous pouvez voir son profil ici : %{userurl}.' + befriend_them: 'Vous pouvez également l''ajouter comme ami ici : %{befriendurl}.' gpx_notification: greeting: Bonjour, your_gpx_file: Il semble que votre fichier GPX with_description: avec la description - and_the_tags: 'et les mots-clés suivants :' + and_the_tags: 'et les mots-clés suivants :' and_no_tags: et sans mot-clé. failure: subject: '[OpenStreetMap] Échec de l’import GPX' - failed_to_import: 'n’a pas pu être importé. Voici l’erreur :' + failed_to_import: 'n’a pas pu être importé. Voici l’erreur :' more_info_1: Plus d’informations sur les échecs d’import GPX et comment les éviter - more_info_2: 'peuvent être trouvés sur :' + more_info_2: 'peuvent être trouvés sur :' success: subject: '[OpenStreetMap] Import GPX réussi' loaded_successfully: s’est chargé correctement avec %{trace_points} des %{possible_points} points possibles. signup_confirm: subject: '[OpenStreetMap] Bienvenue dans OpenStreetMap' - greeting: Bonjour ! + greeting: Bonjour ! created: Quelqu’un (vous, espérons-le) vient juste de créer un compte sur %{site_url}. confirm: 'Avant que nous fassions quoi que ce soit d’autre, nous avons besoin - d’une confirmation que cette demande provient bien de vous ; si c’est le cas, - veuillez cliquer le lien ci-dessous pour confirmer votre compte :' + d’une confirmation que cette demande provient bien de vous ; si c’est le cas, + veuillez cliquer le lien ci-dessous pour confirmer votre compte :' welcome: Une fois votre compte confirmé, nous vous fournirons des informations supplémentaires pour bien démarrer. email_confirm: @@ -1366,7 +1367,7 @@ fr: partial_changeset_without_comment: sans commentaire details: Plus de détails sur l’ensemble de modifications à %{url}. unsubscribe: Pour vous désabonner des mises à jour de cet ensemble de modifications, - visitez %{url} et cliquez sur « Désabonner ». + visitez %{url} et cliquez sur « Désabonner ». messages: inbox: title: Boîte de réception @@ -1385,7 +1386,7 @@ fr: subject: Objet date: Date no_messages_yet: Vous n’avez actuellement aucun message. Pourquoi ne pas entrer - en contact avec quelques %{people_mapping_nearby_link} ? + en contact avec quelques %{people_mapping_nearby_link} ? people_mapping_nearby: personnes qui cartographient aux alentours message_summary: unread_button: Marquer comme non lu @@ -1417,11 +1418,11 @@ fr: to: À subject: Objet date: Date - no_sent_messages: Vous n’avez encore envoyé aucun message. Pourquoi ne pas entrez - en contact avec quelques %{people_mapping_nearby_link} ? + no_sent_messages: Vous n’avez encore envoyé aucun message. Pourquoi ne pas entrer + en contact avec quelques %{people_mapping_nearby_link} ? people_mapping_nearby: personnes proche de vous reply: - wrong_user: Vous êtes identifié(e) comme « %{user} » mais le message auquel + wrong_user: Vous êtes identifié(e) comme « %{user} » mais le message auquel vous souhaitez répondre n’a pas été envoyé à cet utilisateur. Veuillez vous connecter avec l’identifiant correct pour pouvoir répondre. show: @@ -1434,7 +1435,7 @@ fr: destroy_button: Supprimer back: Retour to: À - wrong_user: Vous êtes identifié comme « %{user} » mais le message que vous essayez + wrong_user: Vous êtes identifié comme « %{user} » mais le message que vous essayez de lire n’a pas été envoyé par cet utilisateur, ni ne lui a été destiné. Veuillez vous connecter avec l’identifiant correct pour pouvoir le lire. sent_message_summary: @@ -1447,7 +1448,7 @@ fr: site: about: next: Suivant - copyright_html: © Contributeurs
d’OpenStreetMap + copyright_html: © Contributeurs
d’OpenStreetMap used_by: '%{name} fournit des données cartographiques sur des milliers de sites web, applications mobiles et appareils' lede_text: OpenStreetMap est bâti par une communauté de cartographes bénévoles @@ -1469,7 +1470,7 @@ fr: communautaires et \nle site web de la Fondation OSM." open_data_title: Données ouvertes - open_data_html: 'OpenStreetMap est en données ouvertes : vous êtes libre + open_data_html: 'OpenStreetMap est en données ouvertes : vous êtes libre de l’utiliser dans n’importe quel but tant que vous créditez OpenStreetMap et ses contributeurs. Si vous modifiez ou vous appuyez sur les données d’une façon quelconque, vous pouvez distribuer le résultat seulement suivant la @@ -1516,17 +1517,17 @@ fr: la licence Creative Commons paternité – partage à l’identique 2.0 (CC-BY-SA). credit_title_html: Comment créditer OpenStreetMap - credit_1_html: Nous demandons que votre crédit comporte la mention « © les - contributeurs d’OpenStreetMap ». + credit_1_html: Nous demandons que votre crédit comporte la mention « © les + contributeurs d’OpenStreetMap ». credit_2_html: |- Vous devez également préciser clairement que les données sont disponibles sous la licence ODbL (Open Database License) et, si vous utilisez les tuiles de notre carte, que la carte est sous la licence CC BY-SA. Vous pouvez mentionner ceci avec un lien hypertexte vers cette page de mentions légales. - Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences. Sur les supports où les liens hypertexte sont impossibles (par exemple sur un support papier), nous vous suggérons de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant « OpenStreetMap » en son adresse complète openstreetmap.org), vers opendatacommons.org et, si c’est pertinent, vers creativecommons.org. + Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences. Sur les supports où les liens hypertexte sont impossibles (par exemple sur un support papier), nous vous suggérons de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant « OpenStreetMap » en son adresse complète openstreetmap.org), vers opendatacommons.org et, si c’est pertinent, vers creativecommons.org. credit_3_html: |- Pour une carte électronique navigable, le crédit devrait apparaître dans un coin de la carte. - Par exemple : + Par exemple : attribution_example: alt: Exemple d’attribution d’OpenStreetMap sur une page Internet title: Exemple d’attribution @@ -1544,30 +1545,30 @@ fr: contributors_title_html: Nos contributeurs contributors_intro_html: 'Nos contributeurs sont des milliers de personnes. Nous incluons également des données publiées sous licence ouverte par des - agences nationales de cartographie et par d’autres sources, notamment :' + agences nationales de cartographie et par d’autres sources, notamment :' contributors_at_html: |- - Autriche : contient des données sur la ville de Vienne (sous + Autriche : contient des données sur la ville de Vienne (sous licence CC BY), la région du Vorarlberg et la région du Tyrol (sous licence CC BY AT avec amendements). contributors_au_html: |- - Australie : contient des données sourcées de + Australie : contient des données sourcées de PSMA Australia Limited publiées sous la licence CC BY 4.0 accordée par le Commonwealth d’Australie. - contributors_ca_html: 'Canada : contient des données de GeoBase®, + contributors_ca_html: 'Canada : contient des données de GeoBase®, GeoGratis (© Département des Ressources naturelles du Canada), CanVec (© Département des Ressources naturelles du Canada) et StatCan (Division Géographie, Statistiques du Canada).' - contributors_fi_html: 'Finlande : contient des données de + contributors_fi_html: 'Finlande : contient des données de la Base de données topographique de l’Inspection nationale du territoire de Finlande et d’autres ensembles de données, sous licence NLSFI.' - contributors_fr_html: 'France : contient des données de la + contributors_fr_html: 'France : contient des données de la Direction générale des finances publiques (anciennement la Direction générale des impôts).' - contributors_nl_html: 'Pays-Bas : contient des données © Pays-Bas : contient des données © AND, 2007 (www.and.com).' - contributors_nz_html: "Nouvelle-Zélande : contient des données + contributors_nz_html: "Nouvelle-Zélande : contient des données provenant du service de données LINZ et pour la réutilisation, sous licence \nCC BY 4.0." @@ -1581,10 +1582,10 @@ fr: sous licence CC BY 4.0 pour la réutilisation .' contributors_za_html: |- - Afrique du Sud : contient des données issues de la Direction principale des + Afrique du Sud : contient des données issues de la Direction principale des Informations Géospatiales Nationales, copyright de l’État réservé. contributors_gb_html: |- - Royaume-Uni : contient des données issues de + Royaume-Uni : contient des données issues de l’Ordnance Survey © 2010–2019 Droits d’auteurs et de la base de données de la Couronne. contributors_footer_1_html: Pour plus de détails sur celles-ci et sur les @@ -1658,8 +1659,8 @@ fr: export_details: Les données d’OpenStreetMap sont publiées sous la licence Open Data Commons Open Database (ODbL). too_large: - advice: 'Si l’export ci-dessus échoue, veuillez envisager l’utilisation d’une - des sources listées ci-dessous :' + advice: 'Si l’export ci-dessus échoue, veuillez envisager l’utilisation de + l’une des sources listées ci-dessous :' body: Cette zone est trop vaste pour être exportée au format OpenStreetMap XML. Veuillez zoomer ou sélectionner une zone plus petite, ou utiliser une des sources suivantes pour le téléchargement de données massives. @@ -1751,7 +1752,7 @@ fr: welcomemat: url: https://wiki.openstreetmap.org/wiki/FR:Page_principale title: Pour les organisations - description: Dans une organisation qui fait des plans pour OpenStreetMap ? + description: Dans une organisation qui fait des plans pour OpenStreetMap ? Trouvez ce que vous avez besoin de savoir dans le tapis d’accueil. wiki: url: https://wiki.openstreetmap.org/wiki/FR:Page_principale @@ -1858,7 +1859,7 @@ fr: alt: Texte alternatif url: URL welcome: - title: Bienvenue ! + title: Bienvenue ! introduction_html: Bienvenue à OpenStreetMap, la carte du monde libre et éditable. Maintenant que vous êtes enregistré, vous avez tout ce qu’il faut pour commencer à cartographier. Ce qui suit est un petit guide des choses les plus importantes @@ -1866,7 +1867,7 @@ fr: whats_on_the_map: title: Ce qu’il y a sur la carte on_html: OpenStreetMap sert à cartographier des objets qui sont à la fois - réels et actuels — il contient des millions de bâtiments, de routes + réels et actuels — il contient des millions de bâtiments, de routes et d’autres détails sur des lieux. Vous pouvez cartographier n’importe quel élément du monde réel qui vous intéresse. off_html: Ce qui est par contre exclu sont les données subjectives @@ -1888,7 +1889,7 @@ fr: à propos d’un nœud ou d’un chemin, comme le nom d’un restaurant ou la limite de vitesse d’une route. rules: - title: Règles ! + title: Règles ! paragraph_1_html: OpenStreetMap a quelques règles formelles, mais nous attendons de tous les participants une collaboration et une communication avec la communauté. Si vous envisagez d’autres activités que la modification à la @@ -1896,18 +1897,18 @@ fr: importations et les modifications automatiques. questions: - title: Des questions ? + title: Des questions ? paragraph_1_html: |- OpenStreetMap propose plusieurs ressources pour apprendre à travailler dans le projet, pour poser des questions et y répondre, et pour discuter et documenter les sujets de cartographie en collaboration avec d’autres utilisateurs. - Trouver de l’aide ici. Dans une organisation qui fait des plans pour OpenStreetMap ? Vérifiez votre tapis d’accueil. + Trouver de l’aide ici. Dans une organisation qui fait des plans pour OpenStreetMap ? Vérifiez votre tapis d’accueil. start_mapping: Commencer à cartographier add_a_note: - title: Pas le temps d’effectuer les modifications ? Ajoutez une note ! + title: Pas le temps d’effectuer les modifications ? Ajoutez une note ! paragraph_1_html: |- Si vous voulez juste une petite correction et n’avez pas le temps de vous enregistrer sur le projet et d’apprendre à effectuer les modifications, il est facile d’ajouter une note. paragraph_2_html: |- - Allez simplement sur la carte et cliquez sur l’icône note : + Allez simplement sur la carte et cliquez sur l’icône note : . Cela ajoutera un marqueur sur la carte, que vous pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur Enregistrer, et d’autres contributeurs iront regarder. traces: visibility: @@ -1981,7 +1982,7 @@ fr: delete_trace: Supprimer cette piste trace_not_found: Trace non trouvée ! visibility: 'Visibilité :' - confirm_delete: Supprimer cette trace ? + confirm_delete: Supprimer cette trace ? trace_paging_nav: showing_page: Page %{page} older: Anciennes traces @@ -2016,7 +2017,7 @@ fr: upload_trace: Envoyer une trace see_all_traces: Voir toutes les traces see_my_traces: Voir mes traces - delete: + destroy: scheduled_for_deletion: Piste prévue pour la suppression make_public: made_public: Trace GPS rendue publique @@ -2431,7 +2432,7 @@ fr: confirmer votre nouvelle adresse courriel. flash update success: Informations sur l’utilisateur mises à jour avec succès. confirm: - heading: Vérifiez votre courriel ! + heading: Vérifiez votre courriel ! introduction_1: Nous vous avons envoyé un courriel de confirmation. introduction_2: Confirmez votre compte en cliquant sur le lien dans le courriel et vous pourrez commencer à cartographier. @@ -2456,7 +2457,7 @@ fr: press confirm button: Appuyez sur le bouton Confirmer ci-dessous pour confirmer votre nouvelle adresse de courriel. button: Confirmer - success: Modification de votre adresse de courriel confirmée ! + success: Modification de votre adresse de courriel confirmée ! failure: Une adresse de courriel a déjà été confirmée avec ce jeton d’authentification. unknown_token: Ce code de confirmation a expiré ou n’existe pas. set_home: @@ -2726,7 +2727,7 @@ fr: unhide_comment: démasquer notes: new: - intro: Vous avez repéré une erreur ou un manque ? Faites-le savoir aux autres + intro: Vous avez repéré une erreur ou un manque ? Faites-le savoir aux autres cartographes afin qu’ils puissent y remédier. Déplacez le marqueur à la position exacte et écrivez une note pour expliquer le problème. advice: Votre note est publique et peut être utilisée pour mettre à jour la diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 96ea56993..c4d090ea5 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -230,8 +230,9 @@ fur: open_title: 'Note no risolte #%{note_name}' closed_title: 'Note risolte #%{note_name}' hidden_title: 'Note platade #%{note_name}' - open_by: Creade di %{user} %{when} indaûr - open_by_anonymous: Creade di un anonim %{when} indaûr + opened_by: Creade di %{user} %{when} indaûr + opened_by_anonymous: Creade di un anonim %{when} + indaûr commented_by: Coment di %{user} %{when} indaûr commented_by_anonymous: Coment di un anonim %{when} indaûr diff --git a/config/locales/ga.yml b/config/locales/ga.yml index fdb50f329..96b40a219 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -223,8 +223,8 @@ ga: open_title: 'Nóta neamhréitithe #%{note_name}' closed_title: 'Nóta réitithe #%{note_name}' hidden_title: 'Nóta folaithe #%{note_name}' - open_by: Cruthaithe ag %{user} %{when} ó shin - open_by_anonymous: Cruthaithe ag duine gan ainm %{when} + opened_by: Cruthaithe ag %{user} %{when} ó shin + opened_by_anonymous: Cruthaithe ag duine gan ainm %{when} ó shin commented_by: Nóta tráchta ó %{user} %{when} ó shin commented_by_anonymous: Nóta tráchta ó dhuine gan ainm %{when} @@ -1719,7 +1719,7 @@ ga: vicí. upload_trace: Lorg a uaslódáil see_all_traces: Féach gach lorg - delete: + destroy: scheduled_for_deletion: Lorg sceidealta le scriosadh make_public: made_public: Lorg curtha ar fáil go poiblí diff --git a/config/locales/gd.yml b/config/locales/gd.yml index ec2fea79d..1051353fb 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -252,9 +252,9 @@ gd: open_title: Nòta àireamh %{note_name} gun fhuasgladh closed_title: Nòta àireamh %{note_name} a chaidh fhuasgladh hidden_title: Nòta falaichte àireamh %{note_name} - open_by: Chaidh a chruthachadh le %{user} o chionn + opened_by: Chaidh a chruthachadh le %{user} o chionn %{when} - open_by_anonymous: Chaidh a chruthachadh gun urra o + opened_by_anonymous: Chaidh a chruthachadh gun urra o chionn %{when} commented_by: Beachd le %{user} o chionn %{when} commented_by_anonymous: Beachd gun urra o chionn @@ -1682,7 +1682,7 @@ gd: href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>uicidh. upload_trace: Luchdaich suas lorgadh see_all_traces: Seall a h-uile lorgadh - delete: + destroy: scheduled_for_deletion: Chaidh an lorgadh seo a chur air an sgeideil gus a sguabadh às make_public: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 151ed88ec..932a544dc 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -307,8 +307,8 @@ gl: open_title: Nota sen resolver nº%{note_name} closed_title: Nota resolta nº%{note_name} hidden_title: Nota agochada nº%{note_name} - open_by: Creado por %{user} %{when} - open_by_anonymous: Creado por un anónimo %{when} + opened_by: Creado por %{user} %{when} + opened_by_anonymous: Creado por un anónimo %{when} commented_by: Comentado por %{user} %{when} commented_by_anonymous: Comentado por un anónimo %{when} closed_by: Resolto por %{user} %{when} @@ -1960,7 +1960,7 @@ gl: upload_trace: Subir unha pista see_all_traces: Ollar tódalas pistas see_my_traces: Ollar as miñas pistas - delete: + destroy: scheduled_for_deletion: Pista agardando a súa eliminación make_public: made_public: Pista feita pública diff --git a/config/locales/he.yml b/config/locales/he.yml index b52b8bcae..322f2f80d 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -323,8 +323,8 @@ he: open_title: הערה שלא נפתרה מס׳ %{note_name} closed_title: הערה פתורה מס׳ %{note_name} hidden_title: הערה מוסתרת מס׳ %{note_name} - open_by: נוצרה על־ידי %{user} %{when} - open_by_anonymous: נוצרה על־ידי אלמוני %{when} + opened_by: נוצרה על־ידי %{user} %{when} + opened_by_anonymous: נוצרה על־ידי אלמוני %{when} commented_by: הערה על ידי %{user} %{when} commented_by_anonymous: הערה על ידי אלמוני %{when} closed_by: נפתר על־ידי %{user} ב־%{when} @@ -1918,7 +1918,7 @@ he: upload_trace: העלאת מסלול see_all_traces: הצגת כל המסלולים see_my_traces: הצגת הנתיבים שלי - delete: + destroy: scheduled_for_deletion: מסלול מיועד למחיקה make_public: made_public: מסלול שהוגדר ציבורי diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 8451f877d..a61fbc8f3 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -253,8 +253,8 @@ hr: open_title: NerijeÅ¡ena biljeÅ¡ka broj %{note_name} closed_title: RijeÅ¡ena biljeÅ¡ka broj %{note_name} hidden_title: Skrivena biljeÅ¡ka broj %{note_name} - open_by: Zabilježio/la %{user} u %{when} - open_by_anonymous: Zabilježeno anonimno u %{when} + opened_by: Zabilježio/la %{user} u %{when} + opened_by_anonymous: Zabilježeno anonimno u %{when} commented_by: Komentirao/la %{user} %{when} commented_by_anonymous: Komentirano anonimno u %{when} @@ -1446,7 +1446,7 @@ hr: stranici. upload_trace: Postavi GNSS trag see_all_traces: Prikaži sve trase - delete: + destroy: scheduled_for_deletion: Trase raspoređene za brisanje make_public: made_public: Trag je postao javan diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index b83c9da83..121096ab5 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -243,8 +243,8 @@ hsb: open_title: 'Njesčinjena pokazka #%{note_name}' closed_title: 'Sčinjena pokazka #%{note_name}' hidden_title: 'Schowana pokazka #%{note_name}' - open_by: Wutworjeny wot %{user} před %{when} - open_by_anonymous: Wutworjeny wot anonymneho před + opened_by: Wutworjeny wot %{user} před %{when} + opened_by_anonymous: Wutworjeny wot anonymneho před %{when} commented_by: Komentar wot %{user} před %{when} commented_by_anonymous: Komentar wot anonymneho před @@ -1638,7 +1638,7 @@ hsb: stronje. upload_trace: Ćěr nahrać see_all_traces: Wšě ćěrje pokazać - delete: + destroy: scheduled_for_deletion: Čara předwidźana za zničenje make_public: made_public: Čara wozjewjena diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 831abb846..c124da367 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -312,8 +312,8 @@ hu: open_title: 'Megoldatlan jegyzet: %{note_name}' closed_title: 'Megoldott jegyzet: %{note_name}' hidden_title: Rejtett jegyzet %{note_name} - open_by: Létrehozta %{user}, %{when} - open_by_anonymous: Létrehozva névtelenül, %{when} + opened_by: Létrehozta %{user}, %{when} + opened_by_anonymous: Létrehozva névtelenül, %{when} commented_by: '%{user} megjegyzése, %{when}' commented_by_anonymous: Megjegyzés névtelenül, %{when} closed_by: Megoldotta %{user}, %{when} @@ -1933,7 +1933,7 @@ hu: upload_trace: Nyomvonal feltöltése see_all_traces: Összes nyomvonal megtekintése see_my_traces: Saját nyomvonalak megtekintése - delete: + destroy: scheduled_for_deletion: A nyomvonal törlésre kijelölve make_public: made_public: A nyomvonal nyilvános lett diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 9dbba8edb..99b48925d 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -293,8 +293,8 @@ ia: open_title: Nota non resolvite №%{note_name} closed_title: Nota resolvite №%{note_name} hidden_title: Nota celate №%{note_name} - open_by: Create per %{user} %{when} - open_by_anonymous: Create per un anonymo %{when} + opened_by: Create per %{user} %{when} + opened_by_anonymous: Create per un anonymo %{when} commented_by: Commento de %{user} %{when} commented_by_anonymous: Commento de un anonymo %{when} closed_by: Resolvite per %{user} %{when} @@ -1912,7 +1912,7 @@ ia: upload_trace: Incargar un tracia see_all_traces: Vider tote le tracias see_my_traces: Vider mi tracias - delete: + destroy: scheduled_for_deletion: Tracia programmate pro deletion make_public: made_public: Tracia rendite public diff --git a/config/locales/id.yml b/config/locales/id.yml index 0d2baa962..de3fa3dbb 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -274,9 +274,9 @@ id: open_title: 'Catatan belum tuntas: %{note_name}' closed_title: 'Catatan tuntas: %{note_name}' hidden_title: 'Catatan tersembunyi #%{note_name}' - open_by: Dibuat oleh %{user} %{when} yang lalu - open_by_anonymous: Dibuat oleh anonim %{when} yang - lalu + opened_by: Dibuat oleh %{user} %{when} yang lalu + opened_by_anonymous: Dibuat oleh anonim %{when} + yang lalu commented_by: Komentar dari %{user} %{when} yang lalu commented_by_anonymous: Komentar dari anonim %{when} @@ -1877,7 +1877,7 @@ id: upload_trace: Unggah jejak GPS see_all_traces: Lihat semua jejak see_my_traces: Lihat semua jejak saya - delete: + destroy: scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus make_public: made_public: Jejak yang dipublikasikan diff --git a/config/locales/is.yml b/config/locales/is.yml index 9aa60d33c..4bb95fcd6 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -304,8 +304,8 @@ is: open_title: 'Minnispunktur án lausnar #%{note_name}' closed_title: 'Minnispunktur með lausn #%{note_name}' hidden_title: 'Falinn minnispunktur #%{note_name}' - open_by: Búið til af %{user} fyrir %{when} síðan - open_by_anonymous: Búið til af nafnlausum notanda fyrir %{when} + opened_by: Búið til af %{user} fyrir %{when} síðan + opened_by_anonymous: Búið til af nafnlausum notanda fyrir %{when} síðan commented_by: Umsögn frá %{user} fyrir %{when} síðan commented_by_anonymous: Umsögn frá nafnlausum notanda fyrir %{when} @@ -1975,7 +1975,7 @@ is: upload_trace: Senda inn feril see_all_traces: Sjá alla ferla see_my_traces: Skoða ferlana mína - delete: + destroy: scheduled_for_deletion: Þessum feril verður eitt make_public: made_public: Ferilinn var gerður sjáanlegur diff --git a/config/locales/it.yml b/config/locales/it.yml index 6943654bc..800d3af53 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -335,8 +335,8 @@ it: open_title: 'Nota irrisolta #%{note_name}' closed_title: 'Nota risolta #%{note_name}' hidden_title: 'Nota nascosta #%{note_name}' - open_by: Creata da %{user} %{when} - open_by_anonymous: Creata da anonimo %{when} + opened_by: Creata da %{user} %{when} + opened_by_anonymous: Creata da anonimo %{when} commented_by: Commento da %{user} %{when} commented_by_anonymous: Commento da anonimo %{when} closed_by: Risolta da %{user} %{when} @@ -1979,7 +1979,7 @@ it: upload_trace: Carica un tracciato see_all_traces: Vedi tutti i tracciati see_my_traces: Vedi i miei tracciati - delete: + destroy: scheduled_for_deletion: Tracciato in attesa di essere eliminato make_public: made_public: Tracciato reso pubblico diff --git a/config/locales/ja.yml b/config/locales/ja.yml index ef89cf083..ee94107ba 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -327,8 +327,8 @@ ja: open_title: '未解決のメモ #%{note_name}' closed_title: '解決済のメモ #%{note_name}' hidden_title: '非表示のメモ #%{note_name}' - open_by: '%{user}さんが%{when}前に作成' - open_by_anonymous: 誰かが%{when}前に作成 + opened_by: '%{user}さんが%{when}前に作成' + opened_by_anonymous: 誰かが%{when}前に作成 commented_by: '%{user}さんによる%{when}前のコメント' commented_by_anonymous: 誰かによる%{when}前のコメント closed_by: '%{user}さんが%{when}前に解決' @@ -1811,7 +1811,7 @@ ja: upload_trace: トレースをアップロード see_all_traces: すべてのトレースを見る see_my_traces: 位置情報を見る - delete: + destroy: scheduled_for_deletion: トレースの削除準備を行いました make_public: made_public: トレースを公開しました diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 912107e91..79307e62c 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -253,8 +253,8 @@ kab: open_title: 'Tazmilt ur yefrin ara #%{note_name}' closed_title: 'Tazmilt ur yefrin ara #%{note_name}' hidden_title: 'Tazmilt yeffren #%{note_name}' - open_by: Yerna-t %{user} %{when} aya - open_by_anonymous: Yernat useqdac udrig %{when} + opened_by: Yerna-t %{user} %{when} aya + opened_by_anonymous: Yernat useqdac udrig %{when} aya commented_by: Awennit sÉ£ur %{user} %{when} aya commented_by_anonymous: Awennit n useqdac udrig %{when} @@ -1121,7 +1121,7 @@ kab: awiki. upload_trace: Azen lǧerra see_all_traces: Wali akk lǧerrat - delete: + destroy: scheduled_for_deletion: TafuÉ£alt yettwaheggan i tukksa make_public: made_public: Lǧerra GPS yuÉ£alen d tazayezt diff --git a/config/locales/km.yml b/config/locales/km.yml index 73ba3e8c6..6f725f6f4 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -164,8 +164,8 @@ km: title: កំណត់សម្គាល់៖ %{id} new_note: កំណត់សម្គាល់ថ្មី description: ការពិពណ៌នា - open_by: បង្កើតដោយ %{user} %{when} មុន - open_by_anonymous: បង្កើតឡើងដោយជនអនាមិក %{when} + opened_by: បង្កើតដោយ %{user} %{when} មុន + opened_by_anonymous: បង្កើតឡើងដោយជនអនាមិក %{when} មុន commented_by: មតិពី %{user} %{when} មុន commented_by_anonymous: មតិពីជនអនាមិក %{when} មុន diff --git a/config/locales/ko.yml b/config/locales/ko.yml index a1deae15a..46a87395b 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -294,8 +294,8 @@ ko: open_title: '해결되지 않은 참고 #%{note_name}' closed_title: '해결된 참고 #%{note_name}' hidden_title: '숨겨진 참고 #%{note_name}' - open_by: '%{user}님이 %{when}에 만듦' - open_by_anonymous: 익명이 %{when}에 만듦 + opened_by: '%{user}님이 %{when}에 만듦' + opened_by_anonymous: 익명이 %{when}에 만듦 commented_by: '%{user}님의 %{when} 의견' commented_by_anonymous: 익명 사용자의 %{when} 의견 closed_by: '%{user}님이 %{when}에 해결함' @@ -1855,7 +1855,7 @@ ko: upload_trace: 궤적 올리기 see_all_traces: 모든 궤적 보기 see_my_traces: 내 추적 보기 - delete: + destroy: scheduled_for_deletion: 삭제 계획중인 궤적 make_public: made_public: 추적이 공개적으로 만들어짐 diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 887ffd7c6..f87bf13dd 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -253,9 +253,9 @@ ku-Latn: open_title: 'Nota ku nehatiye çarekirin #%{note_name}' closed_title: 'Nota ku hatiye çarekirin #%{note_name}' hidden_title: 'Notê veşartî #%{note_name}' - open_by: Ji alî %{user} ve berî %{when} + opened_by: Ji alî %{user} ve berî %{when} hatiye çêkirin - open_by_anonymous: Berî %{when} wek anonîm + opened_by_anonymous: Berî %{when} wek anonîm hate çêkirin. commented_by: Şiroveya ji %{user} yê berî %{when} commented_by_anonymous: Şîrove ji alî bikarhênerek anonîm ve berî viru(n) %{when} - open_by_anonymous: Ugeluecht vun engem Anonymen + opened_by: Ugeluecht vum %{user} viru(n) %{when} + opened_by_anonymous: Ugeluecht vun engem Anonymen viru(n) %{when} commented_by: Bemierkung vum %{user} viru(n) %{when} commented_by_anonymous: Bemierkung vun engem Anonymen diff --git a/config/locales/lt.yml b/config/locales/lt.yml index d2558e3e4..c4b23bf0e 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -302,8 +302,8 @@ lt: open_title: 'NeiÅ¡spręsta pastaba: %{note_name}' closed_title: 'IÅ¡spręsta pastaba: %{note_name}' hidden_title: 'Paslėpta pastaba #%{note_name}' - open_by: Sukurta naudotojo %{user} %{when} - open_by_anonymous: Sukurta anonimo %{when} + opened_by: Sukurta naudotojo %{user} %{when} + opened_by_anonymous: Sukurta anonimo %{when} commented_by: Naudotojo %{user} komentaras %{when} commented_by_anonymous: Anonimo komentaras %{when} closed_by: IÅ¡sprendė naudotojas %{user} %{when} @@ -1862,7 +1862,7 @@ lt: upload_trace: Ä®kelti pėdsaką see_all_traces: Rodyti visus pėdsakus see_my_traces: ŽiÅ«rėti mano pėdsakus - delete: + destroy: scheduled_for_deletion: Trasa, numatyta iÅ¡trinimui make_public: made_public: Pėdsakas nuo dabar bus vieÅ¡as diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 5174af69a..9ed97be28 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -259,8 +259,8 @@ lv: open_title: 'Neatrisināta piezÄ«me: #%{note_name}' closed_title: 'Atrisināta piezÄ«me: #%{note_name}' hidden_title: 'Paslēpta piezÄ«me #%{note_name}' - open_by: Izveidoja %{user} %{when} atpakaļ - open_by_anonymous: Izveidoja anonÄ«ms %{when} atpakaļ + opened_by: Izveidoja %{user} %{when} atpakaļ + opened_by_anonymous: Izveidoja anonÄ«ms %{when} atpakaļ commented_by: Komentārs no %{user} %{when} atpakaļ commented_by_anonymous: Komentārs no anonÄ«ma %{when} atpakaļ @@ -1699,7 +1699,7 @@ lv: lapas. upload_trace: AugÅ¡upielādēt trasi see_all_traces: SkatÄ«t visas trases - delete: + destroy: scheduled_for_deletion: Trase atzÄ«mēta dzēšanai make_public: made_public: Trase padarÄ«ta publiska diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 9acddb2e9..8ba81f093 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -296,8 +296,8 @@ mk: open_title: Нерешена белешка бр. %{note_name} closed_title: Решена белешка бр. %{note_name} hidden_title: 'Скриена белешка бр. #%{note_name}' - open_by: Создадено од %{user} %{when} - open_by_anonymous: Создадено од анонимен %{when} + opened_by: Создадено од %{user} %{when} + opened_by_anonymous: Создадено од анонимен %{when} commented_by: Коментар на %{user} %{when} commented_by_anonymous: Коментар на анонимен %{when} closed_by: Решено од %{user} %{when} @@ -1933,7 +1933,7 @@ mk: upload_trace: Подигни трага see_all_traces: Погледајте ги сите траги see_my_traces: Мои траги - delete: + destroy: scheduled_for_deletion: Трагата е закажана за бришење make_public: made_public: Трагата е објавена diff --git a/config/locales/mo.yml b/config/locales/mo.yml index 6605c8ca0..b57dafd71 100644 --- a/config/locales/mo.yml +++ b/config/locales/mo.yml @@ -146,8 +146,9 @@ mo: open_title: 'Нотэ нерезолватэ #%{note_name}' closed_title: 'Нотэ резолватэ #%{note_name}' hidden_title: 'Нотэ аскунсэ #%{note_name}' - open_by: Креатэ де %{user} ку %{when} ын урмэ - open_by_anonymous: Креатэ аноним ку %{when} ын урмэ + opened_by: Креатэ де %{user} ку %{when} ын урмэ + opened_by_anonymous: Креатэ аноним ку %{when} ын + урмэ commented_by: Коментариу скрис де %{user} ку %{when} ын урмэ commented_by_anonymous: Коментариу аноним ку %{when} diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 8e66b3123..b8c208684 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -205,8 +205,9 @@ mr: open_title: 'निराकरण न झालेली टीप #%{note_name}' closed_title: 'निराकरण झालेली टीप #%{note_name}' hidden_title: 'लपविलेली टीप #%{note_name}' - open_by: %{when} पूर्वी%{user} ने तयार केले - open_by_anonymous: %{when} पूर्वी अनामिकाने + opened_by: %{when} पूर्वी%{user} ने तयार + केले + opened_by_anonymous: %{when} पूर्वी अनामिकाने तयार केले commented_by: %{when} पूर्वी%{user} ची टिप्पणी commented_by_anonymous: %{when} पूर्वी अनामिकाची diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 25d61e3ec..f86369b61 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -246,8 +246,8 @@ ms: open_title: 'Nota yang belum diselesaikan: #%{note_name}' closed_title: 'Nota yang telah diselesaikan: #%{note_name}' hidden_title: 'Nota tersembunyi #%{note_name}' - open_by: Dicipta oleh %{user} %{when} lalu - open_by_anonymous: Dicipta oleh pengguna awanama %{when} + opened_by: Dicipta oleh %{user} %{when} lalu + opened_by_anonymous: Dicipta oleh pengguna awanama %{when} lalu commented_by: Komen oleh %{user} %{when} lalu commented_by_anonymous: Komen oleh pengguna awanama %{when} @@ -1586,7 +1586,7 @@ ms: wiki ini. upload_trace: Muat naik jejak see_all_traces: Lihat semua jejak - delete: + destroy: scheduled_for_deletion: Jejak dijadualkan untuk penghapusan make_public: made_public: Jejak diumumkan diff --git a/config/locales/nb.yml b/config/locales/nb.yml index eb84a96ff..a340f3509 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -282,8 +282,8 @@ nb: open_title: 'Uavklart merknad #%{note_name}' closed_title: 'Avklart merknad: #%{note_name}' hidden_title: 'Skjult notis #%{note_name}' - open_by: Opprettet av %{user} for %{when} siden - open_by_anonymous: Opprettet av anonym bruker for %{when} + opened_by: Opprettet av %{user} for %{when} siden + opened_by_anonymous: Opprettet av anonym bruker for %{when} siden commented_by: Kommentar fra %{user} for %{when} siden @@ -1895,7 +1895,7 @@ nb: upload_trace: Last opp et GPS-spor see_all_traces: Se alle spor see_my_traces: Se alle mine spor - delete: + destroy: scheduled_for_deletion: Spor planlagt slettet make_public: made_public: Spor gjort offentlig diff --git a/config/locales/ne.yml b/config/locales/ne.yml index e59e4b1f0..d94a7889d 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -233,10 +233,10 @@ ne: open_title: 'समाधान नगरिएको टिप्पणी #%{note_name}' closed_title: 'समाधान गरिएको टिप्पणी #%{note_name}' hidden_title: 'लुकाइएको टिप्पणी #%{note_name}' - open_by: '%{user}द्वारा %{when} अगाडि सिर्जना - गरिएको' - open_by_anonymous: %{when} अगाडि अज्ञात व्यक्तिद्वारा - सिर्जना गरिएको + opened_by: '%{user}द्वारा %{when} अगाडि + सिर्जना गरिएको' + opened_by_anonymous: %{when} अगाडि अज्ञात + व्यक्तिद्वारा सिर्जना गरिएको commented_by: '%{user}द्वारा %{when} अगाडि गरिएको टिप्पणी' commented_by_anonymous: अज्ञात व्यक्तिद्वारा %{when} @@ -1098,7 +1098,7 @@ ne: public_traces_from: '%{user}बाट सार्वकनिक GPS ट्रेसहरु' tagged_with: ' %{tags}हरूद्वारा ट्याग गरिएको' see_all_traces: सबै ट्रेसहरु हेर्ने - delete: + destroy: scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस make_public: made_public: सार्वजनिक बनाइएको ट्रेस diff --git a/config/locales/nl.yml b/config/locales/nl.yml index ed2601253..54a657f04 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -337,8 +337,8 @@ nl: open_title: 'Onopgeloste opmerking #%{note_name}' closed_title: 'Opgeloste opmerking #%{note_name}' hidden_title: 'Verborgen opmerking #%{note_name}' - open_by: %{when} aangemaakt door %{user} - open_by_anonymous: %{when} aangemaakt door + opened_by: %{when} aangemaakt door %{user} + opened_by_anonymous: %{when} aangemaakt door anoniem commented_by: Reactie van %{user} %{when} commented_by_anonymous: Reactie van anoniem %{when} @@ -1986,7 +1986,7 @@ nl: upload_trace: Trace uploaden see_all_traces: Alle traces bekijken see_my_traces: Weergeef mijn tracks - delete: + destroy: scheduled_for_deletion: Trace staat op de lijst voor verwijdering make_public: made_public: Trace openbaar gemaakt diff --git a/config/locales/nn.yml b/config/locales/nn.yml index c789a75b6..8e14c119e 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -239,8 +239,9 @@ nn: open_title: 'Uavklart merknad #%{note_name}' closed_title: 'Avklart merknad: #%{note_name}' hidden_title: 'Gøymd merknad #%{note_name}' - open_by: Oppretta av %{user} %{when} sidan - open_by_anonymous: Oppretta av anonym %{when} sidan + opened_by: Oppretta av %{user} %{when} sidan + opened_by_anonymous: Oppretta av anonym %{when} + sidan commented_by: Kommentar frÃ¥ %{user} %{when} sidan commented_by_anonymous: Kommentar frÃ¥ anonym %{when} sidan @@ -1494,7 +1495,7 @@ nn: sida. upload_trace: Last opp eit GPS-spor see_all_traces: SjÃ¥ alle spor - delete: + destroy: scheduled_for_deletion: Spor planlagt sletta make_public: made_public: Spor gjort offentleg diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 483544d46..75b295b43 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -293,8 +293,8 @@ oc: open_title: Nòta pas resolguda nº %{note_name} closed_title: Nòta resolguda nº %{note_name} hidden_title: Nòta amagada nº %{note_name} - open_by: Creat per %{user} fa %{when} - open_by_anonymous: Creat per un utilizaire anonim fa + opened_by: Creat per %{user} fa %{when} + opened_by_anonymous: Creat per un utilizaire anonim fa %{when} commented_by: Comentari de %{user} fa %{when} commented_by_anonymous: Comentat per un utilizaire anonim fa @@ -843,7 +843,7 @@ oc: isolated_dwelling: Escart locality: Localitat municipality: Municipalitat - neighbourhood: Quartier de vila + neighbourhood: Quartier forestier, escart postcode: Còdi postal quarter: Quartièr region: Region @@ -851,7 +851,7 @@ oc: square: Plaça state: Estat / província subdivision: Subdivision - suburb: Quartier exterior + suburb: Quartier de vila, borgada town: Vila unincorporated_area: Luòc pas organizat village: Vilatge @@ -1838,7 +1838,7 @@ oc: upload_trace: Mandar una traça see_all_traces: Veire totas las traças see_my_traces: véder las mias traças - delete: + destroy: scheduled_for_deletion: Pista prevista per la supression make_public: made_public: Pista renduda publica diff --git a/config/locales/pl.yml b/config/locales/pl.yml index e6a64dfff..d896bf016 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -50,6 +50,7 @@ # Author: Teiron # Author: The Polish # Author: Ty221 +# Author: WaldiSt # Author: Woytecr # Author: Wpedzich # Author: Yarl @@ -89,6 +90,7 @@ pl: errors: messages: invalid_email_address: nie wygląda na poprawny adres e-mail + email_address_not_routable: nie jest routowalny models: acl: Lista kontroli dostępu changeset: Zestaw zmian @@ -359,8 +361,8 @@ pl: open_title: 'Nierozwiązana uwaga #%{note_name}' closed_title: 'Rozwiązana uwaga #%{note_name}' hidden_title: 'Ukryta uwaga #%{note_name}' - open_by: 'Utworzona przez: %{user} %{when}' - open_by_anonymous: Utworzona anonimowo %{when}. + opened_by: 'Utworzona przez: %{user} %{when}' + opened_by_anonymous: Utworzona anonimowo %{when}. commented_by: Komentarz od %{user} %{when} commented_by_anonymous: Skomentowana anonimowo %{when} closed_by: 'Rozwiązana przez: %{user} %{when}' @@ -1577,10 +1579,10 @@ pl: że udostępniający je podmiot popiera OpenStreetMap, udziela jakiejkolwiek gwarancji lub ponosi jakąkolwiek odpowiedzialność. infringement_title_html: Naruszenia praw autorskich - infringement_1_html: Użytkownicy OpenStreetMap powinni pamiętać, aby nigdy - nie dodawać danych z żadnych źródeł chronionych prawami autorskimi (jak - np. Google Maps i większość map drukowanych) bez wyraźnego pozwolenia - właściciela praw autorskich. + infringement_1_html: Autorzy OpenStreetMap powinni pamiętać, aby nigdy nie + dodawać danych z żadnych źródeł chronionych prawami autorskimi (jak np. + Google Maps i większość map drukowanych) bez wyraźnego pozwolenia właściciela + praw autorskich. infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim został niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej procedury @@ -1991,7 +1993,7 @@ pl: upload_trace: Wyślij ślad see_all_traces: Wyświetl wszystkie ślady see_my_traces: Zobacz moje ślady - delete: + destroy: scheduled_for_deletion: Ślad oczekuje na usunięcie make_public: made_public: Ślad stał się publicznie dostępny @@ -2224,6 +2226,15 @@ pl: title: Warunki heading: Warunki heading_ct: Warunki uczestnictwa + read and accept with tou: Przeczytaj Warunki uczestnictwa i Warunki użytkowania, + zaznacz oba pola wyboru po zakończeniu, a następnie naciśnij przycisk Kontynuuj. + contributor_terms_explain: Niniejsza umowa reguluje warunki twoich obecnych + i przyszłych wkładów. + read_ct: Przeczytałem i akceptuję powyższe warunki współautora + tou_explain_html: Te %{tou_link} regulują korzystanie ze strony internetowej + i innej infrastruktury zapewnianej przez OSMF. Kliknij link, przeczytaj i + zaakceptuj tekst. + read_tou: Przeczytałem i akceptuję Warunki użytkowania consider_pd: Oprócz powyższych warunków, stwierdzam również, że mój wkład jest w domenie publicznej consider_pd_why: co to oznacza? diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 001af78c1..373bc57dc 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -336,8 +336,8 @@ pt-BR: open_title: 'Nota não resolvida #%{note_name}' closed_title: 'Nota resolvida #%{note_name}' hidden_title: 'Nota oculta #%{note_name}' - open_by: Criado por %{user} %{when} - open_by_anonymous: Criado por um usuário anônimo %{when} + opened_by: Criado por %{user} %{when} + opened_by_anonymous: Criado por um usuário anônimo %{when} commented_by: Comentado por %{user} %{when} commented_by_anonymous: Comentado por um usuário anônimo %{when} closed_by: Resolvido por %{user} %{when} @@ -1984,7 +1984,7 @@ pt-BR: upload_trace: Enviar uma trilha see_all_traces: Ver todas as trilhas see_my_traces: Ver minhas trilhas - delete: + destroy: scheduled_for_deletion: Trilha marcada para ser apagada make_public: made_public: Trilha publicada diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 5b63a830c..50460ebb6 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -321,8 +321,8 @@ pt-PT: open_title: Erro não resolvido n.º %{note_name} closed_title: Erro resolvido n.º %{note_name} hidden_title: Erro ocultado n.º %{note_name} - open_by: Reportado por %{user} %{when} - open_by_anonymous: Reportado por um anónimo %{when} + opened_by: Reportado por %{user} %{when} + opened_by_anonymous: Reportado por um anónimo %{when} commented_by: Comentário de %{user} %{when} commented_by_anonymous: Comentário de um anónimo %{when} closed_by: Resolvido por %{user} %{when} @@ -1959,7 +1959,7 @@ pt-PT: upload_trace: Enviar trilho GPS see_all_traces: Ver todos os trilhos see_my_traces: Ver os meus trilhos - delete: + destroy: scheduled_for_deletion: Trilho programado para eliminação make_public: made_public: Trilho tornado público diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 1cf647f02..161e19833 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -305,8 +305,8 @@ ro: open_title: 'Notă nerezolvată #%{note_name}' closed_title: 'Notă rezolvată #%{note_name}' hidden_title: 'Notă ascunsă #%{note_name}' - open_by: Creat de %{user} %{when} - open_by_anonymous: Creat de anonim %{when} + opened_by: Creat de %{user} %{when} + opened_by_anonymous: Creat de anonim %{when} commented_by: Comentariu de la %{user} %{when} commented_by_anonymous: Comentariu de la anonim %{when} closed_by: Rezolvat de %{user} %{when} @@ -1955,7 +1955,7 @@ ro: upload_trace: Încărcați urma see_all_traces: Vedeți toate urmele see_my_traces: Vezi urmele mele - delete: + destroy: scheduled_for_deletion: Traseul este programat pentru ștergere make_public: made_public: Urma este făcută publică diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 35477d1fe..10c396390 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -370,8 +370,8 @@ ru: open_title: 'Необработанная заметка #%{note_name}' closed_title: 'Обработанная заметка #%{note_name}' hidden_title: 'Скрытая заметка #%{note_name}' - open_by: Создана %{user} %{when} - open_by_anonymous: Создано анонимно %{when} + opened_by: Создана %{user} %{when} + opened_by_anonymous: Создано анонимно %{when} commented_by: Комментарий от %{user} %{when} commented_by_anonymous: Анонимный комментарий %{when} closed_by: Обработана %{user} %{when} @@ -2001,7 +2001,7 @@ ru: upload_trace: Загрузить треки see_all_traces: Показать все треки see_my_traces: Показать мои треки - delete: + destroy: scheduled_for_deletion: Запланировано к удалению make_public: made_public: Трек сделан общедоступным diff --git a/config/locales/scn.yml b/config/locales/scn.yml index d8692ffa0..28b167998 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -243,8 +243,9 @@ scn: open_title: 'Nota nun arrisurvuta #%{note_name}' closed_title: 'Nota arrisurvuta #%{note_name}' hidden_title: 'Nota ammucciata #%{note_name}' - open_by: Criata di %{user} %{when} fa - open_by_anonymous: Criata di n'anònimu %{when} fa + opened_by: Criata di %{user} %{when} fa + opened_by_anonymous: Criata di n'anònimu %{when} + fa commented_by: Cummentu di %{user} %{when} fa commented_by_anonymous: Cummentu di n'anònimu %{when} fa @@ -1654,7 +1655,7 @@ scn: href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pàggina dâ wiki. upload_trace: Càrrica nu tracciatu see_all_traces: Talìa tutti li tracciati - delete: + destroy: scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni make_public: made_public: Tracciatu fattu pùbblicu diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 40face15c..36f315f52 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -4,6 +4,7 @@ # Author: Abijeet Patro # Author: AmaryllisGardener # Author: John Reid +# Author: MJL --- sco: time: @@ -68,7 +69,7 @@ sco: latitude: Latitude longitude: Longitude public: Public - description: Description + description: Descreeption message: sender: Sender title: Subject @@ -78,7 +79,7 @@ sco: email: Email active: Active display_name: Display Name - description: Description + description: Descreeption languages: Leids pass_crypt: Passwird editor: @@ -198,8 +199,8 @@ sco: open_title: 'Unresolved note #%{note_name}' closed_title: 'Resolved note #%{note_name}' hidden_title: 'Hidden note #%{note_name}' - open_by: Creatit bi %{user} %{when} ago - open_by_anonymous: Creatit bi anonymous %{when} + opened_by: Creatit bi %{user} %{when} ago + opened_by_anonymous: Creatit bi anonymous %{when} ago commented_by: Comment frae %{user} %{when} ago commented_by_anonymous: Comment frae anonymous %{when} @@ -1164,6 +1165,6 @@ sco: centre_map: Centre cairt here redactions: edit: - description: Description + description: Descreeption heading: Eedit redaction ... diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 0fb7d5750..a1c47e56f 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -247,8 +247,8 @@ sk: open_title: 'NevyrieÅ¡ená chyba #%{note_name}' closed_title: 'VyrieÅ¡ená chyba #%{note_name}' hidden_title: Skrytá poznámka %{note_name} - open_by: Vytvoril %{user} pred %{when} - open_by_anonymous: Vytvoril anonym pred %{when} + opened_by: Vytvoril %{user} pred %{when} + opened_by_anonymous: Vytvoril anonym pred %{when} commented_by: Komentár od %{user} pred %{when} commented_by_anonymous: Komentoval anonym pred %{when} closed_by: VyrieÅ¡il %{user} pred %{when} @@ -1504,7 +1504,7 @@ sk: alebo si niečo o GPS stopách prečítajte na wiki. upload_trace: NahraÅ¥ stopu see_all_traces: ZobraziÅ¥ vÅ¡etky stopy - delete: + destroy: scheduled_for_deletion: Stopa plánovaná na vymazanie make_public: made_public: Zverejnená stopa diff --git a/config/locales/sl.yml b/config/locales/sl.yml index a1916c8ac..0765ab56e 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -266,8 +266,8 @@ sl: open_title: 'NerazreÅ¡ena opomba #%{note_name}' closed_title: 'RazreÅ¡ena opomba #%{note_name}' hidden_title: 'Skrita opomba #%{note_name}' - open_by: Ustvaril %{user} %{when} nazaj - open_by_anonymous: Ustvaril anonimni %{when} nazaj + opened_by: Ustvaril %{user} %{when} nazaj + opened_by_anonymous: Ustvaril anonimni %{when} nazaj commented_by: Komentar uporabnika %{user} %{when} nazaj commented_by_anonymous: Komentar anonimnega uporabnika %{when} @@ -1630,7 +1630,7 @@ sl: upload_trace: Naloži sled GPS see_all_traces: Pokaži vse sledi see_my_traces: Pokaži moje sledi - delete: + destroy: scheduled_for_deletion: Sled bo izbrisana make_public: made_public: Sled je postala javna diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 5e37ba889..25daa537b 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -229,8 +229,8 @@ sq: open_title: 'Shënim i pazgjidhur #%{note_name}' closed_title: 'Shënim i zgjidhur #%{note_name}' hidden_title: 'Shënim i fshehur #%{note_name}' - open_by: Krijuar nga %{user} në %{when} më parë - open_by_anonymous: Krijuar nga person anonim %{when} + opened_by: Krijuar nga %{user} në %{when} më parë + opened_by_anonymous: Krijuar nga person anonim %{when} më parë commented_by: Krijuar nga %{user} në %{when} më parë @@ -1321,7 +1321,7 @@ sq: tagged_with: etiketuar me %{tags} upload_trace: Ngarko një gjurmë see_all_traces: Shih të gjitha gjurmët - delete: + destroy: scheduled_for_deletion: Gjurmë e planifikuar për fshirje make_public: made_public: Gjurmë e bërë publike diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index e23c31b62..c9ad2e1ca 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1184,7 +1184,7 @@ sr-Latn: stranici. upload_trace: Otpremi trag see_all_traces: Pogledaj sve tragove - delete: + destroy: scheduled_for_deletion: Trag postavljen za brisanje make_public: made_public: Javni trag diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 8590d9731..d8ccb7f10 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -266,8 +266,8 @@ sr: open_title: Нерешена белешка бр. %{note_name} closed_title: Решена белешка бр. %{note_name} hidden_title: Скривена белешка бр. %{note_name} - open_by: Направио %{user} пре %{when} - open_by_anonymous: Направио анониман корисник пре %{when} + opened_by: Направио %{user} пре %{when} + opened_by_anonymous: Направио анониман корисник пре %{when} commented_by: Коментар корисника %{user} пре %{when} commented_by_anonymous: Коментар анонимног корисника пре %{when} closed_by: Разрешио %{user} пре %{when} @@ -1811,7 +1811,7 @@ sr: upload_trace: Отпреми траг see_all_traces: Погледај све трагове see_my_traces: Прикажи моје трагове - delete: + destroy: scheduled_for_deletion: Траг постављен за брисање make_public: made_public: Јавни траг diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 648d3d85e..41e562df8 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -330,8 +330,8 @@ sv: open_title: 'Ej avklarad anteckning #%{note_name}' closed_title: 'Avklarad anteckning #%{note_name}' hidden_title: 'Dold anteckning #%{note_name}' - open_by: Skapad av %{user} %{when} - open_by_anonymous: Skapad av anonym %{when} + opened_by: Skapad av %{user} %{when} + opened_by_anonymous: Skapad av anonym %{when} commented_by: Kommentar frÃ¥n %{user} %{when} commented_by_anonymous: Kommentar frÃ¥n en anonym användare för %{when} @@ -1967,7 +1967,7 @@ sv: upload_trace: Ladda upp GPS-spÃ¥r see_all_traces: Se alla GPS-spÃ¥r see_my_traces: Se mina GPS-spÃ¥r - delete: + destroy: scheduled_for_deletion: GPS-spÃ¥r schemalagt för radering make_public: made_public: GPS-spÃ¥r offentliggjort diff --git a/config/locales/th.yml b/config/locales/th.yml index 098fb1282..9f0aaa1c4 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -244,8 +244,8 @@ th: open_title: 'หมายเหตุที่ยังไม่มีคำตอบ #%{note_name}' closed_title: หมายเหตุที่ตอบสนองแล้ว %{note_name} hidden_title: 'หมายเหตุที่ซ่อนอยู่ #%{note_name}' - open_by: จัดทำโดย %{user} เมื่อ %{when} - open_by_anonymous: จัดทำโดยผู้ไม่ประสงค์ออกนามเมื่อ %{when} + opened_by: จัดทำโดย %{user} เมื่อ %{when} + opened_by_anonymous: จัดทำโดยผู้ไม่ประสงค์ออกนามเมื่อ %{when} commented_by: ความเห็นจาก %{user} เมื่อ %{when} commented_by_anonymous: ความเห็นจากผู้ไม่ประสงค์ออกนามเมื่อ %{when} closed_by: แก้ไขโดย %{user} เมื่อ %{when} diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 98686a3e2..e6df49135 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -218,8 +218,8 @@ tl: new_note: Bagong Tala description: Paglalarawan hidden_title: 'Nakatagong tala #%{note_name}' - open_by: Nilikha ni %{user} %{when} ang nakaraan - open_by_anonymous: Nilikha ng isang di-nagpakilalang tagagamit %{when} + opened_by: Nilikha ni %{user} %{when} ang nakaraan + opened_by_anonymous: Nilikha ng isang di-nagpakilalang tagagamit %{when} ang nakaraan commented_by: Puna mula kay %{user} %{when} ang nakaraan @@ -1439,7 +1439,7 @@ tl: ng wiki. upload_trace: Magkargang paitaas ng isang bakas see_all_traces: Tingnan ang lahat ng mga pagbabakas - delete: + destroy: scheduled_for_deletion: Itinakda ang bakas para sa pagtatanggal make_public: made_public: Ginawang pangmadla ang bakas diff --git a/config/locales/tr.yml b/config/locales/tr.yml index bfa9c9110..1c7f6061d 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -327,8 +327,9 @@ tr: open_title: 'Çözümlenmemiş not: #%{note_name}' closed_title: 'Çözümlenmiş not: #%{note_name}' hidden_title: 'Gizli not #%{note_name}' - open_by: '%{user} tarafından %{when} oluşturuldu' - open_by_anonymous: Anonim olarak %{when} + opened_by: '%{user} tarafından %{when} + oluşturuldu' + opened_by_anonymous: Anonim olarak %{when} oluşturuldu commented_by: '%{user} kullanıcısının %{when} yorumu' @@ -1985,7 +1986,7 @@ tr: upload_trace: GPS izi gönder see_all_traces: Tüm izleri görüntüle see_my_traces: Ä°zlerimi görüntüle - delete: + destroy: scheduled_for_deletion: Ä°z, silme işlemi için ayarlandı make_public: made_public: Iz herkese açık diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 24cb0968d..6a9489ea1 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -178,8 +178,8 @@ tt: note: title: 'Искәрмә: %{id}' description: Тасвирлама - open_by: '%{user} тарафыннан төзелгән %{when}' - open_by_anonymous: Аноним тарафыннан төзелгән %{when} + opened_by: '%{user} тарафыннан төзелгән %{when}' + opened_by_anonymous: Аноним тарафыннан төзелгән %{when} hidden_by: '%{user} тарафыннан яшеренгән %{when}' changesets: changeset_paging_nav: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 1281e0ae1..9474541c5 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -338,8 +338,8 @@ uk: open_title: 'Неопрацьована нотатка #%{note_name}' closed_title: 'Опрацьована нотатка #%{note_name}' hidden_title: 'Прихована нотатка #%{note_name}' - open_by: Створено учасником %{user} %{when} - open_by_anonymous: Створено анонімом %{when} + opened_by: Створено учасником %{user} %{when} + opened_by_anonymous: Створено анонімом %{when} commented_by: Прокоментовано учасником %{user} %{when} commented_by_anonymous: Прокоментовано анонімом %{when} closed_by: Розв’язано учасником %{user} %{when} @@ -1965,7 +1965,7 @@ uk: upload_trace: Надіслати GPS-трек на сервер see_all_traces: Показати всі треки see_my_traces: Показати мої треки - delete: + destroy: scheduled_for_deletion: Заплановано для вилучення make_public: made_public: Трек зроблено загальнодоступним diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 749d6c98c..ba872ab65 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -271,8 +271,8 @@ vi: open_title: 'Ghi chú chÆ°a giải quyết #%{note_name}' closed_title: 'Ghi chú đã giải quyết #%{note_name}' hidden_title: 'Ghi chú ẩn #%{note_name}' - open_by: Tạo bởi %{user} %{when} - open_by_anonymous: Tạo vô danh %{when} + opened_by: Tạo bởi %{user} %{when} + opened_by_anonymous: Tạo vô danh %{when} commented_by: Bình luận của %{user} %{when} commented_by_anonymous: Bình luận vô danh %{when} closed_by: Giải quyết bởi %{user} %{when} @@ -1856,7 +1856,7 @@ vi: upload_trace: Tải lên tuyến đường see_all_traces: Xem tất cả các tuyến đường see_my_traces: Xem các tuyến đường của tôi - delete: + destroy: scheduled_for_deletion: Tuyến đường chờ được xóa make_public: made_public: Tuyến đường được phát hành công khai diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 416dda744..baa61ebba 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -334,8 +334,8 @@ zh-CN: open_title: '未解决笔记 #%{note_name}' closed_title: '已解决笔记 #%{note_name}' hidden_title: '隐藏笔记 #%{note_name}' - open_by: '%{user}创建于%{when}' - open_by_anonymous: 匿名用户创建于%{when} + opened_by: '%{user}创建于%{when}' + opened_by_anonymous: 匿名用户创建于%{when} commented_by: '%{user}于%{when}发表的评论' commented_by_anonymous: 匿名用户于%{when}发表的评论 closed_by: '%{user}解决于%{when}' @@ -1812,7 +1812,7 @@ zh-CN: upload_trace: 上传轨迹 see_all_traces: 查看所有轨迹 see_my_traces: 查看我的轨迹 - delete: + destroy: scheduled_for_deletion: 计划删除的轨迹 make_public: made_public: 公开化路径 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 51f459da4..bfd293fb9 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -326,8 +326,8 @@ zh-TW: open_title: 未解決的註記：#%{note_name} closed_title: 已解決的註記：#%{note_name} hidden_title: 已隱藏的註記：#%{note_name} - open_by: 於%{when}由%{user}建立 - open_by_anonymous: 於%{when}由匿名使用者建立 + opened_by: 於%{when}由%{user}建立 + opened_by_anonymous: 於%{when}由匿名使用者建立 commented_by: '%{user}於%{when}的評論' commented_by_anonymous: 匿名使用者於%{when}的評論 closed_by: 於%{when}由%{user}解決 @@ -1837,7 +1837,7 @@ zh-TW: upload_trace: 上傳軌跡 see_all_traces: 查看所有的軌跡 see_my_traces: 查看我的軌跡 - delete: + destroy: scheduled_for_deletion: 軌跡已被排程刪除 make_public: made_public: 軌跡標記為公開 diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index 91fb83b67..a798013db 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -259,11 +259,31 @@ class SiteControllerTest < ActionController::TestCase assert_equal 18, assigns(:zoom) end + # Test editing inaccessible nodes + def test_edit_with_inaccessible_nodes + user = create(:user) + deleted_node = create(:node, :lat => 1.0, :lon => 1.0, :visible => false) + + get :edit, :params => { :node => 99999 }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + + get :edit, :params => { :node => deleted_node.id }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + end + # Test editing a specific way def test_edit_with_way user = create(:user) node = create(:node, :lat => 3, :lon => 3) - way = create(:way) + way = create(:way) create(:way_node, :node => node, :way => way) get :edit, :params => { :way => way.id }, :session => { :user => user } @@ -274,6 +294,26 @@ class SiteControllerTest < ActionController::TestCase assert_equal 17, assigns(:zoom) end + # Test editing inaccessible ways + def test_edit_with_inaccessible_ways + user = create(:user) + deleted_way = create(:way, :visible => false) + + get :edit, :params => { :way => 99999 }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + + get :edit, :params => { :way => deleted_way.id }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + end + # Test editing a specific note def test_edit_with_note user = create(:user) @@ -289,10 +329,32 @@ class SiteControllerTest < ActionController::TestCase assert_equal 17, assigns(:zoom) end + # Test editing inaccessible notes + def test_edit_with_inaccessible_notes + user = create(:user) + deleted_note = create(:note, :status => "hidden") do |n| + n.comments.create(:author_id => user.id) + end + + get :edit, :params => { :note => 99999 }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + + get :edit, :params => { :note => deleted_note.id }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + end + # Test editing a specific GPX trace def test_edit_with_gpx user = create(:user) - gpx = create(:trace, :latitude => 1, :longitude => 1) + gpx = create(:trace, :latitude => 1, :longitude => 1) get :edit, :params => { :gpx => gpx.id }, :session => { :user => user } assert_response :success @@ -302,6 +364,34 @@ class SiteControllerTest < ActionController::TestCase assert_equal 16, assigns(:zoom) end + # Test editing inaccessible GPX traces + def test_edit_with_inaccessible_gpxes + user = create(:user) + deleted_gpx = create(:trace, :deleted, :latitude => 1, :longitude => 1) + private_gpx = create(:trace, :latitude => 1, :longitude => 1, :visibility => "private") + + get :edit, :params => { :gpx => 99999 }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + + get :edit, :params => { :gpx => deleted_gpx.id }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + + get :edit, :params => { :gpx => private_gpx.id }, :session => { :user => user } + assert_response :success + assert_template "edit" + assert_nil assigns(:lat) + assert_nil assigns(:lon) + assert_nil assigns(:zoom) + end + # Test the edit page redirects def test_edit_redirect get :edit, :params => { :lat => 4, :lon => 5 } diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb index ce82f3ab5..838217e40 100644 --- a/test/helpers/note_helper_test.rb +++ b/test/helpers/note_helper_test.rb @@ -8,7 +8,7 @@ class NoteHelperTest < ActionView::TestCase date = Time.new(2014, 3, 5, 21, 37, 45, "+00:00") user = create(:user) - assert_match %r{^Created by anonymous .* ago$}, note_event("open", date, nil) + assert_match %r{^Created by anonymous .* ago$}, note_event("opened", date, nil) assert_match %r{^Resolved by #{user.display_name} .* ago$}, note_event("closed", date, user) end diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index ba4c12b8c..4d9bca7bf 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -40,7 +40,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }, + :params => { :user => { :email => dup_email, + :email_confirmation => dup_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } }, :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } end end @@ -61,7 +65,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }, + :params => { :user => { :email => email, + :email_confirmation => email, + :display_name => dup_display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } }, :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } end end @@ -82,7 +90,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end end end @@ -124,7 +136,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end end end @@ -160,10 +176,20 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :referer => referer } assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -208,7 +234,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! @@ -218,7 +250,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -241,7 +280,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! @@ -273,7 +318,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! @@ -283,7 +335,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -330,7 +389,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") follow_redirect! @@ -340,7 +404,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -363,7 +434,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") follow_redirect! @@ -397,7 +473,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") follow_redirect! @@ -407,7 +489,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -452,7 +541,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") follow_redirect! @@ -462,7 +556,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -485,7 +586,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") follow_redirect! @@ -517,7 +623,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") follow_redirect! @@ -527,7 +639,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -572,7 +691,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") follow_redirect! @@ -582,7 +706,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -605,7 +736,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") follow_redirect! @@ -637,7 +773,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") follow_redirect! @@ -647,7 +789,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -692,7 +841,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") follow_redirect! @@ -702,7 +856,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, + :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -725,7 +887,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") follow_redirect! @@ -757,7 +924,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") follow_redirect! @@ -767,7 +940,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, + :read_tou => 1 } follow_redirect! end end @@ -812,7 +993,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -822,7 +1008,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, + :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -845,7 +1039,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -877,7 +1076,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -887,7 +1092,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_ct => 1, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, + :read_tou => 1 } follow_redirect! end end diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb index 3aa528ceb..cdfd234af 100644 --- a/test/lib/i18n_test.rb +++ b/test/lib/i18n_test.rb @@ -3,51 +3,53 @@ require "test_helper" class I18nTest < ActiveSupport::TestCase I18n.available_locales.each do |locale| define_method("test_#{locale.to_s.underscore}".to_sym) do - # plural_keys = plural_keys(locale) + without_i18n_exceptions do + # plural_keys = plural_keys(locale) - translation_keys.each do |key| - variables = [] + translation_keys.each do |key| + variables = [] - default_value = I18n.t(key, :locale => I18n.default_locale) + default_value = I18n.t(key, :locale => I18n.default_locale) - if default_value.is_a?(Hash) - variables.push("count") + if default_value.is_a?(Hash) + variables.push("count") - default_value.each_value do |subvalue| - subvalue.scan(/%\{(\w+)\}/) do + default_value.each_value do |subvalue| + subvalue.scan(/%\{(\w+)\}/) do + variables.push(Regexp.last_match(1)) + end + end + else + default_value.scan(/%\{(\w+)\}/) do variables.push(Regexp.last_match(1)) end end - else - default_value.scan(/%\{(\w+)\}/) do - variables.push(Regexp.last_match(1)) - end - end - variables.push("attribute") if key =~ /^(active(model|record)\.)?errors\./ + variables.push("attribute") if key =~ /^(active(model|record)\.)?errors\./ - value = I18n.t(key, :locale => locale, :fallback => true) + value = I18n.t(key, :locale => locale, :fallback => true) - if value.is_a?(Hash) - value.each do |subkey, subvalue| - # assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key" + if value.is_a?(Hash) + value.each do |subkey, subvalue| + # assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key" - next if subvalue.nil? + next if subvalue.nil? - subvalue.scan(/%\{(\w+)\}/) do - assert variables.include?(Regexp.last_match(1)), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}" + subvalue.scan(/%\{(\w+)\}/) do + assert variables.include?(Regexp.last_match(1)), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}" + end end - end - else - assert value.is_a?(String), "#{key} is not a string" + else + assert value.is_a?(String), "#{key} is not a string" - value.scan(/%\{(\w+)\}/) do - assert variables.include?(Regexp.last_match(1)), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}" + value.scan(/%\{(\w+)\}/) do + assert variables.include?(Regexp.last_match(1)), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}" + end end end - end - assert %w[ltr rtl].include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl" + assert %w[ltr rtl].include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl" + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 05385b4f9..4d9372148 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -42,6 +42,18 @@ module ActiveSupport end end + ## + # execute a block with missing translation exceptions suppressed + def without_i18n_exceptions + exception_handler = I18n.exception_handler + begin + I18n.exception_handler = nil + yield + ensure + I18n.exception_handler = exception_handler + end + end + ## # work round minitest insanity that causes it to tell you # to use assert_nil to test for nil, which is fine if you're