From: Andy Allan Date: Wed, 19 Jun 2024 14:34:14 +0000 (+0100) Subject: Merge pull request #4813 from AntonKhorev/no-fst-italic X-Git-Tag: live~382 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d57dd1f4da4d4605f534607b69944e3c977e4db5?hp=98ff2c0b9c28b7a039b55573540f85ea84eb9fca Merge pull request #4813 from AntonKhorev/no-fst-italic Use font size instead of italic for changeset/trace descriptions --- diff --git a/Gemfile b/Gemfile index 75387b5d5..5a21c7f7a 100644 --- a/Gemfile +++ b/Gemfile @@ -72,6 +72,7 @@ gem "validates_email_format_of", ">= 1.5.1" gem "quad_tile", "~> 1.0.1" # Sanitise URIs +gem "addressable", "~> 2.8" gem "rack-uri_sanitizer" # Omniauth for authentication @@ -116,9 +117,6 @@ gem "connection_pool" gem "dalli" gem "kgio" -# Load secure_headers for Content-Security-Policy support -gem "secure_headers" - # Load canonical-rails to generate canonical URLs gem "canonical-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 95bebd649..28acf9135 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,35 +3,35 @@ GEM specs: aasm (5.5.0) concurrent-ruby (~> 1.0) - actioncable (7.1.3.3) - actionpack (= 7.1.3.3) - activesupport (= 7.1.3.3) + actioncable (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.3) - actionpack (= 7.1.3.3) - activejob (= 7.1.3.3) - activerecord (= 7.1.3.3) - activestorage (= 7.1.3.3) - activesupport (= 7.1.3.3) + actionmailbox (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.3) - actionpack (= 7.1.3.3) - actionview (= 7.1.3.3) - activejob (= 7.1.3.3) - activesupport (= 7.1.3.3) + actionmailer (7.1.3.4) + actionpack (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.3) - actionview (= 7.1.3.3) - activesupport (= 7.1.3.3) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -41,39 +41,39 @@ GEM rails-html-sanitizer (~> 1.6) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actiontext (7.1.3.3) - actionpack (= 7.1.3.3) - activerecord (= 7.1.3.3) - activestorage (= 7.1.3.3) - activesupport (= 7.1.3.3) + actiontext (7.1.3.4) + actionpack (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.3) - activesupport (= 7.1.3.3) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (7.1.3.3) - activesupport (= 7.1.3.3) + activejob (7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.3.6) - activemodel (7.1.3.3) - activesupport (= 7.1.3.3) - activerecord (7.1.3.3) - activemodel (= 7.1.3.3) - activesupport (= 7.1.3.3) + activemodel (7.1.3.4) + activesupport (= 7.1.3.4) + activerecord (7.1.3.4) + activemodel (= 7.1.3.4) + activesupport (= 7.1.3.4) timeout (>= 0.4.0) - activerecord-import (1.6.0) + activerecord-import (1.7.0) activerecord (>= 4.2) - activestorage (7.1.3.3) - actionpack (= 7.1.3.3) - activejob (= 7.1.3.3) - activerecord (= 7.1.3.3) - activesupport (= 7.1.3.3) + activestorage (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activesupport (= 7.1.3.4) marcel (~> 1.0) - activesupport (7.1.3.3) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -95,17 +95,17 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.928.0) - aws-sdk-core (3.196.0) + aws-partitions (1.944.0) + aws-sdk-core (3.197.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.81.0) - aws-sdk-core (~> 3, >= 3.193.0) + aws-sdk-kms (1.85.0) + aws-sdk-core (~> 3, >= 3.197.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.150.0) - aws-sdk-core (~> 3, >= 3.194.0) + aws-sdk-s3 (1.152.3) + aws-sdk-core (~> 3, >= 3.197.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) @@ -137,10 +137,10 @@ GEM racc brotli (0.5.0) browser (5.3.1) - builder (3.2.4) + builder (3.3.0) bzip2-ffi (1.1.1) ffi (~> 1.0) - cancancan (3.5.0) + cancancan (3.6.1) canonical-rails (0.2.15) actionview (>= 4.1, <= 7.2) capybara (3.40.0) @@ -152,8 +152,8 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - concurrent-ruby (1.2.3) - config (5.4.0) + concurrent-ruby (1.3.3) + config (5.5.1) deep_merge (~> 1.2, >= 1.2.1) connection_pool (2.4.1) crack (1.0.0) @@ -198,7 +198,7 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) - dry-schema (1.13.3) + dry-schema (1.13.4) concurrent-ruby (~> 1.0) dry-configurable (~> 1.0, >= 1.0.1) dry-core (~> 1.0, < 2) @@ -226,7 +226,7 @@ GEM rainbow rubocop smart_properties - erubi (1.12.0) + erubi (1.13.0) execjs (2.9.1) exifr (1.4.0) factory_bot (6.4.6) @@ -234,11 +234,11 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (2.9.0) + faraday (2.9.2) faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -288,7 +288,7 @@ GEM image_size (3.4.0) in_threads (1.6.0) io-console (0.7.2) - irb (1.13.1) + irb (1.13.2) rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.12.0) @@ -300,7 +300,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.7.2) - jwt (2.8.1) + jwt (2.8.2) base64 kgio (2.11.4) kramdown (2.4.0) @@ -325,12 +325,12 @@ GEM marcel (1.0.4) matrix (0.4.2) maxminddb (0.1.22) - mini_magick (4.12.0) + mini_magick (4.13.1) mini_mime (1.1.5) - mini_portile2 (2.8.6) + mini_portile2 (2.8.7) mini_racer (0.9.0) libv8-node (~> 18.19.0.0) - minitest (5.23.0) + minitest (5.23.1) minitest-focus (1.4.0) minitest (>= 4, < 6) msgpack (1.7.2) @@ -339,7 +339,7 @@ GEM mutex_m (0.2.0) net-http (0.4.1) uri - net-imap (0.4.11) + net-imap (0.4.13) date net-protocol net-pop (0.1.2) @@ -349,7 +349,7 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.5) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (0.4.7) @@ -369,8 +369,9 @@ GEM hashie (>= 3.4.6) rack (>= 1.6.2, < 3) rack-protection - omniauth-facebook (9.0.0) - omniauth-oauth2 (~> 1.2) + omniauth-facebook (10.0.0) + bigdecimal + omniauth-oauth2 (>= 1.2, < 3) omniauth-github (2.0.1) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) @@ -382,7 +383,7 @@ GEM omniauth-mediawiki (0.0.4) jwt (~> 2.0) omniauth-oauth (~> 1.0) - omniauth-microsoft_graph (2.0.0) + omniauth-microsoft_graph (2.0.1) jwt (~> 2.0) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8.0) @@ -399,8 +400,8 @@ GEM actionpack (>= 4.2) omniauth (~> 2.0) openstreetmap-deadlock_retry (1.3.1) - parallel (1.24.0) - parser (3.3.1.0) + parallel (1.25.1) + parser (3.3.3.0) ast (~> 2.4.1) racc pg (1.5.6) @@ -408,11 +409,11 @@ GEM progress (3.6.0) psych (5.1.2) stringio - public_suffix (5.0.5) + public_suffix (5.1.1) puma (5.6.8) nio4r (~> 2.0) quad_tile (1.0.1) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-cors (2.0.2) rack (>= 2.0.0) @@ -430,20 +431,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3.3) - actioncable (= 7.1.3.3) - actionmailbox (= 7.1.3.3) - actionmailer (= 7.1.3.3) - actionpack (= 7.1.3.3) - actiontext (= 7.1.3.3) - actionview (= 7.1.3.3) - activejob (= 7.1.3.3) - activemodel (= 7.1.3.3) - activerecord (= 7.1.3.3) - activestorage (= 7.1.3.3) - activesupport (= 7.1.3.3) + rails (7.1.3.4) + actioncable (= 7.1.3.4) + actionmailbox (= 7.1.3.4) + actionmailer (= 7.1.3.4) + actionpack (= 7.1.3.4) + actiontext (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activemodel (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) bundler (>= 1.15.0) - railties (= 7.1.3.3) + railties (= 7.1.3.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -461,9 +462,9 @@ GEM rails_param (1.3.1) actionpack (>= 3.2.0) activesupport (>= 3.2.0) - railties (7.1.3.3) - actionpack (= 7.1.3.3) - activesupport (= 7.1.3.3) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -472,22 +473,23 @@ GEM rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) - regexp_parser (2.9.1) - reline (0.5.7) + regexp_parser (2.9.2) + reline (0.5.9) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - rexml (3.2.6) + rexml (3.3.0) + strscan rinku (2.0.6) rotp (6.3.0) - rouge (4.2.1) + rouge (4.3.0) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -500,17 +502,17 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.20.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-capybara (2.21.0) rubocop (~> 1.41) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) rubocop-minitest (0.35.0) rubocop (>= 1.61, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -522,14 +524,13 @@ GEM ruby-vips (2.2.1) ffi (~> 1.12) rubyzip (2.3.2) - sanitize (6.1.0) + sanitize (6.1.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass-embedded (1.64.2) google-protobuf (~> 3.23) rake (>= 13.0.0) - secure_headers (6.5.0) - selenium-webdriver (4.20.1) + selenium-webdriver (4.21.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -541,8 +542,7 @@ GEM simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) - simpleidn (0.2.2) - unf (~> 0.1.4) + simpleidn (0.2.3) smart_properties (1.17.0) snaky_hash (2.0.1) hashie @@ -553,16 +553,17 @@ GEM sprockets-exporters_pack (0.1.2) brotli (>= 0.2.0) sprockets (>= 4.0.0.beta3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.1) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - stringio (3.1.0) + stringio (3.1.1) strong_migrations (1.8.0) activerecord (>= 5.2) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - terser (1.2.2) + terser (1.2.3) execjs (>= 0.3.0, < 3) thor (1.3.1) tilt (2.3.0) @@ -573,9 +574,6 @@ GEM railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) unicode-display_width (2.5.0) uri (0.13.0) validates_email_format_of (1.8.2) @@ -583,7 +581,7 @@ GEM simpleidn vendorer (0.2.0) version_gem (1.1.4) - webmock (3.23.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -594,7 +592,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.14) + zeitwerk (2.6.16) PLATFORMS ruby @@ -604,6 +602,7 @@ DEPENDENCIES actionpack-page_caching (>= 1.2.0) active_record_union activerecord-import + addressable (~> 2.8) annotate argon2 autoprefixer-rails @@ -688,7 +687,6 @@ DEPENDENCIES rubocop-rake sanitize sass-embedded (~> 1.64.0) - secure_headers selenium-webdriver simplecov simplecov-lcov diff --git a/README.md b/README.md index eba23a360..e7e9bd259 100644 --- a/README.md +++ b/README.md @@ -45,3 +45,4 @@ More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTI * Tom Hughes [@tomhughes](https://github.com/tomhughes/) * Andy Allan [@gravitystorm](https://github.com/gravitystorm/) +* Anton Khorev [@AntonKhorev](https://github.com/AntonKhorev/) diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 3aba63c33..c0b2f3982 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -18,7 +18,8 @@ class Ability can [:index, :feed, :show], Changeset can :index, ChangesetComment can [:confirm, :confirm_resend, :confirm_email], :confirmation - can [:index, :rss, :show, :comments], DiaryEntry + can [:index, :rss, :show], DiaryEntry + can :index, DiaryComment can [:index], Note can [:new, :create, :edit, :update], :password can [:index, :show], Redaction @@ -53,7 +54,7 @@ class Ability can [:index, :create, :destroy], UserMute if user.moderator? - can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry + can [:hide, :unhide], [DiaryEntry, DiaryComment] can [:index, :show, :resolve, :ignore, :reopen], Issue can :create, IssueComment can [:new, :create, :edit, :update, :destroy], Redaction @@ -61,7 +62,7 @@ class Ability end if user.administrator? - can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry + can [:hide, :unhide], [DiaryEntry, DiaryComment] can [:index, :show, :resolve, :ignore, :reopen], Issue can :create, IssueComment can [:set_status, :destroy, :index], User diff --git a/app/assets/images/about/sprite.png b/app/assets/images/about/sprite.png deleted file mode 100644 index fa0ce2986..000000000 Binary files a/app/assets/images/about/sprite.png and /dev/null differ diff --git a/app/assets/images/about/sprite.svg b/app/assets/images/about/sprite.svg deleted file mode 100644 index 01a80ae16..000000000 --- a/app/assets/images/about/sprite.svg +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/about/sprite@2x.png b/app/assets/images/about/sprite@2x.png deleted file mode 100644 index 7560c8773..000000000 Binary files a/app/assets/images/about/sprite@2x.png and /dev/null differ diff --git a/app/assets/images/banners/StateoftheMapEurope_2023.png b/app/assets/images/banners/StateoftheMapEurope_2023.png deleted file mode 100644 index 33e9db907..000000000 Binary files a/app/assets/images/banners/StateoftheMapEurope_2023.png and /dev/null differ diff --git a/app/assets/images/banners/StateoftheMapEurope_2024.png b/app/assets/images/banners/StateoftheMapEurope_2024.png new file mode 100644 index 000000000..d0d1cee62 Binary files /dev/null and b/app/assets/images/banners/StateoftheMapEurope_2024.png differ diff --git a/app/assets/images/directions.png b/app/assets/images/directions.png deleted file mode 100644 index 197244f4a..000000000 Binary files a/app/assets/images/directions.png and /dev/null differ diff --git a/app/assets/images/openid.svg b/app/assets/images/openid.svg new file mode 100644 index 000000000..d4de5897b --- /dev/null +++ b/app/assets/images/openid.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/app/assets/images/openid_small.png b/app/assets/images/openid_small.png deleted file mode 100644 index 41adc9fa6..000000000 Binary files a/app/assets/images/openid_small.png and /dev/null differ diff --git a/app/assets/images/routing-sprite.svg b/app/assets/images/routing-sprite.svg index e03a1bb84..97701d5a8 100644 --- a/app/assets/images/routing-sprite.svg +++ b/app/assets/images/routing-sprite.svg @@ -1,37 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/welcome-sprite.svg b/app/assets/images/welcome-sprite.svg deleted file mode 100644 index 5381a2542..000000000 --- a/app/assets/images/welcome-sprite.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 20976d15a..054742126 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -106,6 +106,7 @@ $(document).ready(function () { $("body").removeClass("compact-nav"); $("header").removeClass("text-nowrap"); + $("header nav.secondary > ul").removeClass("flex-nowrap"); updateHeader(); diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 69d625eca..7a761b500 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -58,7 +58,7 @@ OSM.initializeBrowse = function (map) { .click(cancel))), $("

") .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })), - $("") + $("") .val(I18n.t("browse.start_rjs.load_data")) .click(add))); } diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 42854f2e2..ae01cb566 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -3,7 +3,6 @@ //= require qs/dist/qs OSM.Directions = function (map) { - var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back var chosenEngine; @@ -21,9 +20,18 @@ OSM.Directions = function (map) { weight: 12 }); + var endpointDragCallback = function (dragging) { + if (map.hasLayer(polyline)) { + getRoute(false, !dragging); + } + }; + var endpointGeocodeCallback = function () { + getRoute(true, true); + }; + var endpoints = [ - Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN), - Endpoint($("input[name='route_to']"), OSM.MARKER_RED) + Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointGeocodeCallback), + Endpoint($("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointGeocodeCallback) ]; var expiry = new Date(); @@ -43,7 +51,7 @@ OSM.Directions = function (map) { select.append(""); }); - function Endpoint(input, iconUrl) { + function Endpoint(input, iconUrl, dragCallback, geocodeCallback) { var endpoint = {}; endpoint.marker = L.marker([0, 0], { @@ -64,18 +72,14 @@ OSM.Directions = function (map) { if (dragging && !chosenEngine.draggable) return; if (dragging && awaitingRoute) return; endpoint.setLatLng(e.target.getLatLng()); - if (map.hasLayer(polyline)) { - getRoute(false, !dragging); - } + dragCallback(dragging); }); input.on("keydown", function () { - input.removeClass("error"); + input.removeClass("is-invalid"); }); input.on("change", function (e) { - awaitingGeocode = true; - // make text the same in both text boxes var value = e.target.value; endpoint.setValue(value); @@ -84,7 +88,7 @@ OSM.Directions = function (map) { endpoint.setValue = function (value, latlng) { endpoint.value = value; delete endpoint.latlng; - input.removeClass("error"); + input.removeClass("is-invalid"); input.val(value); if (latlng) { @@ -109,7 +113,7 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = false; endpoint.hasGeocode = true; if (json.length === 0) { - input.addClass("error"); + input.addClass("is-invalid"); alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value })); return; } @@ -118,10 +122,7 @@ OSM.Directions = function (map) { input.val(json[0].display_name); - if (awaitingGeocode) { - awaitingGeocode = false; - getRoute(true, true); - } + geocodeCallback(); }); }; @@ -209,11 +210,9 @@ OSM.Directions = function (map) { var endpoint = endpoints[ep_i]; if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) { endpoint.getGeocode(); - awaitingGeocode = true; } } if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) { - awaitingGeocode = true; return; } @@ -307,7 +306,7 @@ OSM.Directions = function (map) { var row = $(""); row.append("

"); row.append("" + instruction); - row.append("" + dist); + row.append("" + dist); row.on("click", function () { popup @@ -357,7 +356,7 @@ OSM.Directions = function (map) { getRoute(true, true); }); - $(".routing_marker").on("dragstart", function (e) { + $(".routing_marker_column img").on("dragstart", function (e) { var dt = e.originalEvent.dataTransfer; dt.effectAllowed = "move"; var dragData = { type: $(this).data("type") }; diff --git a/app/assets/javascripts/index/directions/fossgis_valhalla.js b/app/assets/javascripts/index/directions/fossgis_valhalla.js index d44dbd12b..619f8f1e3 100644 --- a/app/assets/javascripts/index/directions/fossgis_valhalla.js +++ b/app/assets/javascripts/index/directions/fossgis_valhalla.js @@ -27,7 +27,7 @@ function FOSSGISValhallaEngine(id, costing) { 5, // kStayLeft = 24; 20, // kMerge = 25; 10, // kRoundaboutEnter = 26; - 11, // kRoundaboutExit = 27; + 10, // kRoundaboutExit = 27; 17, // kFerryEnter = 28; 0, // kFerryExit = 29; null, // kTransit = 30; diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js index 11d600316..e72f6d75f 100644 --- a/app/assets/javascripts/index/directions/graphhopper.js +++ b/app/assets/javascripts/index/directions/graphhopper.js @@ -9,7 +9,12 @@ function GraphHopperEngine(id, vehicleType) { "3": 3, // sharp right "4": 14, // finish reached "5": 14, // via reached - "6": 10 // roundabout + "6": 10, // roundabout + "-7": 19, // keep left + "7": 18, // keep right + "-98": 4, // unknown direction u-turn + "-8": 4, // left u-turn + "8": 4 // right u-turn }; return { diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js index 15fedb1d1..3839d2715 100644 --- a/app/assets/javascripts/index/note.js +++ b/app/assets/javascripts/index/note.js @@ -36,12 +36,12 @@ OSM.Note = function (map) { }; function initialize(path, id, callback) { - content.find("input[type=submit]").on("click", function (e) { + content.find("button[type=submit]").on("click", function (e) { e.preventDefault(); var data = $(e.target).data(); var form = e.target.form; - $(form).find("input[type=submit]").prop("disabled", true); + $(form).find("button[type=submit]").prop("disabled", true); $.ajax({ url: data.url, @@ -83,12 +83,12 @@ OSM.Note = function (map) { } function updateButtons(form) { - $(form).find("input[type=submit]").prop("disabled", false); + $(form).find("button[type=submit]").prop("disabled", false); if ($(form.text).val() === "") { - $(form.close).val($(form.close).data("defaultActionText")); + $(form.close).text($(form.close).data("defaultActionText")); $(form.comment).prop("disabled", true); } else { - $(form.close).val($(form.close).data("commentActionText")); + $(form.close).text($(form.close).data("commentActionText")); $(form.comment).prop("disabled", false); } } diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index d41fc7d53..94bb52a1b 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -9,9 +9,9 @@ OSM.Search = function (map) { } }); - $(".search_form a.button.switch_link").on("click", function (e) { + $(".search_form a.btn.switch_link").on("click", function (e) { e.preventDefault(); - var query = $(e.target).parent().parent().find("input[name=query]").val(); + var query = $(this).closest("form").find("input[name=query]").val(); if (query) { OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map)); } else { diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index 1a34b05c2..55d492b29 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -84,7 +84,7 @@ L.OSM.layers = function (options) { $("

") .text(I18n.t("javascripts.map.layers.overlays")) - .attr("class", "text-muted") + .attr("class", "text-body-secondary small mb-2") .appendTo(overlaySection); var overlays = $("

-

+

<% if trace.tags.empty? %> <%= t ".details_without_tags_html", :time_ago => friendly_date_ago(trace.timestamp), :user => link_to(trace.user.display_name, trace.user) %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index a2a068360..b618f3811 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -7,13 +7,13 @@ <% content_for :heading do %> <% if @client_app_name %> -

<%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %>

+

<%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %>

<% end %>
-
    +
    • - <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions), :class => "nav-link" %> + <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions, :referer => @referer), :class => "nav-link" %>
    • <%= link_to t("users.new.tab_title"), "#", :class => "nav-link active" %> @@ -24,14 +24,14 @@
      <% if current_user.auth_uid.nil? %> -
      +

      <%= t ".about.header" %> <%= t ".about.paragraph_1" %>

      <%= t ".about.paragraph_2" %>

      <% unless @preferred_auth_provider.nil? %> <%= render :partial => "auth_providers" %> -
      +
      <%= t ".or" %>
      @@ -53,6 +53,7 @@ t(".privacy_policy_url"), :title => t(".privacy_policy_title"), :target => :new)), + :autofocus => true, :tabindex => 1 %> <% else %> <%= f.hidden_field :email %> @@ -71,17 +72,17 @@
      <% end %> -

      <%= t(".by_signing_up_html", - :tou_link => link_to(t("layouts.tou"), - "https://wiki.osmfoundation.org/wiki/Terms_of_Use", - :target => :new), - :privacy_policy_link => link_to(t(".privacy_policy"), - t(".privacy_policy_url"), - :title => t(".privacy_policy_title"), - :target => :new), - :contributor_terms_link => link_to(t(".contributor_terms"), - t(".contributor_terms_url"), - :target => :new)) %>

      +

      <%= t(".by_signing_up_html", + :tou_link => link_to(t("layouts.tou"), + "https://wiki.osmfoundation.org/wiki/Terms_of_Use", + :target => :new), + :privacy_policy_link => link_to(t(".privacy_policy"), + t(".privacy_policy_url"), + :title => t(".privacy_policy_title"), + :target => :new), + :contributor_terms_link => link_to(t(".contributor_terms"), + t(".contributor_terms_url"), + :target => :new)) %>

      <%= f.form_group do %> <%= f.check_box :consider_pd, :tabindex => 5, diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9da3f8f04..c73581b25 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -14,7 +14,8 @@ <%= number_with_delimiter(current_user.changesets.size) %>
    • - <%= link_to t(".my notes"), user_notes_path(@user) %> + <%= link_to t(".my notes"), user_notes_path(current_user) %> + <%= number_with_delimiter(current_user.note_comments.size) %>
    • <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %> @@ -26,6 +27,7 @@
    • <%= link_to t(".my comments"), diary_comments_path(current_user) %> + <%= number_with_delimiter(current_user.diary_comments.size) %>
    • <%= link_to t(".my settings"), edit_account_path %> @@ -59,6 +61,7 @@
    • <%= link_to t(".notes"), user_notes_path(@user) %> + <%= number_with_delimiter(@user.note_comments.size) %>
    • <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %> @@ -76,6 +79,7 @@
    • <%= link_to t(".comments"), diary_comments_path(@user) %> + <%= number_with_delimiter(@user.diary_comments.size) %>
    • <% if current_user and current_user.friends_with?(@user) %> @@ -132,11 +136,13 @@ <% end %> -
      +
      <%= t ".mapper since" %>
      <%= l @user.created_at.to_date, :format => :long %>
      +
      <%= t ".last map edit" %>
      +
      <%= l @user.changesets.first&.created_at&.to_date, :format => :long, :default => t(".no activity yet") %>
      <% unless @user.terms_agreed %>
      <%= t ".ct status" %>
      @@ -206,7 +212,7 @@ <% end %> <% if current_user and current_user.administrator? -%> -
      +
      <%= t ".email address" %>
      diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb index 340aaf04e..b7efe912e 100644 --- a/app/views/users/terms.html.erb +++ b/app/views/users/terms.html.erb @@ -11,11 +11,11 @@ <%= form_tag({ :action => "save" }) do %> -

      <%= t ".read and accept with tou" %>

      +

      <%= t ".read and accept with tou" %>

      <%= t ".heading_ct" %>

      -

      <%= t ".contributor_terms_explain" %>

      +

      <%= t ".contributor_terms_explain" %>

      @@ -35,7 +35,7 @@
      -

      +

      <%= t ".guidance_info_html", :readable_summary_link => link_to(t(".readable_summary"), "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary"), @@ -55,7 +55,7 @@

      <%= t "layouts.tou" %>

      -

      <%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %>

      +

      <%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %>

      diff --git a/config/banners.yml b/config/banners.yml index 8edbfa7e0..d9eb92c13 100644 --- a/config/banners.yml +++ b/config/banners.yml @@ -8,13 +8,12 @@ donate_2023: - [banners/donate_2023_1@2x.jpg, 2x] dark: true enddate: 2023-dec-31 -sotmeu_2023: - id: sotmeu_2023 - alt: State of the Map Europe 2023 - link: https://stateofthemap.eu/ - img: banners/StateoftheMapEurope_2023.png - startdate: 2023-oct-05 - enddate: 2023-nov-05 +sotmeu_2024: + id: sotmeu_2024 + alt: State of the Map Europe 2024 + link: https://tobilet.pl/state-of-the-map-europe-2024.html + img: banners/StateoftheMapEurope_2024.png + enddate: 2024-jul-18 sotmasia_2023: id: sotmasia_2023 alt: State of the Map Asia x Foss4G Thailand 2023 diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb index 2bc4f5e59..9d59656c7 100644 --- a/config/initializers/abstract_adapter.rb +++ b/config/initializers/abstract_adapter.rb @@ -6,7 +6,7 @@ if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter) if e.is_a?(Timeout::Error) || e.is_a?(OSM::APITimeoutError) e else - super(e, sql) + super end end end diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index b3076b38f..9ddaf70f9 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -4,22 +4,42 @@ # See the Securing Rails Applications Guide for more information: # https://guides.rubyonrails.org/security.html#content-security-policy-header -# Rails.application.configure do -# config.content_security_policy do |policy| -# policy.default_src :self, :https -# policy.font_src :self, :https, :data -# policy.img_src :self, :https, :data -# policy.object_src :none -# policy.script_src :self, :https -# policy.style_src :self, :https -# # Specify URI for violation reports -# # policy.report_uri "/csp-violation-report-endpoint" -# end -# -# # Generate session nonces for permitted importmap, inline scripts, and inline styles. -# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s } -# config.content_security_policy_nonce_directives = %w(script-src style-src) -# -# # Report violations without enforcing the policy. -# # config.content_security_policy_report_only = true -# end +Rails.application.configure do + connect_src = [:self] + img_src = [:self, :data, "www.gravatar.com", "*.wp.com", "tile.openstreetmap.org", "gps.tile.openstreetmap.org", "*.tile.thunderforest.com", "tile.tracestrack.com", "*.openstreetmap.fr"] + script_src = [:self] + + connect_src << Settings.matomo["location"] if defined?(Settings.matomo) + img_src << Settings.matomo["location"] if defined?(Settings.matomo) + script_src << Settings.matomo["location"] if defined?(Settings.matomo) + + img_src << Settings.avatar_storage_url if Settings.key?(:avatar_storage_url) + img_src << Settings.trace_image_storage_url if Settings.key?(:trace_image_storage_url) + + config.content_security_policy do |policy| + policy.default_src :self + policy.child_src(:self) + policy.connect_src(*connect_src) + policy.font_src(:none) + policy.form_action(:self) + policy.frame_ancestors(:self) + policy.frame_src(:self) + policy.img_src(*img_src) + policy.manifest_src(:self) + policy.media_src(:none) + policy.object_src(:self) + policy.plugin_types + policy.script_src(*script_src) + policy.style_src(:self) + policy.worker_src(:none) + policy.manifest_src(:self) + policy.report_uri(Settings.csp_report_url) if Settings.key?(:csp_report_url) + end + + # Generate session nonces for permitted importmap and inline scripts + config.content_security_policy_nonce_generator = ->(_request) { SecureRandom.base64(24) } + config.content_security_policy_nonce_directives = %w[style-src] + + # Report violations without enforcing the policy. + config.content_security_policy_report_only = true unless Settings.csp_enforce +end diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index fdbf11a2c..e7b813b73 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -6,7 +6,7 @@ module OpenStreetMap class Cors < Rack::Cors def call(env) - status, headers, body = super(env) + status, headers, body = super headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"] [status, headers, body] end diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 266e41cbb..8f74c3cd3 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -18,7 +18,7 @@ module OpenStreetMap def store_translations(locale, data, options = {}) locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s - super(locale, data, options) + super end end diff --git a/config/initializers/mail_delivery_job.rb b/config/initializers/mail_delivery_job.rb index 4bab2000b..30b23d2dd 100644 --- a/config/initializers/mail_delivery_job.rb +++ b/config/initializers/mail_delivery_job.rb @@ -4,7 +4,7 @@ module OpenStreetMap def perform(mailer, mail_method, delivery_method, *args, **kwargs) kwargs = args.pop if kwargs.empty? && args.last.is_a?(Hash) - super(mailer, mail_method, delivery_method, *args, **kwargs) + super end end end diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index fbe4ad219..812e6610d 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -45,7 +45,7 @@ module OpenStreetMap status = options.delete(:status) || :ok head status, options else - super(options) + super end end @@ -61,7 +61,7 @@ module OpenStreetMap end end - super(controller) + super end end end diff --git a/config/initializers/router.rb b/config/initializers/router.rb index 4357a87f2..849aba2ad 100644 --- a/config/initializers/router.rb +++ b/config/initializers/router.rb @@ -5,7 +5,7 @@ module OpenStreetMap module Router module ForceEncoding def normalize_path(path) - super(path).force_encoding("UTF-8") + super.force_encoding("UTF-8") end end end diff --git a/config/initializers/rtlcss.rb b/config/initializers/rtlcss.rb index 11e4e0d5c..793c484fc 100644 --- a/config/initializers/rtlcss.rb +++ b/config/initializers/rtlcss.rb @@ -2,7 +2,7 @@ require "rtlcss" class RtlcssSCSSProcessor < SassC::Rails::ScssTemplate def self.call(input) - output = super(input) + output = super data = Rtlcss.flip_css(output[:data]) output.delete(:map) output.merge(:data => data) diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb deleted file mode 100644 index 60f155139..000000000 --- a/config/initializers/secure_headers.rb +++ /dev/null @@ -1,50 +0,0 @@ -csp_policy = { - :preserve_schemes => true, - :default_src => %w['self'], - :child_src => %w['self'], - :connect_src => %w['self'], - :font_src => %w['none'], - :form_action => %w['self'], - :frame_ancestors => %w['self'], - :frame_src => %w['self'], - :img_src => %w['self' data: www.gravatar.com *.wp.com tile.openstreetmap.org *.tile.openstreetmap.org *.tile.thunderforest.com tile.tracestrack.com *.openstreetmap.fr], - :manifest_src => %w['self'], - :media_src => %w['none'], - :object_src => %w['self'], - :plugin_types => %w[], - :script_src => %w['self'], - :style_src => %w['self'], - :worker_src => %w['none'], - :report_uri => [] -} - -csp_policy[:connect_src] << Settings.matomo["location"] if defined?(Settings.matomo) -csp_policy[:img_src] << Settings.matomo["location"] if defined?(Settings.matomo) -csp_policy[:script_src] << Settings.matomo["location"] if defined?(Settings.matomo) - -csp_policy[:img_src] << Settings.avatar_storage_url if Settings.key?(:avatar_storage_url) -csp_policy[:img_src] << Settings.trace_image_storage_url if Settings.key?(:trace_image_storage_url) - -csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_url) - -cookie_policy = { - :httponly => { :only => %w[_osm_session _osm_totp_token] } -} - -SecureHeaders::Configuration.default do |config| - config.hsts = SecureHeaders::OPT_OUT - config.referrer_policy = "strict-origin-when-cross-origin" - - if Settings.csp_enforce - config.csp = csp_policy - config.csp_report_only = SecureHeaders::OPT_OUT - elsif Settings.key?(:csp_report_url) - config.csp = SecureHeaders::OPT_OUT - config.csp_report_only = csp_policy - else - config.csp = SecureHeaders::OPT_OUT - config.csp_report_only = SecureHeaders::OPT_OUT - end - - config.cookies = cookie_policy -end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index a12284855..4119064c3 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file. if Settings.key?(:memcache_servers) - Rails.application.config.session_store :mem_cache_store, :memcache_server => Settings.memcache_servers, :namespace => "rails:session", :key => "_osm_session" + Rails.application.config.session_store :mem_cache_store, :memcache_server => Settings.memcache_servers, :namespace => "rails:session", :key => "_osm_session", :same_site => :lax else - Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new + Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new, :same_site => :lax end diff --git a/config/locales/af.yml b/config/locales/af.yml index ed86ba29b..fd2f4c1fa 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -407,6 +407,11 @@ af: join_discussion: Meld aan en gesels saam still_open: Wysigingstel is steeds oop - bespreking sal oopmaak sodra die wysigingstel gesluit is. + subscribe: Skryf in + unsubscribe: Kanselleer subskripsie + hide_comment: versteek + unhide_comment: bring weer aan die lig + comment: Reageer changesetxml: Wysigingstel XML osmchangexml: osmWysiging XML paging_nav: @@ -517,7 +522,8 @@ af: all: title: OpenStreetMap-dagboekinskrywings description: Onlangse dagboekinskrywings van OpenStreetMap-gebruikers - comments: + diary_comments: + index: no_comments: Geen dagboekkommentaar post: Inskrywing when: Wanneer @@ -1598,10 +1604,6 @@ af: credit_title_html: Hoe om na OpenStreetMap te verwys contributors_title_html: Ons bydraers infringement_title_html: Kopieregoortreding - index: - permalink: Perma-skakel - shortlink: Kortskakel - createnote: Voeg 'n nota by edit: user_page_link: gebruikersbladsy anon_edits_link_text: Lees waarom dit so is. @@ -2114,13 +2116,6 @@ af: map_data_zoom_in_tooltip: Zoem in om kaartdata te sien queryfeature_tooltip: Soek bakens op queryfeature_disabled_tooltip: Zoem in om bakens te zoek - changesets: - show: - comment: Reageer - subscribe: Skryf in - unsubscribe: Kanselleer subskripsie - hide_comment: versteek - unhide_comment: bring weer aan die lig directions: engines: fossgis_osrm_car: Kar (OSRM) diff --git a/config/locales/aln.yml b/config/locales/aln.yml index d648ede29..33317892c 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -273,7 +273,8 @@ aln: all: title: hyra OpenStreetMap ditar description: Shënimet mat fundit të ditarit nga anëtarët e OpenStreetMap - comments: + diary_comments: + index: comment: Koment friendships: make_friend: @@ -855,8 +856,6 @@ aln: js_1: Ju jeni duke përdorur ndonjë shfletues që nuk e përkrah JavaScript, ose i keni çativizuar JavaScript. js_2: OpenStreetMap përdor Java skriptet për planet e saj të rrëshqitshëm. - permalink: Permalink - shortlink: Shortlink edit: not_public: Ju nuk keni vendosur redaktimet e juaj të jetë publike. not_public_description_html: Ju nuk mund të redaktoni hartën e nëse ju një gjë diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 947fb0d20..1aa1673f0 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -561,8 +561,13 @@ ar: join_discussion: ادخل للاشتراك في المناقشة still_open: ما زالت مجموعة التغييرات مفتوحة - سيتم فتح المناقشة بمجرد إغلاق مجموعة التغييرات. + subscribe: اشترك + unsubscribe: إلغاء الاشتراك comment_by_html: تعليق من %{user}%{time_ago} hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user} + hide_comment: إخفاء + unhide_comment: أظهر + comment: التعليق changesetxml: حزمة التغييرات XML osmchangexml: osmChange XML paging_nav: @@ -677,7 +682,14 @@ ar: all: title: مدخلات اليومية في خريطة الشارع المفتوحة description: المدخلات الحديثة في يومية مستخدمي خريطة الشارع المفتوحة - comments: + subscribe: + heading: اشترك في مناقشة مدونة الدخول التالية؟ + button: الاشتراك في المناقشة + unsubscribe: + heading: إلغاء الاشتراك في مناقشة إدخال اليوميات التالية؟ + button: إلغاء الاشتراك من المناقشة + diary_comments: + index: title: تمت إضافة تعليقات اليوميات بواسطة %{user} heading: تعليقات يوميات %{user} subheading_html: تمت إضافة تعليقات اليوميات بواسطة %{user} @@ -687,12 +699,6 @@ ar: comment: التعليق newer_comments: التعليقات الأحدث older_comments: التعليقات الأقدم - subscribe: - heading: اشترك في مناقشة مدونة الدخول التالية؟ - button: الاشتراك في المناقشة - unsubscribe: - heading: إلغاء الاشتراك في مناقشة إدخال اليوميات التالية؟ - button: إلغاء الاشتراك من المناقشة doorkeeper: errors: messages: @@ -2075,9 +2081,6 @@ ar: index: js_1: إما أنك تستخدم متصفحا لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت. js_2: خريطة الشارع المفتوحة تستخدم جافا سكريبت لخريطتها المنزلقة. - permalink: وصلة دائمة - shortlink: وصلة قصيرة - createnote: أضف ملاحظة license: copyright: حقوق طبع ونشر ومساهمو خريطة الشارع المفتوحة، تحت رخصة مفتوحة remote_failed: فشل التعديل - تأكد من تحميل JOSM أو Merkaartor وتمكين خيار التحكم @@ -2812,13 +2815,6 @@ ar: map_data_zoom_in_tooltip: تكبير الخريطة لرؤية بيانات الخريطة queryfeature_tooltip: ميزات الاستعلام queryfeature_disabled_tooltip: ميزات تكبير الاستعلام - changesets: - show: - comment: التعليق - subscribe: اشترك - unsubscribe: إلغاء الاشتراك - hide_comment: إخفاء - unhide_comment: أظهر edit_help: انقل الخريطة وكبر الموقع الذي تريد تحريره، ثم اضغط هنا. directions: ascend: رفع diff --git a/config/locales/arz.yml b/config/locales/arz.yml index bfe44811a..762f819c5 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -727,8 +727,6 @@ arz: index: js_1: أنت إما تستخدم متصفح لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت. js_2: خريطه الشارع المفتوحه تستخدم جافا سكريبت لخريطتها المنزلقه. - permalink: وصله دائمة - shortlink: وصله قصيرة edit: not_public: لم تقم بتعيين تعديلاتك لتظهر بشكل علنى. not_public_description_html: أنت لم تعد قادر على تعديل الخريطه إلا إذا قمت بذلك. diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 4078b2e73..a715692ab 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -375,6 +375,11 @@ ast: join_discussion: Anicia sesión pa xunite al alderique still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en zarrando'l conxuntu de cambios. + subscribe: Suscribite + unsubscribe: Date de baxa + hide_comment: anubrir + unhide_comment: amosar + comment: Comentar changesetxml: Conxuntu de cambeos XML osmchangexml: osmChange XML paging_nav: @@ -484,7 +489,8 @@ ast: all: title: Entraes nel diariu d'OpenStreetMap description: Entraes recién nel diariu d'usuarios d'OpenStreetMap - comments: + diary_comments: + index: post: Publicar when: Cuándo comment: Comentariu @@ -1530,9 +1536,6 @@ ast: js_1: O tas usando un restolador ensin sofitu pa JavaScript, o tienes JavaScript desactiváu. js_2: OpenStreetMap usa JavaScript pal so mapa eslizante. - permalink: Enllaz permanente - shortlink: Enllaz curtiu - createnote: Amestar una nota license: copyright: Copyright OpenStreetMap y collaboradores, baxo una llicencia abierta remote_failed: Falló la edición - asegúrate de tener cargáu JOSM o Merkaartor @@ -2240,13 +2243,6 @@ ast: map_data_zoom_in_tooltip: Averar pa ver los datos del mapa queryfeature_tooltip: Consultar entidaes queryfeature_disabled_tooltip: Averar pa consultar entidaes - changesets: - show: - comment: Comentar - subscribe: Suscribite - unsubscribe: Date de baxa - hide_comment: anubrir - unhide_comment: amosar edit_help: Mueve'l mapa y amplía al llugar que quies editar, llueu calca equí. directions: ascend: Ascender diff --git a/config/locales/az.yml b/config/locales/az.yml index 30f712324..9c0cd7630 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -320,7 +320,8 @@ az: all: title: OpenStreetMap gündəlik yazısı description: OpenStreetMap istifadəçilərinin axırıncı gündəlik yazıları - comments: + diary_comments: + index: post: Post when: Nə vaxt comment: Şərh @@ -940,8 +941,6 @@ az: more_title_html: Daha ətraflı öyrən contributors_title_html: Kimlər bizim layihəyə töhfə verir infringement_title_html: Müəllif hüquqlarının pozulması - index: - shortlink: Qısa keçid edit: user_page_link: istifadəçi səhifəsi export: diff --git a/config/locales/ba.yml b/config/locales/ba.yml index c19165b69..a50b4a187 100644 --- a/config/locales/ba.yml +++ b/config/locales/ba.yml @@ -485,7 +485,8 @@ ba: all: title: OpenStreetMap көндәлек яҙмаһы description: OpenStreetMap ҡулланысыларының һуңғы көндәлек яҙмалары - comments: + diary_comments: + index: no_comments: Көндәлектә комментарийҙар юҡ post: Post when: Ҡасан diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index f34c20da5..aed7bb646 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -484,7 +484,8 @@ be-Tarask: all: title: Запісы ў дзёньніку OpenStreetMap description: Апошнія запісы ў дзёньніку карыстальнікаў OpenStreetMap - comments: + diary_comments: + index: post: Запіс friendships: make_friend: @@ -1110,8 +1111,6 @@ be-Tarask: index: js_1: Вы карыстаецеся браўзэрам, які не падтрымлівае ці мае забаронены JavaScript. js_2: OpenStreetMap выкарыстоўвае JavaScript для паказу мапы. - permalink: Сталая спасылка - shortlink: Кароткая спасылка remote_failed: Памылка рэдагаваньня. Упэўніцеся, што JOSM ці Merkaartor загружаныя і дазволеная магчымасьць аддаленага кіраваньня edit: diff --git a/config/locales/be.yml b/config/locales/be.yml index c0fd0644c..11e78ea3b 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Alex73 +# Author: Andoti # Author: Artsiom91 # Author: Chadyka # Author: Goshaproject @@ -17,14 +18,20 @@ # Author: Unomano # Author: ZlyiLev # Author: Zmicier21 +# Author: Zmickli21 # Author: Дзяніс Тутэйшы # Author: Тест # Author: Чаховіч Уладзіслаў --- be: + html: + dir: ltr time: formats: friendly: '%e %B %Y у %H:%M' + blog: '%e %B %Y' + count: + at_least_pattern: '%{count}+' helpers: file: prompt: Абраць файл @@ -58,6 +65,11 @@ be: messages: invalid_email_address: не падобны на карэктны адрас электроннай пошты email_address_not_routable: немагчыма пракласці маршрут + display_name_is_user_n: не можа быць user_n, калі n не з’яўляецца вашым ідэнтыфікатарам + карыстальніка + models: + user_mute: + is_already_muted: ужо заглушаны models: acl: Спіс правоў доступу changeset: Пакет правак @@ -180,66 +192,69 @@ be: datetime: distance_in_words_ago: about_x_hours: - one: прыкладна 1 гадзіну таму + one: прыкладна %{count} гадзіну таму few: прыкладна %{count} гадзіны таму many: прыкладна %{count} гадзін таму other: прыкладна %{count} гадзін(ы) таму about_x_months: - one: прыкладна 1 месяц таму + one: прыкладна %{count} месяц таму few: прыкладна %{count} месяцы таму many: прыкладна %{count} месяцаў таму other: прыкладна %{count} месяцы(аў) таму about_x_years: - one: прыкладна 1 год таму + one: прыкладна %{count} год таму few: прыкладна %{count} гады таму many: прыкладна %{count} гадоў таму other: прыкладна %{count} гады(оў) таму almost_x_years: - one: амаль 1 год таму + one: амаль %{count} год таму few: амаль %{count} гады таму many: амаль %{count} гадоў таму other: амаль %{count} гады(оў) таму half_a_minute: паўхвіліны таму less_than_x_seconds: - one: менш за секунду таму + one: менш за %{count} секунду таму few: менш за %{count} секунды таму many: менш за %{count} секунд таму other: менш за %{count} секунд(ы) таму less_than_x_minutes: - one: менш за хвіліну таму + one: менш за %{count} хвіліну таму few: менш за %{count} хвіліны таму many: менш за %{count} хвілін таму other: менш за %{count} хвілін(ы) таму over_x_years: - one: больш за год таму + one: больш за %{count} год таму few: больш за %{count} гады таму many: больш за %{count} гадоў таму other: больш за %{count} гады(оў) таму x_seconds: - one: 1 секунду таму + one: '%{count} секунду таму' few: '%{count} секунды таму' many: '%{count} секунд таму' other: '%{count} секунд(ы) таму' x_minutes: - one: 1 хвіліну таму + one: '%{count} хвіліну таму' few: '%{count} хвіліны таму' many: '%{count} хвілін таму' other: '%{count} хвілін(ы) таму' x_days: - one: 1 дзень таму + one: '%{count} дзень таму' few: '%{count} дні таму' many: '%{count} дзён таму' other: '%{count} дзён таму' x_months: - one: 1 месяц таму + one: '%{count} месяц таму' few: '%{count} месяцы таму' many: '%{count} месяцаў таму' other: '%{count} месяцы(аў) таму' x_years: - one: 1 год таму + one: '%{count} год таму' few: '%{count} гады таму' many: '%{count} гадоў таму' other: '%{count} гады(оў) таму' + printable_name: + with_name_html: '%{name} (%{id})' + current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: Тыповы (зараз %{name}) id: @@ -247,12 +262,13 @@ be: description: iD (браўзэрны рэдактар) remote: name: Вонкавы рэдактар - description: вонкавага рэдактара (JOSM або Merkaartor) + description: Дыстанцыйнае кіраванне (JOSM, Potlatch, Merkaartor) auth: providers: none: Няма google: Google facebook: Facebook + microsoft: Microsoft github: GitHub wikipedia: Вікіпедыя api: @@ -268,6 +284,7 @@ be: reopened_at_by_html: Пераадкрыта %{when} удзельнікам %{user} rss: title: Заўвагі OpenStreetMap + description_all: Спіс створаных, пракаментаваных або закрытых нататак description_area: Спіс заўваг створаных, пракаментаваных ці вырашаных у вашым рэгіёне [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: RSS-стужка заўваг %{id} @@ -313,10 +330,12 @@ be: current email address: Бягучы адрас электроннай пошты external auth: Знешняя Аўтэнтыфікацыя openid: + link: http://wiki.openstreetmap.org/wiki/OpenID link text: што гэта? public editing: heading: Агульнае рэдагаванне enabled: Уключана. Вы - не ананімны і можаце рэдагаваць дадзеныя. + enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits enabled link text: што гэта? disabled: Адключана. Вы не можаце больш рэдагаваць, але ўсе ранейшыя змены ананімныя. @@ -329,11 +348,25 @@ be: каб разгледзець і прыняць новыя ўмовы ўдзелу. agreed_with_pd: Вы таксама заявілі, што лічыце, што змены павінны знаходзіцца ў агульнай уласнасці. + link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: што гэта? save changes button: Запісаць змены delete_account: Выдаліць уліковы запіс... go_public: heading: Публічнае рэдагаванне + currently_not_public: " \nУ дадзены момант вашыя праўкі ананімныя, і людзі не + могуць адпраўляць вам паведамленні або бачыць вашае месцазнаходжанне. Каб + паказаць тое, што вы рэдагавалі, і дазволіць людзям звязацца з вамі праз вэб-сайт, + націсніце кнопку ніжэй." + only_public_can_edit: Пасля пераходу на API 0.6 толькі публічныя карыстальнікі + могуць рэдагаваць даныя мапы. + find_out_why_html: (%{link}). + find_out_why: даведацца, чаму + find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits + email_not_revealed: Ваш адрас электроннай пошты не будзе раскрыты, калі стане + публічным. + not_reversible: Гэта дзеянне нельга адмяніць, і ўсе новыя карыстальнікі цяпер + агульнадаступныя па змаўчанні. make_edits_public_button: Зрабіць усе мае змены публічнымі update: success_confirm_needed: Звесткі аб карыстальніку паспяхова абноўленыя. Праверце @@ -350,6 +383,16 @@ be: anonymous: ананімны no_comment: (без каментароў) part_of: Частка + part_of_relations: + one: '%{count} адносіны' + few: '%{count} адносін ' + many: '%{count} адносін' + other: '%{count} адносін' + part_of_ways: + one: '%{count} шлях' + few: '%{count} шляхі' + many: '%{count} шляхоў' + other: '%{count} шляхі(-оў)' download_xml: Спампаваць XML view_history: Прагляд гісторыі view_unredacted_history: Прагляд неадрэдагаванай гісторыі @@ -357,6 +400,8 @@ be: view_redacted_data: Прагляд адрэдагаваных даных view_redaction_message: Прагляд паведамлення аб рэдагаванні location: 'Месца:' + common_details: + coordinates_html: '%{latitude}; %{longitude}' node: title_html: 'Пункт: %{name}' history_title_html: 'Гісторыя пункта: %{name}' @@ -364,6 +409,11 @@ be: title_html: 'Лінія: %{name}' history_title_html: 'Гісторыя лініі: %{name}' nodes: Пункты + nodes_count: + one: '%{count} пункт' + few: '%{count} пункты' + many: '%{count} пунктаў' + other: '%{count} пункты(-аў)' also_part_of_html: one: частка лініі %{related_ways} other: частка ліній %{related_ways} @@ -371,7 +421,15 @@ be: title_html: 'Дачыненне: %{name}' history_title_html: 'Гісторыя дачынення: %{name}' members: Удзельнікі + members_count: + one: |- + … + %{count} чалец + few: '%{count} чальцы' + many: '%{count} чальцоў' + other: '%{count} чальцы(-оў)' relation_member: + entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} як %{role}' type: node: Пункт @@ -428,6 +486,15 @@ be: introduction: Націсніце на карце, каб атрымаць звесткі пра аб’екты паблізу. nearby: Аб’екты паблізу enclosing: Навакольныя аб'екты + old_nodes: + not_found: + sorry: На жаль, пункт №%{id} версіі %{version} не знойдзены. + old_ways: + not_found: + sorry: На жаль, шлях №%{id} версіі %{version} не знойдзены. + old_relations: + not_found: + sorry: На жаль, адносіны №%{id} версіі %{version} не знойдзены. changesets: changeset_paging_nav: showing_page: Старонка %{page} @@ -470,13 +537,31 @@ be: button: Адпісацца ад абмеркавання heading: title: Набор змен %{id} + created_by_html: Створана %{link_user} %{created}. + no_such_entry: + title: Няма такіх змяненняў + heading: 'Няма запісу з нумарам: %{id}' + body: На жаль, няма змяненняў з нумарам %{id}. Калі ласка, праверце, ці карэктна + уведзены нумар, або магчыма вам далі няслушную спасылку. show: title: 'Набор змен: %{id}' created: 'Створана: %{when}' + closed: 'Закрыта: %{when}' + created_ago_html: Створана %{time_ago} + closed_ago_html: Закрыта %{time_ago} + created_ago_by_html: Створана %{time_ago} удзельнікам %{user} + closed_ago_by_html: Закрыта %{time_ago} карыстальнікам %{user} discussion: Абмеркаванне join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання still_open: Пакет правак яшчэ адкрыты. Абмеркаванне стане даступным, як толькі пакет правак закрыецца. + subscribe: Падпісацца + unsubscribe: Адпісацца + comment_by_html: Пракаментавана карыстальнікам %{user} %{time_ago} таму + hidden_comment_by_html: Схаваны каментар ад %{user} %{time_ago} таму + hide_comment: схаваць + unhide_comment: паказаць + comment: Каментаваць changesetxml: XML пакета правак osmchangexml: osmChange XML paging_nav: @@ -510,6 +595,8 @@ be: friend: Сябар show: title: Мая панэль + no_home_location_html: '%{edit_profile_link} і ўсталюйце вашае месцазнаходжанне, + каб бачыць карыстальнікаў паблізу.' edit_your_profile: Адрэдагуйце свой профіль my friends: Мае сябры no friends: Вы пакуль не дадалі нікога ў сябры. @@ -525,7 +612,7 @@ be: title: Новы запіс дзённіку form: location: Месца - use_map_link: карыстацца картай + use_map_link: Карыстацца мапай index: title: Дзённікі карыстальнікаў title_friends: Дзённікі сяброў @@ -546,6 +633,8 @@ be: title: Дзённік карыстальніка %{user} | %{title} user_title: Дзённік карыстальніка %{user} discussion: Абмеркаванне + subscribe: Падпісацца + unsubscribe: Адпісацца leave_a_comment: Пакінуць каментар login_to_leave_a_comment_html: '%{login_link} каб пакінуць каментар' login: Увайсці @@ -555,13 +644,16 @@ be: body: Прабачце, не існуе запісу ў дзённіку ці каментара з нумарам %{id}. Праверце свой запыт, магчыма, вы перайшлі па неіснуючай спасылцы. diary_entry: - posted_by_html: Апублікавана %{link_user}, %{created}, %{language_link} + posted_by_html: Апублікавана карыстальнікам %{link_user} %{created} на мове + %{language_link} + updated_at_html: Апошняе абнаўленне %{updated}. comment_link: Каментаваць гэты запіс reply_link: Адказаць на гэты запіс comment_count: - one: 1 каментар - zero: Каментароў няма - other: 'Каментароў: %{count}' + one: '%{count} каментар' + few: '%{count} каментары' + many: '%{count} каментароў' + other: '%{count} каментары(-оў)' no_comments: Няма каментароў edit_link: Правіць гэты запіс hide_link: Схаваць гэты запіс @@ -578,6 +670,7 @@ be: location: 'Месца:' view: Прагляд edit: Правіць + coordinates: '%{latitude}; %{longitude}' feed: user: title: Запісы ў дзённіку OpenStreetMap карыстальніка %{user} @@ -588,13 +681,79 @@ be: all: title: Дзеннікавыя запісы OpenStreetMap description: Свежыя дзеннікавыя запісы карыстальнікаў OpenStreetMap - comments: + subscribe: + heading: Падпісацца на абмеркаванне наступнага запісу ў дзённіку? + button: Падпісацца на абмеркаванне + unsubscribe: + heading: Адпісацца ад абмеркавання наступнага запісу ў дзённіку? + button: Адпісацца ад абмеркавання + diary_comments: + index: + title: Каментары да запісаў у дзённіку, дадазеныя карыстальнікам %{user} + heading: Каментары да запісаў у дзённіку карыстальніка %{user} + subheading_html: Каментары да запісаў у дзённіку, дадазеныя карыстальнікам %{user} no_comments: Няма каментароў у дзённіку post: Апублікаваць when: Калі comment: Каментар newer_comments: Навейшыя каментары older_comments: Старэйшыя каментары + doorkeeper: + errors: + messages: + account_selection_required: Сервер аўтарызацыі патрабуе выбару ўліковага запісу + канчатковага карыстальніка + consent_required: Сервер аўтарызацыі патрабуе згоды канчатковага карыстальніка + interaction_required: Сервер аўтарызацыі патрабуе ўзаемадзеяння з канчатковым + карыстальнікам + login_required: Сервер аўтарызацыі патрабуе аўтэнтыфікацыі канчатковага карыстальніка + flash: + applications: + create: + notice: Прыкладанне зарэгістраванае. + openid_connect: + errors: + messages: + auth_time_from_resource_owner_not_configured: Памылка праз адсутнасць канфігурацыі + з Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner. + reauthenticate_resource_owner_not_configured: Памылка праз адсутнасць канфігурацыі + з Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner. + resource_owner_from_access_token_not_configured: Памылка праз адсутнасць + канфігурацыі з Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token. + select_account_for_resource_owner_not_configured: Памылка праз адсутнасць + канфігурацыі з Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner. + subject_not_configured: Збой генерацыі ID Token з-за адсутнасці канфігурацыі + Doorkeeper::OpenidConnect.configure.subject. + scopes: + address: Праглядзіце свой фізічны адрас + email: Увядзіце ваш адрас электроннай пошты + openid: Аўтэнтыфікуйце свой уліковы запіс + phone: Праглядзець ваш нумар тэлефона + profile: Праглядзець інфармацыю вашага профілю + errors: + contact: + contact_url: https://wiki.openstreetmap.org/wiki/Contact + contact_url_title: Тлумачэнне розных каналаў сувязі + contact: звяртацца + contact_the_community_html: Не саромейцеся %{contact_link} да супольнасці OpenStreetMap, + калі вы знайшлі непрацуючую спасылку / памылку. Запішыце дакладны URL вашага + запыту. + bad_request: + title: Памылковы запыт + description: Запытаная вамі аперацыя на серверы OpenStreetMap несапраўдная + (HTTP 400) + forbidden: + title: Доступ забаронены + description: Запытаная вамі аперацыя на серверы OpenStreetMap даступная толькі + адміністратарам (HTTP 403) + internal_server_error: + title: Памылка праграмы + description: Сервер OpenStreetMap сутыкнуўся з нечаканай сітуацыяй, якая перашкодзіла + яму выканаць запыт (HTTP 500) + not_found: + title: Файл не знойдзены + description: Не ўдалося знайсці файл/тэчку/аперацыю API з такім імем на серверы + OpenStreetMap (HTTP 404) friendships: make_friend: heading: Пасябраваць з %{user}? @@ -602,36 +761,54 @@ be: success: '%{name} пасябраваў з вамі.' failed: Прабачце, немагчыма пасябраваць з %{name}. already_a_friend: Вы ўжо сябруеце з %{name}. + limit_exceeded: Апошнім часам вы пасябравалі з вялікай колькасцю карыстальнікаў. + Калі ласка, пачакайце пэўны час, перш чым спрабаваць пасябравацца зноўку. remove_friend: heading: Перастаць сябраваць з %{user}? button: Выдаліць з сяброў success: '%{name} выдалены са спіса сяброў.' not_a_friend: '%{name} не з’яўляецца вашым сябрам.' geocoder: + search: + title: + results_from_html: Вынікі з %{results_link} + latlon: Унутраны + latlon_url: https://openstreetmap.org/ + osm_nominatim: OpenStreetMap Nominatim + osm_nominatim_url: https://nominatim.openstreetmap.org/ + osm_nominatim_reverse: OpenStreetMap Nominatim + osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/ search_osm_nominatim: + prefix_format: '%{name}' prefix: aerialway: cable_car: Лінная дарога chair_lift: Крэсельны пад'ёмнік drag_lift: Бугельны пад'ёмнік gondola: Лінная дарога + magic_carpet: Пад’ёмнік дываноў platter: Бугельны пад'ёмнік pylon: Апора station: Станцыя канатнай дарогі t-bar: Т-вобразны пад'ёмнік + "yes": Канатка aeroway: aerodrome: Аэрадром airstrip: Узлётна-пасадачная паласа - apron: Перон - gate: Вароты + apron: Перон аэрадрома + gate: Выхад на пасадку hangar: Ангар helipad: Верталётная пляцоўка holding_position: Месца чакання + navigationaid: Авіяцыйная навігацыйная сістэма parking_position: Месца паркоўкі runway: Узлётна-пасадачная паласа + taxilane: Паласа для таксі taxiway: Рулёжныя дарожкі - terminal: Тэрмінал + terminal: Тэрмінал аэрапорта + windsock: Ветрапаказальнік amenity: + animal_boarding: Інтэрнат для жывёл animal_shelter: Прытулак для жывёл arts_centre: Цэнтр мастацтваў atm: Банкамат @@ -641,7 +818,9 @@ be: bench: Лаўка bicycle_parking: Веласіпедная паркоўка bicycle_rental: Пракат ровараў + bicycle_repair_station: Рамонтная станцыя для ровараў biergarten: Рэстаранны падворак + blood_bank: Банк крыві boat_rental: Пракат лодак brothel: Бардэль bureau_de_change: Абмен валют @@ -658,6 +837,7 @@ be: clock: Гадзіннік college: Каледж community_centre: Грамадскі цэнтр + conference_centre: Канферэнц-цэнтр courthouse: Суд crematorium: Крэматорый dentist: Стаматолагія @@ -665,28 +845,37 @@ be: drinking_water: Пітная вада driving_school: Аўташкола embassy: Амбасада + events_venue: Месца правядзення мерапрыемстваў fast_food: Фаст-Фуд ferry_terminal: Паромны тэрмінал fire_station: Пажарная станцыя food_court: Фуд-Корт fountain: Фантан - fuel: АЗС + fuel: Аўтазапраўка gambling: Азартныя гульні grave_yard: Могілкі grit_bin: Кантэйнер з дарожным пасыпаннем hospital: Бальніца hunting_stand: Паляўнічая вежа ice_cream: Марозіва + internet_cafe: Інтэрнэт-кафэ kindergarten: Дзіцячы садок + language_school: Моўная школа library: Бібліятэка + loading_dock: Загрузны док + love_hotel: Гатэль кахання marketplace: Рыначная плошча + mobile_money_agent: Мабільны грашовы агент monastery: Кляштар + money_transfer: Перавод грошай motorcycle_parking: Паркоўка для матацыклаў + music_school: Музычная школа nightclub: Начны клуб nursing_home: Прыватная лякарня parking: Паркоўка parking_entrance: Заезд на паркоўку parking_space: Паркоўка + payment_terminal: Плацежны тэрмінал pharmacy: Аптэка place_of_worship: Культавы будынак police: Паліцыя @@ -694,9 +883,13 @@ be: post_office: Паштовае аддзяленне prison: Турма pub: Паб + public_bath: Лазня + public_bookcase: Кніжны абмен public_building: Грамадскі будынак + ranger_station: Станцыя рэйнджараў recycling: Пункт перапрацоўкі restaurant: Рэстаран + sanitary_dump_station: Санітарнае сметнішча school: Школа shelter: Укрыццё shower: Душ @@ -709,18 +902,27 @@ be: theatre: Тэатр toilets: Прыбіральні townhall: Ратуша + training: Навучальны цэнтр university: Універсітэт + vehicle_inspection: Станцыя тэхагляду vending_machine: Гандлёвы аўтамат veterinary: Ветэрынарная хірургія village_hall: Вясковая зала waste_basket: Кош для смецця waste_disposal: Смеццевы бак + waste_dump_site: Нелегальная звалка + watering_place: Вадапой для жывёл water_point: Вада + weighbridge: Грузавыя вагі + "yes": Зручнасць boundary: + aboriginal_lands: Тэрыторыі тубыльцаў administrative: Адміністрацыйная мяжа census: Межы перапісу national_park: Нацыянальны парк + political: Электаральная мяжа protected_area: Абаронены раён + "yes": Мяжа bridge: aqueduct: Акведук boardwalk: Тратуар @@ -729,24 +931,94 @@ be: viaduct: Віядук "yes": Мост building: + apartment: Кватэра + apartments: Кватэры + barn: Свіран + bungalow: Бунгала + cabin: Хаціна + chapel: Капліца + church: Будынак царквы + civic: Грамадзянскі будынак + college: Будынак каледжа + commercial: Камерцыйны будынак + construction: Будынак будуецца + detached: Хата + dormitory: Інтэрнат + duplex: Падзеленая хата + farm: Фермерская хата + farm_auxiliary: Фермерская прыбудова + garage: Гараж + garages: Гаражы + greenhouse: Шклярніца + hangar: Ангар + hospital: Будынак бальніцы + hotel: Будынак гасцініцы + house: Дом + houseboat: Плывучы дом + hut: Хата + industrial: Прамысловы будынак + kindergarten: Дзіцячы сад + manufacture: Вытворчы будынак + office: Офисны будынак + public: Грамадскі будынак + residential: Жылы будынак + retail: Гандлёвы будынак + roof: Дах + ruins: Рэшткі будынку + school: Школа + semidetached_house: Двухкватэрная хата + service: Службовы будынак + shed: Адрына + stable: Стайня + static_caravan: Мабільны дом + temple: Храм + terrace: Тэраса + train_station: Чыгуначны вакзал + university: Универсітэт + warehouse: Склад "yes": Будынак + club: + scout: База скаўтаў + sport: Спартыўны клуб + "yes": Клуб craft: + beekeeper: Пчальнік + blacksmith: Кузня brewery: Бровар carpenter: Цясляр + caterer: Пастаўшчык правізіі + confectionery: Цукерня + dressmaker: Атэлье electrician: Электрык + electronics_repair: Рамонт электронікі gardener: Садоўнік + glaziery: Гута + handicraft: Майстэрня + hvac: Тэхнічнае памяшканне + metal_construction: Майстэрня металаканструкцый painter: Мастак photographer: Фатограф plumber: Сантэхнік + roofer: Майстэрня страхара + sawmill: Тартак shoemaker: Шавец + stonemason: Мулярня tailor: Кравец + window_construction: Аконная майстэрня + winery: Вінакурня "yes": Майстэрня emergency: + access_point: Пункт доступу ambulance_station: Станцыя хуткай медыцынскай дапамогі assembly_point: Месца збору defibrillator: Дэфібрылятар + fire_extinguisher: Вогнетушыльнік + fire_water_pond: Пажарны вадаём landing_site: Месца аварыйнай пасадкі + life_ring: Ратавальны круг phone: Тэлефон экстранай сувязі + siren: Аварыйная сірэна + suction_point: Пункт рэанімічнай аспірацыі water_tank: Пажарны вадаём/рэзервуар highway: abandoned: Занядбаная дарога @@ -755,9 +1027,11 @@ be: bus_stop: Аўтобусны прыпынак construction: Будаўніцтва дарогі corridor: Праход цераз будынак + crossing: Пераход cycleway: Веласіпедная дарожка elevator: Ліфт emergency_access_point: Пункт хуткай дапамогі + emergency_bay: Аварыйны прыпынак footway: Сцяжынка ford: Брод give_way: Знак "Саступі дарогу" @@ -788,35 +1062,47 @@ be: tertiary: Троесная дарога tertiary_link: Трэцясная дарога track: Каляя + traffic_mirror: Люстэрка дарожнага руху traffic_signals: Святлафор + trailhead: Пачатак сцежкі trunk: Шаша trunk_link: Магістраль + turning_circle: Разваротны круг turning_loop: Разваротнае кальцо unclassified: Некласіфікаваная дарога "yes": Дарога historic: + aircraft: Гістарычны самалёт archaeological_site: Археалагічныя раскопы + bomb_crater: Гістарычны кратар ад бомбы battlefield: Поле бою boundary_stone: Пагранічны камень building: Гістарычны будынак bunker: Бункер + cannon: Гістарычная гармата castle: Замак + charcoal_pile: Гістарычная куча драўнянага вугалю church: Царква city_gate: Гарадская брама citywalls: Гарадскія сцены fort: Форт heritage: Культурная спадчына + hollow_way: Нізінная сцежка house: Дом manor: Сядзіба memorial: Мемарыял + milestone: Гістарычная вяха mine: Шахта mine_shaft: Шахтавы стаўбур monument: Помнік + railway: Гістарычная чыгунка roman_road: Рымская дарога ruins: Руіны + rune_stone: Рунічны камень stone: Камень tomb: Магіла tower: Вежа + wayside_chapel: Прыдарожная капліца wayside_cross: Прыдарожны крыж wayside_shrine: Прыдарожная каплічка wreck: Месца аварыі @@ -825,12 +1111,13 @@ be: "yes": Перакрыжаванне landuse: allotments: Сады-агароды + aquaculture: Аквакультура basin: Вадаём brownfield: Ачышчанае месца для забудовы cemetery: Могілкі commercial: Камерцыйная зона conservation: Запаведнік - construction: Будаўніцтва + construction: Будаўнічая тэрыторыя farmland: Сельскагаспадарчыя землі farmyard: Двор фермы forest: Лес @@ -843,20 +1130,28 @@ be: military: Ваенная зона mine: Шахта orchard: Фруктовы сад + plant_nursery: Расаднік quarry: Кар'ер railway: Чыгунка recreation_ground: Пляцоўка для гульняў + religious: Рэлігійная тэрыторыя reservoir: Вадасховішча reservoir_watershed: Водападзел вадасховішча residential: Жылы раён - retail: Рознічны гандаль + retail: Гандлёвая тэрыторыя village_green: Вясковая паляна vineyard: Вінаграднік "yes": Землекарыстанне leisure: + adult_gaming_centre: Гульнявы цэнтр для дарослых + amusement_arcade: Забаўляльная аркада + bandstand: Эстрада beach_resort: Пляжны курорт bird_hide: Засада + bleachers: Трыбуны + bowling_alley: Боўлінг common: Агульная зямля + dance: Танцавальная зала dog_park: Пляцоўка для сабак firepit: Кастрышча fishing: Раён рыбалоўства @@ -864,12 +1159,14 @@ be: fitness_station: Спартыўная пляцоўка garden: Сад golf_course: Поле для гольфа - horse_riding: Верхавая язда + horse_riding: Цэнтр коннай язды ice_rink: Каток marina: Гавань для катэраў miniature_golf: Міні-Гольф nature_reserve: Запаведнік + outdoor_seating: Месцы для сядзення на вольным паветры park: Парк + picnic_table: Стол для пікніка pitch: Спартыўная пляцоўка playground: Дзіцячая пляцоўка recreation_ground: Зона адпачынку @@ -884,13 +1181,21 @@ be: "yes": Забавы man_made: adit: Штольня + advertising: Рэклама + antenna: Антэна + avalanche_protection: Абарона ад лавін beacon: Бакен + beam: Бэлька beehive: Борць breakwater: Хвалярэз bridge: Мост bunker_silo: Бункер + cairn: Керн chimney: Комін + clearcut: Лесапавал + communications_tower: Вежа сувязі crane: Кран + cross: Крыж dolphin: Прычальная тумба dyke: Прыбярэжны насып embankment: Насып @@ -899,6 +1204,7 @@ be: groyne: Буна kiln: Печ lighthouse: Маяк + manhole: Люк mast: Мачта mine: Шахта mineshaft: Шахтавы стаўбур @@ -906,12 +1212,20 @@ be: petroleum_well: Свідравіна pier: Пірс pipeline: Трубаправод + pumping_station: Помпавая станцыя + reservoir_covered: Крытае вадасховішча silo: Сілас + snow_cannon: Снежная гармата + snow_fence: Снегаахоўная загарода storage_tank: Крыты рэзервуар + street_cabinet: Вулічная шафа surveillance: Камера назірання + telescope: Тэлескоп tower: Вежа + utility_pole: Электрычны слуп wastewater_plant: Станцыя ачысткі сцёкавых вод watermill: Вадзяны млын + water_tap: Водаправодны кран water_tower: Ваданапорная вежа water_well: Студня water_works: Водазабор @@ -922,15 +1236,20 @@ be: airfield: Ваенны аэрадром barracks: Казармы bunker: Бункер + checkpoint: Кантрольна-прапускны пункт + trench: Траншэя "yes": Ваенны mountain_pass: "yes": Перавал natural: + atoll: Атол + bare_rock: Голая скала bay: Заліў beach: Пляж cape: Мыс cave_entrance: Уваход у пячору cliff: Мяжа скалы + coastline: Узбярэжжа crater: Кратэр dune: Дзюна fell: Неапрацаваная зямля @@ -941,12 +1260,15 @@ be: grassland: Луг heath: Здароўе hill: Пагорак + hot_spring: Гарачая крыніца island: Востраў + isthmus: Перашыек land: Зямля marsh: Марш moor: Швартоўка mud: Бруд peak: Пік + peninsula: Паўвостраў point: Кропка reef: Рыф ridge: Хрыбет @@ -955,34 +1277,49 @@ be: sand: Пясок scree: Абсып scrub: Кустарнік + shingle: Галька spring: Крыніца stone: Камень strait: Праліў tree: Дрэва + tree_row: Рад дрэў + tundra: Тундра valley: Даліна volcano: Вулкан water: Вада wetland: Забалочаны ўчастак wood: Пушча + "yes": Прыродны аб’ект office: accountant: Бухгалтар administrative: Aдміністрацыя + advertising_agency: Рэкламнае агенцтва architect: Архітэктар association: Асацыяцыя company: Кампанія + diplomatic: Дыпламатычная ўстанова educational_institution: Адукацыйная ўстанова employment_agency: Агенцтва занятасці + energy_supplier: Офіс пастаўшчыка энергіі estate_agent: Агент па нерухомасці + financial: Фінансавая ўстанова government: Дзяржаўная ўстанова insurance: Страхавая кантора it: IT-офіс lawyer: Юрыст + logistics: Лагістычная ўстанова + newspaper: Рэдакцыя газеты ngo: Офіс НДА + notary: Натарыус + religion: Рэлігійная ўстанова + research: Навукова-даследніцкая ўстанова + tax_advisor: Падатковая інспекцыя telecommunication: Аддзяленне сувязі travel_agent: Турыстычнае агенцтва "yes": Офіс place: allotments: Сады-агароды + archipelago: Архіпелаг city: Горад city_block: Гарадскі квартал country: Краіна @@ -997,6 +1334,7 @@ be: locality: Мясцовасць municipality: Муніцыпалітэт neighbourhood: Наваколле + plot: Дзялянка postcode: Паштовы індэкс quarter: Раён горада region: Рэгіен @@ -1010,6 +1348,7 @@ be: "yes": Месца railway: abandoned: Закінутая чыгунка + buffer_stop: Буферны прыпынак construction: Будаўніцтва чыгункі disused: Закінутая чыгунка funicular: Фунікулер @@ -1023,6 +1362,7 @@ be: platform: Чыгуначная платформа preserved: Закансерваваная чыгунка proposed: Праектуемая чыгунка + rail: Калея spur: Чыгуначнае разгалінаванне station: Чыгуначны вакзал stop: Чыгуначны прыпынак @@ -1031,13 +1371,20 @@ be: switch: Чыгуначная стрэлка tram: Трамвай tram_stop: Трамвайны прыпынак + turntable: Чыгуначны паваротны круг yard: Сартавальная станцыя shop: + agrarian: Аграрная крама alcohol: Алкагольная крама antiques: Антыкварыят + appliance: Крама побытавай тэхнікі art: Арт-Крама + baby_goods: Дзіцячыя тавары + bag: Крама сумак bakery: Пякарня + bathroom_furnishing: Мэбля для ваннай beauty: Салон прыгажосці + bed: Пасцельныя рэчы beverages: Крама напояў bicycle: Крама ровараў bookmaker: Букмекер @@ -1049,61 +1396,90 @@ be: car_repair: Рамонт аўтамабіляў carpet: Крама дываноў charity: Дабрачынная крама + cheese: Сырная крама chemist: Аптэкар + chocolate: Шакалад clothes: Крама вопраткі + coffee: Кававая крама computer: Крама кампутарнай тэхнікі confectionery: Кандытарская крама convenience: Крама крокавай даступнасці copyshop: Капіравальны цэнтр cosmetics: Крама касметыкі + craft: Крама тавараў для рукадзелля + curtain: Крама фіранак + dairy: Малочная крама deli: Гастраном department_store: Універмаг discount: Крама тавараў са зніжкай - doityourself: Крама будаўнічых матэр'ялаў + doityourself: Крама матэрыялаў dry_cleaning: Хімчыстка + e-cigarette: Крама электронных цыгарэт electronics: Крама электронікі + erotic: Крама эратычных тавараў estate_agent: Агент па нерухомасці + fabric: Крама тканін farm: Фермерская крама fashion: Крама моднай вопраткі + fishing: Крама тавараў для рыбалкі florist: Фларыст food: Прадуктовая крама + frame: Крама рамак funeral_directors: Рытуальныя паслугі furniture: Мэбля garden_centre: Садовы цэнтр + gas: Крама газавага абсталявання general: Універсам gift: Крама падарункаў greengrocer: Садавіна, гародніна grocery: Бакалея hairdresser: Цырульнік hardware: Гаспадарчая крама - hifi: Аўдыётэхніка + health_food: Крама здаровага харчавання + hearing_aids: Слыхавыя апараты + herbalist: Крама зёлак + hifi: Крама аўдыя/відэатэхнікі houseware: Крама посуду + ice_cream: Крама марозіва interior_decoration: Афармленне інтэр'еру jewelry: Ювелірная крама kiosk: Кіёск kitchen: Крама кухань laundry: Пральня + locksmith: Выраб ключоў lottery: Латарэя mall: Гандлёвы цэнтр massage: Паведамленне + medical_supply: Крама медыцынскіх тавараў mobile_phone: Салон мабільнай сувязі + money_lender: Пазычальнік грошай motorcycle: Крама матацыклаў + motorcycle_repair: Рамонт матацыклаў music: Музычная крама + musical_instrument: Музычныя інструменты newsagent: Газетны кіёск + nutrition_supplements: Харчовыя дабаўкі optician: Оптыка organic: Арганічныя прадукты outdoor: Турыстычная крама paint: Крама мастака + pastry: Кандытарская pawnbroker: Ламбард + perfumery: Крама парфумы pet: Заалагічная крама + pet_grooming: Стрыжка гадаванцаў photo: Фота майстэрня seafood: Морапрадукты second_hand: Крама патрыманых рэчаў + sewing: Швейны цэх shoes: Абутковая крама sports: Спартыўная крама stationery: Крама канцылярскіх тавараў + storage_rental: Арэнда склада supermarket: Супермаркет tailor: Кравец + tattoo: Тату салон + tea: Чайная крама ticket: Каса tobacco: Тытунёвая крама toys: Крама цацак @@ -1112,6 +1488,8 @@ be: vacant: Пустуючая крама variety_store: Крама адной цаны video: Відэа крама + video_games: Крама відэагульняў + wholesale: Аптовая крама wine: Алкагольная крама "yes": Крама tourism: @@ -1120,7 +1498,8 @@ be: artwork: Інсталяцыя attraction: Цікавосць bed_and_breakfast: Ложак і сняданак - cabin: Хаціна + cabin: Турысцкая халупіна + camp_pitch: Лагерная пляцоўка camp_site: Турбаза caravan_site: Пляцоўка для аўтадамоў chalet: Шале @@ -1134,6 +1513,7 @@ be: picnic_site: Месца для пікніка theme_park: Тэматычны парк viewpoint: Аглядальная пляцоўка + wilderness_hut: Хаціна zoo: Заапарк tunnel: building_passage: Праезд цераз будынак @@ -1160,12 +1540,15 @@ be: "yes": Водны маршрут admin_levels: level2: Мяжа краіны + level3: Мяжа рэгіёна level4: Мяжа сталіцы і абласцей level5: Мяжа рэгіёна level6: Мяжа райцэнтра і раёна + level7: Мяжа муніцыпалітэта level8: Мяжа горада level9: Мяжа раёну н/п level10: Мяжа прыгараду + level11: Мяжа суседства types: cities: Гарады towns: Мястэчкі @@ -1188,10 +1571,13 @@ be: status: Статус reports: Скаргі last_updated: Апошняе змяненне + last_updated_time_ago_user_html: '%{time_ago} %{user}' link_to_reports: Глядзець скаргі reports_count: - one: 1 Скарга - other: '%{count} Скаргі' + one: '%{count} скарга' + few: '%{count} скаргі' + many: '%{count} скаргаў' + other: '%{count} скаргі(-аў)' reported_item: Скарга states: ignored: Праігнаравана @@ -1200,9 +1586,11 @@ be: show: title: '%{status} Праблема #%{issue_id}' reports: - zero: Няма паведамленняў - one: 1 паведамленне - other: '%{count} паведамленняў' + one: '%{count} скарга' + few: '%{count} скаргі' + many: '%{count} скаргаў' + other: '%{count} скаргі(-аў)' + no_reports: Няма скаргаў report_created_at_html: Упершыню паведамлена %{datetime} last_resolved_at_html: Апошні раз вырашана %{datetime} last_updated_at_html: Апошняе абнаўленне %{datetime} карыстальнікам %{displayname} @@ -1233,6 +1621,7 @@ be: issue_comments: create: comment_created: Ваш каментар быў паспяхова створаны + issue_reassigned: Ваш каментар быў створаны, і праблема была пераадрасаваная. reports: new: title_html: Скарга %{link} @@ -1295,6 +1684,8 @@ be: intro_2_create_account: Стварыць уліковы запіс удзельніка hosting_partners_2024_html: Хостынг падтрымліваюць %{fastly}, %{corpmembers} і іншыя %{partners}. + partners_fastly: Fastly + partners_corpmembers: Карпаратыўныя члены OSMF partners_partners: партнёры tou: Умовы карыстання osm_offline: База дадзеных OpenStreetMap зараз па-за сецівам, таму што праходзіць @@ -1356,8 +1747,17 @@ be: gpx_failure: hi: Прывітанне, %{to_user}, failed_to_import: 'збой імпарту. Адбылася памылка:' + more_info_html: Больш інфармацыі пра памылкі імпарту GPX і пра тое, як іх пазбегнуць, + можна знайсці на %{url}. subject: '[OpenStreetMap] Збой імпарту GPX' gpx_success: + hi: Прывітанне %{to_user}, + loaded: + one: паспяхова загружаны %{trace_points} пункт з %{count} імаверных. + few: паспяхова загружаныя %{trace_points} пункты з %{count} імаверных. + many: паспяхова загружаных %{trace_points} пунктаў з %{count} імаверных. + other: "" + all_your_traces_html: Усе паспяхова спампаваныя трэкі GPX можна знайсці ў %{url} subject: '[OpenStreetMap] Паспяховы імпарт GPX' signup_confirm: subject: '[OpenStreetMap] Сардэчна запрашаем у OpenStreetMap' @@ -1383,6 +1783,7 @@ be: click_the_link: Калі гэта вы, калі ласка, перайдзіце па спасылцы, паказанай ніжэй, каб змяніць ваш пароль. note_comment_notification: + description: Нататка OpenStreetMap №%{id} anonymous: Ананімны карыстальнік greeting: Прывітанне, commented: @@ -1391,24 +1792,38 @@ be: быць вам цікава' your_note: '%{commenter} пракаментаваў адну з вашых заўваг на карце, каля %{place}.' + your_note_html: '%{commenter} пакінуў каментар да адной з вашых нататак каля + %{place}.' commented_note: '%{commenter} пракаменаваў заўвагу на карце, якую вы таксама каментавалі. Заўвага каля %{place}.' + commented_note_html: '%{commenter} пакінуў каментар да адной з нататак, якую + вы таксама каментавалі. Нататка знаходзіцца каля %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} вырашыў адну з вашых заўваг' subject_other: '[OpenStreetMap] %{commenter} вырашыў заўвагу, што можа быць вам цікава' your_note: '%{commenter} вырашыў адну з вашых заўваг на карце, каля %{place}.' + your_note_html: '%{commenter} закрыў адну з вашых нататак на мапе побач з + %{place}.' commented_note: '%{commenter} вырашыў заўвагу на карце, што вы каментавалі. Заўвага каля %{place}.' + commented_note_html: '%{commenter} закрыў адну з пракаментаваных вамі нататак + побач з %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} пераадчыніў адну з вашых заўваг' subject_other: '[OpenStreetMap] %{commenter} пераадчыніў заўвагу, што можа быць вам цікава' your_note: '%{commenter} пераадчыніў адну з вашых заўваг на карце, каля %{place}.' + your_note_html: '%{commenter} адкрыў ізноў адну з вашых нататак на мапе побач + з %{place}.' commented_note: '%{commenter} пераадчыніў заўвагу на карце, якую вы каментавалі. Заўвага каля %{place}.' - details: Больш падрабязна пра ўвагу можна прачытаць на %{url}. + commented_note_html: '%{commenter} адкрыў ізноў адну з вамі пракаментаваных + нататак побач з %{place}.' + details: Адказаць або здаведацца больш пра нататку праз %{url}. + details_html: Адказаць або здаведацца больш пра нататку праз %{url} changeset_comment_notification: + description: Набор зменаў OpenStreetMap №%{id} hi: Прывітанне, %{to_user}, greeting: Прывітанне, commented: @@ -1418,13 +1833,21 @@ be: зменаў' your_changeset: '%{commenter} пакінуў каментарый на адзін з вашых набораў змен, створаных %{time}' + your_changeset_html: '%{commenter} пакінуў каментар а %{time} да аднаго з + вашых набораў зменаў' commented_changeset: '%{commenter}% у %{time} пакінуў каментарый да набору змен ад %{changeset_author}, за якім вы назіраеце' + commented_changeset_html: '%{commenter} пакінуў каментар а %{time} на адзін + з набораў зменаў, за якім вы сачыце, які створаны %{changeset_author}' partial_changeset_with_comment: з каментаром '%{changeset_comment}' + partial_changeset_with_comment_html: з каментаром "%{changeset_comment}" partial_changeset_without_comment: без каментароў - details: Дадатковыя звесткі аб наборы зьменаў можна знайсці ў %{url}. - unsubscribe: Каб адпісацца ад абнаўленняў гэтага пакета правак наведайце %{url} - і націсніце кнопку "Адпісацца". + details: Адказаць або здаведацца больш пра набор зменаў праз %{url}. + details_html: Адказаць або здаведацца больш пра набор зменаў праз %{url}. + unsubscribe: Вы можаце адпісацца ад атрымання апавяшчэнняў пра абнаўленні гэтага + набору зменаў праз %{url}. + unsubscribe_html: Вы можаце адпісацца ад атрымання апавяшчэнняў пра абнаўленні + гэтага набору зменаў праз %{url}. confirmations: confirm: heading: Праверце вашу электронную пошту! @@ -1436,6 +1859,9 @@ be: success: Уліковы запіс пацверджаны, дзякуй за рэгістрацыю! already active: Гэты ўліковы запіс ужо пацверджаны. unknown token: Тэрмін дзеяння кода пацвярджэння ўжо прайшоў ці ён не існуе. + resend_html: Калі вам патрэбна атрымаць паўторна электронны ліст пацвярджэння, + перайдзіце праз %{reconfirm_link}. + click_here: націсніце тут confirm_resend: failure: Карыстальнік %{name} не знойдзены. confirm_email: @@ -1445,6 +1871,13 @@ be: success: Змена вамі адраса электроннай пошты пацверджана! failure: Паштовы адрас ужо быў пацверджаны гэтым токенам. unknown_token: Тэрмін дзеяння кода пацвярджэння ўжо прайшоў ці ён не існуе. + resend_success_flash: + confirmation_sent: Мы адправілі вам электронны ліст пацвярджэння на электронную + пошту %{email}. Вам трэба як мага хутчэй спраўдзіць ваш уліковы запіс, каб + мець магчымасць правіць мапу. + whitelist: Калі вы карыстаецеся сістэмай абароны ад спаму, якая дасылае запыты + на пацвярджэнне, калі ласка, унясіце %{sender} у белы спіс, паколькі мы не + можам адказаць на аніякія запыты на пацвярджэнне. messages: inbox: title: Уваходныя @@ -1463,11 +1896,13 @@ be: to: Каму subject: Тэма date: Дата + actions: Дзеянні message_summary: unread_button: Адзначыць як нечытанае read_button: Адзначыць як прачытанае reply_button: Адказаць destroy_button: Выдаліць + unmute_button: Перамясціць у папку "Уваходныя" new: title: Даслаць паведамленне send_message_to_html: Даслаць новае паведамленне %{name} @@ -1482,42 +1917,59 @@ be: body: Шкада, паведамлення з гэтым ідэнтыфікатарам няма. outbox: title: Зыходныя + actions: Дзеянні messages: one: Вы адаслалі %{count} паведамленне other: Вы адаслалі %{count} паведамленняў no_sent_messages_html: У вас пакуль няма дасланых паведамленняў. Чаму б не зкаардынавацца з %{people_mapping_nearby_link}? people_mapping_nearby: людзьмі, што жывуць непадалёку + muted: + title: Прыглушаныя паведамленні + messages: + one: '%{count} прыглушанае паведамленне' + few: '%{count} прыглушаных паведамлення' + many: '%{count} прыглушаных паведамленняў' + other: '%{count} прыглушанных паведамлення(-яў)' reply: - wrong_user: Вы ўвайшлі ў сістэму як `%{user}', але паведамленне, на якое Вы + wrong_user: Вы ўвайшлі ў сістэму як "%{user}", але паведамленне, на якое вы жадаеце адказаць, не было дасланае гэтаму карыстальніку. Калі ласка, увайдзіце - як карыстальнік, адпаведна запыту, каб адказаць. + ў сістэму як праўдзівы карыстальнік , каб адказаць. show: title: Прачытаць паведамленне reply_button: Адказаць unread_button: Адзначыць, як непрачытанае destroy_button: Выдаліць back: Назад - wrong_user: Вы ўвайшлі ў сістэму як `%{user}', але паведамленне, якое Вы жадаеце - прачытаць, было дасланае не гэтым ці гэтаму карыстальніку. Калі ласка, увайдзіце - як карыстальнік, адпаведна запыту, каб прачытаць. + wrong_user: Вы ўвайшлі ў сістэму пад імем "%{user}", але паведамленне, якое + вы жадаеце прачытаць, не было адпраўленае гэтым карыстальнікам. Калі ласка, + увайдзіце ў сістэму пад правільным імем, каб прачытаць яго. sent_message_summary: destroy_button: Выдаліць heading: my_inbox: Мае уваходныя + my_outbox: Мае выходныя + muted_messages: Прыглушаныя паведамленні mark: as_read: Паведамленне адмечана прачытаным as_unread: Паведамленне адмечана нечытаным + unmute: + notice: Паведамленне было перамешчана ў папку "Уваходныя". + error: Паведамленне не можа быць перамешчана ў папку "Уваходныя". destroy: destroyed: Паведамленне выдалена passwords: new: title: згублены пароль heading: Забылі пароль? - email address: 'Паштовы адрас:' + email address: Адрас электроннай пошты new password button: Выслаць мне новы пароль help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі, і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для змены паролю. + create: + send_paranoid_instructions: Калі ваш адрас электроннай пошты ёсць у нашай базе + даных, вы атрымаеце спасылку для аднаўлення пароля на свой адрас электроннай + пошты праз некалькі хвілін. edit: title: скінуць пароль heading: Скінуць пароль для %{user} @@ -1525,11 +1977,30 @@ be: flash token bad: Не знайшоў такі токен, можа, праверце URL? update: flash changed: Ваш пароль быў зменены. + flash token bad: Не знайшоў такі токен, мабыць, праверце URL? + preferences: + show: + title: Параметры + preferred_editor: Пераважны рэдактар + preferred_languages: Пераважныя мовы + edit_preferences: Змяніць параметры + edit: + title: Змяніць параметры + save: Абнавіць параметры + cancel: Скасаваць + update: + failure: Немагчыма абнавіць параметры. + update_success_flash: + message: Параметры абноўленыя. profiles: edit: + title: Рэдагаваць профіль + save: Абнавіць профіль + cancel: Скасаваць image: Выява gravatar: gravatar: Выкарыстоўваць Gravatar + what_is_gravatar: Што такое Gravatar? disabled: Граватар быў адключаны. enabled: Паказ вашага Граватара быў уключаны. new image: Дадаць выяву @@ -1537,36 +2008,62 @@ be: delete image: Выдаліць бягучую выяву replace image: Замяніць бягучую выяву image size hint: (найлепей пасуюць квадратныя выявы памерам 100×100) - home location: 'Ваша месцазнаходжанне:' + home location: Маё месцазнаходжанне no home location: Вы не выбралі вашае асноўнае месцазнаходжанне. update home location on click: Абнавіць каардэнаты, калі я пстрыкну па карце? + show: Паказаць + delete: Выдаліць + undelete: Адмяніць выдаленне + update: + success: Профіль абноўлены. + failure: Немагчыма абнавіць профіль. sessions: new: title: Уваход tab_title: Уваход + login_to_authorize_html: Увайдзіце ў сістэму OpenStreetMap, каб мець доступ + да %{client_app_name}. email or username: Электронны адрас або Імя карыстальніка password: Пароль remember: Памятаць мяне lost password link: Згубілі пароль? login_button: Увайсці register now: Зарэгістравацца зараз - with external: 'У якасці альтэрнатывы выкарыстайце для ўваходу старонні сервіс:' + with external: або ўвайдзіце ў сістэму з дапамогай трэцяй асобы + or: або auth failure: Прабачце, немагчыма увайсці з такім адрасам і паролем. destroy: title: Выйсці heading: Выйсці з OpenStreetMap logout_button: Выйсці + suspended_flash: + suspended: На жаль, ваш уліковы запіс быў прыпынены з-за падазронай актыўнасці. + contact_support_html: Калі ласка, звяжыцеся з %{support_link}, калі хочаце абмеркаваць + гэта. + support: падтрымка shared: markdown_help: + heading_html: Разабрана з %{kramdown_link} + headings: Загалоўкі + heading: Загаловак subheading: Падзагаловак + unordered: Неўпарадкаваны спіс + ordered: Упарадкаваны спіс + first: Першы пункт + second: Другі пункт link: Спасылка text: Тэкст image: Выява + alt: Альтэрнатыўны тэкст + url: URL + codeblock: Блок коду richtext_field: edit: Правіць + preview: Перадпаказ site: about: next: Далей + heading_html: '%{copyright}OpenStreetMap %{br} удзельнікаў' used_by_html: '%{name} забяспечвае картаграфічнымі данымі тысячы сайтаў, мабільных праграм і прылад' lede_text: OpenStreetMap створаны супольнасцю картографаў, якія дадаюць і падтрымліваюць @@ -1578,7 +2075,21 @@ be: палявыя карты для праверкі таго, што дадзеныя OSM з'яўляюцца дакладнымі і актуальнымі. community_driven_title: Развіваецца супольнасцю + community_driven_1_html: |- + Супольнасць OpenStreetMap разнастайная, зацятая і расце штодзень. + Сярод нашых удзельнікаў ёсць картографы-энтузіясты, адмыслоўцы па ГІС, інжынеры, якія працуюць з сістэмамі OSM, гуманітарныя працаўнікі, якія робяць рэдагаванні мапы ў раёнах, якія пацярпелі ад стыхійных бедстваў, і шмат іншых. + Каб здаведацца больш пра супольнасць, наведайце %{osm_blog_link}, %{user_diaries_link}, %{community_blogs_link} і вэб-сайт %{osm_foundation_link}. + community_driven_osm_blog: Блог OpenStreetMap + community_driven_user_diaries: дзённікі карыстальнікаў + community_driven_community_blogs: блогі супольнасці + community_driven_osm_foundation: Фонд OSM open_data_title: Адкрытыя даныя + open_data_1_html: |- + OpenStreetMap — гэта %{open_data}: вы можаце выкарыстоўваць іх для любых мэтаў + патуль, пакуль вы пазначаеце OpenStreetMap і ягоных удзельнікаў. Калі вы зменіце або дададзіце даныя пэўным чынам, вы можаце пашыраць вынік толькі + па той жа ліцэнзіі. Падрабязней %{copyright_license_link}. + open_data_open_data: адкрытыя даныя + open_data_copyright_license: Аўтарскія правы і ліцэнзія legal_title: Прававыя пытанні partners_title: Партнёры copyright: @@ -1618,9 +2129,6 @@ be: index: js_1: Вы карыстаецеся вандроўнікам без падтрымкі JavaScript. js_2: OpenStreetMap выкарыстоўвае JavaScript для адлюстравання карты на сайце. - permalink: Спасылка сюды - shortlink: Кароткая - createnote: Дадаць заўвагу license: copyright: Аўтарскія правы належаць OpenStreetMap і яго ўдзельнікам на ўмовах адкрытай ліцэнзіі. @@ -2360,13 +2868,6 @@ be: map_data_zoom_in_tooltip: Павялічце, каб убачыць картаграфічныя даныя queryfeature_tooltip: Пошук аб’ектаў queryfeature_disabled_tooltip: Наблізіцеся для пошуку аб'ектаў - changesets: - show: - comment: Каментаваць - subscribe: Падпісацца - unsubscribe: Адпісацца - hide_comment: схаваць - unhide_comment: паказаць edit_help: Перамясціце карту і наблізце месца, якое вы хочаце рэдагаваць, затым націсніце тут. directions: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 714adfce1..a4c28a374 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -220,8 +220,8 @@ bg: opened_at_by_html: Създадена %{when} от %{user} commented_at_html: Обновена %{when} commented_at_by_html: Обновена %{when} от %{user} - closed_at_html: Решена %{when} - closed_at_by_html: Решена %{when} от %{user} + closed_at_html: Затворена %{when} + closed_at_by_html: Затворена %{when} от %{user} reopened_at_html: Повторно отворена %{when} reopened_at_by_html: Повторно отворена %{when} от %{user} rss: @@ -406,6 +406,11 @@ bg: join_discussion: Впишете се, за да се присъедините към обсъждането still_open: Списъкът с промени не е завършен - обсъждането ще започне след неговото завършване. + subscribe: Абониране + unsubscribe: Отписване + hide_comment: скриване + unhide_comment: показване + comment: Коментиране changesetxml: XML на списъка с промени osmchangexml: osmChange XML paging_nav: @@ -514,7 +519,8 @@ bg: %{language_name} all: title: Записи в дневника на OpenStreetMap - comments: + diary_comments: + index: no_comments: Няма коментари в дневника post: Публикация when: Кога @@ -1165,16 +1171,16 @@ bg: states: ignored: Пренебрегнат open: Отворен - resolved: Решени + resolved: Затворени show: title: '%{status} Проблем #%{issue_id}' reports: one: '%{count} доклад' other: '%{count} доклада' report_created_at_html: Първоначално докладван на %{datetime} - last_resolved_at_html: Последно решена на %{datetime} + last_resolved_at_html: Последно затворена на %{datetime} last_updated_at_html: Последно актуализиран на %{datetime} от %{displayname} - resolve: Решаване + resolve: Затваряне ignore: Пропусни reopen: Отново отвори reports_of_this_issue: Сигнали за този Проблем @@ -1317,11 +1323,11 @@ bg: subject_other: '[OpenStreetMap] %{commenter} коментира бележка, от която се интересувате' closed: - subject_own: '[OpenStreetMap] %{commenter} е решил една от бележките ви' - subject_other: '[OpenStreetMap] %{commenter} разреши бележка, която ви интересува' - your_note: '%{commenter} е решил една от бележките ви към картата в близост + subject_own: '[OpenStreetMap] %{commenter} е затворил една от бележките ви' + subject_other: '[OpenStreetMap] %{commenter} затвори бележка, която ви интересува' + your_note: '%{commenter} е затворил една от бележките ви към картата в близост до %{place}.' - your_note_html: '%{commenter} разреши една от вашите бележки на картата близо + your_note_html: '%{commenter} затворил една от вашите бележки на картата близо до %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} повторно е отворил една от бележките @@ -1561,11 +1567,23 @@ bg: more_title_html: Открийте повече contributors_title_html: Нашите сътрудници infringement_title_html: Нарушаване на авторските права + infringement_1_html: Напомняме на сътрудниците на OSM никога да не добавят + данни от източници, защитени с авторски права (например Google Maps или + печатни карти), без изрично разрешение от притежателите на авторските права. + infringement_2_1_html: Ако смятате, че материал, защитен с авторско право, + е добавен по неправомерен начин в базата данни на OpenStreetMap или в този + сайт, моля, обърнете се към нашата %{takedown_procedure_link} или подайте + сигнал директно чрез нашата %{online_filing_page_link}. + infringement_2_1_takedown_procedure: процедура за сваляне + infringement_2_1_online_filing_page: онлайн страница за подаване на документи + trademarks_title: Търговски марки + trademarks_1_1_html: |- + OpenStreetMap, логото с лупата и State of the Map са регистрирани търговски марки на + OpenStreetMap Foundation. Ако имате въпроси относно използването на марките, моля вижте нашата + %{trademark_policy_link}. + trademarks_1_1_trademark_policy: политика за търговски марки index: js_2: OpenStreetMap използва JavaScript за своята статична карта. - permalink: Постоянна връзка - shortlink: Къса връзка - createnote: Добавяне на бележка edit: not_public: Не сте посочили вашите редакции да бъдат публични. user_page_link: Потребителска страница @@ -2066,21 +2084,21 @@ bg: title: Бележка № %{id} description: Описание open_title: Нерешена бележка № %{note_name} - closed_title: Решена бележка № %{note_name} + closed_title: Затворена бележка № %{note_name} hidden_title: Скрита бележка № %{note_name} event_opened_by_html: Създадена от %{user} %{time_ago} report: докладване anonymous_warning: Бележката е от анонимен потребител и съдържа твърдения, които трябва да бъдат проверени. hide: Скриване - resolve: Решаване + resolve: Затваряне reactivate: Повторно отваряне - comment_and_resolve: Коментиране и решаване + comment_and_resolve: Коментиране и затваряне comment: Коментиране report_link_html: Ако тази бележка съдържа поверителна информация, която трябва да бъде премахната, можете да я %{link}. - other_problems_resolve: За всички други проблеми с бележката, моля, разрешете - ги с коментар. + other_problems_resolve: За всички други проблеми с бележката, моля, затворете + я с коментар. new: title: Нова бележка intro: Забелязали сте грешка или нещо липсващо? Уведомете другите картографи, @@ -2143,13 +2161,6 @@ bg: map_data_zoom_in_tooltip: Увеличете за подробности queryfeature_tooltip: Търсене на обекти queryfeature_disabled_tooltip: Увеличете за търсене на обекти - changesets: - show: - comment: Коментиране - subscribe: Абониране - unsubscribe: Отписване - hide_comment: скриване - unhide_comment: показване directions: ascend: Изкачване engines: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index a9f60ec4e..3459542d1 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -19,6 +19,7 @@ # Author: R4356th # Author: R4bb1 # Author: Rasal Lia +# Author: RiazACU # Author: Sayma Jahan # Author: Tahmid # Author: Tauhid16 @@ -473,6 +474,7 @@ bn: join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে। hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন' + comment: মন্তব্য changesetxml: পরিবর্তনধার্য এক্সএমএল osmchangexml: osmChange এক্সএমএল paging_nav: @@ -592,7 +594,10 @@ bn: all: title: ওপেনস্ট্রিটম্যাপ দিনলিপির ভুক্তি description: ওপেনস্ট্রিটম্যাপ ব্যবহারকারীগণ কর্তৃক সাম্প্রতিক দিনলিপির ভুক্তি - comments: + subscribe: + button: আলোচনায় সাবস্ক্রাইব করুন + diary_comments: + index: title: '%{user}-এর কৃত দিনলিপি ভুক্তি' heading: '%{user}-এর দিনলিপি মন্তব্য' subheading_html: '%{user}-এর করা দিনলিপি মন্তব্য' @@ -602,8 +607,6 @@ bn: comment: মন্তব্য newer_comments: নতুনতর মন্তব্য older_comments: পুরাতন মন্তব্য - subscribe: - button: আলোচনায় সাবস্ক্রাইব করুন doorkeeper: flash: applications: @@ -1627,9 +1630,6 @@ bn: index: js_1: আপনি এমন একটি ব্রাউজার ব্যবহার করছেন যা জাভাস্ক্রিপ্ট সমর্থন করে না অথবা আপনি জাভাস্ক্রিপ্ট অক্ষম করেছেন। - permalink: স্থায়ী সংযোগ - shortlink: সংক্ষিপ্ত সংযোগ - createnote: একটি দ্রষ্টব্য যোগ করুন edit: user_page_link: ব্যবহারকারীর পাতা export: @@ -2077,9 +2077,6 @@ bn: site: edit_tooltip: মানচিত্রটি সম্পাদনা করুন embed_html_disabled: এই মানচিত্রের স্তরের জন্য এইচটিএমএল এম্বেডিং উপলব্ধ নয়। - changesets: - show: - comment: মন্তব্য directions: engines: graphhopper_car: গাড়ি (GraphHopper) diff --git a/config/locales/br.yml b/config/locales/br.yml index 67c5b031c..981632918 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -526,8 +526,13 @@ br: join_discussion: Kevreit evit mont er gaozeadenn still_open: Hollad cheñchamantoù digor - an diviz a zigoro ur wech ma vo serret an hollad cheñchamantoù. + subscribe: Koumanantiñ + unsubscribe: Digoumanantiñ comment_by_html: Kemennadenn skrivet gant %{user} %{time_ago} hidden_comment_by_html: Kemennadenn kuzhet gant %{user} %{time_ago} + hide_comment: kuzhat + unhide_comment: diskouez + comment: Embann changesetxml: Hollad cheñchamantoù XML osmchangexml: Cheñchoùosm XML paging_nav: @@ -648,7 +653,12 @@ br: all: title: Enmontoù en deizlevr OpenStreetMap description: Enmontoù nevez en deizlevr gant implijerien OpenStreetMap - comments: + subscribe: + button: Koumanantiñ ouzh ar gaozeadenn + unsubscribe: + button: Digoumanantiñ diouzh ar gaozeadenn + diary_comments: + index: title: Kemennadennoù skrivet en deizlevr gant %{user} heading: Kemennadennoù-deizlevr %{user} subheading_html: Kemennadennoù skrivet en deizlevr gant %{user} @@ -658,10 +668,6 @@ br: comment: Evezhiadenn newer_comments: Evezhiadennoù nevesañ older_comments: Evezhiadennoù koshañ - subscribe: - button: Koumanantiñ ouzh ar gaozeadenn - unsubscribe: - button: Digoumanantiñ diouzh ar gaozeadenn doorkeeper: flash: applications: @@ -676,6 +682,8 @@ br: errors: contact: contact: darempred + bad_request: + title: Reked fall forbidden: title: Difennet internal_server_error: @@ -1927,7 +1935,8 @@ br: lost password link: Ankouaet ho ker-tremen ganeoc'h ? login_button: Kevreañ register now: En em enskrivañ bremañ - with external: 'Mod all, implijit un tredeour evit kevreañ :' + with external: 'pe kevreit gant un tredeour:' + or: pe auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù pourchaset. destroy: @@ -2089,9 +2098,6 @@ br: js_1: Pe emaoc'h oc'h implijout ur merdeer ha ne skor ket JavaScript, pe hoc'h eus diweredekaet JavaScript. js_2: OpenStreetMap a implij JavaScript evit e gartenn risklus. - permalink: Peurliamm - shortlink: Liamm berr - createnote: Ouzhpennañ un notenn license: copyright: Gwir-eilañ gant OpenStreetMap hag ar genlabourerien, dindan un aotre-implijout digor @@ -2195,7 +2201,7 @@ br: close: Serriñ search: search: Klask - get_directions: Kaout an tuioù + get_directions: Kaout an durc'hadurioù get_directions_title: Kavit an hentoù etre an daou boent from: Eus to: Da @@ -2417,6 +2423,7 @@ br: identifiable: ANAVEZADUS private: PREVEZ trackable: HEULIADUS + details_with_tags_html: '%{time_ago} gant %{user} e-barzh %{tags}' details_without_tags_html: '%{time_ago} gant %{user}' index: public_traces: Roudoù GPS foran @@ -2473,6 +2480,7 @@ br: muted_users: Implijerien kuzhet auth_providers: openid_logo_alt: Kevreañ gant un OpenID + openid_login_button: Kenderc'hel openid: title: Kevreañ gant OpenID alt: Kevreañ gant un URL OpenID @@ -2623,20 +2631,23 @@ br: users: new: title: Kevreañ + tab_title: En em enskrivañ no_auto_account_create: Siwazh n'omp ket evit krouiñ ur gont evidoc'h ent emgefreek. please_contact_support_html: Kit e darempred gant ar %{support_link}, mar plij, evit ma krouo ur gont evidoc'h - klask a raimp plediñ gant ho koulenn kerkent ha ma vo tu. support: skor about: - header: Digoust hag aozadus + header: Digoust hag aozadus. paragraph_1: E-skoaz ar c'hartennoù all eo savet OpenStreetMap penn-da-benn gant tud eveldoc'h ha tu zo da bep hini reizhañ, hizivaat, pellgargañ hag implijout e gartennoù. - paragraph_2: Lakait hoc'h anv ha stagit da gemer perzh. Kaset a vo ur postel - deoc'h a-benn kadarnaat ho kont. + paragraph_2: Lakait hoc'h anv ha stagit da gemer perzh. + welcome: Degemer mat en OpenStreetMap display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit cheñch diwezhatoc'h en ho penndibaboù. + tou: Termenoù implijout + contributor_terms: reolennoù ar genlabourerien external auth: 'Dilesadur trede :' continue: En em enskrivañ terms accepted: Trugarez deoc'h evit bezañ asantet da ziferadennoù nevez ar @@ -2644,7 +2655,9 @@ br: email_help_html: Ho chomlec'h ne vo ket hewel d'an holl, sellit ouzh %{privacy_policy_link} evit gouzout hiroc'h. privacy_policy: reolennoù prevezded - use external auth: 'Mod all, implijit un tredeour evit kevreañ :' + consider_pd: domani foran + or: pe + use external auth: 'pe kevreit gant un tredeour:' terms: title: Termenoù heading: Termenoù @@ -2974,12 +2987,15 @@ br: reactivate: Adweredekaat comment_and_resolve: Addisplegañ & Diskoulmañ comment: Evezhiadenn + log_in_to_comment: Kevreit evit skrivañ war an notenn-mañ other_problems_resolved: Evit an holl gudennoù all ez eo a-walc'h d'o diskoulmañ. new: title: Notenn nevez intro: Gwelet ho peus ur fazi pe un dra a vank ? Roit an dra-se da c'houzout d'ar gartennaouerien all evit ma vo renket. Lakait ar merker el lec'h mat ha skrivit un notenn da zisplegañ ar gudenn. + anonymous_warning_log_in: kevreañ + anonymous_warning_sign_up: en em enskrivañ advice: Foran eo ho notenn ha ne c'hall ket bezañ implijet evit hizivaat ar gartenn. Setu perak eo arabat ebarzhiñ titouroù personel pe titouroù o tont eus kartennoù gwarezet na endalc'hioù rolloù. @@ -3036,6 +3052,7 @@ br: standard: Standard cycle_map: Kelc'hiad kartenn transport_map: Kartenn treuzdougen + tracestracktop_topo: Tracestrack Topo hot: Denegour layers: header: Gwiskadoù kartenn @@ -3060,13 +3077,6 @@ br: map_data_zoom_in_tooltip: Zoumiñ evit gwelet roadennoù ar gartenn queryfeature_tooltip: Arc'hweladurioù enklask queryfeature_disabled_tooltip: Zoumañ evit an arc'hweladurioù enklask - changesets: - show: - comment: Embann - subscribe: Koumanantiñ - unsubscribe: Digoumanantiñ - hide_comment: kuzhat - unhide_comment: diskouez edit_help: Dilec'hiit ar gartenn ha zoumit war ul lec'h a fell deoc'h aozañ, ha neuze klikit amañ. directions: @@ -3082,7 +3092,7 @@ br: fossgis_valhalla_car: Karr (Valhalla) fossgis_valhalla_foot: War droad (Valhalla) descend: Diskenn - directions: Tuioù + directions: Durc'hadurioù distance: Hed distance_m: '%{distance}m' distance_km: '%{distance}km' diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 2b53f8ce4..43026e263 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -366,7 +366,8 @@ bs: all: title: Unosi u OpenStreetMap dnevniku description: Nedavni unosi u dnevnik OpenStreetMap korisnika - comments: + diary_comments: + index: post: Post when: Kada comment: Komentar @@ -1100,9 +1101,6 @@ bs: js_1: Koristite internet preglednik koji ne podržava JavaScript, ili ste onemogućili JavaScript. js_2: OpenStreetMap koristi JavaScript za slippy kartu. - permalink: Trajni link - shortlink: Kratki link - createnote: Dodaj biljeÅ¡ku license: copyright: Autorska prava OpenStreetMap i doprinosioci, pod otvorenom dozvolom remote_failed: Uređivanje nije uspjelo - provjerite da li je JOSM ili Merkaartor diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d08b674fb..6b41a80d5 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -503,8 +503,13 @@ ca: join_discussion: Inicieu una sessió per a unir-vos al debat still_open: Conjunt de canvis encara obert - el debat començarà quan es tanqui el conjunt de canvis. + subscribe: Subscriure's + unsubscribe: Dona de baixa comment_by_html: Comentari de %{user} %{time_ago} hidden_comment_by_html: Comentari ocult de %{user} %{time_ago} + hide_comment: ocultar + unhide_comment: mostrar + comment: Comenta changesetxml: XML del conjunt de canvis osmchangexml: XML en format osmChange paging_nav: @@ -619,7 +624,8 @@ ca: all: title: Entrades de diari d'OpenStreetMap description: Entrades de diari recents dels usuaris d'OpenStreetMap - comments: + diary_comments: + index: title: Comentaris del diari afegits per %{user} heading: Comentaris del diari de %{user} subheading_html: Comentaris del diari afegits per %{user} @@ -2101,9 +2107,6 @@ ca: js_1: O bé esteu utilitzant un navegador no compatible amb JavaScript o bé teniu JavaScript deshabilitat. js_2: L'OpenStreetMap utilitza JavaScript per al mapa lliscant. - permalink: Enllaç permanent - shortlink: Enllaç curt - createnote: Afegeix una nota license: copyright: Copyright d'OpenStreetMap i els seus col·laboradors sota llicència oberta @@ -3106,13 +3109,6 @@ ca: queryfeature_disabled_tooltip: Apropeu-vos per a consultar característiques embed_html_disabled: La incrustació d'HTML no està disponible per a aquesta capa de mapa - changesets: - show: - comment: Comenta - subscribe: Subscriure's - unsubscribe: Dona de baixa - hide_comment: ocultar - unhide_comment: mostrar edit_help: Moveu el mapa i feu zoom sobre una ubicació que vulgueu editar, i a continuació, feu clic aquí. directions: diff --git a/config/locales/ce.yml b/config/locales/ce.yml index 611ea2696..ce2a0acc6 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: McDutchie # Author: Sasan700 +# Author: Исмаил Садуев # Author: Умар --- ce: @@ -28,7 +29,7 @@ ce: update: Хийцам Ӏалашбе trace: create: Сервер тӀейаккха - update: Ӏалашбе хийцамаш + update: Хийцамаш дӀаӀалашбе user_block: create: Кхолла блок update: Карлайаккха блок @@ -72,7 +73,7 @@ ce: way_tag: Сизан тег attributes: diary_comment: - body: Йоза + body: Текст diary_entry: user: Декъашхо title: Тема @@ -95,7 +96,7 @@ ce: message: sender: Баийтинарг title: Тема - body: Йоза + body: Текст recipient: Кхаьчнарг user: email: Электронан пошт @@ -173,7 +174,7 @@ ce: title: OpenStreetMap билгалонаш entry: comment: Коммент - full: Дуьззина йоза + full: Йуьззина текст accounts: edit: current email address: 'Карара электронан поштан адрес:' @@ -294,6 +295,9 @@ ce: title: 'Нисдарш: %{id}' discussion: Дийцар join_discussion: Дийцарехь дакъалаца системин чугӀо + hide_comment: къайлайаккха + unhide_comment: гайта + comment: Коммент changesetxml: Нисдарийн XML osmchangexml: osmChange XML paging_nav: @@ -384,7 +388,8 @@ ce: all: title: Дневникан дӀайаздарш OpenStreetMap description: OpenStreetMap декъашхойн тӀаьххьарлера дӀайаздарш - comments: + diary_comments: + index: post: Хаам when: Маца comment: Коммент @@ -919,7 +924,7 @@ ce: revoker: 'БлокдӀайаьккхинарг:' block: show: Гайта - edit: Нисйе + edit: Нисйан revoke: ДӀайаккхаблок! blocks: display_name: Блоктоьхна декъашхо @@ -976,11 +981,6 @@ ce: site: edit_tooltip: Нисде карта edit_disabled_tooltip: Хийцамашбан гергадаладе карта - changesets: - show: - comment: Коммент - hide_comment: къайлайаккха - unhide_comment: гайта directions: ascend: Хьала engines: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f609f4850..0698af177 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -565,8 +565,13 @@ cs: join_discussion: Chcete-li diskutovat, přihlaste se still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude sada změn uzavřena. + subscribe: Odebírat + unsubscribe: ZruÅ¡it odebírání comment_by_html: Komentář od uživatele %{user} %{time_ago} hidden_comment_by_html: Skrytý komentář od uživatele %{user} %{time_ago} + hide_comment: skrýt + unhide_comment: odkrýt + comment: Okomentovat changesetxml: Sada změn XML osmchangexml: osmChange XML paging_nav: @@ -683,7 +688,14 @@ cs: all: title: Deníkové záznamy OpenStreetMap description: Nedávné záznamy v denících uživatelů OpenStreetMap - comments: + subscribe: + heading: Přihlásit se k odběru následující diskuse k deníkovému záznamu? + button: Odebírat diskusi + unsubscribe: + heading: Odhlásit odběr následující diskuse k deníkovému záznamu? + button: ZruÅ¡it odběr diskuse + diary_comments: + index: title: Komentáře k deníkům přidané uživatelem %{user} heading: Deníkové komentáře uživatele %{user} subheading_html: Komentáře k deníkům přidané uživatelem %{user} @@ -693,12 +705,6 @@ cs: comment: Komentář newer_comments: Novější komentáře older_comments: Starší komentáře - subscribe: - heading: Přihlásit se k odběru následující diskuse k deníkovému záznamu? - button: Odebírat diskusi - unsubscribe: - heading: Odhlásit odběr následující diskuse k deníkovému záznamu? - button: ZruÅ¡it odběr diskuse doorkeeper: errors: messages: @@ -2266,9 +2272,6 @@ cs: js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript zakázaný. js_2: OpenStreetMap používá pro svou interaktivní mapu JavaScript. - permalink: Trvalý odkaz - shortlink: Krátký odkaz - createnote: Přidat poznámku license: copyright: Copyright OpenStreetMap a přispěvatelé, pod svobodnou licencí remote_failed: Editace se nezdařila – ujistěte se, že JOSM nebo Merkaartor běží @@ -2876,8 +2879,8 @@ cs: continue: Zaregistrovat se terms accepted: Děkujeme za odsouhlasení nových podmínek pro přispěvatele! email_help_html: VaÅ¡e adresa se nezobrazuje veřejně, více informací získáte - v naÅ¡ich %{privacy_policy_link}. - privacy_policy: pravidlech ochrany osobních údajů + na stránce s naÅ¡imi %{privacy_policy_link}. + privacy_policy: pravidly ochrany osobních údajů privacy_policy_title: Pravidla ochrany osobních údajů OSMF, včetně části o e-mailových adresách consider_pd_html: Své příspěvky považuji za %{consider_pd_link}. @@ -3318,13 +3321,6 @@ cs: queryfeature_tooltip: Průzkum prvků queryfeature_disabled_tooltip: Pro průzkum prvků přejděte na větší měřítko embed_html_disabled: HTML vkládání není pro tuto mapovou vrstvu k dispozici - changesets: - show: - comment: Okomentovat - subscribe: Odebírat - unsubscribe: ZruÅ¡it odebírání - hide_comment: skrýt - unhide_comment: odkrýt edit_help: Posuňte si mapu a zvětÅ¡ete si místo, které chcete editovat, a klikněte zde. directions: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index edaf1023a..f2d25da83 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -344,6 +344,7 @@ cy: deleted_ago_by_html: Wedi dileu %{time_ago} gan %{user} edited_ago_by_html: Golygwyd %{time_ago} gan %{user} version: Fersiwn + redacted_version: Fersiwn Wedi'i Gorchuddio in_changeset: Grŵp newid anonymous: dienw no_comment: (dim sylw) @@ -364,7 +365,10 @@ cy: other: '%{count} llwybr' download_xml: Lawrlwytho XML view_history: Gweld hanes + view_unredacted_history: Gweld Hanes Heb Ei Orchuddio view_details: Gweld manylion + view_redacted_data: Gweld Data Wedi'i Gorchuddio + view_redaction_message: Gweld Neges Orchuddio location: Lleoliadː node: title_html: 'Nod: %{name}' @@ -510,8 +514,13 @@ cy: join_discussion: Mewngofnodwch i ymuno â'r sgwrs still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd y grŵp newid wedi cau. + subscribe: Tanysgrifio + unsubscribe: Dad-danysgrifio comment_by_html: Sylw gan %{user} %{time_ago} hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago} + hide_comment: cuddio + unhide_comment: datguddio + comment: Sylw changesetxml: XML grŵp newid osmchangexml: XML osmChange paging_nav: @@ -581,6 +590,8 @@ cy: title: Dyddiadur %{user} | %{title} user_title: Dyddiadur %{user} discussion: Sgwrs + subscribe: Tanysgrifio + unsubscribe: Dad-danysgrifio leave_a_comment: Sylw login_to_leave_a_comment_html: '%{login_link} i adael sylw' login: Mewngofnodi @@ -629,7 +640,13 @@ cy: all: title: Cofnodion dyddiadur OpenStreetMap description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap - comments: + subscribe: + button: Tanysgrifio i drafodaeth + unsubscribe: + heading: Dad-danysgrifio o'r drafodaeth cofnod dyddiadur ganlynol? + button: Dad-danysgrifio o'r drafodaeth + diary_comments: + index: title: Sylwadau Dyddiadur wedi'u hychwanegu gan %{user} heading: Sylwadau Dyddiadur %{user} subheading_html: Sylwadau Dyddiadur wedi'u hychwanegu gan %{user} @@ -639,11 +656,6 @@ cy: comment: Sylw newer_comments: Sylwadau Diweddarach older_comments: Sylwadau HÅ·n - subscribe: - button: Tanysgrifio i drafodaeth - unsubscribe: - heading: Dad-danysgrifio o'r drafodaeth cofnod dyddiadur ganlynol? - button: Dad-danysgrifio o'r drafodaeth doorkeeper: flash: applications: @@ -675,6 +687,8 @@ cy: contact_the_community_html: '%{contact_link} â''r gymuned OpenStreetMap os ydych chi wedi dod o hyd i nam neu ddolen sydd wedi torri. Nodwch yr URL cywir o''ch cais.' + bad_request: + title: Cais Drwg forbidden: title: Gwaharddedig internal_server_error: @@ -885,6 +899,7 @@ cy: roof: To ruins: Adeilad Adfeiliedig school: Adeilad Ysgol + semidetached_house: TÅ· Pâr service: Adeilad Gwasanaeth shed: Sied stable: Stabl @@ -917,8 +932,11 @@ cy: photographer: Ffotograffydd plumber: Plymar roofer: Towr + sawmill: Melin Lifio shoemaker: Crydd + stonemason: Saer Maen tailor: Teiliwr + window_construction: Gwydrwr winery: Gwindy "yes": Siop Grefft emergency: @@ -927,6 +945,7 @@ cy: assembly_point: Man Ymgynull defibrillator: Diffibriliwr fire_extinguisher: Diffoddwr Tân + fire_water_pond: Pwll Dŵr Tân landing_site: Man Glanio Argyfwng phone: Ffôn Argyfwng water_tank: Tanc Dŵr Argyfwng @@ -1306,6 +1325,7 @@ cy: grocery: Siop y Groser hairdresser: Siop Drin Gwallt hardware: Siop Nwyddau Metel + herbalist: Herbwr hifi: Siop Hi-Fi houseware: Siop Offer TÅ· ice_cream: Siop Hufen Iâ @@ -1319,7 +1339,9 @@ cy: massage: Tylino mobile_phone: Siop Ffonau Symudol motorcycle: Siop Beiciau Modur + motorcycle_repair: Siop Atgyweirio Beiciau Modur music: Siop Gerddoriaeth + musical_instrument: Offerynau Cerddorol newsagent: Siop Bapurau optician: Optegydd organic: Siop Fwyd Organig @@ -1529,6 +1551,7 @@ cy: sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd. intro_2_create_account: Creu cyfrif defnyddiwr partners_fastly: Fastly + partners_corpmembers: Aelodau corfforaethol OSMF partners_partners: phartneriaid tou: Telerau Gwasanaeth osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwaith @@ -1550,8 +1573,11 @@ cy: more: Mwy user_mailer: diary_comment_notification: + description: 'Cofnod Dyddiadur OpenStreetMap #%{id}' subject: '[OpenStreetMap] Gwnaeth %{user} sylw ar gofnod dyddiadur' hi: Helo %{to_user}, + footer_unsubscribe: Gallwch chi ddad-danysgrifio o'r drafodaeth yn %{unsubscribeurl} + footer_unsubscribe_html: Gallwch chi ddad-danysgrifio o'r drafodaeth yn %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Helo %{to_user}, @@ -1586,6 +1612,7 @@ cy: click_the_link: Os mai chi yw hwn, cliciwch ar y ddolen isod i ailosod eich cyfrinair. note_comment_notification: + description: 'Nodyn OpenStreetMap #%{id}' anonymous: Defnyddiwr dienw greeting: Helo, commented: @@ -1607,8 +1634,8 @@ cy: ddiddordeb ynddo' your_note: Ailysgogodd %{commenter} un o'ch nodiadau map ger %{place}. your_note_html: Ailysgogodd %{commenter} un o'ch nodiadau map ger %{place}. - details: Ceir rhagor o fanylion am y nodyn ar %{url}. - details_html: Ceir rhagor o fanylion am y nodyn ar %{url}. + details: 'Ateb neu ddysgu mwy am y nodyn: %{url}.' + details_html: 'Ateb neu ddysgu mwy am y nodyn: %{url}.' changeset_comment_notification: description: 'Grŵp newid OpenStreetMap #%{id}' hi: Helo %{to_user}, @@ -1624,8 +1651,8 @@ cy: partial_changeset_with_comment: gyda sylw '%{changeset_comment}' partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}' partial_changeset_without_comment: dim sylw - details: Ceir rhagor o fanylion am y grŵp newid ar %{url}. - details_html: Ceir rhagor o fanylion am y grŵp newid ar %{url}. + details: 'Ateb neu ddysgu mwy am y grŵp newid: %{url}.' + details_html: 'Ateb neu ddysgu mwy am y grŵp newid: %{url}.' confirmations: confirm: heading: Gwiriwch eich e-byst! @@ -1772,13 +1799,15 @@ cy: new: title: Mewngofnodi tab_title: Mewngofnodi + login_to_authorize_html: Mewngofnodwch i OpenStreetMap i gael mynediad i %{client_app_name}. email or username: Cyfeiriad E-Bost neu Enw Defnyddiwr password: Cyfrinair remember: Cofiwch fi lost password link: Wedi anghofio eich cyfrinair? login_button: Mewngofnodi register now: Cofrestru nawr - with external: 'Fel arall, defnyddiwch drydydd parti i fewngofnodi:' + with external: neu fewngofnodi gyda thrydydd parti + or: neu auth failure: Mae'n ddrwg gennym, ni ellir mewngofnodi gyda'r manylion hynny. destroy: title: Allgofnodi @@ -1904,6 +1933,7 @@ cy: contributors_fr_credit_html: '%{france}: Cynhwysir data gan Direction Générale des Impôts.' contributors_fr_france: Ffrainc + contributors_hr_croatia: Croatia contributors_nl_credit_html: '%{netherlands}: Cynhwysir data © AND, 2007 (%{and_link})' contributors_nl_netherlands: Iseldiroedd @@ -1929,9 +1959,6 @@ cy: trademarks_1_1_trademark_policy: Polisi Nod Masnach index: js_2: Mae OpenStreetMap yn defnyddio JavaScript ar gyfer ei fap llithrig. - permalink: Dolen barhaol - shortlink: Dolen fer - createnote: Ychwanegu nodyn license: copyright: Hawlfraint OpenStreetMap a chyfranwyr, dan drwydded agored edit: @@ -2223,6 +2250,8 @@ cy: identifiable: CANFYDDADWY private: PREIFAT trackable: OLRHAINADWY + details_with_tags_html: '%{time_ago} gan %{user} yn %{tags}' + details_without_tags_html: '%{time_ago} gan %{user}' index: public_traces: Arllwybrau GPS Cyhoeddus my_gps_traces: Fy Arllwybrau GPS @@ -2244,6 +2273,8 @@ cy: description: description_without_count: Ffeil GPX gan %{user} application: + basic_auth_disabled: 'Mae Dilysiad Sylfaenol HTTP wedi''i analluogi: %{link}' + oauth_10a_disabled: 'Analluogir OAuth 1.0 a 1.0a: %{link}' require_admin: not_an_admin: Mae rhaid ichi fod yn weinyddwr i gyflawni'r weithred honno. settings_menu: @@ -2254,6 +2285,7 @@ cy: muted_users: Defnyddwyr ag Anwybyddwyd auth_providers: openid_logo_alt: Mewngofnodi gydag OpenID + openid_login_button: Parhau openid: title: Mewngofnodi ag OpenID alt: Mewngofnodi ag URL OpenID @@ -2264,8 +2296,8 @@ cy: title: Mewngofnodi â Facebook alt: Mewngofnodi â Chyfrif Facebook microsoft: - title: Mewngofnodi gyda Microsoft - alt: Mewngofnodi gyda Chyfrif Microsoft + title: Mewngofnodi â Microsoft + alt: Mewngofnodi â Chyfrif Microsoft github: title: Mewngofnodi â GitHub alt: Mewngofnodi â Chyfrif GitHub @@ -2377,16 +2409,25 @@ cy: users: new: title: Cofrestru + tab_title: Cofrestru + signup_to_authorize_html: Cofrestrwch gydag OpenStreetMap i gael mynediad at + %{client_app_name}. support: cymorth about: - header: Rhydd ac agored + header: Rhydd a golygadwy. + paragraph_2: Cofrestrwch i ddechrau cyfrannu. + welcome: Croeso i OpenStreetMap display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn nes ymlaen yn eich dewisiadau. + tou: telerau defnydd + contributor_terms: thelerau cyfranwyr external auth: 'Dilysu Trydydd Parti:' continue: Cofrestru terms accepted: Diolch am dderbyn telerau newydd cyfranwyr! privacy_policy: polisi preifatrwydd - use external auth: Fel arall, defnyddiwch drydydd parti i fewngofnodi + consider_pd: parth cyhoeddus + or: neu + use external auth: neu gofrestru gyda thrydydd parti terms: title: Telerau heading: Telerau @@ -2432,6 +2473,7 @@ cy: remove as friend: Dad-ffrindio add as friend: Ychwanegu ffrind mapper since: 'Yn mapio ers:' + last map edit: 'Golygiad map diwethaf:' uid: 'ID Defnyddiwr:' ct status: 'Telerau cyfrannwr:' ct undecided: Heb Benderfynu @@ -2486,8 +2528,12 @@ cy: unknown_error: Methodd y dilysu user_role: grant: + title: Cadarnhau rhoi rôl + heading: Cadarnhau rhoi rôl confirm: Cadarnhau revoke: + title: Cadarnhau dirymu rôl + heading: Cadarnhau dirymu rôl confirm: Cadarnhau user_blocks: not_found: @@ -2510,6 +2556,7 @@ cy: revoke: revoke: Dad-flocio! revoke_all: + empty: Nid oes gan %{name} flociau gweithredol. active_blocks: zero: '%{count} blociau cyfredol.' one: '%{count} %{count} bloc cyfredol.' @@ -2520,6 +2567,7 @@ cy: revoke: Dad-flocio! helper: time_future_html: Yn dod i ben mewn %{time}. + until_login: Gweithredol hyd nes bod y defnyddiwr yn mewngofnodi. time_past_html: Wedi dod i ben %{time} yn ôl. block_duration: hours: @@ -2564,6 +2612,7 @@ cy: title: Blociau gan %{name} heading_html: Rhestr Blociau gan %{name} show: + heading_html: '%{block_on} a flociwyd gan %{block_by}' created: 'Crëwyd:' duration: 'Cyfnod:' status: 'Statws:' @@ -2584,6 +2633,15 @@ cy: reason: Rheswm dros flocio status: Statws revoker_name: Dirymwyd gan + older: Blociau HÅ·n + newer: Blociau Diweddarach + navigation: + all_blocks: Pob Bloc + blocks_on_me: Blociau arnaf i + blocks_on_user: Blociau ar %{user} + blocks_by_me: Blociau gennyf i + blocks_by_user: Blociau gan %{user} + block: 'Bloc #%{id}' user_mutes: index: title: Defnyddwyr ag Anwybyddwyd @@ -2605,14 +2663,14 @@ cy: index: title: Nodiadau ag agorwyd neu y gwnaed sylw arnynt gan %{user} heading: Nodiadau %{user} - subheading_html: Nodiadau ag %{submitted} neu y %{commented} arnynt gan %{user} - subheading_submitted: cyflwynwyd - subheading_commented: rhoddwyd sylw + subheading_html: Nodiadau %{submitted} neu %{commented} arnynt gan %{user} + subheading_submitted: a gyflwynwyd + subheading_commented: y gwnaed sylw no_notes: Dim nodiadau id: Id creator: Crëwr description: Disgrifiad - created_at: Crëwyd am + created_at: Crëwyd last_changed: Newidiwyd ddiwethaf show: title: 'Nodyn: %{id}' @@ -2649,6 +2707,10 @@ cy: intro: Ydych chi wedi sylwi ar gamgymeriad neu rywbeth sydd ar goll? Rhowch wybod i fapwyr eraill fel y gallwn ei ddatrys. Symudwch y marciwr i'r safle cywir ac ysgrifennwch nodyn i esbonio'r broblem. + anonymous_warning_html: Nid ydych chi wedi mewngofnodi. %{log_in} neu %{sign_up} + os ydych chi eisiau derbyn diweddariadau am eich nodyn. + anonymous_warning_log_in: Mewngofnodwch + anonymous_warning_sign_up: gofrestrwch advice: Mae eich nodyn yn gyhoeddus a gellid ei ddefnyddio i ddiweddaru'r map, felly peidiwch ag ysgrifennu gwybodaeth bersonol, na gwybodaeth o fapiau hawlfreintiedig neu gyfeiriaduron. @@ -2717,13 +2779,6 @@ cy: map_data_zoom_in_tooltip: Chwyddwch mewn i weld data'r map queryfeature_tooltip: Manylion nodweddion queryfeature_disabled_tooltip: Chwyddwch i mewn i gael manylion nodweddion - changesets: - show: - comment: Sylw - subscribe: Tanysgrifio - unsubscribe: Dad-danysgrifio - hide_comment: cuddio - unhide_comment: datguddio directions: ascend: Esgyn engines: @@ -2750,6 +2805,12 @@ cy: offramp_right: Cymerwch y ramp ar y dde offramp_right_with_exit: Cymerwch allanfa %{exit} ar y dde offramp_right_with_exit_name: Cymerwch allanfa %{exit} ar y dde i %{name} + offramp_right_with_name: Cymerwch y ramp ar y dde i %{name} + offramp_right_with_directions: Cymerwch y ramp ar y dde tuag at %{directions} + offramp_right_with_name_directions: Cymerwch y ramp ar y dde i %{name}, tuag + at %{directions} + onramp_right_without_exit: Trowch i'r dde ar y ramp i %{name} + onramp_right_with_directions: Trowch i'r dde ar y ramp tuag at %{directions} merge_right_without_exit: Cyfunwch i'r dde ar %{name} turn_right_without_exit: Trowch i'r dde ar %{name} sharp_right_without_exit: Siarp i'r dde ar %{name} diff --git a/config/locales/da.yml b/config/locales/da.yml index 6f0d89417..0636b5ef9 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -498,8 +498,13 @@ da: join_discussion: Log pÃ¥ for at deltage i diskussionen still_open: Ændringssæt er stadig Ã¥ben - diskussion vil Ã¥bne nÃ¥r ændringssættet lukkes. + subscribe: Abonnér + unsubscribe: Afmeld comment_by_html: Kommentar fra %{user} %{time_ago} hidden_comment_by_html: Skjult kommentar fra %{user} %{time_ago} + hide_comment: skjul + unhide_comment: fjern skjul + comment: Kommenter changesetxml: XML for ændringssæt osmchangexml: XML for osmChange paging_nav: @@ -614,7 +619,12 @@ da: all: title: OpenStreetMap-blogindlæg description: Seneste blogindlæg fra brugere af OpenStreetMap - comments: + subscribe: + button: Abonner pÃ¥ diskussion + unsubscribe: + heading: Vil du afmelde følgende dagbogsindlægsdiskussion? + diary_comments: + index: title: Kommentarer til blogindlæg tilføjet af %{user} heading: '%{user}s kommentarer til blogindlæg' subheading_html: Kommentarer til blogindlæg tilføjet af %{user} @@ -624,10 +634,6 @@ da: comment: Kommentar newer_comments: Nyere kommentarer older_comments: Ældre kommentarer - subscribe: - button: Abonner pÃ¥ diskussion - unsubscribe: - heading: Vil du afmelde følgende dagbogsindlægsdiskussion? doorkeeper: errors: messages: @@ -2172,9 +2178,6 @@ da: js_1: Du bruger enten en browser som ikke understøtter Javascript, eller du har deaktiveret Javascript. js_2: OpenStreetMap bruger JavaScript til det interaktive kort. - permalink: Permalink - shortlink: Kort link - createnote: Tilføj en bemærkning license: copyright: Ophavsret tilhører OpenStreetMap og bidragsydere, under en Ã¥ben licens @@ -3175,13 +3178,6 @@ da: queryfeature_tooltip: Find kortobjekter queryfeature_disabled_tooltip: Zoom ind for at finde kortobjekter embed_html_disabled: HTML-indlejring er ikke tilgængelig for dette kortlag - changesets: - show: - comment: Kommenter - subscribe: Abonnér - unsubscribe: Afmeld - hide_comment: skjul - unhide_comment: fjern skjul edit_help: Flyt kortet og zoom ind pÃ¥ et sted, du vil redigere, og klik sÃ¥ her. directions: ascend: Stigning diff --git a/config/locales/de.yml b/config/locales/de.yml index 4103dbcba..f485543fa 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -72,6 +72,7 @@ # Author: MarkusHD # Author: McDutchie # Author: Mcandri13 +# Author: Mcliquid # Author: Metalhead64 # Author: Michi # Author: Milet @@ -602,8 +603,13 @@ de: join_discussion: Anmelden, um mitzudiskutieren still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet, sobald der Änderungssatz geschlossen ist. + subscribe: Abonnieren + unsubscribe: Abbestellen comment_by_html: Kommentar von %{user} %{time_ago} hidden_comment_by_html: Versteckter Kommentar von %{user} %{time_ago} + hide_comment: verstecken + unhide_comment: einblenden + comment: Kommentieren changesetxml: Änderungssatz-XML osmchangexml: osmChange-XML paging_nav: @@ -677,6 +683,8 @@ de: title: Blog von %{user} | %{title} user_title: Blog von %{user} discussion: Diskussion + subscribe: Abonnieren + unsubscribe: Abbestellen leave_a_comment: Schreibe einen Kommentar login_to_leave_a_comment_html: '%{login_link}, um einen Kommentar zu schreiben' login: Anmelden @@ -720,7 +728,14 @@ de: all: title: OpenStreetMap Blogbeiträge description: Neueste Blogeinträge von OpenStreetMap-Nutzern - comments: + subscribe: + heading: Folgende Tagebucheintragsdiskussion abonnieren? + button: Diskussion abonnieren + unsubscribe: + heading: Von der folgenden Tagebucheintragsdiskussion abmelden? + button: Von der Diskussion abmelden + diary_comments: + index: title: Tagebuch-Kommentare hinzugefügt von %{user} heading: '%{user}s Tagebuch-Kommentare' subheading_html: Tagebuch-Kommentare hinzugefügt von %{user} @@ -730,12 +745,6 @@ de: comment: Kommentar newer_comments: Neuere Kommentare older_comments: Ältere Kommentare - subscribe: - heading: Folgende Tagebucheintragsdiskussion abonnieren? - button: Diskussion abonnieren - unsubscribe: - heading: Von der folgenden Tagebucheintragsdiskussion abmelden? - button: Von der Diskussion abmelden doorkeeper: errors: messages: @@ -776,6 +785,10 @@ de: contact_the_community_html: Bitte nimm %{contact_link} mit der OpenStreetMap-Community auf, wenn du einen defekten Link / Fehler gefunden hast. Notiere dir die genaue URL deiner Anfrage. + bad_request: + title: Ungültige Anfrage + description: Die angeforderte Operation auf dem OpenStreetMap-Server ist ungültig + (HTTP 400). forbidden: title: Verboten description: Die von dir angeforderte Aktion auf dem OpenStreetMap-Server ist @@ -1854,8 +1867,8 @@ de: den du kommentiert hattest, reaktivert.' commented_note_html: '%{commenter} hat einen Hinweis in der Nähe von %{place}, den du kommentiert hattest, reaktivert.' - details: Weitere Details über den Hinweis findest du unter %{url}. - details_html: Weitere Details über den Hinweis findest du unter %{url}. + details: Antworte oder erfahre mehr über die Notiz unter %{url}. + details_html: Antworte oder erfahre mehr über die Notiz unter %{url}. changeset_comment_notification: description: 'OpenStreetMap-Änderungssatz #%{id}' hi: Hallo %{to_user}, @@ -1876,9 +1889,8 @@ de: partial_changeset_with_comment: mit der Bemerkung „%{changeset_comment}“ partial_changeset_with_comment_html: mit der Bemerkung „%{changeset_comment}“ partial_changeset_without_comment: ohne Kommentar - details: Weitere Details über den Änderungssatz können gefunden werden unter - %{url}. - details_html: Weitere Details über den Änderungssatz findest Du unter %{url}. + details: Antworte oder erfahre mehr über den Änderungssatz unter %{url}. + details_html: Antworte oder erfahre mehr über den Änderungssatz unter %{url}. unsubscribe: Du kannst dich auf %{url} von den Benachrichtigungen dieses Änderungssatzes abmelden. unsubscribe_html: Du kannst dich auf %{url} von den Benachrichtigungen dieses @@ -2059,6 +2071,8 @@ de: new: title: Anmelden tab_title: Anmelden + login_to_authorize_html: Melde dich bei OpenStreetMap an, um auf %{client_app_name} + zuzugreifen. email or username: E-Mail-Adresse oder Benutzername password: Passwort remember: Anmeldedaten merken @@ -2332,9 +2346,6 @@ de: index: js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert. js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung. - permalink: Permanentlink - shortlink: Shortlink - createnote: Hinweis geben/Fehler melden license: copyright: Copyright OpenStreetMap und Mitwirkende, unter einer offenen Lizenz remote_failed: Der Aufruf des Editors ist fehlgeschlagen. Stelle sicher, dass @@ -2739,6 +2750,9 @@ de: other: GPX-Datei mit %{count} Punkten von %{user} description_without_count: GPX-Datei von %{user} application: + basic_auth_disabled: 'Die HTTP-Basisauthentifizierung ist deaktiviert: %{link}' + oauth_10a_disabled: 'OAuth 1.0 und 1.0a sind deaktiviert: %{link}' + auth_disabled_link: https://wiki.openstreetmap.org/wiki/DE:2024_authentication_update permission_denied: Du hast keine Berechtigung, um auf diese Aktion zuzugreifen. require_cookies: cookies_needed: Es scheint als hättest du Cookies ausgeschaltet. Bitte aktiviere @@ -2827,6 +2841,9 @@ de: write_redactions: Kartendaten redigieren read_email: Lesen der Benutzer-E-Mail-Adresse skip_authorization: Antrag automatisch genehmigen + for_roles: + moderator: Diese Berechtigung gilt nur für Aktionen, die nur Moderatoren zur + Verfügung stehen. oauth_clients: new: title: Eine neue Anwendung registrieren @@ -2931,18 +2948,21 @@ de: erstellen zu lassen - wir werden die Anfrage möglichst schnell bearbeiten. support: Support about: - header: Frei und editierbar + header: Frei und editierbar. paragraph_1: Im Gegensatz zu anderen Karten wird OpenStreetMap vollständig von Leuten wie dir erstellt und kann von jedem kostenlos repariert, aktualisiert, heruntergeladen und verwendet werden. - paragraph_2: Melde dich an, um mit der Mitarbeit zu beginnen. Wir senden dir - eine E-Mail zur Bestätigung deines Kontos. + paragraph_2: Registriere dich, um mit deinem Beitrag zu beginnen. welcome: Willkommen bei OpenStreetMap + duplicate_social_email: Wenn du bereits ein OpenStreetMap-Konto hast und einen + Identitätsanbieter eines Drittanbieters verwenden möchtest, melde dich bitte + mit deinem Passwort an und ändere die Einstellungen deines Kontos. display name description: Dein öffentlich angezeigter Benutzername. Er kann später in den Einstellungen geändert werden. by_signing_up_html: Mit Ihrer Anmeldung stimmen Sie unseren %{tou_link}, %{privacy_policy_link} und %{contributor_terms_link} zu. tou: Nutzungsbedingungen + contributor_terms: Bedingungen für Mitwirkende external auth: 'Drittparteiauthentifikation:' continue: Registrieren terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt @@ -2952,6 +2972,8 @@ de: privacy_policy: Datenschutzrichtlinie privacy_policy_title: OSMF-Datenschutzrichtlinie einschließlich Abschnitt zu E-Mail-Adressen + consider_pd_html: Ich betrachte meine Beiträge als %{consider_pd_link}. + consider_pd: gemeinfrei or: oder use external auth: oder melde dich über einen Drittanbieter an terms: @@ -3023,6 +3045,8 @@ de: remove as friend: Freund entfernen add as friend: Freund hinzufügen mapper since: 'Mapper seit:' + last map edit: 'Letzte Kartenbearbeitung:' + no activity yet: Noch keine Aktivität uid: 'Benutzer-ID:' ct status: 'Bedingungen für Mitwirkende:' ct undecided: Unentschlossen @@ -3315,6 +3339,10 @@ de: intro: Fehlt etwas oder hast du einen Fehler gefunden? Bitte verschiebe den Marker auf die exakte Position und gib genaue Hinweise/Informationen an bzw. beschreibe den Fehler in der Karte möglichst präzise. + anonymous_warning_html: Du bist nicht eingeloggt. Bitte %{log_in} oder %{sign_up}, + wenn du Updates für deine Notiz erhalten möchtest. + anonymous_warning_log_in: Anmelden + anonymous_warning_sign_up: Registrieren advice: Deine Meldung ist öffentlich und kann zur Aktualisierung der Karte verwendet werden. Gib deshalb keine persönlichen oder urheberrechtlich geschützten Informationen von anderen Karten oder Verzeichnislisten an. @@ -3393,13 +3421,6 @@ de: queryfeature_tooltip: Objektabfrage queryfeature_disabled_tooltip: Für Objektabfrage vergrößern embed_html_disabled: Für diese Kartenebene ist keine HTML-Einbettung verfügbar - changesets: - show: - comment: Kommentieren - subscribe: Abonnieren - unsubscribe: Abbestellen - hide_comment: verstecken - unhide_comment: einblenden edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort, den du bearbeiten möchtest, und klicke hier. directions: diff --git a/config/locales/diq.yml b/config/locales/diq.yml index de3966bf3..d1f10a614 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -149,7 +149,7 @@ diq: new_email: E-postay adresiyo neweh active: Aktiv display_name: Nameyo ke Aseno - description: Şınasiya weci + description: Şınasiya Profili home_lat: 'Verıniye:' home_lon: Derganiye languages: Zıwanê tercihi @@ -313,6 +313,11 @@ diq: closed_ago_by_html: Be hetên %{user} ra %{time_ago} kefılia discussion: Werênayış join_discussion: Dekewtena vatenayışi rê qeyd bê + subscribe: Abone be + unsubscribe: Aboneyiye ra veciye + hide_comment: bınımne + unhide_comment: menımne + comment: Mışewre changesetxml: Vurnayışê peyênê XML osmchangexml: OsmVurnayışê XML paging_nav: @@ -378,7 +383,8 @@ diq: location: 'Lokasyon:' view: Bıvêne edit: Bıvurne - comments: + diary_comments: + index: post: Rışte when: Key comment: Mışewre @@ -921,8 +927,6 @@ diq: copyright: native: title: Heqa na pele de - index: - permalink: Gıreyo daimi edit: user_page_link: pela karberi export: @@ -1162,13 +1166,6 @@ diq: transport_map: Xeritay Resnayışi site: edit_tooltip: Xeriti timar ke - changesets: - show: - comment: Mışewre - subscribe: Abone be - unsubscribe: Aboneyiye ra veciye - hide_comment: bınımne - unhide_comment: menımne directions: engines: fossgis_osrm_bike: Bisiklet (OSRM) diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 7682a8f00..5d435eaf6 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -297,6 +297,7 @@ dsb: belongs_to: Awtor show: title: 'Sajźba změnow: %{id}' + comment: Reagěrowaś changesetxml: Sajźbu změnow XML osmchangexml: osmChange XML paging_nav: @@ -389,7 +390,8 @@ dsb: all: title: Zapiski dnjownika OpenStreetMap description: NejnowÅ¡e zapiski dnjownika wót wužywarjow OpenStreetMap - comments: + diary_comments: + index: post: Powěsć when: Cas comment: Komentar @@ -1181,9 +1183,6 @@ dsb: js_1: Pak wužywaÅ¡ wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił JavaScript. js_2: OpenStreetMap wužywa JavaScript za suwatu kórtu. - permalink: Trajny wótkaz - shortlink: Krotki wótkaz - createnote: Pokaz pśidaś license: copyright: Copyright OpenStreetMap a sobustatkujuce, pód wótewrjoneju licencu remote_failed: Wobźěłowanje njejo se raźiło - pśeznań se, lěc JOSM jo zacytany @@ -1764,9 +1763,6 @@ dsb: createnote_disabled_tooltip: PowětÅ¡yś, aby kórśe pokazku pśidało map_notes_zoom_in_tooltip: PowětÅ¡ kórtu, aby pokazki wiźeł map_data_zoom_in_tooltip: PowětÅ¡ kórtu, aby daty wiźeł - changesets: - show: - comment: Reagěrowaś edit_help: Pśesuń kórtu do městna, kótarež coÅ¡ wobźěłaś, powětÅ¡ tam a klikni pótom how. directions: diff --git a/config/locales/el.yml b/config/locales/el.yml index 58aac6fd6..19e26897f 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -4,6 +4,7 @@ # Author: AProdromou # Author: Aitolos # Author: Alexstam +# Author: AntonyFragakis # Author: Auslaender # Author: Babispan # Author: Consta @@ -198,10 +199,10 @@ el: trace: tagstring: διαχωρισμένο με κόμμα user_block: - reason: Η αιτία αποκλεισμού του χρήστη. Παρακαλώ να είστε όσο το δυνατόν πιο - ήρεμος/-η και λογικός/-ή, δίνοντας όσες περισσότερες λεπτομέρειες μπορείτε - για την κατάσταση και σκεπτόμενος/-η ότι το μήνυμα θα είναι δημόσια ορατό. - Λάβετε υπόψη σας ότι δεν κατανοούν όλοι οι χρήστες την ορολογία της κοινότητας, + reason: Η αιτία φραγής του χρήστη. Παρακαλώ να είστε όσο το δυνατόν πιο ήρεμος/-η + και λογικός/-ή, δίνοντας όσες περισσότερες λεπτομέρειες μπορείτε για την + κατάσταση και σκεπτόμενος/-η ότι το μήνυμα θα είναι δημόσια ορατό. Λάβετε + υπόψη σας ότι δεν κατανοούν όλοι οι χρήστες την ορολογία της κοινότητας, γι' αυτό προσπαθήστε να χρησιμοποιήσετε απλούς και κατανοητούς όρους. needs_view: Πρέπει ο χρήστης να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή; user: @@ -366,6 +367,7 @@ el: deleted_ago_by_html: Διαγράφηκε %{time_ago} από %{user} edited_ago_by_html: Επεξεργάστηκε %{time_ago} από %{user} version: Έκδοση + redacted_version: Επανεξεργασμένη έκδοση in_changeset: Ομάδα αλλαγών anonymous: ανώνυμος no_comment: (χωρίς σχόλιο) @@ -378,7 +380,10 @@ el: other: '%{count} διαδρομές' download_xml: Λήψη XML view_history: Προβολή ιστορικού + view_unredacted_history: Προβολή μη τροποποιημένου ιστορικού view_details: Προβολή λεπτομερειών + view_redacted_data: Προβολή αναδιατυπωμένων δεδομένων + view_redaction_message: Προβολή μηνύματος διόρθωσης location: 'Τοποθεσία:' node: title_html: 'Κόμβος: %{name}' @@ -527,8 +532,13 @@ el: join_discussion: Συνδεθείτε για συμμετοχή στη συζήτηση still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει μόλις ολοκληρωθεί η ομάδα αλλαγών. + subscribe: Εγγραφείτε ως συνδρομητής + unsubscribe: Κατάργηση εγγραφής comment_by_html: Σχόλιο από %{user} %{time_ago} hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago} + hide_comment: απόκρυψη + unhide_comment: επανεμφάνιση + comment: Σχολιάζω changesetxml: Ομάδας αλλαγών XML osmchangexml: osmChange XML paging_nav: @@ -602,6 +612,8 @@ el: title: Ημερολόγιο του χρήστη %{user} | %{title} user_title: Ημερολόγιο του χρήστη %{user} discussion: Συζήτηση + subscribe: Εγγραφή + unsubscribe: Απεγγραφή leave_a_comment: Αφήστε σχόλιο login_to_leave_a_comment_html: '%{login_link} για να αφήσετε ένα σχόλιο' login: Συνδεθείτε @@ -647,7 +659,14 @@ el: all: title: Καταχωρήσεις ημερολογίου OpenStreetMap description: Πρόσφατες καταχωρήσεις ημερολογίου από χρήστες του OpenStreetMap - comments: + subscribe: + heading: Εγγραφή στην ακόλουθη συζήτηση καταχώρισης ημερολογίου; + button: Εγγραφείτε στη συζήτηση + unsubscribe: + heading: Απεγγραφή από την ακόλουθη συζήτηση καταχώρισης ημερολογίου; + button: Απεγγραφή από τη συζήτηση + diary_comments: + index: title: Σχόλια ημερολογίου που προστέθηκαν από τον χρήστη %{user} heading: Σχόλια Ημερολογίου %{user} subheading_html: Σχόλια ημερολογίου που προστέθηκαν από τον χρήστη %{user} @@ -657,12 +676,6 @@ el: comment: Σχόλιο newer_comments: Νεότερα σχόλια older_comments: Παλαιότερα σχόλια - subscribe: - heading: Εγγραφή στην ακόλουθη συζήτηση καταχώρισης ημερολογίου; - button: Εγγραφείτε στη συζήτηση - unsubscribe: - heading: Απεγγραφή από την ακόλουθη συζήτηση καταχώρισης ημερολογίου; - button: Απεγγραφή από τη συζήτηση doorkeeper: errors: messages: @@ -704,12 +717,14 @@ el: errors: contact: contact_url_title: Επεξήγηση διαφόρων καναλιών επικοινωνίας - contact: επικοινωνία + contact: επικοινωνήσετε contact_the_community_html: Μη διστάσετε να %{contact_link} με την κοινότητα του OpenStreetMap εάν έχετε βρει έναν κατεστραμμένο σύνδεσμο / σφάλμα. Σημειώστε την ακριβή διεύθυνση URL του αιτήματός σας. bad_request: title: Κακό αίτημα + description: Η λειτουργία που αιτηθήκατε στον διακομιστή OpenStreetMap δεν είναι + έγκυρη (HTTP 400) forbidden: title: Απαγορευμένο description: Η λειτουργία που ζητήσατε στο διακομιστή OpenStreetMap είναι διαθέσιμη @@ -892,7 +907,7 @@ el: boardwalk: Πεζοδρόμιο suspension: Κρεμαστή γέφυρα swing: Αιωρούμενη γέφυρα - viaduct: Κοιλαδογέφυρα + viaduct: Οδογέφυρα "yes": Γέφυρα building: apartment: Διαμέρισμα @@ -1786,10 +1801,8 @@ el: Η σημείωση είναι κοντά σε %{place}. commented_note_html: ο χρήστης %{commenter} έχει επαναενεργοποιήσει μία σημείωση στον χάρτη την οποία έχετε σχολιάσει. Η σημείωση είναι κοντά στο %{place}. - details: Περισσότερες λεπτομέρειες σχετικά με τη σημείωση μπορούν να βρεθούν - στο %{url}. - details_html: Περισσότερες λεπτομέρειες σχετικά με τη σημείωση μπορούν να βρεθούν - στο %{url}. + details: Απαντήστε ή μάθετε περισσότερα για τη σημείωση στο %{url}. + details_html: Απαντήστε ή μάθετε περισσότερα για τη σημείωση στο %{url}. changeset_comment_notification: description: 'OpenStreetMap Ομάδα Αλλαγών #%{id}' hi: Γεια σας, %{to_user}, @@ -1811,10 +1824,8 @@ el: partial_changeset_with_comment: με το σχόλιο «%{changeset_comment}» partial_changeset_with_comment_html: με σχόλιο '%{changeset_comment}' partial_changeset_without_comment: χωρίς σχόλιο - details: Περισσότερες λεπτομέρειες για την ομάδα αλλαγών μπορούν να βρεθούν - στο %{url}. - details_html: Περισσότερες λεπτομέρειες για την ομάδα αλλαγών μπορούν να βρεθούν - στο %{url}. + details: Απαντήστε ή μάθετε περισσότερα σχετικά με το σύνολο αλλαγών στο %{url}. + details_html: Απαντήστε ή μάθετε περισσότερα για την ομάδα αλλαγών στο %{url}. unsubscribe: Μπορείτε να απεγγραφείτε από τις ενημερώσεις αυτής της ομάδας αλλαγών στο %{url}. unsubscribe_html: Μπορείτε να απεγγραφείτε από τις ενημερώσεις σε αυτή την ομάδα @@ -1994,6 +2005,7 @@ el: new: title: Σύνδεση tab_title: Σύνδεση + login_to_authorize_html: Συνδεθείτε στο OpenStreetMap για πρόσβαση στο %{client_app_name}. email or username: Διεύθυνση Ηλ. Ταχυδρομείου ή Όνομα Χρήστη password: Συνθηματικό remember: Να με θυμάσαι @@ -2216,9 +2228,6 @@ el: js_1: Είτε χρησιμοποιείτε πρόγραμμα περιήγησης που δεν υποστηρίζει JavaScript ή έχετε απενεργοποιήσει την JavaScript. js_2: Το OpenStreetMap χρησιμοποιεί JavaScript για το ολισθαίνοντα χάρτη του. - permalink: Μόνιμος σύνδεσμος - shortlink: Σύντομος σύνδεσμος - createnote: Προσθήκη σημείωσης license: copyright: Πνευματικά δικαιώματα του OpenStreetMap και των συντακτών του, υπό ελεύθερη άδεια @@ -2618,7 +2627,9 @@ el: other: αρχείο GPX με %{count} σημεία από %{user} description_without_count: Αρχείο GPX από τον χρήστη %{user} application: - auth_disabled_link: https://wiki.openstreetmap.org/wiki/2024_authentication_update + basic_auth_disabled: 'Ο Βασικός Έλεγχος Ταυτότητας HTTP είναι απενεργοποιημένος: + %{link}' + oauth_10a_disabled: 'Τα OAuth 1.0 και 1.0a είναι απενεργοποιημένα: %{link}' permission_denied: Δεν έχετε τα απαραίτητα δικαιώματα για πρόσβαση σε αυτήν την ενέργεια require_cookies: @@ -2823,6 +2834,7 @@ el: display name description: Το δημόσια εμφανιζόμενο όνομα χρήστη. Μπορείτε να το αλλάξετε αργότερα από τις προτιμήσεις. tou: όροι χρήσης + contributor_terms: όρους συνεισφοράς external auth: 'Έλεγχος ταυτότητας από τρίτο μέρος:' continue: Εγγραφή terms accepted: Ευχαριστούμε για την αποδοχή των νέων όρων συνεισφοράς! @@ -2831,6 +2843,8 @@ el: privacy_policy: πολιτική απορρήτου privacy_policy_title: Πολιτική απορρήτου OSMF, συμπεριλαμβανομένης της ενότητας για τις διευθύνσεις ηλεκτρονικού ταχυδρομείου + consider_pd_html: Θεωρώ τις συνεισφορές μου να είναι στο %{consider_pd_link}. + consider_pd: κοινό κτήμα or: ή use external auth: ή συνδεθείτε μέσω τρίτης υπηρεσίας terms: @@ -2898,6 +2912,8 @@ el: remove as friend: Αφαίρεση Φίλου add as friend: Προσθήκη Φίλου mapper since: 'Χαρτογράφος από:' + last map edit: 'Τελευταία επεξεργασία χάρτη:' + no activity yet: Καμία δραστηριότητα ακόμη uid: 'Id χρήστη:' ct status: 'Όροι συνεισφοράς:' ct undecided: Αναποφάσιστος @@ -3100,6 +3116,15 @@ el: reason: Αιτία φραγής status: Κατάσταση revoker_name: Ανακλήθηκε από + older: Παλαιότερες φραγές + newer: Νεότερες φραγές + navigation: + all_blocks: Όλες οι φραγές + blocks_on_me: Φραγές σε μένα + blocks_on_user: Φραγές σε %{user} + blocks_by_me: Φραγές από μένα + blocks_by_user: Φραγές από %{user} + block: 'Φραγή #%{id}' user_mutes: index: title: Χρήστες σε Σίγαση @@ -3174,6 +3199,10 @@ el: intro: Εντοπίσατε λάθος ή κάτι που λείπει; Πείτε το στους άλλους χαρτογράφους ώστε να λυθεί το πρόβλημα. Μετακινείστε το δείκτη στη σωστή θέση και γράψτε μια περιγραφή του προβλήματος ως εξήγηση. + anonymous_warning_html: Δεν έχετε συνδεθεί. Παρακαλούμε κάντε %{log_in} ή %{sign_up} + αν θέλετε να λαμβάνετε ενημερώσεις για την σημείωσή σας. + anonymous_warning_log_in: σύνδεση + anonymous_warning_sign_up: εγγραφή advice: Η σημείωση σας είναι δημόσια και μπορεί να χρησιμοποιηθεί για την ενημέρωση του χάρτη, γι'αυτό μην προστέθετε προσωπικές πληροφορίες, ή πληροφορίες από χάρτες που καλύπτονται από πνευματικά δικαιώματα ή καταχωρήσεις καταλόγου. @@ -3255,13 +3284,6 @@ el: για διάφορα χαρακτηριστικά embed_html_disabled: Η ενσωμάτωση HTML δεν είναι διαθέσιμη γι' αυτό το στρώμα χάρτη - changesets: - show: - comment: Σχολιάζω - subscribe: Εγγραφείτε ως συνδρομητής - unsubscribe: Κατάργηση εγγραφής - hide_comment: απόκρυψη - unhide_comment: επανεμφάνιση edit_help: Μετακινήστε το χάρτη και να κάνετε ζουμ σε μια τοποθεσία που θέλετε να επεξεργαστείτε, στη συνέχεια, κάντε κλικ εδώ. directions: diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index b2d20128f..213127d45 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -394,6 +394,11 @@ en-GB: join_discussion: Log in to join the discussion still_open: Changeset still open - discussion will open once the changeset is closed. + subscribe: Subscribe + unsubscribe: Unsubscribe + hide_comment: hide + unhide_comment: unhide + comment: Comment changesetxml: Changeset XML osmchangexml: osmChange XML paging_nav: @@ -500,7 +505,8 @@ en-GB: all: title: OpenStreetMap diary entries description: Recent diary entries from users of OpenStreetMap - comments: + diary_comments: + index: post: Post when: When comment: Comment @@ -1428,9 +1434,6 @@ en-GB: index: js_1: You are either using a browser that does not support JavaScript, or you have disabled JavaScript. - permalink: Permalink - shortlink: Shortlink - createnote: Add a note license: copyright: Copyright OpenStreetMap and contributors, under an open licence remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that @@ -2086,13 +2089,6 @@ en-GB: map_data_zoom_in_tooltip: Zoom in to see map data queryfeature_tooltip: Query features queryfeature_disabled_tooltip: Zoom in to query features - changesets: - show: - comment: Comment - subscribe: Subscribe - unsubscribe: Unsubscribe - hide_comment: hide - unhide_comment: unhide edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: diff --git a/config/locales/en.yml b/config/locales/en.yml index 647cf66f2..8de8a8721 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -472,8 +472,13 @@ en: discussion: Discussion join_discussion: "Log in to join the discussion" still_open: "Changeset still open - discussion will open once the changeset is closed." + subscribe: "Subscribe" + unsubscribe: "Unsubscribe" comment_by_html: "Comment from %{user} %{time_ago}" hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" + hide_comment: "hide" + unhide_comment: "unhide" + comment: "Comment" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" paging_nav: @@ -543,6 +548,8 @@ en: title: "%{user}'s Diary | %{title}" user_title: "%{user}'s Diary" discussion: "Discussion" + subscribe: "Subscribe" + unsubscribe: "Unsubscribe" leave_a_comment: "Leave a comment" login_to_leave_a_comment_html: "%{login_link} to leave a comment" login: "Log in" @@ -585,7 +592,14 @@ en: all: title: "OpenStreetMap diary entries" description: "Recent diary entries from users of OpenStreetMap" - comments: + subscribe: + heading: Subscribe to the following diary entry discussion? + button: Subscribe to discussion + unsubscribe: + heading: Unsubscribe from the following diary entry discussion? + button: Unsubscribe from discussion + diary_comments: + index: title: "Diary Comments added by %{user}" heading: "%{user}'s Diary Comments" subheading_html: "Diary Comments added by %{user}" @@ -595,12 +609,6 @@ en: comment: Comment newer_comments: "Newer Comments" older_comments: "Older Comments" - subscribe: - heading: Subscribe to the following diary entry discussion? - button: Subscribe to discussion - unsubscribe: - heading: Unsubscribe from the following diary entry discussion? - button: Unsubscribe from discussion doorkeeper: errors: messages: @@ -1673,8 +1681,8 @@ en: your_note_html: "%{commenter} has reactivated one of your map notes near %{place}." commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}." commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}." - details: "More details about the note can be found at %{url}." - details_html: "More details about the note can be found at %{url}." + details: "Reply or learn more about the note at %{url}." + details_html: "Reply or learn more about the note at %{url}." changeset_comment_notification: description: "OpenStreetMap Changeset #%{id}" hi: "Hi %{to_user}," @@ -1689,8 +1697,8 @@ en: partial_changeset_with_comment: "with comment '%{changeset_comment}'" partial_changeset_with_comment_html: "with comment '%{changeset_comment}'" partial_changeset_without_comment: "without comment" - details: "More details about the changeset can be found at %{url}." - details_html: "More details about the changeset can be found at %{url}." + details: "Reply or learn more about the changeset at %{url}." + details_html: "Reply or learn more about the changeset at %{url}." unsubscribe: "You can unsubscribe from updates to this changeset at %{url}." unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}." confirmations: @@ -1953,6 +1961,7 @@ en: legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy partners_title: Partners copyright: + title: Copyright and License foreign: title: About this translation html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence @@ -1963,7 +1972,6 @@ en: native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping legal_babble: - title_html: Copyright and License introduction_1_html: | OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF). @@ -2166,9 +2174,6 @@ en: index: js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map." - permalink: Permalink - shortlink: Shortlink - createnote: Add a note license: copyright: "Copyright OpenStreetMap and contributors, under an open license" license_url: "https://openstreetmap.org/copyright" @@ -2821,6 +2826,8 @@ en: remove as friend: Unfriend add as friend: Add Friend mapper since: "Mapper since:" + last map edit: "Last map edit:" + no activity yet: "No activity yet" uid: "User id:" ct status: "Contributor terms:" ct undecided: Undecided @@ -3169,13 +3176,6 @@ en: queryfeature_tooltip: Query features queryfeature_disabled_tooltip: Zoom in to query features embed_html_disabled: HTML embedding is not available for this map layer - changesets: - show: - comment: "Comment" - subscribe: "Subscribe" - unsubscribe: "Unsubscribe" - hide_comment: "hide" - unhide_comment: "unhide" edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend" diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 87a5466e6..f65b3cd93 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -507,8 +507,13 @@ eo: join_discussion: Ensalutu por aliĝi al la diskuto still_open: Ŝanĝaro plue malfermita - diskuto estos malfermita ekde kiam la ŝanĝaro estos fermita. + subscribe: Observi + unsubscribe: Malobservi comment_by_html: Komento de %{time_ago} de %{user} hidden_comment_by_html: Kaŝita komento de %{time_ago} de %{user} + hide_comment: kaŝi + unhide_comment: malkaŝi + comment: Komenti changesetxml: Ŝanĝaro XML osmchangexml: osmŜanĝo XML paging_nav: @@ -580,6 +585,8 @@ eo: title: Taglibro de %{user} | %{title} user_title: Taglibro de %{user} discussion: Diskuto + subscribe: Observi + unsubscribe: Malobservi leave_a_comment: Komenti login_to_leave_a_comment_html: '%{login_link} por aldoni komenton' login: Ensaluti @@ -622,7 +629,14 @@ eo: all: title: OpenStreetMap taglibraj afiŝoj description: Lastaj taglibraj afiŝoj de OpenStreetMap-uzantoj - comments: + subscribe: + heading: Ĉu aboni diskuton pri tiu ĉi taglibra afiŝo? + button: Aboni diskuton + unsubscribe: + heading: Ĉu malaboni diskuton pri tiu ĉi taglibra afiŝo? + button: Malaboni diskuton + diary_comments: + index: title: Komentoj de %{user} sub taglibraj afiŝoj heading: Komentoj de %{user} subheading_html: Komentoj de %{user} sub taglibraj afiŝoj @@ -632,12 +646,6 @@ eo: comment: Komento newer_comments: Pli novaj komentoj older_comments: Pli malnovaj komentoj - subscribe: - heading: Ĉu aboni diskuton pri tiu ĉi taglibra afiŝo? - button: Aboni diskuton - unsubscribe: - heading: Ĉu malaboni diskuton pri tiu ĉi taglibra afiŝo? - button: Malaboni diskuton doorkeeper: errors: messages: @@ -1737,8 +1745,8 @@ eo: La rimarko troviĝis ĉe %{place}.' commented_note_html: '%{commenter} remalfermis rimarkon sur la mapo pri kiu vi interesiĝis. La rimarko troviĝis ĉe %{place}.' - details: Pli da detaloj pri la rimarko, vi povas trovi je %{url}. - details_html: Pli da detaloj pri la noto troveblas ĉe %{url}. + details: Vi povas respondi aÅ­ sciiĝi pli pri la rimarko ĉe %{url}. + details_html: Vi povas respondi aÅ­ sciiĝi pli pri la rimarko ĉe %{url}. changeset_comment_notification: description: 'OpenStreetMap: ŝanĝaro %{id}' hi: Saluton %{to_user}, @@ -1756,8 +1764,8 @@ eo: partial_changeset_with_comment: kun komento '%{changeset_comment}' partial_changeset_with_comment_html: kun komento '%{changeset_comment}' partial_changeset_without_comment: sen komento - details: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. - details_html: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. + details: Vi povas respondi aÅ­ sciiĝi pli pri la ŝanĝaro ĉe %{url}. + details_html: Vi povas respondi aÅ­ sciiĝi pli pri la ŝanĝaro ĉe %{url}. unsubscribe: Vi povas malaboni ĝisdatigojn pri tiu ĉi ŝanĝaro ĉe %{url}. unsubscribe_html: Vi povas malaboni ĝisdatigojn pri tiu ĉi ŝanĝaro ĉe %{url}. confirmations: @@ -1869,7 +1877,7 @@ eo: passwords: new: title: Perdita pasvorto - heading: Forgesis vian pasvorton ? + heading: Ĉu vi forgesis pasvorton? email address: Retpoŝta adreso new password button: Nuligi pasvorton help_text: Entajpu la retpoŝtan adreson kiun vi uzis por ensaluto, ni sendos @@ -1936,7 +1944,7 @@ eo: lost password link: Ĉu vi forgesis vian pasvorton? login_button: Ensaluti register now: Registriĝi - with external: aÅ­ ensalutu uzante eksteran liveranton + with external: 'ensaluti per ekstera liveranto:' or: aÅ­ auth failure: BedaÅ­rinde ne povas ensaluti kun ĉi tiuj informoj. destroy: @@ -2179,9 +2187,6 @@ eo: index: js_1: Vi aÅ­ uzas foliumilon, kiu ne subtenas Ĝavoskripton, aÅ­ vi havas ĝin malaktivan. js_2: OpensStreetMap uzas Ĝavoskripton por montri ŝoveblan mapon. - permalink: Konstanta ligilo - shortlink: Mallonga ligilo - createnote: Aldoni rimarkon license: copyright: AÅ­torrajtoj al OpenStreetMap kaj kontribuintoj, laÅ­ malferma permesilo remote_failed: Redaktado malsukcesis - certigu ĉu JOSM aÅ­ Merkaartor estas startigita @@ -2788,7 +2793,7 @@ eo: consider_pd_html: Mi konsideras ke miaj kontribuoj estu eldonitaj en la %{consider_pd_link}. consider_pd: publika havaĵo or: aÅ­ - use external auth: aÅ­ registriĝu uzante eksteran liveranton + use external auth: 'registriĝi per ekstera liveranto:' terms: title: Kondiĉoj heading: Kondiĉoj @@ -2853,6 +2858,8 @@ eo: remove as friend: Eksamikigi add as friend: Aldoni kiel amikon mapper since: 'Mapigisto ekde:' + last map edit: 'AntaÅ­a map-redakto:' + no activity yet: ankoraÅ­ neniu agado uid: 'Identigilo de uzanto:' ct status: 'Interkonsento pri kontribuado:' ct undecided: ne decidita @@ -3207,13 +3214,6 @@ eo: queryfeature_tooltip: Montri informojn pri objekto queryfeature_disabled_tooltip: Pligrandigu por montri informojn pri objektoj embed_html_disabled: HTML-enigo ne haveblas por ĉi tiu mapo-tavolo - changesets: - show: - comment: Komenti - subscribe: Observi - unsubscribe: Malobservi - hide_comment: kaŝi - unhide_comment: malkaŝi edit_help: Movu la mapon kaj pligrandigu al loko kiun vi volas redakti, kaj poste alklaku tie ĉi. directions: diff --git a/config/locales/es.yml b/config/locales/es.yml index c557e58d8..9a147a136 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -23,6 +23,7 @@ # Author: DannyS712 # Author: DarkGames26 # Author: Dcapillae +# Author: Descubriunaisla # Author: Destinid10 2 # Author: Dgstranz # Author: Egofer @@ -587,8 +588,13 @@ es: join_discussion: Inicia sesión para unirte a la discusión still_open: El conjunto de cambios sigue abierto - la discusión se abrirá una vez se cierre el conjunto de cambios. + subscribe: Suscribirse + unsubscribe: Desuscribirse comment_by_html: Comentario de %{user} %{time_ago} hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago} + hide_comment: ocultar + unhide_comment: mostrar + comment: Comentar changesetxml: XML del conjunto de cambios osmchangexml: XML en formato osmChange paging_nav: @@ -663,6 +669,8 @@ es: title: Diario de %{user} | %{title} user_title: Diario de %{user} discussion: Discusión + subscribe: Suscribirse + unsubscribe: Desuscríbete leave_a_comment: Dejar un comentario login_to_leave_a_comment_html: '%{login_link} para dejar un comentario' login: Iniciar sesión @@ -706,7 +714,14 @@ es: all: title: Entradas en el diario de OpenStreetMap description: Entradas recientes en los diarios de los usuarios de OpenStreetMap - comments: + subscribe: + heading: ¿Deseas suscribirte a la siguiente discusión sobre la entrada al diario? + button: Suscribirse a la discusión + unsubscribe: + heading: ¿Deseas desuscribirte de la siguiente discusión de entrada de diario? + button: Desuscribirse de la discusión + diary_comments: + index: title: Comentarios de diario añadidos por %{user} heading: Comentarios del diario de %{user} subheading_html: Comentarios del diario añadidos por %{user} @@ -716,12 +731,6 @@ es: comment: Comentario newer_comments: Comentarios más recientes older_comments: Comentarios más antiguos - subscribe: - heading: ¿Deseas suscribirte a la siguiente discusión sobre la entrada al diario? - button: Suscribirse a la discusión - unsubscribe: - heading: ¿Deseas desuscribirte de la siguiente discusión de entrada de diario? - button: Desuscribirse de la discusión doorkeeper: errors: messages: @@ -764,6 +773,10 @@ es: contact_the_community_html: Siéntete libre de %{contact_link} con la comunidad de OpenStreetMap si has encontrado un enlace roto o un error. Toma nota de la URL exacta de tu solicitud. + bad_request: + title: Mala solicitud + description: La operación que solicitaste en el servidor de OpenStreetMap no + es valida (HTTP 400) forbidden: title: Prohibido description: La operación que se solicitó al servidor de OpenStreetMap solo @@ -1835,7 +1848,7 @@ es: La nota está cerca de %{place}.' commented_note_html: '%{commenter} ha reactivado un nota del mapa en la que has comentado. La nota está cerca de %{place}.' - details: Más detalles acerca de la nota pueden encontrarse en %{url}. + details: Responde o conoce más acerca de la nota en %{url}. details_html: Puedes encontrar más detalles acerca de la nota en %{url}. changeset_comment_notification: description: 'Conjunto de cambios de OpenStreetMap #%{id}' @@ -1857,9 +1870,8 @@ es: partial_changeset_with_comment: con el comentario '%{changeset_comment}' partial_changeset_with_comment_html: con el comentario '%{changeset_comment}' partial_changeset_without_comment: sin comentarios - details: Puedes encontrar más detalles sobre el conjunto de cambios en %{url}. - details_html: Puedes encontrar más detalles sobre el conjunto de cambios en - %{url}. + details: Responde o conoce más sobre el conjunto de cambios en %{url}. + details_html: Responde o conoce más sobre el conjunto de cambios en %{url}. unsubscribe: Puedes desinscrirte de las actualizaciones de este conjunto de cambios en %{url}. unsubscribe_html: Puedes desinscrirte de las actualizaciones de este conjunto @@ -2302,9 +2314,6 @@ es: index: js_1: Estás usando un navegador que no soporta o tiene desactivado JavaScript js_2: OpenStreetMap utiliza JavaScript para mostrar su mapa deslizable. - permalink: Enlace permanente - shortlink: Enlace corto - createnote: Añadir una nota license: copyright: Derechos de autor de OpenStreetMap y colaboradores, bajo una licencia abierta @@ -2713,6 +2722,8 @@ es: other: Archivo GPX con %{count} puntos de %{user} description_without_count: Archivo GPX de %{user} application: + basic_auth_disabled: 'La autenticación básica de HTTPS está desactivada: %{link}' + oauth_10a_disabled: 'OAuth 1.0 y 1.0a están desactivados: %{link}' permission_denied: No tienes permisos para realizar esa acción require_cookies: cookies_needed: Parece que tienes las cookies deshabilitadas. Habilita las cookies @@ -2997,6 +3008,8 @@ es: remove as friend: Eliminar como amigo add as friend: Añadir como amigo mapper since: 'Mapeando desde:' + last map edit: Última edición del mapa + no activity yet: Sin actividad todavía uid: 'Identificación de usuario:' ct status: 'Términos de Colaborador:' ct undecided: Indeciso @@ -3282,6 +3295,10 @@ es: intro: ¿Detectaste un error o falta algo? Informa a otros mapeadores para que podamos corregirlo. Mueve el marcador a la posición correcta y escribe una nota para explicar el problema. + anonymous_warning_html: No has iniciado sesión. Por favor %{log_in} o %{sign_up} + si tu quieres recibir actualizaciones de tu nota. + anonymous_warning_log_in: inicia sesión + anonymous_warning_sign_up: crea una cuenta advice: Tu nota será pública y podría utilizarse para actualizar el mapa, así que no des información personal ni datos provenientes de mapas o catálogos protegidos por derechos de autor. @@ -3361,13 +3378,6 @@ es: queryfeature_disabled_tooltip: Acercar para consultar elementos embed_html_disabled: La incrustación de HTML no está disponible para esta capa de mapa - changesets: - show: - comment: Comentar - subscribe: Suscribirse - unsubscribe: Cancelar suscripción - hide_comment: ocultar - unhide_comment: mostrar edit_help: Mueve el mapa el mapa y acerca a una ubicación que desees editar, luego haz clic aquí. directions: diff --git a/config/locales/et.yml b/config/locales/et.yml index 0c3b1427c..4c153959e 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -108,7 +108,7 @@ et: diary_entry: user: Kasutaja title: Teema - body: Päevikusissekanne + body: Kehatekst latitude: Laius longitude: Pikkus language_code: Keel @@ -484,8 +484,13 @@ et: join_discussion: Logi sisse, kui soovid arutelus osaleda still_open: Muudatuskogum on veel avatud. Arutelu avaneb siis, kui muudatuskogum on suletud. + subscribe: Telli + unsubscribe: Lõpeta tellimus comment_by_html: Kommentaar kasutajalt %{user} %{time_ago} hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago} + hide_comment: peida + unhide_comment: nähtavale + comment: Kommenteeri changesetxml: Muudatuskogumi XML osmchangexml: osmChange XML paging_nav: @@ -601,7 +606,14 @@ et: all: title: OpenStreetMapi päevikusissekanded description: Hiljutised OpenStreetMapi kasutajate päevikusissekanded - comments: + subscribe: + heading: Kas soovid selle päeviku sissekande arutelu tellida? + button: Telli arutelu + unsubscribe: + heading: Kas soovid selle päeviku sissekande arutelu tellimusest loobuda? + button: Loobu arutelu jälgimisest + diary_comments: + index: title: Kasutaja %{user} lisatud päeviku kommentaarid heading: Kasutaja %{user} päeviku kommentaarid subheading_html: Päeviku kommentaarid, mille on lisanud kasutaja %{user} @@ -611,12 +623,6 @@ et: comment: Kommentaar newer_comments: Uuemad kommentaarid older_comments: Vanemad kommentaarid - subscribe: - heading: Kas soovid selle päeviku sissekande arutelu tellida? - button: Telli arutelu - unsubscribe: - heading: Kas soovid selle päeviku sissekande arutelu tellimusest loobuda? - button: Loobu arutelu jälgimisest doorkeeper: flash: applications: @@ -1662,8 +1668,8 @@ et: Märkus on koha %{place} lähedal.' commented_note_html: '%{commenter} on taasaktiveerinud märkuse, mida oled kommenteerinud. Märkus on koha %{place} lähedal.' - details: Üksikasjad märkuse kohta leiad aadressilt %{url}. - details_html: Üksikasjad märkuse kohta leiad aadressilt %{url}. + details: Vasta või loe veel märkuse kohta aadressil %{url}. + details_html: Vasta või loe veel märkuse kohta aadressil %{url}. changeset_comment_notification: description: 'OpenStreetMapi muudatuskogum #%{id}' hi: Tere, %{to_user} @@ -1682,8 +1688,8 @@ et: partial_changeset_with_comment: kommentaariga '%{changeset_comment}'. partial_changeset_with_comment_html: kommentaariga '%{changeset_comment}'. partial_changeset_without_comment: ilma kommentaarita. - details: Üksikasjad muudatuskogumi kohta leiad aadressilt %{url}. - details_html: Üksikasjad muudatuskogumi kohta leiad aadressilt %{url}. + details: Vasta või loe muudatuskogumi kohta veel aadressil %{url}. + details_html: Vasta või loe muudatuskogumi kohta veel aadressil %{url}. unsubscribe: Saad muudatuskogumi uuendusteadetest ära ütelda aadressil %{url}. unsubscribe_html: Saad muudatuskogumi uuendusteadetest ära ütelda aadressil %{url}. @@ -1859,7 +1865,7 @@ et: lost password link: Kas unustasid parooli? login_button: Logi sisse register now: Registreeru nüüd - with external: 'Teise võimalusena võid sisse logida kolmanda osapoole kaudu:' + with external: või logi sisse kolmanda osapoole kaudu auth failure: Kahjuks ei õnnestu nende andmetega sisse logida. destroy: title: Logi välja @@ -2114,9 +2120,6 @@ et: js_1: Kasutad kas brauserit, mis ei toeta JavaScripti, või oled JavaScripti keelanud. js_2: OpenStreetMap kasutab JavaScripti kaartide laadimiseks. - permalink: Püsilink - shortlink: Lühilink - createnote: Lisa märkus license: copyright: Autoriõigused OpenStreetMap ja kaasautorid avatud litsentsi alusel remote_failed: Redigeerimise ebaõnnestus - veendu, et JOSM või Merkaartor töötab @@ -2653,6 +2656,7 @@ et: title: Minu volitatud rakendused application: Rakendus permissions: Õigused + last_authorized: Viimati volitatud no_applications_html: Sa pole volitanud veel ühtegi %{oauth2} rakendust. application: revoke: Eemalda juurdepääs @@ -2660,27 +2664,33 @@ et: users: new: title: Registreerumine + tab_title: Registreeru no_auto_account_create: Kahjuks ei ole meil võimalik luua hetkel sinu jaoks automaatselt kontot. please_contact_support_html: Palun võta ühendust %{support_link}, et kasutajakonto luua. Üritame tegeleda selle taotlusega nii kiiresti kui võimalik. support: toega about: - header: Vaba ja muudetav + header: Vaba ja muudetav. paragraph_1: Erinevalt teistest kaartidest on kogu OpenStreetMapi loonud sinusugused inimesed ja igaüks võib seda parandada, täiendada, alla laadida ja kasutada. - paragraph_2: Registreeru, et alustada kaardi täiendamist. Saadame sulle e-kirja, - et saaksid kinnitada enda kasutajakonto. + paragraph_2: Registreeru, et alustada kaardi täiendamist. display name description: Avalikult kuvatud kasutajanimi. Seda saate muuta hiljem eelistustes. + by_signing_up_html: Registreerudes nõustud meie %{tou_link}, %{privacy_policy_link} + ja %{contributor_terms_link}. + tou: kasutustingimustega + contributor_terms: kaastöötingimustega external auth: 'Kolmanda osapoole autentimine:' continue: Registreeru terms accepted: Täname, et nõustusid uute kaastöötingimustega! - email_help_html: Sinu aadressi ei kuvata avalikult, loe täpsemalt meie %{privacy_policy_link}. - privacy_policy: andmekaitsereeglitest + email_help_html: Sinu aadressi ei kuvata avalikult, tutvu meie %{privacy_policy_link}. + privacy_policy: andmekaitsereeglitega privacy_policy_title: OSMF-i andmekaitsereeglid, milles on alaosa e-posti aadresside kohta - use external auth: Teise võimalusena võid sisse logida kolmanda osapoole kaudu + consider_pd_html: Pean enda kaastööd %{consider_pd_link} kuuluvaks. + consider_pd: avalikku omandisse + use external auth: või registreeru kolmanda osapoole kaudu terms: title: Tingimused heading: Tingimused @@ -2856,8 +2866,8 @@ et: andis. success: Blokeering uuendatud. index: - title: Kasutaja blokeeringud - heading: Kasutaja blokeeringute loetelu + title: Kasutajate blokeeringud + heading: Kasutajate blokeeringute loetelu empty: Ühtegi blokeeringut pole veel antud. revoke: title: Kasutaja %{block_on} blokeeringu eemaldamine @@ -3001,6 +3011,10 @@ et: intro: Kas märkasid viga või midagi, mis vajab täiendamist? Anna sellest teistele kaardistajatele teada, et nad saaksid seda parandada. Lohista marker õigele kohale ja kirjuta märkus, et probleemi selgitada. + anonymous_warning_html: Sa pole sisse logitud. Palun %{log_in} või %{sign_up}, + kui soovid saada enda märkuse kohta uuendusi. + anonymous_warning_log_in: logi sisse + anonymous_warning_sign_up: registreeru advice: Märkus on avalik ja seda võidakse kasutada kaardi uuendamiseks. Seega palun ära kirjuta siia isiklikku teavet ega teavet autoriõigustega kaitstud kaartidelt ega kataloogiloenditest. @@ -3072,13 +3086,6 @@ et: queryfeature_tooltip: Mis siin on? queryfeature_disabled_tooltip: Suurenda, et objektide kohta päring teha embed_html_disabled: Selle kaardikihi jaoks pole HTML-i lõimimine saadaval - changesets: - show: - comment: Kommenteeri - subscribe: Telli - unsubscribe: Lõpeta tellimus - hide_comment: peida - unhide_comment: nähtavale edit_help: Nihuta kaarti ja suumi sisse asukohta mida soovid redigeerida ja seejärel kliki siia. directions: @@ -3105,24 +3112,24 @@ et: continue_without_exit: 'Liigu edasi teele: %{name}' slight_right_without_exit: 'Pööra kergelt paremal pool asuvale teele: %{name}' offramp_right: Sõida paremal asuvale kaldteele - offramp_right_with_exit: Lahku teelt paremal asuva ärapöörde %{exit} kaudu - offramp_right_with_exit_name: 'Lahku teelt paremal asuva ärapöörde %{exit} - kaudu sõites teele: %{name}' - offramp_right_with_exit_directions: 'Lahku teelt paremal asuva ärapöörde %{exit} - kaudu võttes suunaks: %{directions}' - offramp_right_with_exit_name_directions: 'Lahku teelt paremal asuva ärapöörde - %{exit} kaudu sõites teele: %{name} suunaga %{directions} poole' + offramp_right_with_exit: Lahku teelt %{exit}. väljumise kaudu paremal + offramp_right_with_exit_name: 'Lahku paremalt %{exit}. väljumise kaudu sõites + teele: %{name}' + offramp_right_with_exit_directions: Lahku paremalt %{exit}. väljumise kaudu, + sõites tee %{directions} suunas + offramp_right_with_exit_name_directions: Lahku paremalt %{exit}. väljumise + kaudu sõites teele %{name} tee %{directions} suunas offramp_right_with_name: 'Pööra paremal asuvalt kaldteelt teele: %{name}' - offramp_right_with_directions: Pööra paremal asuvale kaldteele suunaga %{directions} - poole + offramp_right_with_directions: Pööra paremal asuvale kaldteele, liikudes tee + %{directions} suunas offramp_right_with_name_directions: 'Pööra paremal asuvale kaldteele: uus tee on %{name} ja suunaks %{directions}' onramp_right_without_exit: 'Pööra paremale ja sõida kaldteed mööda teele: %{name}' - onramp_right_with_directions: Pööra paremale ja sõida kaldteelt %{directions} + onramp_right_with_directions: Pööra paremale ja sõida kaldteelt tee %{directions} suunas - onramp_right_with_name_directions: Pööra paremal asuvale kaldteele %{name} - poole, suunaks %{directions} + onramp_right_with_name_directions: Pööra paremal asuvalt kaldteelt teele %{name}, + sõites tee %{directions} suunas onramp_right_without_directions: Sõida paremal asuvale kaldteele onramp_right: Sõida paremal asuvale kaldteele endofroad_right_without_exit: 'Tee lõpus pööra paremale teele: %{name}' @@ -3134,20 +3141,20 @@ et: sharp_left_without_exit: 'Pööra järsult vasakul pool asuvale teele: %{name}' turn_left_without_exit: 'Pööra vasakul pool asuvale teele: %{name}' offramp_left: Sõida vasakul asuvale kaldteele - offramp_left_with_exit: Lahku teelt vasakul asuva ärapöörde %{exit} kaudu - offramp_left_with_exit_name: 'Lahku teelt vasakul asuva ärapöörde %{exit} - kaudu sõites teele: %{name}' - offramp_left_with_exit_directions: 'Lahku teelt vasakul asuva ärapöörde %{exit} - kaudu võttes suunaks: %{directions}' - offramp_left_with_exit_name_directions: 'Lahku teelt vasakul asuva ärapöörde - %{exit} kaudu sõites teele: %{name} suunaga %{directions} poole' + offramp_left_with_exit: Lahku vasakult %{exit}. väljumise kaudu + offramp_left_with_exit_name: 'Lahku vasakult %{exit}. väljumise kaudu sõites + teele: %{name}' + offramp_left_with_exit_directions: Lahku vasakult %{exit}. väljumise kaudu, + sõites tee %{directions} suunas + offramp_left_with_exit_name_directions: Lahku vasakult %{exit}. väljumise + kaudu sõites teele %{name} tee %{directions} suunas offramp_left_with_name: 'Pööra vasakul asuvalt kaldteelt teele: %{name}' - offramp_left_with_directions: Pööra vasakul asuvale kaldteele suunaga %{directions} - poole + offramp_left_with_directions: Pööra vasakul asuvale kaldteele, liikudes tee + %{directions} suunas offramp_left_with_name_directions: 'Pööra vasakul asuvale kaldteele: uus tee on %{name} ja suunaks %{directions}' onramp_left_without_exit: 'Pööra vasakule ja sõida kaldteed mööda teele: %{name}' - onramp_left_with_directions: Pööra vasakule ja sõida kaldteelt %{directions} + onramp_left_with_directions: Pööra vasakule ja sõida kaldteelt tee %{directions} suunas onramp_left_with_name_directions: 'Pööra vaskul asuvale kaldteele: uus tee on %{name} ja suunaks %{directions}' @@ -3159,7 +3166,7 @@ et: slight_left_without_exit: 'Pööra kergelt vasakule teele: %{name}' via_point_without_exit: (teekonnapunkti kaudu) follow_without_exit: 'Sõida edasi mööda teed: %{name}' - roundabout_without_exit: 'Pööra ringteelt järgnevale teele: %{name}' + roundabout_without_exit: 'Pööra ringteelt järgmisele teele: %{name}' leave_roundabout_without_exit: Pööra ära ringteelt - %{name} stay_roundabout_without_exit: Jätka sõitmist ringteel - %{name} start_without_exit: 'Alusta teelt: %{name}' diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 8cd2bf1cb..98f30c2dd 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -487,8 +487,13 @@ eu: join_discussion: Hasi saioa eztabaidan parte hartzeko still_open: Aldaketak oraindik zabalik - eztabaida aldaketak itxi ondoren irekiko da. + subscribe: Harpidetu + unsubscribe: Harpidetza kendu comment_by_html: '%{user} -ren iruzkina orain dela %{time_ago}' hidden_comment_by_html: '%{user} -ren ezkutuko iruzkina %{time_ago} tik' + hide_comment: ezkutatu + unhide_comment: erakutsi + comment: Iruzkina changesetxml: Aldaketaren XML kodea osmchangexml: osmChange XML kodea paging_nav: @@ -606,7 +611,8 @@ eu: all: title: OpenStreetMap eguneroko sarrerak description: OpenStreetMap erabiltzaileek azkenaldian egindako eguneroko sarrerak - comments: + diary_comments: + index: title: '%{user} erabiltzaileak gehitutako egunkariko iruzkinak' heading: '%{user} erabiltzailearen egunkariko iruzkinak' subheading_html: '%{user} erabiltzaileak gehitutako egunkariko iruzkinak' @@ -2080,9 +2086,6 @@ eu: js_1: Javascript onartzen ez duen arakatzailea erabiltzen ari zara edo JavaScript desgaitu duzu. js_2: OpenStreetMap-ek Javascript erabiltzen du bere mapa irriztagarrirako. - permalink: Esteka iraunkorra - shortlink: Esteka laburra - createnote: Gehitu oharra license: copyright: OpenStreetMap eta laguntzaileen Copyright-a erabili, lizentzia irekiaren babespean @@ -2982,13 +2985,6 @@ eu: map_data_zoom_in_tooltip: Handiagotu mapa datuak ikusteko queryfeature_tooltip: Eskaera ezaugarriak queryfeature_disabled_tooltip: Handiagotu ezaugarriak eskatzeko - changesets: - show: - comment: Iruzkina - subscribe: Harpidetu - unsubscribe: Harpidetza kendu - hide_comment: ezkutatu - unhide_comment: erakutsi edit_help: Mugitu mapa eta zooma editatu nahi duzun kokaleku batean erabili, gero klik hemen egin. directions: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 31b88d8a9..ad2d928e1 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -15,6 +15,7 @@ # Author: Danialbehzadi # Author: Darafsh # Author: Dr jackie +# Author: Ebrahim # Author: Ebraminio # Author: FarsiNevis # Author: Fatemi127 @@ -490,8 +491,13 @@ fa: discussion: بحث join_discussion: وارد شوید تا به بحث بپیوندید still_open: بستهٔ تغییر هنوز باز است - امکان بحث پس از بستن آن باز می‌شود. + subscribe: اشتراک + unsubscribe: لغو اشتراک comment_by_html: نظر از %{user}‏ %{time_ago} hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago} + hide_comment: نهفتن + unhide_comment: نمایش + comment: نظر changesetxml: Changeset XML osmchangexml: osmChange XML paging_nav: @@ -604,7 +610,12 @@ fa: all: title: ‫روزنوشت‌های OpenStreetMap‬ description: ‫روزنوشت‌های اخیر از کاربران OpenStreetMap‬ - comments: + subscribe: + button: اشتراک در بحث + unsubscribe: + button: لغو اشتراک در بحث + diary_comments: + index: title: نظراتی که %{user} به روزنوشت‌ها داده است heading: نظرات %{user} به روزنوشت‌ها subheading_html: نظراتی که %{user} به روزنوشت‌ها داده است @@ -614,10 +625,6 @@ fa: comment: نظر newer_comments: نظرات جدیدتر older_comments: نظرات قدیمی‌تر - subscribe: - button: اشتراک در بحث - unsubscribe: - button: لغو اشتراک در بحث doorkeeper: flash: applications: @@ -1931,9 +1938,6 @@ fa: js_1: شما در حال استفاده از مرورگری هستید که جاوااسکریپت را پشتیبانی نمی‌کند، یا جاوااسکریپت را غیرفعال کرده‌اید. js_2: OpenStreetMap برای نقشهٔ لغزان از جاوااسکریپت استفاده می‌کند. - permalink: پیوند پایدار - shortlink: پیوند کوتاه - createnote: افزودن یادداشت license: copyright: حق نشر OpenStreetMap و مشارکت‌کنندگان، تحت یک پروانهٔ آزاد remote_failed: ویرایش انجام نشد - مطمئن شوید JOSM یا Merkaartor باز و گزینهٔ @@ -2724,13 +2728,6 @@ fa: map_data_zoom_in_tooltip: برای دیدن دادهٔ نقشه بزرگ‌نمایی کنید queryfeature_tooltip: پرس‌وجوی عارضه‌ها queryfeature_disabled_tooltip: برای پرس‌وجوی عارضه‌ها بزرگ‌نمایی کنید - changesets: - show: - comment: نظر - subscribe: اشتراک - unsubscribe: لغو اشتراک - hide_comment: نهفتن - unhide_comment: نمایش edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگ‌نمایی کنید. سپس اینجا کلیک کنید. directions: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 7268c13e7..5bdf2698f 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -492,8 +492,13 @@ fi: join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun muutoskokoelma on suljettu. + subscribe: Tilaa + unsubscribe: Lopeta tilaus comment_by_html: Kommentti käyttäjältä %{user}, %{time_ago} hidden_comment_by_html: Piilotettu kommentti käyttäjältä %{user} %{time_ago} + hide_comment: piilota + unhide_comment: näytä + comment: Kommentoi changesetxml: Muutoskokoelman XML osmchangexml: osmChange XML paging_nav: @@ -609,7 +614,8 @@ fi: all: title: OpenStreetMap-päiväkirjamerkinnät description: Tuoreimmat OpenStreetMapin käyttäjien päiväkirjamerkinnät - comments: + diary_comments: + index: title: Käyttäjän %{user} lisäämät päiväkirjamerkinnät heading: Päiväkirjamerkinnät käyttäjältä %{user} subheading_html: Käyttäjän %{user} lisäämät päiväkirjamerkinnät @@ -2029,9 +2035,6 @@ fi: index: js_1: Selain ei tue JavaScriptiä tai sen suorittaminen on estetty. js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan. - permalink: Ikilinkki - shortlink: Lyhytosoite - createnote: Ilmoita karttavirheestä license: copyright: 'Tekijänoikeus: OpenStreetMapin tekijät, avoimella lisenssillä' remote_failed: Muokkaus epäonnistui - varmista, että JOSM tai Merkaartor on @@ -2552,17 +2555,26 @@ fi: users: new: title: Rekisteröidy + tab_title: Rekisteröidy no_auto_account_create: Automaattinen käyttäjätunnuksen luonti ei ole juuri nyt käytössä. support: tuki about: header: Muokkaa vapaasti + paragraph_1: Toisin kuin muut karttapalvelut, OpenStreetMap on täysin tavallisten + ihmisten luoma. Kuka tahansa voi korjata, päivittää, ladata ja käyttää sitä + ilmaiseksi. + paragraph_2: Osallistu projektiin luomalla käyttäjätunnus. display name description: Julkisesti näkyvä käyttäjänimi. Tätä voi myöhemmin muuttaa asetuksista. + by_signing_up_html: Rekisteröitymällä hyväksyt %{tou_link}, %{privacy_policy_link} + ja %{contributor_terms_link}. external auth: 'Kolmannen osapuolen todennus:' continue: Rekisteröidy terms accepted: Kiitos uusien osallistujaehtojen hyväksymisestä! + email_help_html: Osoitetta ei näytetä julkisesti, lisätietoja on sivulla %{privacy_policy_link}. privacy_policy: tietosuojakäytäntö + consider_pd_html: Pidän tuotoksiani %{consider_pd_link}. use external auth: Kirjaudu toisen palvelun tunnuksilla terms: title: Ehdot @@ -2853,6 +2865,7 @@ fi: intro: Huomasitko virheen tai puuttuvan kohteen? Ilmoita siitä muille kartoittajille, jolloin virhe voidaan korjata. Siirrä merkkipiste oikeaan kohtaan ja kirjoita selite ongelmasta. + anonymous_warning_sign_up: rekisteröidy advice: Merkintä näkyy julkisesti kaikille, älä kirjoita henkilökohtaisia tietoja. Aineistoa kehitetään palautteen perusteella, minkä takia älä käytä lähteenä muita karttoja tai hakemistoja. @@ -2926,13 +2939,6 @@ fi: map_data_zoom_in_tooltip: Näytä kartta-aineisto lähentämällä karttaa queryfeature_tooltip: Karttakohdeluettelo queryfeature_disabled_tooltip: Näytä ominaisuusluettelo suurentamalla karttaa - changesets: - show: - comment: Kommentoi - subscribe: Tilaa - unsubscribe: Lopeta tilaus - hide_comment: piilota - unhide_comment: näytä edit_help: Siirrä ja lähennä kartta muokattavaan paikkaan ja napsauta sitten tästä. directions: ascend: Nousu diff --git a/config/locales/fit.yml b/config/locales/fit.yml index 8b29b97f4..c2461d164 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -315,6 +315,7 @@ fit: join_discussion: Lokkaa sisäle, jos halvaat osallistua keskusteluun still_open: Muutoskokoelma on edelleen avoimena - keskustelu avathaan heti kun muutoskokoelma on suljettu. + comment: Kommentoi changesetxml: Muutoskokoelman XML osmchangexml: osmChange XML paging_nav: @@ -414,7 +415,8 @@ fit: all: title: OpenStreetMap-päiväkirjamerkinnät description: Verekset OpenStreetMapin käyttäjitten päiväkirjamerkinnät - comments: + diary_comments: + index: post: Kommentti when: Taatumi comment: Kommentti @@ -759,9 +761,6 @@ fit: title: Nimeämisesimerkki more_title_html: Lisätietoja contributors_title_html: Meän tekijät - index: - permalink: Ikunen länkki - shortlink: Lyhylänkki edit: user_page_link: käyttäjätieot export: @@ -913,9 +912,6 @@ fit: site: edit_tooltip: Mookkaa karttaa edit_disabled_tooltip: Lähennä karttaa mookataksesi - changesets: - show: - comment: Kommentoi directions: instructions: unnamed: nimetön tie diff --git a/config/locales/fr.yml b/config/locales/fr.yml index da9281e0d..4ce8d20e5 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -38,6 +38,7 @@ # Author: GeorgeKaplan # Author: Gileri # Author: Gomoko +# Author: Graineahumus # Author: Gravitystorm # Author: Guilhelma # Author: Hashar @@ -75,6 +76,7 @@ # Author: Orikrin1998 # Author: Otourly # Author: Oupsa +# Author: Overflorian # Author: Peter17 # Author: Phoenamandre # Author: Pipo @@ -457,6 +459,7 @@ fr: view_unredacted_history: Voir l'historique non censuré view_details: Afficher les détails view_redacted_data: Afficher les données censurées + view_redaction_message: Afficher le message de rédaction location: 'Emplacement :' common_details: coordinates_html: '%{latitude} ; %{longitude}' @@ -583,6 +586,7 @@ fr: closed: Fermé belongs_to: Auteur subscribe: + heading: S'abonner à la discussion sur l'ensemble de modifications suivante ? button: S'abonner à la discussion unsubscribe: heading: Se désabonner de la discussion du groupe de modifications suivant ? @@ -591,6 +595,7 @@ fr: title: Groupe de modifications %{id} created_by_html: Créé par %{link_user} le %{created}. no_such_entry: + title: Aucun ensemble de modifications de ce type heading: 'Aucune entrée avec l’identifiant : %{id}' body: Désolé, il n’y a aucun groupe de modifications avec l'identifiant %{id}. Veuillez vérifier l'orthographe ou la validité du lien sur lequel vous avez @@ -607,8 +612,13 @@ fr: join_discussion: Se connecter pour rejoindre la discussion still_open: Ensemble de modifications toujours ouvert – la discussion s’ouvrira une fois que l’ensemble de modifications sera fermé. + subscribe: S’abonner + unsubscribe: Se désabonner comment_by_html: Commentaire de %{user} %{time_ago} hidden_comment_by_html: Commentaire caché de %{user} %{time_ago} + hide_comment: masquer + unhide_comment: démasquer + comment: Commenter changesetxml: XML du groupe de modifications osmchangexml: XML osmChange paging_nav: @@ -684,6 +694,8 @@ fr: title: Carnet de %{user} | %{title} user_title: Carnet de %{user} discussion: Discussion + subscribe: S’abonner + unsubscribe: Se désabonner leave_a_comment: Laisser un commentaire login_to_leave_a_comment_html: '%{login_link} pour laisser un commentaire' login: Se connecter @@ -729,7 +741,14 @@ fr: all: title: Entrées des journaux OpenStreetMap description: Entrées récentes des journaux d’utilisateurs de OpenStreetMap - comments: + subscribe: + heading: S'abonner à la discussion suivante sur les entrées de journal ? + button: S'abonner à la discussion + unsubscribe: + heading: Se désinscrire de la discussion suivante sur les entrées du journal ? + button: Se désinscrire de la discussion + diary_comments: + index: title: Commentaires de journal ajoutés par %{user} heading: Commentaires de journal de %{user} subheading_html: Commentaires de journal ajoutés par %{user} @@ -739,10 +758,6 @@ fr: comment: Commentaire newer_comments: Commentaires plus récents older_comments: Commentaires plus anciens - subscribe: - button: S'abonner à la discussion - unsubscribe: - button: Se désinscrire de la discussion doorkeeper: errors: messages: @@ -785,6 +800,10 @@ fr: contact_the_community_html: N’hésitez pas à %{contact_link} la communauté OpenStreetMap si vous avez trouvé un lien cassé ou une anomalie. Notez l’URL exacte de votre demande. + bad_request: + title: Mauvaise requête + description: L'opération que vous avez demandée sur le serveur OpenStreetMap + n'est pas valide (HTTP 400) forbidden: title: Interdit description: L’opération que vous avez demandée sur le serveur OpenStreetMap @@ -1725,6 +1744,7 @@ fr: hosting_partners_2024_html: L’hébergement est pris en charge par %{fastly}, %{corpmembers}, et d’autres %{partners}. partners_fastly: Fastly + partners_corpmembers: Membres d'entreprise de l'OSMF partners_partners: partenaires tou: Conditions d’utilisation osm_offline: La base de données OpenStreetMap est actuellement hors ligne ; une @@ -1746,6 +1766,7 @@ fr: more: Plus user_mailer: diary_comment_notification: + description: 'Entrée du journal OpenStreetMap #%{id}' subject: '[OpenStreetMap] %{user} a publié un commentaire sur un article de journal' hi: Bonjour %{to_user}, @@ -1860,8 +1881,8 @@ fr: La note se trouve près de %{place}.' commented_note_html: '%{commenter} a réactivé une note de carte que vous avez commentée. La note est près de %{place}.' - details: Plus de détails concernant la note se trouvent à %{url}. - details_html: Plus de détails concernant la note se trouvent à %{url}. + details: Répondez ou apprenez-en plus sur la note sur %{url}. + details_html: Répondez ou en savoir plus sur la note sur %{url}. changeset_comment_notification: description: 'Groupe de modifications OpenStreetMap #%{id}' hi: Bonjour %{to_user}, @@ -1882,9 +1903,8 @@ fr: partial_changeset_with_comment: avec le commentaire « %{changeset_comment} » partial_changeset_with_comment_html: avec le commentaire « %{changeset_comment} » partial_changeset_without_comment: sans commentaire - details: Plus de détails sur l’ensemble de modifications à %{url}. - details_html: Vous pouvez trouver plus de détails sur l’ensemble de modifications - sur %{url}. + details: Répondez ou en savoir plus sur l'ensemble de changements sur %{url}. + details_html: Répondre ou en savoir plus sur l'ensemble de changements sur %{url}. unsubscribe: Vous pouvez vous désabonner des mises à jour de cet ensemble de modifications depuis %{url}. unsubscribe_html: Vous pouvez vous désabonner des mises à jour de cet ensemble @@ -1983,9 +2003,9 @@ fr: unread_button: Marque comme non lu destroy_button: Supprimer back: Retour - 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. + wrong_user: Vous êtes identifié comme « %{user} » mais le message que vous avez + demandé de lire n’a pas été envoyé par cet utilisateur, ni ne lui a été destiné. + Veuillez vous connecter avec le bon identifiant pour pouvoir le lire. sent_message_summary: destroy_button: Supprimer heading: @@ -2067,6 +2087,7 @@ fr: new: title: Se connecter tab_title: Se connecter + login_to_authorize_html: Connectez-vous à OpenStreetMap pour accéder à %{client_app_name}. email or username: 'Adresse de courriel ou nom d’utilisateur :' password: 'Mot de passe :' remember: Se souvenir de moi @@ -2266,7 +2287,12 @@ fr: générale des finances publiques (anciennement la Direction générale des impôts).' contributors_fr_france: France + contributors_hr_credit_html: |- + %{croatia} : contient des données de %{dgu_link} et %{open_data_portal} + (informations publiques de Croatie). contributors_hr_croatia: Croatie + contributors_hr_dgu: Administration géodésique de l'État de Croatie + contributors_hr_open_data_portal: Portail national des données ouvertes contributors_nl_credit_html: '%{netherlands} : contient des données © AND, 2007 (%{and_link})' contributors_nl_netherlands: Pays-Bas @@ -2336,9 +2362,6 @@ fr: js_1: JavaScript n’est pas pris en charge par le navigateur que vous utilisez, ou bien vous l’avez désactivé. js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes. - permalink: Lien permanent - shortlink: Lien court - createnote: Ajouter une note license: copyright: Copyright OpenStreetMap et ses contributeurs, sous une licence ouverte @@ -2719,6 +2742,8 @@ fr: identifiable: IDENTIFIABLE private: PRIVÉE trackable: PISTABLE + details_with_tags_html: '%{time_ago} par %{user} dans %{tags}' + details_without_tags_html: '%{time_ago} par %{user}' index: public_traces: Traces GPS publiques my_gps_traces: Mes traces GPS @@ -2754,6 +2779,8 @@ fr: other: Fichier GPX avec %{count} points de %{user} description_without_count: Fichier GPX de %{user} application: + basic_auth_disabled: 'L''authentification HTTP de base est désactivée : %{link}' + oauth_10a_disabled: 'OAuth 1.0 et 1.0a sont désactivés : %{link}' permission_denied: Vous n’avez pas le droit d’accéder à cette action require_cookies: cookies_needed: Il semble que les témoins (cookies) soient désactivés dans votre @@ -2776,30 +2803,31 @@ fr: muted_users: Utilisateurs silencieux auth_providers: openid_logo_alt: Se connecter avec OpenID + openid_login_button: Continuer openid: title: Connexion avec OpenID alt: Se connecter avec une URL OpenID google: - title: Connexion avec Google + title: Se connecter avec Google alt: Se connecter avec un OpenID de Google facebook: - title: Connexion avec Facebook + title: Se connecter avec Facebook alt: Se connecter avec un compte de Facebook microsoft: - title: Connexion avec Microsoft + title: Se connecter avec Microsoft alt: Se connecter avec un compte Microsoft github: - title: Connexion avec GitHub - alt: Se connecter avec un compte de GitHub + title: Se connecter avec GitHub + alt: Se connecter avec un compte GitHub wikipedia: - title: Connexion avec Wikipédia - alt: Se connecter avec un compte de Wikipédia + title: Se connecter avec Wikipédia + alt: Se connecter avec un compte Wikipédia wordpress: - title: Connexion avec Wordpress + title: Se connecter avec Wordpress alt: Se connecter avec un OpenID de Wordpress aol: - title: Connexion avec AOL - alt: Se connecter avec un OpenID d’AOL + title: Se connecter avec AOL + alt: Se connecter avec un OpenID AOL oauth: authorize: title: Autoriser l’accès à votre compte @@ -2843,6 +2871,9 @@ fr: write_redactions: Caviarder les données cartographiques read_email: Lire l’adresse courriel de l’utilisateur skip_authorization: Demande d’approbation automatique + for_roles: + moderator: Cette autorisation concerne les actions disponibles uniquement pour + les modérateurs oauth_clients: new: title: Inscrire une nouvelle application @@ -2939,6 +2970,8 @@ fr: users: new: title: S’inscrire + tab_title: Créer un compte + signup_to_authorize_html: Se connecter à OpenStreetMap pour accéder à %{client_app_name}. no_auto_account_create: Malheureusement, nous ne sommes actuellement pas en mesure de vous créer un compte automatiquement. please_contact_support_html: Veuillez contacter %{support_link} pour organiser @@ -2950,10 +2983,17 @@ fr: paragraph_1: Contrairement à d’autres cartes, OpenStreetMap est entièrement créé par des personnes comme vous et il permet à quiconque de librement la réparer, la mettre à jour, la télécharger et l’utiliser. - paragraph_2: Inscrivez-vous pour commencer à contribuer. Nous vous enverrons - un courriel pour confirmer votre compte. + paragraph_2: Se connecter pour commencer à contribuer. + welcome: Bienvenue dans OpenStreetMap + duplicate_social_email: Si vous possédez déjà un compte OpenStreetMap et souhaitez + utiliser un fournisseur d'identité tiers, veuillez vous connecter en utilisant + votre mot de passe et modifier les paramètres de votre compte. display name description: Votre nom d’utilisateur affiché publiquement. Vous pouvez changer ceci ultérieurement dans les préférences. + by_signing_up_html: En vous inscrivant, vous acceptez nos %{tou_link}, %{privacy_policy_link} + et %{contributor_terms_link}. + tou: conditions d'utilisation + contributor_terms: Conditions de contribution external auth: 'Authentification tierce :' continue: S’inscrire terms accepted: Merci d’avoir accepté les nouveaux termes du contributeur ! @@ -2962,8 +3002,10 @@ fr: privacy_policy: politique de confidentialité privacy_policy_title: Politique de confidentialité de l’OSMF, qui comprend une section sur les adresses de courriel - use external auth: Vous pouvez également utiliser un service tiers pour vous - connecter. + consider_pd_html: Je considère que mes contributions se situent dans le %{consider_pd_link}. + consider_pd: domaine public + or: ou + use external auth: ou vous pouvez vous connecter avec un service tiers. terms: title: Conditions heading: Conditions @@ -3032,6 +3074,8 @@ fr: remove as friend: Supprimer en tant qu’ami add as friend: Ajouter en tant qu’ami mapper since: 'Cartographe depuis :' + last map edit: 'Dernière modification de la carte :' + no activity yet: Pas encore d'activité uid: 'Identifiant utilisateur :' ct status: 'Conditions de contribution :' ct undecided: Indécis @@ -3074,6 +3118,9 @@ fr: heading: Utilisateurs older: Utilisateurs plus anciens newer: Utilisateurs plus récents + found_users: + one: '%{count} utilisateur trouvé' + other: '%{count} utilisateurs trouvés' summary_html: '%{name} créé depuis %{ip_address} le %{date}' summary_no_ip_html: '%{name} créé le %{date}' confirm: Confirmer les utilisateurs sélectionnés @@ -3098,9 +3145,9 @@ fr: heading: Votre identifiant n’est pas encore associé à un compte OpenStreetMap. option_1: Si vous êtes nouveau sur OpenStreetMap, veuillez créer un nouveau compte à l’aide du formulaire ci-dessous. - option_2: Si vous avez déjà un compte, vous pouvez vous connecter avec en utilisant - votre nom d’utilisateur et votre mot de passe, puis associer le compte avec - votre ID dans vos préférences utilisateur. + option_2: Si vous avez déjà un compte, vous pouvez vous y connecter avec en + utilisant votre nom d’utilisateur et votre mot de passe, puis associer le + compte avec votre ID dans vos préférences utilisateur. user_role: filter: not_a_role: La chaîne « %{role} » n’est pas un rôle valide. @@ -3231,6 +3278,8 @@ fr: reason: Motif du blocage status: État revoker_name: Révoqué par + older: Blocs plus anciens + newer: Blocs plus récents navigation: all_blocks: Tous les blocages blocks_on_me: Blocages me concernant @@ -3312,6 +3361,10 @@ fr: 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. + anonymous_warning_html: Vous n'êtes pas connecté. Veuillez %{log_in} ou %{sign_up} + si vous souhaitez recevoir des mises à jour pour votre note. + anonymous_warning_log_in: se connecter + anonymous_warning_sign_up: créer un compte advice: Votre note est publique et peut être utilisée pour mettre à jour la carte, aussi n’entrez aucune information personnelle, ni aucune information venant de cartes protégées, ni aucune entrée de répertoire ou d’annuaire. @@ -3390,13 +3443,6 @@ fr: queryfeature_disabled_tooltip: Zoomer plus pour rechercher des objets embed_html_disabled: L’intégration de HTML n’est pas disponible pour cette couche de carte - changesets: - show: - comment: Commenter - subscribe: S’abonner - unsubscribe: Se désabonner - hide_comment: masquer - unhide_comment: démasquer edit_help: Déplacez la carte et zoomez sur un emplacement que vous voulez modifier, puis cliquez dessus. directions: diff --git a/config/locales/fur.yml b/config/locales/fur.yml index f03174352..d4689691a 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -390,8 +390,13 @@ fur: closed_ago_by_html: Sierât di %{user} %{time_ago} discussion: Discussion join_discussion: Jentre par partecipâ ae discussion + subscribe: Notiti + unsubscribe: Disnotiti comment_by_html: Comentât di %{user} %{time_ago} hidden_comment_by_html: Coment platât di %{user} %{time_ago} + hide_comment: plate + unhide_comment: mostre + comment: Coment changesetxml: Grup di cambiaments XML osmchangexml: XML in formât osmChange paging_nav: @@ -504,7 +509,8 @@ fur: all: title: Vôs dai diaris di OpenStreetMap description: Lis ultimis vôs dai diaris dai utents di OpenStreetMap - comments: + diary_comments: + index: title: Coments ai diaris zontâts par %{user} heading: Coments ai diaris di %{user} subheading_html: Coments ai diaris zontâts di %{user} @@ -1204,9 +1210,6 @@ fur: js_1: Tu stâs doprant un sgarfadôr che nol supuarte JavaScript o ben JavaScript al è stât disativât. js_2: OpenStreetMap al dopre JavaScript par mostrâ la sô mape. - permalink: Leam permanent - shortlink: Leam curt - createnote: Zonte une note license: copyright: Copyright di OpenStreetMap e dai siei colaboradôrs, sot di une licence vierte @@ -1799,13 +1802,6 @@ fur: map_data_zoom_in_tooltip: Aumente il zoom par viodi i dâts de mape queryfeature_tooltip: Domande ce ch'al è intun lûc queryfeature_disabled_tooltip: Aumente il zoom par domandâ ce ch'al è - changesets: - show: - comment: Coment - subscribe: Notiti - unsubscribe: Disnotiti - hide_comment: plate - unhide_comment: mostre edit_help: Môf la mape e aumente il zoom tal lûc che tu vuelis cambiâ, po frache culì directions: diff --git a/config/locales/fy.yml b/config/locales/fy.yml index ec00cb99b..c628f4180 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -428,6 +428,11 @@ fy: join_discussion: Meld jo oan en oerlis mei still_open: Wizigingsset net ree - it oerlis iepenet sa gau't de wizigingsset ôfdien is. + subscribe: Folgje + unsubscribe: Net folgje + hide_comment: ferbergje + unhide_comment: werompleatse + comment: Reägearje changesetxml: Wizigingsset-XML osmchangexml: osmWizigings-XML paging_nav: @@ -540,7 +545,8 @@ fy: all: title: OpenStreetMap Deiboekstikken description: Nije deiboekstikken fan meidoggers oan OpenStreetMap - comments: + diary_comments: + index: title: Troch %{user} taheakke deiboekreäksjes heading: Deiboekreäksjes fan %{user} subheading_html: Troch %{user} taheakke deiboekreäksjes @@ -1855,9 +1861,6 @@ fy: js_1: Jo brûke ôf in webblêder dy't gjin JavaScript stipet, ôf jo hawwe JavaScript útskeakele. js_2: OpenStreetMap brûkt JavaScript foar de ferskobere kaart. - permalink: Fêste kepp. - shortlink: Lytse kepp. - createnote: Notysje taheakje license: copyright: Auteursrjochten OpenStreetMap en bydragers, ûnder in iepen lisinsje remote_failed: Bewurkjen mislearre - soargje dat JOSM of Merkaartor laden is, @@ -2655,13 +2658,6 @@ fy: map_data_zoom_in_tooltip: Sûm yn om kaartdata sjen te kinnen queryfeature_tooltip: Skaaimerken opfreegje queryfeature_disabled_tooltip: Sûm yn om skaaimerken opfreegje te kinnen - changesets: - show: - comment: Reägearje - subscribe: Folgje - unsubscribe: Net folgje - hide_comment: ferbergje - unhide_comment: werompleatse edit_help: Sko de kaart en sûm yn op 'e lokaasje dy't jo bewurkje wolle, klik dan hjir. directions: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 2e8857e8f..d42c7285b 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -318,6 +318,11 @@ ga: title: 'Tacar athruithe: %{id}' discussion: Plé join_discussion: Logáil isteach chun páirt a ghlacadh sa phlé + subscribe: Liostáil + unsubscribe: Díliostáil + hide_comment: folaigh + unhide_comment: dífholaigh + comment: Freagair changesetxml: XML an Tacair athruithe osmchangexml: XML osmChange paging_nav: @@ -424,7 +429,8 @@ ga: all: title: Iontrálacha dialainne OpenStreetMap description: Iontrálacha dialainne le déanaí ó úsáideoirí OpenStreetMap - comments: + diary_comments: + index: no_comments: Níl aon nóta tráchta dialainne ann post: Postáil when: Cá huair @@ -1373,9 +1379,6 @@ ga: díchumasaithe agat. js_2: Baineann OpenStreetMap úsáid as JavaScript dá léarscáil 'slippy' (léarscáil ghréasáin bunaithe ar thíleanna). - permalink: Buan-nasc - shortlink: Nasc gearr - createnote: Cuir nóta leis license: copyright: Cóipcheart OpenStreetMap agus rannchuiditheoirí, faoi cheadúnas oscailte @@ -1888,13 +1891,6 @@ ga: map_data_zoom_in_tooltip: Zúmáil isteach chun sonraí na léarscáile a fheiceáil queryfeature_tooltip: Gnéithe a fhiosrú queryfeature_disabled_tooltip: Zúmáil isteach chun gnéithe a fhiosrú - changesets: - show: - comment: Freagair - subscribe: Liostáil - unsubscribe: Díliostáil - hide_comment: folaigh - unhide_comment: dífholaigh edit_help: Bog an léarscáil agus zúmáil isteach ar áit is mian leat a chur in eagar, ansin cliceáil anseo. directions: diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index b4f35e515..3fd0fd75f 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -160,6 +160,7 @@ gcf: join_discussion: Konèkté-w pou jwenn bokantaj-la comment_by_html: Komantasyon a %{user} %{time_ago} hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago} + comment: Komantasyon changesetxml: Niméwo Chanjeman XML osmchangexml: osmChanjeman XML dashboards: @@ -212,7 +213,8 @@ gcf: confirm: Konfirmé location: view: Vwè - comments: + diary_comments: + index: comment: Komantasyon newer_comments: Sé komantasyon pli nèf la older_comments: Pli vyé komantasyon @@ -566,7 +568,6 @@ gcf: js_1: Ou ka sèvi èvè on navigatè ki pa ka sipòté Javascript ouben Javascript éten. js_2: OpenStreetMap ka sèvi èvè Javascript pou kat glisad. - permalink: Permalink edit: not_public: Ou pé pa réglé édision aw pou yo piblik. not_public_description_html: Pou modifié kat la fok édision aw piblik. Ou pé @@ -696,9 +697,6 @@ gcf: site: edit_tooltip: Modifyé kat-la createnote_tooltip: Jouté on komantasyon asi kat-la - changesets: - show: - comment: Komantasyon directions: engines: fossgis_valhalla_bicycle: biskèt (Valhalla) diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 5f9ee4709..e22400a38 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -296,6 +296,11 @@ gd: title: 'Seata atharraichean: %{id}' discussion: Deasbaireachd join_discussion: Clàraich a-steach gus pàirt a ghabhail san deasbaireachd + subscribe: Fo-sgrìobh + unsubscribe: Cuir crìoch air an fh-sgrìobhadh + hide_comment: falaich + unhide_comment: neo-fhalaich + comment: Thoir beachd changesetxml: XML le seata atharraichean osmchangexml: XML osmChange paging_nav: @@ -400,7 +405,8 @@ gd: title: Clàran san leabhar-latha OpenStreetMap description: Clàran leabhair-latha le cleachdaichean OpenStreetMap o chionn goirid - comments: + diary_comments: + index: post: Post when: Àm comment: Beachd @@ -1235,9 +1241,6 @@ gd: js_1: Tha thu a' chleachdadh brabhsair nach cuir taic ri JavaScript no chuir thu JavaScript à comas. js_2: Cleachdaidh OpenStreetMap JavaScript gus am mapa a shealltainn. - permalink: Ceangal buan - shortlink: Ceangal goirid - createnote: cuir nòta ris license: copyright: Còir-lethbhreac OpenStreetMap agus na co-thabhartaichean aige fo cheadachas fosgailte @@ -1881,13 +1884,6 @@ gd: map_data_zoom_in_tooltip: Sùm a-steach gus dàta a' mhapa a shealltainn queryfeature_tooltip: Lorg airson feartan sònraichte queryfeature_disabled_tooltip: Sùm an-steach gus lorg airson feartan sònraichte - changesets: - show: - comment: Thoir beachd - subscribe: Fo-sgrìobh - unsubscribe: Cuir crìoch air an fh-sgrìobhadh - hide_comment: falaich - unhide_comment: neo-fhalaich edit_help: Gluais am mapa agus sùm a-steach air ionad a tha thu airson deasachadh. Briog an-seo an uairsin. directions: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index b757d74ff..b8ac4f2cf 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -506,8 +506,13 @@ gl: join_discussion: Inicia a sesión para unirte á parola still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando o conxunto de modificacións estea pechado. + subscribe: Subscribirse + unsubscribe: Cancelar a subscrición comment_by_html: Comentario de %{user} %{time_ago} hidden_comment_by_html: Comentario de %{user} agochado %{time_ago} + hide_comment: agochar + unhide_comment: amosar + comment: Comentar changesetxml: XML do conxunto de modificacións osmchangexml: XML de osmChange paging_nav: @@ -584,6 +589,8 @@ gl: title: Diario de %{user} | %{title} user_title: Diario de %{user} discussion: Conversa + subscribe: Subscribirse + unsubscribe: Cancelar a subscrición leave_a_comment: Deixar un comentario login_to_leave_a_comment_html: '%{login_link} para deixar un comentario' login: Inicia sesión @@ -627,7 +634,15 @@ gl: all: title: Entradas no diario do OpenStreetMap description: Entradas de diario recentes dos usuarios do OpenStreetMap - comments: + subscribe: + heading: Queres subscribirte á seguinte conversa sobre a entrada no diario? + button: Subscribirse á conversa + unsubscribe: + heading: Queres cancelar a subscrición á seguinte conversa sobre a entrada no + diario? + button: Cancelar a subscrición á conversa + diary_comments: + index: title: Comentarios do diario engadidos por %{user} heading: Comentarios do diario de %{user} subheading_html: Comentarios do diario engadidos por %{user} @@ -637,13 +652,6 @@ gl: comment: Comentario newer_comments: Comentarios máis recentes older_comments: Comentarios máis vellos - subscribe: - heading: Queres subscribirte á seguinte conversa sobre a entrada no diario? - button: Subscribirse á conversa - unsubscribe: - heading: Queres cancelar a subscrición á seguinte conversa sobre a entrada no - diario? - button: Cancelar a subscrición á conversa doorkeeper: errors: messages: @@ -685,6 +693,10 @@ gl: contact_the_community_html: Non dubides en %{contact_link} coa comunidade do OpenStreetMap se atopaches un erro ou unha ligazón rota. Anota o enderezo URL exacto da túa solicitude. + bad_request: + title: Solicitude incorrecta + description: A operación que solicitaches no servidor do OpenStreetMap non é + válida (HTTP 400) forbidden: title: Prohibido description: A operación que solicitaches no servidor do OpenStreetMap só está @@ -1752,8 +1764,8 @@ gl: A nota está preto de %{place}.' commented_note_html: '%{commenter} reactivou unha das notas do mapa nas que comentaches. A nota está preto de %{place}.' - details: Pode atopar máis detalles da nota en %{url}. - details_html: Podes atopar máis detalles da nota en %{url}. + details: Responde ou descubre máis detalles da nota en %{url}. + details_html: Responde ou descubre máis detalles da nota en %{url}. changeset_comment_notification: description: Conxunto de modificacións do OpenStreetMap n.º %{id} hi: 'Ola, %{to_user}:' @@ -1774,9 +1786,9 @@ gl: partial_changeset_with_comment: co comentario '%{changeset_comment}' partial_changeset_with_comment_html: con comentario '%{changeset_comment}' partial_changeset_without_comment: sen comentarios - details: Pódense atopar máis detalles acerca do conxunto de modificacións en + details: Responde ou descubre máis detalles do conxunto de modificacións en %{url}. - details_html: Pódense atopar máis detalles sobre o conxunto de modificacións + details_html: Responde ou descubre máis detalles do conxunto de modificacións en %{url}. unsubscribe: Podes cancelar a subscrición ás actualizacións deste conxunto de modificacións en %{url}. @@ -2233,9 +2245,6 @@ gl: index: js_1: Estás a usar un navegador que non soporta o JavaScript ou telo desactivado. js_2: O OpenStreetMap emprega JavaScript para o seu mapa estático e dinámico. - permalink: Ligazón permanente - shortlink: Atallo - createnote: Engadir unha nota license: copyright: Dereitos de autoría do OpenStreetMap e os seus colaboradores, baixo unha licenza aberta @@ -2631,6 +2640,8 @@ gl: other: Ficheiro GPX con %{count} puntos de %{user} description_without_count: Ficheiro GPX de %{user} application: + basic_auth_disabled: 'A autenticación básica HTTP está desactivada: %{link}' + oauth_10a_disabled: 'OAuth 1.0 e 1.0a están desactivados: %{link}' permission_denied: Non ten permisos para acceder a esa acción require_cookies: cookies_needed: Semella que ten as cookies do navegador desactivadas. Actíveas @@ -2914,6 +2925,8 @@ gl: remove as friend: Eliminar coma amizade add as friend: Engadir coma amizade mapper since: 'Cartógrafo dende:' + last map edit: 'Última edición do mapa:' + no activity yet: Aínda non hai actividade uid: 'Identificador de usuario:' ct status: 'Termos do colaborador:' ct undecided: Indeciso @@ -3277,13 +3290,6 @@ gl: queryfeature_disabled_tooltip: Achegar para consultar os elementos embed_html_disabled: A incorporación de HTML non está dispoñible para esta capa de mapa - changesets: - show: - comment: Comentar - subscribe: Subscribirse - unsubscribe: Cancelar a subscrición - hide_comment: agochar - unhide_comment: amosar edit_help: Desplaza o mapa e achégao na localización que queiras editar; logo, preme aquí. directions: diff --git a/config/locales/he.yml b/config/locales/he.yml index 365c8980d..b55b15620 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -545,8 +545,13 @@ he: discussion: דיון join_discussion: נא להיכנס לחשבון כדי להצטרף לדיון still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר. + subscribe: מינוי + unsubscribe: ביטול מינוי comment_by_html: הערה מאת %{user} %{time_ago} hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago} + hide_comment: הסתרה + unhide_comment: ביטול הסתרה + comment: להגיב changesetxml: XML של ערכת השינויים osmchangexml: osmChange XML paging_nav: @@ -618,6 +623,8 @@ he: title: היומן של%{user} ‏ | %{title} user_title: היומן של %{user} discussion: דיון + subscribe: מינוי + unsubscribe: ביטול מינוי leave_a_comment: הוספת תגובה login_to_leave_a_comment_html: נא %{login_link} כדי להשאיר תגובה login: להיכנס @@ -662,7 +669,14 @@ he: all: title: רשומות ביומן של OpenStreetMap description: רשומות יומן אחרונות ממשתמשי OpenStreetMap - comments: + subscribe: + heading: לעשות מינוי לדיון ברשומת היומן הבאה? + button: מינוי לדיון + unsubscribe: + heading: לבטל את המינוי לדיון ברשומת היומן הבאה? + button: ביטול המינוי לדיון + diary_comments: + index: title: הערות יומן שנוספו על־ידי %{user} heading: הערות ביומן של %{user} subheading_html: הערות יומן שנוספו על־ידי %{user} @@ -672,12 +686,6 @@ he: comment: תגובה newer_comments: הערות חדשות older_comments: הערות ישנות - subscribe: - heading: לעשות מינוי לדיון ברשומת היומן הבאה? - button: מינוי לדיון - unsubscribe: - heading: לבטל את המינוי לדיון ברשומת היומן הבאה? - button: ביטול המינוי לדיון doorkeeper: errors: messages: @@ -712,6 +720,9 @@ he: contact: ליצור קשר contact_the_community_html: אפשר %{contact_link} עם קהילת OpenStreetMap אם מצאת קישור פגום / תקלה. יש לתעד את הכתובת המדויקת של הבקשה שלך. + bad_request: + title: בקשה מקולקלת + description: הפעולה שביקשת בשרת OpenStreetMap אינה תקינה (HTTP 400) forbidden: title: אסור description: הפעולה שביקשת לבצע מול שרת OpenStreetMap זמינה למנהלים בלבד (HTTP @@ -1769,8 +1780,8 @@ he: היא ליד %{place}. commented_note_html: '%{commenter} הפעיל מחדש הערת מפה שהגבת עליה. הערה נמצאת ליד %{place}' - details: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url} - details_html: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url}. + details: אפשר להגיב להערה או לקבל מידע נוסף עליה בכתובת %{url} + details_html: אפשר להגיב להערה או לקבל מידע נוסף עליה בכתובת %{url} changeset_comment_notification: description: ערכת שינויים של OpenStreetMap מס׳ %{id} hi: שלום %{to_user}, @@ -1791,8 +1802,8 @@ he: partial_changeset_with_comment: עם ההערה '%{changeset_comment}' partial_changeset_with_comment_html: עם ההערה '%{changeset_comment}' partial_changeset_without_comment: ללא הערה - details: פרטים נוספים על ערכת השינויים אפשר למצוא בכתובת %{url} - details_html: פרטים נוספים על ערכת השינויים אפשר למצוא בכתובת %{url} + details: אפשר להגיב לערכת השינויים או לקבל מידע נוסף עליה בכתובת %{url} + details_html: אפשר להגיב לערכת השינויים או לקבל מידע נוסף עליה בכתובת %{url} unsubscribe: באפשרותך לבטל את המינוי לעדכונים מערכת השינויים הזאת בכתובת %{url}. unsubscribe_html: באפשרותך לבטל את המינוי לעדכונים מערכת השינויים הזאת בכתובת %{url}. @@ -2229,9 +2240,6 @@ he: index: js_1: הדפדפן שבו אתה משתמש אינו תומך ב־JavaScript, או שכיבית את השימוש ב־JavaScript. js_2: אתר OpenStreetMap משתמש ב־JavaScript למפה המחליקה. - permalink: קישור קבוע - shortlink: קישור מקוצר - createnote: הוספת הערה license: copyright: 'זכויות היוצרים: מיזם OpenStreetMap ותורמיו, בכפוף לרישיון פתוח' remote_failed: העריכה נכשלה – נא לוודא כי JOSM או Merkaartor נטענו ושאפשרות @@ -2608,6 +2616,8 @@ he: other: קובץ GPS עם %{count} נקודות מאת %{user} description_without_count: קובץ GPS מאת %{user} application: + basic_auth_disabled: 'אימות בסיסי ב־HTTP כבוי: %{link}' + oauth_10a_disabled: 'OAuth 1.0 ו־1.0a כבויים: %{link}' permission_denied: אין לך הרשאה לגשת לפעולה הזאת require_cookies: cookies_needed: נראה שהעוגיות כבויות אצלך – נא להפעיל עוגיות בדפדפן שלך כדי @@ -2879,6 +2889,8 @@ he: remove as friend: הסרה מרשימת חברים add as friend: הוספה כחבר mapper since: 'ממפה מאז:' + last map edit: 'עריכת מפה אחרונה:' + no activity yet: עדיין אין פעילות uid: 'מזהה משתמש:' ct status: 'תנאי תרומה:' ct undecided: עוד אין החלטה @@ -3164,6 +3176,10 @@ he: title: הערה חדשה intro: יש פה טעות או שחסר משהו? אנו מבקשים ממך לספר את זה לממפים אחרים. לשם כך צריך להזיז את הסמן למקום הנכון ולכתוב הערה שמסבירה את הבעיה. + anonymous_warning_html: לא נכנסת לחשבון. נא %{log_in} או %{sign_up} אם ברצונך + לקבל עדכונים על ההערה שלך. + anonymous_warning_log_in: להיכנס לחשבון + anonymous_warning_sign_up: להירשם advice: /start add: הוספת הערה javascripts: @@ -3243,13 +3259,6 @@ he: queryfeature_tooltip: שאילתת ישויות queryfeature_disabled_tooltip: התקרבות כדי להריץ שאילתת ישויות embed_html_disabled: הטבעת HTML אינה זמינה בשכבת המפה הזאת - changesets: - show: - comment: להגיב - subscribe: מינוי - unsubscribe: ביטול מינוי - hide_comment: הסתרה - unhide_comment: ביטול הסתרה edit_help: יש להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן. directions: ascend: מעלה diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 4c27fea94..b30ddb5ad 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -409,6 +409,7 @@ hi: join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा होगी। + comment: जवाब देना changesetxml: Changeset XML osmchangexml: osmChange XML paging_nav: @@ -504,7 +505,8 @@ hi: all: title: ओपनस्ट्रीटमैप डायरी एंट्री description: ओपनस्ट्रीटमैप के सदस्यों से नई डायरी एंट्रियाँ - comments: + diary_comments: + index: post: पोस्ट when: कब comment: टिप्पणी @@ -1078,9 +1080,6 @@ hi: javascripts: site: createnote_disabled_tooltip: नोट जोड़ने के लिए जूम इन करें - changesets: - show: - comment: जवाब देना directions: directions: रास्ता distance: दूरी diff --git a/config/locales/hr.yml b/config/locales/hr.yml index a01a6e06d..cbc190f53 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -393,6 +393,11 @@ hr: title: 'Set promjena: %{id}' discussion: Razgovor join_discussion: Prijavi se za uključivanje u raspravu + subscribe: Pretplati se + unsubscribe: Otkaži pretplatu + hide_comment: sakrij + unhide_comment: vrati sakriveno + comment: Komentiraj changesetxml: XLM Set promjena osmchangexml: osmChange XML paging_nav: @@ -493,7 +498,8 @@ hr: all: title: Zapisi u OpenStreetMap dnevniku description: Nedavni zapisi u dnevnik korisnika OpenStreetMapa - comments: + diary_comments: + index: post: PoÅ¡alji when: Kada comment: Komentar @@ -1307,9 +1313,6 @@ hr: js_1: Koristite preglednik koji ne podržava JavaScript ili Vam je JavaScript isključen. js_2: OpenStreetMap koristi JavaScript za slippy kartu. - permalink: Permalink - shortlink: Kratki link - createnote: Dodaj biljeÅ¡ku license: copyright: Autorska prava pripadaju OpenStreetMap-u i doprinositeljima, pod otvorenom licencijom @@ -1902,13 +1905,6 @@ hr: map_data_zoom_in_tooltip: Približi da vidiÅ¡ podatke karte queryfeature_tooltip: Provjeri elemente karte queryfeature_disabled_tooltip: Približi za provjeru elemenata - changesets: - show: - comment: Komentiraj - subscribe: Pretplati se - unsubscribe: Otkaži pretplatu - hide_comment: sakrij - unhide_comment: vrati sakriveno edit_help: Pomakni kartu i približi dio koji želiÅ¡ urediti, zatim klikni ovdje. directions: engines: diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 96b9ebff2..e845df375 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -464,8 +464,13 @@ hsb: join_discussion: Přizjew so, zo by móhł(a) sobu diskutować still_open: Sadźba změnow je hišće wočinjena. Diskusija so wočinja, ručež je sadźba změnow začinjena. + subscribe: Abonować + unsubscribe: Wotskazać comment_by_html: Komentar wot %{user} %{time_ago} hidden_comment_by_html: Schowany komentar wot %{user} %{time_ago} + hide_comment: schować + unhide_comment: pokazać + comment: Komentar changesetxml: Sadźba změnow XML osmchangexml: osmChange XML paging_nav: @@ -581,7 +586,12 @@ hsb: all: title: OpenStreetMap dźenikowe zapiski description: NajnowÅ¡e dźenikowe zapiski wužiwarjow OpenStreetMap - comments: + subscribe: + button: Diskusiju abonować + unsubscribe: + button: Diskusiju wotskazać + diary_comments: + index: title: Dźenikowe komentary přidate wot wužiwarja %{user} heading: Dźenikowe komentary wot wužiwarja %{user} subheading_html: Dźenikowe komentary přidate wot wužiwarja %{user} @@ -591,10 +601,6 @@ hsb: comment: Komentar newer_comments: NowÅ¡e komentary older_comments: StarÅ¡e komentary - subscribe: - button: Diskusiju abonować - unsubscribe: - button: Diskusiju wotskazać doorkeeper: flash: applications: @@ -1932,9 +1938,6 @@ hsb: js_1: Pak wužiwaÅ¡ wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript znjemóžnił. js_2: OpenStreetMap JavaScript za slippy map wužiwa. - permalink: Trajny wotkaz - shortlink: Krótki wotkaz - createnote: Pokazku přidać license: copyright: Copyright OpenStreetMap a sobuskutkowarjo, pod wotewrjenej licencu remote_failed: Wobdźěłowanje je so njeporadźiło - zawěsć, zo JOSM abo Merkaartor @@ -2801,13 +2804,6 @@ hsb: map_data_zoom_in_tooltip: PowjetÅ¡ kartu, zo by daty widźał queryfeature_tooltip: Funkcije napraÅ¡ować queryfeature_disabled_tooltip: Za napraÅ¡owanje funkcijow powjetÅ¡ić - changesets: - show: - comment: Komentar - subscribe: Abonować - unsubscribe: Wotskazać - hide_comment: schować - unhide_comment: pokazać edit_help: Přesuń kartu do městna, kotrež chceÅ¡ wobdźěłać, powjetÅ¡ tam a klikń potom tu. directions: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 759414b84..3ed904d0c 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -515,8 +515,13 @@ hu: join_discussion: Jelentkezz be, hogy bekapcsolódhass a megbeszélésbe still_open: A módosításcsomag még nyitva van – a megbeszélés akkor nyílik meg, ha a módosításcsomag lezárul. + subscribe: Feliratkozás + unsubscribe: Leiratkozás comment_by_html: Hozzászólt %{user} %{time_ago} hidden_comment_by_html: Rejtett hozzászólás %{user} felhasználótól %{time_ago} + hide_comment: elrejt + unhide_comment: megjelenít + comment: Hozzászólás changesetxml: Módosításcsomag adatai (XML) osmchangexml: Módosításcsomag tartalma (osmChange XML) paging_nav: @@ -635,7 +640,14 @@ hu: all: title: OpenStreetMap naplóbejegyzések description: Legutóbbi naplóbejegyzések az OpenStreetMap felhasználóitól - comments: + subscribe: + heading: Feliratkozol a következő naplóbejegyzés-megbeszélésre? + button: Feliratkozás a megbeszélésre + unsubscribe: + heading: Leiratkozol a következő naplóbejegyzés-megbeszélésről? + button: Leiratkozás a megbeszélésről + diary_comments: + index: title: '%{user} naplóhozzászólásai' heading: '%{user} naplóhozzászólásai' subheading_html: '%{user} naplóhozzászólásai' @@ -645,12 +657,6 @@ hu: comment: Hozzászólás newer_comments: Újabb hozzászólások older_comments: Régebbi hozzászólások - subscribe: - heading: Feliratkozol a következő naplóbejegyzés-megbeszélésre? - button: Feliratkozás a megbeszélésre - unsubscribe: - heading: Leiratkozol a következő naplóbejegyzés-megbeszélésről? - button: Leiratkozás a megbeszélésről doorkeeper: errors: messages: @@ -2153,9 +2159,6 @@ hu: js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet, vagy letiltottad a JavaScriptet. js_2: Az OpenStreetMap JavaScriptet használ a slippy maphoz. - permalink: Permalink - shortlink: Shortlink - createnote: Új jegyzet license: copyright: Copyright OpenStreetMap és közreműködői, egy nyílt licenc alatt remote_failed: A szerkesztés nem sikerült. Győződj meg róla, hogy a JOSM vagy @@ -3148,13 +3151,6 @@ hu: queryfeature_tooltip: Objektumok lekérdezése queryfeature_disabled_tooltip: Objektumok lekérdezéséhez nagyíts a térképre embed_html_disabled: Ezen a térképrétegen nem lehet HTML-t beágyazni - changesets: - show: - comment: Hozzászólás - subscribe: Feliratkozás - unsubscribe: Leiratkozás - hide_comment: elrejt - unhide_comment: megjelenít edit_help: Mozgasd a térképet, nagyíts ott ahol módosítani szeretnéd, majd kattints ide. directions: diff --git a/config/locales/ia.yml b/config/locales/ia.yml index be024cccb..81b65fb3a 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -256,7 +256,7 @@ ia: delete_introduction: 'Tu pote deler tu conto OpenStreetMap con le button sequente. Nota ben que:' delete_profile: Tu information de profilo, includente tu avatar, description - e domicilio, essera removite. + e loco de residentia, essera removite. delete_display_name: Tu nomine a monstrar essera removite e potera esser reusate per altere contos. retain_caveats: 'Nonobstante, alcun informationes sur te essera retenite sur @@ -489,8 +489,13 @@ ia: join_discussion: Aperi session pro unir te al discussion still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira quando le gruppo de modificationes essera claudite. + subscribe: Subscriber + unsubscribe: Cancellar subscription comment_by_html: Commento de %{user} %{time_ago} hidden_comment_by_html: Commento celate de %{user} %{time_ago} + hide_comment: celar + unhide_comment: revelar + comment: Commento changesetxml: XML del gruppo de modificationes osmchangexml: XML osmChange paging_nav: @@ -529,8 +534,8 @@ ia: friend: Amico show: title: Mi pannello - no_home_location_html: '%{edit_profile_link} e defini tu loco de domicilio pro - vider le usatores a proximitate.' + no_home_location_html: '%{edit_profile_link} e defini tu loco de residentia + pro vider le usatores a proximitate.' edit_your_profile: Modifica tu profilo my friends: Mi amicos no friends: Tu non ha ancora addite alcun amico. @@ -566,6 +571,8 @@ ia: title: Diario de %{user} | %{title} user_title: Diario de %{user} discussion: Discussion + subscribe: Abonar me + unsubscribe: Disabonar me leave_a_comment: Lassar un commento login_to_leave_a_comment_html: '%{login_link} pro lassar un commento' login: Aperir session @@ -608,7 +615,14 @@ ia: all: title: Entratas de diario de OpenStreetMap description: Entratas recente de diario de usatores de OpenStreetMap - comments: + subscribe: + heading: Abonar te al sequente discussion de entrata de diario? + button: Abonar te al discussion + unsubscribe: + heading: Disabonar te del sequente discussion de entrata de diario? + button: Disabonar te del discussion + diary_comments: + index: title: Commentos de diario addite per %{user} heading: Commento de diario de %{user} subheading_html: Commentos de diario addite per %{user} @@ -618,12 +632,6 @@ ia: comment: Commento newer_comments: Commentos plus recente older_comments: Commentos plus ancian - subscribe: - heading: Abonar te al sequente discussion de entrata de diario? - button: Abonar te al discussion - unsubscribe: - heading: Disabonar te del sequente discussion de entrata de diario? - button: Disabonar te del discussion doorkeeper: errors: messages: @@ -665,6 +673,10 @@ ia: contact_the_community_html: Sia libere de %{contact_link} le communitate de OpenStreetMap si tu ha trovate un ligamine rupte o qualcunque anomalia. Nota le URL exacte de tu requesta. + bad_request: + title: Mal requesta + description: Le operation que tu ha requestate sur le servitor de OpenStreetMap + non es valide (HTTP 400) forbidden: title: Prohibite description: Le operation que tu ha requestate sur le servitor de OpenStreetMap @@ -1578,7 +1590,7 @@ ia: layouts: logo: alt_text: Logo de OpenStreetMap - home: Vader al position de initio + home: Vader al loco de residentia logout: Clauder session log_in: Aperir session sign_up: Crear conto @@ -1739,8 +1751,8 @@ ia: Le nota es in le vicinitate de %{place}.' commented_note_html: '%{commenter} ha reactivate un nota de carta que tu ha commentate. Le nota es in le vicinitate de %{place}.' - details: Plus detalios sur le nota pote esser trovate a %{url}. - details_html: Plus detalios sur le nota pote esser trovate a %{url}. + details: Responde o discoperi plus sur le nota a %{url}. + details_html: Responde o discoperi plus sur le nota a %{url}. changeset_comment_notification: description: 'Gruppo de modificationes OpenStreetMap #%{id}' hi: Salute %{to_user}, @@ -1761,10 +1773,8 @@ ia: partial_changeset_with_comment: con commento '%{changeset_comment}' partial_changeset_with_comment_html: con commento '%{changeset_comment}' partial_changeset_without_comment: sin commento - details: Plus detalios sur le gruppo de modificationes pote esser trovate a - %{url}. - details_html: Plus detalios sur le gruppo de modificationes pote esser trovate - a %{url}. + details: Responde o discoperi plus sur le gruppo de modificationes a %{url}. + details_html: Responde o discoperi plus sur le gruppo de modificationes a %{url}. unsubscribe: Tu pote disabonar te del actualisationes de iste gruppo de modificationes sur %{url}. unsubscribe_html: Tu pote disabonar te del actualisationes de iste gruppo de @@ -1927,9 +1937,9 @@ ia: delete image: Remover le imagine actual replace image: Reimplaciar le imagine actual image size hint: (imagines quadrate de al minus 100×100 functiona melio) - home location: Position de origine - no home location: Tu non ha entrate tu position de origine. - update home location on click: Actualisar le position de origine quando io clicca + home location: Loco de residentia + no home location: Tu non ha definite tu loco de residentia. + update home location on click: Actualisar le loco de residentia quando io clicca sur le carta? show: Monstrar delete: Deler @@ -2200,9 +2210,6 @@ ia: js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate JavaScript. js_2: OpenStreetMap usa JavaScript pro su carta glissante. - permalink: Permaligamine - shortlink: Ligamine curte - createnote: Adder un nota license: copyright: Copyright OpenStreetMap e contributores, sub licentia aperte remote_failed: Modification fallite - assecura te que JOSM o Merkaartor es cargate @@ -2600,6 +2607,8 @@ ia: other: File GPX con %{count} punctos de %{user} description_without_count: File GPX de %{user} application: + basic_auth_disabled: 'Le authentication HTTP basic es disactivate: %{link}' + oauth_10a_disabled: 'OAuth 1.0 e 1.0a es disactivate: %{link}' permission_denied: Tu non ha le permission de acceder a iste action require_cookies: cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies @@ -2882,6 +2891,8 @@ ia: remove as friend: Remover amico add as friend: Adder amico mapper since: 'Cartographo depost:' + last map edit: 'Ultime modification del carta:' + no activity yet: Necun activitate ancora uid: 'ID de usator:' ct status: 'Conditiones de contributor:' ct undecided: Indecise @@ -3161,6 +3172,10 @@ ia: intro: Tu ha trovate un error? Qualcosa manca? Face lo saper al altere cartographos a fin que nos pote corriger lo. Displacia le marcator al position correcte e scribe un nota pro explicar le problema. + anonymous_warning_html: Tu non ha aperite session. Per favor %{log_in} o %{sign_up} + si tu vole reciper actualisationes pro tu nota. + anonymous_warning_log_in: aperi session + anonymous_warning_sign_up: crea un conto advice: Tu nota es public e pote esser usate pro actualisar le carta. Dunque, non insere alcun information personal, ni datos ab cartas o catalogos protegite per derectos de autor. @@ -3239,13 +3254,6 @@ ia: queryfeature_disabled_tooltip: Face zoom avante pro cercar objectos embed_html_disabled: Le incastration de HTML non es disponibile pro iste strato cartographic - changesets: - show: - comment: Commento - subscribe: Subscriber - unsubscribe: Cancellar subscription - hide_comment: celar - unhide_comment: revelar edit_help: Displacia le carta e face zoom avante in un loco que tu vole modificar, postea clicca hic. directions: diff --git a/config/locales/id.yml b/config/locales/id.yml index 0cb3aea07..263f78360 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -484,8 +484,13 @@ id: join_discussion: Masuk untuk bergabung diskusi still_open: Set perubahan masih terbuka - diskusi akan dibuka ketika set perubahan telah ditutup. + subscribe: Berlangganan + unsubscribe: Berhenti berlangganan comment_by_html: Komentar dari %{user} %{time_ago} hidden_comment_by_html: Komentar tersembunyi dari %{user} %{time_ago} + hide_comment: sembunyikan + unhide_comment: Jangan sembunyikan + comment: Komentar changesetxml: Set Perubahan XML osmchangexml: osmChange XML paging_nav: @@ -601,7 +606,8 @@ id: all: title: Entri catatan harian OpenStreetMap description: Entri catatan harian terbaru dari pengguna OpenStreetMap - comments: + diary_comments: + index: title: Komentar Buku Harian ditambahkan oleh %{user} heading: Komentar Buku Harian %{user} subheading_html: Komentar Buku Harian yang ditambahkan oleh %{user} @@ -2158,9 +2164,6 @@ id: js_1: Anda menggunakan browser yang tidak mendukung JavaScript, atau Anda telah menonaktifkan JavaScript. js_2: OpenStreetMap menggunakan JavaScript untuk slippy map nya. - permalink: Permalink - shortlink: Shortlink - createnote: Tambahkan catatan license: copyright: Hak cipta dan kontributor OpenStreetMap, di bawah lisensi terbuka remote_failed: Gagal melakukan edit - pastikan JOSM atau Merkaartor telah termuat @@ -3151,13 +3154,6 @@ id: queryfeature_tooltip: Fitur kueri queryfeature_disabled_tooltip: Perbesar ke fitur kueri embed_html_disabled: Penyematan HTML tidak tersedia untuk lapisan peta ini - changesets: - show: - comment: Komentar - subscribe: Berlangganan - unsubscribe: Berhenti berlangganan - hide_comment: sembunyikan - unhide_comment: Jangan sembunyikan edit_help: Memindahkan peta dan memperbesar lokasi yang ingin Anda sunting, kemudian klik di sini. directions: diff --git a/config/locales/is.yml b/config/locales/is.yml index 8adacfff3..7e6039c73 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -471,8 +471,13 @@ is: join_discussion: Skráðu þig inn til að taka þátt í umræðunni still_open: Breytingasett er enn opið - Umræða mun opnast þegar breytingasettinu hefur verið lokað. + subscribe: Gerast áskrifandi + unsubscribe: Hætta í áskrift comment_by_html: Umsögn frá %{user} %{time_ago} hidden_comment_by_html: Falin umsögn frá %{user} %{time_ago} + hide_comment: fela + unhide_comment: hætta að fela + comment: Athugasemd changesetxml: XML breytingasetts osmchangexml: XML osmChange paging_nav: @@ -588,7 +593,8 @@ is: all: title: OpenStreetMap bloggfærslur description: Nýjustu bloggfærslur frá notendum OpenStreetMap - comments: + diary_comments: + index: title: Dagbók Athugasemdir bætt við af %{user} heading: Athugasemdir dagbókar %{user} subheading_html: Dagbóka Athugasemdir bætt við af %{user} @@ -2161,9 +2167,6 @@ is: js_1: Þú ert annaðhvort að nota vafra sem styður ekki JavaScript eða hefur slökkt á JavaScript stuðning. js_2: OpenStreetMap notar JavaScript til að útfæra gagnvirk kort. - permalink: Varanlegur tengill - shortlink: Varanlegur smátengill - createnote: Bæta við minnispunkti license: copyright: Höfundarréttur OpenStreetMap og þátttakendur, með opnu notkunarleyfi remote_failed: Breytingar mistókust - gakktu úr skugga um að JOSM eða Merkaartor @@ -3143,13 +3146,6 @@ is: map_data_zoom_in_tooltip: Renndu að til að skoða gögn kortsins queryfeature_tooltip: Rannsaka fitjur queryfeature_disabled_tooltip: Renndu að til að rannsaka fitjur - changesets: - show: - comment: Athugasemd - subscribe: Gerast áskrifandi - unsubscribe: Hætta í áskrift - hide_comment: fela - unhide_comment: hætta að fela edit_help: Færðu kortið og stilltu aðdrátt inn á staðinn sem þú vilt breyta, smelltu síðan hér. directions: diff --git a/config/locales/it.yml b/config/locales/it.yml index 5db27d3b8..25cb7fcbb 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -550,8 +550,13 @@ it: join_discussion: Accedi per unirti alla discussione still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno disponibili quando verrà chiuso. + subscribe: Iscriviti + unsubscribe: Annulla iscrizione comment_by_html: Commento da %{user} %{time_ago} hidden_comment_by_html: Commento nascosto da %{user} %{time_ago} + hide_comment: nascondi + unhide_comment: Rendi visibile + comment: Commenta changesetxml: Gruppo di modifiche XML osmchangexml: XML in formato osmChange paging_nav: @@ -625,6 +630,8 @@ it: title: Diario di %{user} | %{title} user_title: Diario di %{user} discussion: Discussione + subscribe: Iscriviti + unsubscribe: Annulla iscrizione leave_a_comment: Lascia un commento login_to_leave_a_comment_html: '%{login_link} per lasciare un commento' login: Entra @@ -668,7 +675,14 @@ it: all: title: Voci del diario di OpenStreetMap description: Voci del diario recenti degli utenti di OpenStreetMap - comments: + subscribe: + heading: Vuoi iscriverti alla seguente discussione sul diario? + button: Iscriviti alla discussione + unsubscribe: + heading: Annullare l'iscrizione alla seguente discussione sul diario? + button: Annulla l'iscrizione alla discussione + diary_comments: + index: title: Commenti del diario aggiunti da %{user} heading: I commenti del diario di %{user} subheading_html: Commenti del diario aggiunti da %{user} @@ -678,12 +692,6 @@ it: comment: Commento newer_comments: Commenti più recenti older_comments: Commenti più vecchi - subscribe: - heading: Vuoi iscriverti alla seguente discussione sul diario? - button: Iscriviti alla discussione - unsubscribe: - heading: Annullare l'iscrizione alla seguente discussione sul diario? - button: Annulla l'iscrizione alla discussione doorkeeper: errors: messages: @@ -725,6 +733,10 @@ it: contact_the_community_html: Se hai trovato un link non funzionante o un bug, sentiti libero di %{contact_link} la comunità OpenStreetMap. Prendi nota dell'indirizzo URL esatto della tua richiesta. + bad_request: + title: Richiesta errata + description: L'operazione richiesta al server OpenStreetMap non è valida (HTTP + 400) forbidden: title: Vietato description: L'operazione che hai richiesto sul server OpenStreetMap è disponibile @@ -1797,8 +1809,8 @@ it: La nota si trova vicino a %{place}.' commented_note_html: '%{commenter} ha riattivato una nota che avevi commentato. La nota si trova vicino a %{place}.' - details: Ulteriori dettagli sulla nota possono essere trovati su %{url}. - details_html: Ulteriori dettagli sulla nota possono essere trovati su %{url}. + details: Rispondi o scopri di più sulla nota su %{url}. + details_html: Rispondi o scopri di più sulla nota su %{url}. changeset_comment_notification: description: 'Gruppo di modifiche OpenStreetMap #%{id}' hi: Ciao %{to_user}, @@ -1818,10 +1830,8 @@ it: partial_changeset_with_comment: con il commento '%{changeset_comment}' partial_changeset_with_comment_html: con il commento '%{changeset_comment}' partial_changeset_without_comment: senza commento - details: Ulteriori dettagli sul gruppo di modifiche possono essere trovati su - %{url}. - details_html: Ulteriori dettagli sul gruppo di modifiche possono essere trovati - su %{url}. + details: Rispondi o scopri di più sul gruppo di modifiche su %{url}. + details_html: Rispondi o scopri di più sul gruppo di modifiche su %{url}. unsubscribe: Puoi annullare l'iscrizione agli aggiornamenti di questo insieme di modifiche su %{url}. unsubscribe_html: Puoi annullare l'iscrizione agli aggiornamenti di questo insieme @@ -1999,6 +2009,7 @@ it: new: title: Entra tab_title: Entra + login_to_authorize_html: Accedi a OpenStreetMap per accedere a %{client_app_name}. email or username: Indirizzo e-mail o nome utente password: Password remember: Ricordati di me @@ -2253,9 +2264,6 @@ it: js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato disabilitato JavaScript. js_2: OpenStreetMap utilizza JavaScript per le sua mappa. - permalink: Link permanente - shortlink: Link breve - createnote: Aggiungi una nota license: copyright: Copyright OpenStreetMap e collaboratori, sotto una licenza aperta remote_failed: Modifica non riuscita - assicurarsi che JOSM o Merkaartor sia @@ -2660,6 +2668,8 @@ it: other: File GPX con %{count} punti da %{user} description_without_count: File GPX da %{user} application: + basic_auth_disabled: 'L''autenticazione di base HTTP è disabilitata: %{link}' + oauth_10a_disabled: 'OAuth 1.0 e 1.0a sono disabilitati: %{link}' permission_denied: Non disponi dei permessi necessari per eseguire questa azione require_cookies: cookies_needed: Pare che tu abbia i cookie non abilitati - abilita i cookie @@ -2843,6 +2853,7 @@ it: new: title: Registrati tab_title: Registrati + signup_to_authorize_html: Registrati su OpenStreetMap per accedere a %{client_app_name}. no_auto_account_create: Sfortunatamente in questo momento non è possibile creare automaticamente per te un profilo. please_contact_support_html: Contatta %{support_link} per organizzare la creazione @@ -2855,8 +2866,13 @@ it: scaricarla o usarla. paragraph_2: Registrati per iniziare a contribuire. welcome: Benvenuti in OpenStreetMap + duplicate_social_email: Se hai già un account OpenStreetMap e desideri utilizzare + un provider d'identità di terze parti, accedi utilizzando la tua password + e modifica le impostazioni del tuo account. display name description: Il proprio nome utente visualizzato pubblicamente. Può essere modificato più tardi nelle preferenze. + by_signing_up_html: Registrandoti, accetti i nostri %{tou_link}, %{privacy_policy_link} + e %{contributor_terms_link}. tou: condizioni d'uso contributor_terms: regole per contribuire external auth: 'Autenticazione tramite terze parti:' @@ -2867,6 +2883,7 @@ it: privacy_policy: normativa sulla privacy privacy_policy_title: Informativa sulla privacy di OSM Foundation compresa la sezione sugli indirizzi e-mail + consider_pd_html: Considero i miei contributi in %{consider_pd_link}. consider_pd: pubblico dominio or: o use external auth: o registrati tramite terze parti @@ -2934,6 +2951,8 @@ it: remove as friend: Rimuovi amico add as friend: Aggiungi amico mapper since: 'Mappatore dal:' + last map edit: 'Ultima modifica della mappa:' + no activity yet: Non ci sono ancora attività uid: 'ID utente:' ct status: 'Termini di collaborazione:' ct undecided: Indeciso @@ -3214,6 +3233,8 @@ it: intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli altri mappatori così possono correggerlo. Sposta il puntatore nella posizione esatta e inserisci una nota per spiegare il problema. + anonymous_warning_html: Non hai effettuato l'accesso. %{log_in} oppure %{sign_up} + se desideri ricevere aggiornamenti sulla tua nota. anonymous_warning_log_in: entra anonymous_warning_sign_up: registrati advice: La tua nota è pubblica e potrebbe essere utilizzata per aggiornare la @@ -3294,13 +3315,6 @@ it: queryfeature_disabled_tooltip: Ingrandisci per ricercare elementi embed_html_disabled: L'incorporamento HTML non è disponibile per questo livello mappa - changesets: - show: - comment: Commenta - subscribe: Iscriviti - unsubscribe: Annulla iscrizione - hide_comment: nascondi - unhide_comment: Rendi visibile edit_help: Sposta la mappa e usa lo zoom sulla posizione che vuoi modificare, quindi clicca qui. directions: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 9d7bccaa1..4c05c4ace 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -478,6 +478,11 @@ ja: discussion: 議論 join_discussion: 議論に参加するにはログインしてください still_open: 変更セットが開いたままです - 議論を行うには変更セットを閉じる必要があります。 + subscribe: 購読 + unsubscribe: 購読停止 + hide_comment: 非表示 + unhide_comment: 非表示を解除 + comment: コメント changesetxml: 変更セット XML osmchangexml: OSM 差分 XML paging_nav: @@ -587,7 +592,8 @@ ja: all: title: OpenStreetMap 利用者の日記エントリ description: OpenStreetMap 利用者による最近の日記エントリ - comments: + diary_comments: + index: title: '%{user}が追加した日記コメント' heading: '%{user}の日記コメント' subheading_html: '%{user}が追加した日記コメント' @@ -1881,9 +1887,6 @@ ja: index: js_1: JavaScript に対応していないブラウザーを使用しているか、JavaScript を無効にしているかのどちらかです。 js_2: OpenStreetMap は地図の表示に JavaScript を使用します。 - permalink: 固定リンク - shortlink: 短縮リンク - createnote: メモを追加 license: copyright: オープンライセンスによるOpenStreetMapおよび協力者の著作権を保護する remote_failed: 編集に失敗しました - JOSM または Merkaartor を起動し、リモート制御オプションが有効になっていることを確認してください @@ -2347,13 +2350,24 @@ ja: support: サポート about: header: フリー、編集可能 + paragraph_1: 他の地図とは異なり、OpenStreetMapは完全に皆さんのような人によって作成されおり、誰でも自由に修正・更新・ダウンロード・利用ができます。 + paragraph_2: 投稿を通じて貢献するには、登録が必要です。 + welcome: OpenStreetMap へようこそ。 + duplicate_social_email: すでに OpenStreetMap アカウントをお持ちで第三者認証プロバイダーを使用したい場合は、パスワードを使用してログインしたうえでアカウントの設定を変更してください。 display name description: あなたの公開利用者名です。あとで個人設定で変更できます。 + by_signing_up_html: 登録することで %{tou_link}、 %{privacy_policy_link}と %{contributor_terms_link}に同意したことになります。 + tou: 利用規約 + contributor_terms: 協力者規約 external auth: 'サードパーティ認証:' continue: 利用者登録 terms accepted: 新しい協力者規約を承諾していただき、ありがとうございます! + email_help_html: あなたのアドレスは公開されません。詳細については、%{privacy_policy_link} をご覧ください。 privacy_policy: プライバシー・ポリシー + privacy_policy_title: OSMFのプライバシーポリシー（電子メールアドレスに関するセクションを含む） + consider_pd_html: 私の貢献は %{consider_pd_link} にあるとみなします。 consider_pd: パブリックドメイン - use external auth: サードパーティのアカウントでもログインできます + or: または + use external auth: サードパーティのアカウントでもログインできます。 terms: title: 規約 heading: 規約 @@ -2365,6 +2379,7 @@ ja: read_tou: 私は利用規約を読み終え、これに同意します consider_pd: 上記に加え、私の投稿をパブリック ドメインとします consider_pd_why: これは何ですか? + guidance_info_html: 'これらの用語を理解するのに役立つ情報: %{readable_summary_link} といくつかの %{informal_translations_link}' readable_summary: 人間が読める要約 informal_translations: 非公式の翻訳 continue: 続行 @@ -2410,6 +2425,8 @@ ja: remove as friend: 友達を解除 add as friend: 友達として追加 mapper since: 'マッパー歴:' + last map edit: '地図の最後の編集:' + no activity yet: 活動がありません uid: '利用者id:' ct status: '協力者規約:' ct undecided: 未決定 @@ -2425,6 +2442,7 @@ ja: grant: administrator: 管理者権限を許可 moderator: モデレーター権限を許可 + importer: importerアクセス権を付与する revoke: administrator: 管理者権限を剥奪 moderator: モデレーター権限を剥奪 @@ -2685,13 +2703,6 @@ ja: queryfeature_tooltip: 地物を検索 queryfeature_disabled_tooltip: 検索した地物にズーム embed_html_disabled: このマップレイヤーではHTML埋め込みは利用できません - changesets: - show: - comment: コメント - subscribe: 購読 - unsubscribe: 購読停止 - hide_comment: 非表示 - unhide_comment: 非表示を解除 edit_help: 編集したい位置に移動してズームインしてから、ここをクリックしてください。 directions: ascend: 上り坂 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 2e9f02aa4..c2d262a3e 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -283,7 +283,8 @@ ka: location: 'მდებარეობა:' view: იხილეთ edit: რედაქტირება - comments: + diary_comments: + index: post: პოსტი when: როდის comment: კომენტარი @@ -891,10 +892,6 @@ ka: mapping_link: კარტოგრაფირების დაწყება legal_babble: title_html: საავტორო უფლებები და ლიცენზია - index: - permalink: მუდმივი ბმული - shortlink: მოკლე ბმული - createnote: შენიშვნის დამატება edit: user_page_link: მომხმარებლის გვერდი export: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index dc9724bc6..b27abff77 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -347,6 +347,11 @@ kab: join_discussion: Qqen akken ad tedduḍ ar usqerdec still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa ttwamedlen. + subscribe: Jerred + unsubscribe: FfeÉ£ seg ujerred + hide_comment: ffer + unhide_comment: sken + comment: Awennit changesetxml: XML n ugraw n ibeddilen osmchangexml: XML osmChange paging_nav: @@ -452,7 +457,8 @@ kab: all: title: Imagraden n iÉ£misen OpenStreetMap description: Imagraden inegguran n iÉ£misen n iseqdacen OpenStreetMap - comments: + diary_comments: + index: post: Amagrad when: Melmi comment: Awennit @@ -998,10 +1004,6 @@ kab: title: Amedya n uttekki more_title_html: Akken ad tafeḍ ugar n telÉ£ut contributors_title_html: Iwiziwen-nneÉ£ - index: - permalink: AseÉ£wen yezgan - shortlink: AseÉ£wen awezlan - createnote: Rnu tazmilt edit: user_page_link: asebter n useqdac export: @@ -1374,13 +1376,6 @@ kab: edit_tooltip: Ẓreg takarḍa createnote_tooltip: Rnu tazmilt ar tkarḍa queryfeature_tooltip: isitar É£ef tmahilin - changesets: - show: - comment: Awennit - subscribe: Jerred - unsubscribe: FfeÉ£ seg ujerred - hide_comment: ffer - unhide_comment: sken directions: engines: fossgis_osrm_car: S tkeṛṛust (OSRM) diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml index fe4518973..ca1fd0fc4 100644 --- a/config/locales/kk-cyrl.yml +++ b/config/locales/kk-cyrl.yml @@ -340,6 +340,9 @@ kk-cyrl: show: title: 'Өңдеме дестесі: %{id}' discussion: Талқылау + subscribe: Жазылу + hide_comment: жасыру + unhide_comment: көрсету changesetxml: Өңдеме дестесінің XML-і osmchangexml: osmChange XML paging_nav: @@ -398,13 +401,14 @@ kk-cyrl: confirm: Құптау location: edit: Өңдеу - comments: + subscribe: + button: Талқыға жазылу + diary_comments: + index: when: Қашан comment: Пікір newer_comments: Жаңалау пікірлер older_comments: Ескілеу пікірлер - subscribe: - button: Талқыға жазылу doorkeeper: flash: applications: @@ -1061,10 +1065,6 @@ kk-cyrl: contributors_es_spain: Испания contributors_za_south_africa: Оңтүстік Африка contributors_gb_united_kingdom: Ұлыбритания - index: - permalink: Тұрақты сілтеме - shortlink: Қысқа сілтеме - createnote: Ескертпе қосу edit: user_page_link: қолданушы беті export: @@ -1310,11 +1310,6 @@ kk-cyrl: queryfeature_tooltip: Маңайдағы нысандар queryfeature_disabled_tooltip: Маңайдағы нысандарды көру үшін картаны үлкейтіп жіберіңіз - changesets: - show: - subscribe: Жазылу - hide_comment: жасыру - unhide_comment: көрсету directions: engines: fossgis_osrm_bike: Велосипед (OSRM) diff --git a/config/locales/kn.yml b/config/locales/kn.yml index 584c3e5ce..a41272f9c 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -390,7 +390,8 @@ kn: description: ಓಪನ್‍ಸ್ಟ್ರೀಟ್‍ಮ್ಯಾಪ್ ನಲ್ಲಿ %{user} ಅವರ ಇತ್ತೀಚಿನ ದಿನಚರಿ ದಾಖಲಾತಿಗಳು language: title: '%{language_name} ಭಾಷೆಯಲ್ಲಿ ಓಪನ್‍ಸ್ಟ್ರೀಟ್‍ಮ್ಯಾಪ್‍ನ ದಿನಚರಿ ದಾಖಲಾತಿಗಳು' - comments: + diary_comments: + index: post: ಪೋಸ್ಟ್ ಮಾಡಿ when: ಯಾವಾಗ comment: ಟಿಪ್ಪಣಿ diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 03188391b..de1c6a90f 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -86,6 +86,9 @@ ko: messages: invalid_email_address: 유효한 이메일 주소로 보이지 않음 email_address_not_routable: 라우팅할 수 없음 + models: + user_mute: + is_already_muted: 님은 이미 음소거되어 있습니다 models: acl: 접근 제어 목록 changeset: 바뀜집합 @@ -416,6 +419,15 @@ ko: introduction: 근처의 지물을 찾으려면 지도에서 클릭하세요. nearby: 근처 지물 enclosing: 근접 지역 내 지물 + old_nodes: + not_found: + sorry: '죄송합니다. 버전 %{version}의 노드 #%{id}를 찾을 수 없습니다.' + old_ways: + not_found: + sorry: '죄송합니다. 버전 %{version}의 경로 #%{id}를 찾을 수 없습니다.' + old_relations: + not_found: + sorry: '죄송합니다. 버전 %{version}의 관계 #%{id}를 찾을 수 없습니다.' changesets: changeset_paging_nav: showing_page: '%{page}쪽' @@ -472,8 +484,13 @@ ko: discussion: 토론 join_discussion: 토론에 참여하려면 로그인하세요 still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다. + subscribe: 구독 + unsubscribe: 구독 해지 comment_by_html: '%{time_ago} %{user}님의 의견' hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견' + hide_comment: 숨기기 + unhide_comment: 숨기기 취소 + comment: 의견 changesetxml: 바뀜집합 XML osmchangexml: osmChange XML paging_nav: @@ -583,7 +600,13 @@ ko: all: title: 오픈스트리트맵 일기 항목 description: 오픈스트리트맵 사용자의 최근 일기 항목 - comments: + subscribe: + heading: 다음 일기 항목 토론에 구독하시겠습니까? + button: 토론 구독 + unsubscribe: + button: 토론 구독 취소 + diary_comments: + index: title: '%{user}님이 추가한 일기 댓글' heading: '%{user}의 일기 댓글' subheading_html: '%{user}님이 추가한 일기 댓글' @@ -593,11 +616,6 @@ ko: comment: 의견 newer_comments: 새 의견 older_comments: 이전 의견 - subscribe: - heading: 다음 일기 항목 토론에 구독하시겠습니까? - button: 토론 구독 - unsubscribe: - button: 토론 구독 취소 doorkeeper: flash: applications: @@ -620,6 +638,8 @@ ko: contact: 여러 연락 수단 contact_the_community_html: 끊어진 링크나 버그를 발견했다면 언제든지 오픈스트리트맵 커뮤니티에 %{contact_link}으로 알려주십시오. 요청의 정확한 URL을 기록해 두십시오. + bad_request: + title: 잘못된 요청 forbidden: title: 접근 거부됨 description: 오픈스트리트맵 서버에 요청한 이 작업은 관리자만 사용할 수 있습니다(HTTP 403). @@ -1794,7 +1814,8 @@ ko: lost password link: 비밀번호를 잊으셨나요? login_button: 로그인 register now: 지금 등록하세요 - with external: '다른 제3자 로그인 방식 사용하기:' + with external: 혹은 제3자 방식으로 로그인하기 + or: 혹은 auth failure: 죄송합니다, 입력한 정보로 로그인할 수 없습니다. destroy: title: 로그아웃 @@ -1997,9 +2018,6 @@ ko: index: js_1: 자바스크립트를 지원하지 않는 브라우저를 사용 중이거나, 자바스크립트가 활성화되어 있지 않습니다. js_2: 오픈스트리트맵은 매끄러운 지도를 위해 자바스크립트를 사용합니다. - permalink: 고유링크 - shortlink: 짧은링크 - createnote: 참고 추가 license: copyright: 저작권 오픈스트리트맵 및 기여자, 오픈 라이선스로 배포 remote_failed: 편집을 실패했습니다 - JOSM이나 Merkaartor를 불러왔고 원격 제어 설정이 활성화되어 있는지 확인하세요 @@ -2166,6 +2184,7 @@ ko: lake: 호수 reservoir: 저수지 glacier: 빙하 + reef: 암초 wetland: 습지 farm: 농장 brownfield: 재개발지역 @@ -2227,6 +2246,7 @@ ko: imports: 들여오기 automated_edits: 자동화 편집 start_mapping: 매핑 시작하기 + continue_authorization: 승인 계속하기 add_a_note: title: 편집할 짬을 내기가 어려우신가요? 손쉽게 '노트'(참고)를 덧붙이세요! para_1: 가입한 다음 편집 방법을 배울 시간이 없거나 자잘한 사항만 고치고 싶은 경우, '노트'(참고)를 덧붙여서 알려주면 쉽습니다. @@ -2320,6 +2340,7 @@ ko: identifiable: 식별 가능 private: 비공개 trackable: 추적 가능 + details_without_tags_html: '%{time_ago} %{user}님' index: public_traces: 공개 GPS 궤적 my_gps_traces: 내 GPS 궤적 @@ -2519,6 +2540,7 @@ ko: users: new: title: 가입하기 + tab_title: 가입하기 no_auto_account_create: 불행하게도 현재로서는 자동으로 계정을 만들 수 없습니다. please_contact_support_html: 계정 생성 준비를 위해 %{support_link}(으)로 문의해 주세요. 요청 처리가 최대한 빨리 이뤄질 수 있도록 노력하겠습니다. @@ -2527,14 +2549,19 @@ ko: header: 자유롭게 편집 가능 paragraph_1: 다른 지도와 달리 오픈스트리트맵은 전부 여러분과 같은 사람들이 제작했으며 누구나 자유롭게 수정, 업데이트, 다운로드, 사용을 할 수 있습니다. - paragraph_2: 기여를 시작하려면 가입하세요. 당신의 계정 확인을 위해 이메일을 보내드리겠습니다. + paragraph_2: 회원 가입으로 기여를 시작해 봅시다. + welcome: 오픈스트리트맵에 오신 것을 환영합니다 display name description: 공개적으로 표시되는 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다. + tou: 이용 약관 + contributor_terms: 기여자 약관 external auth: '제3자 인증:' continue: 가입하기 terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다! email_help_html: 당신의 주소는 공개적으로 노출되지 않습니다. 자세한 내용은 %{privacy_policy_link}를 참조하세요. privacy_policy: 개인정보처리방침 privacy_policy_title: 이메일 주소 섹션을 포함한 OSMF 개인 정보 보호 정책 + consider_pd: 퍼블릭 도메인 + or: 혹은 use external auth: 다른 제3자 로그인 방식 사용하기 terms: title: 약관 @@ -2585,6 +2612,8 @@ ko: my_dashboard: 내 대시보드 blocks on me: 나를 차단 blocks by me: 나한테 차단 + create_mute: 이 사용자 음소거하기 + destroy_mute: 이 사용자를 음소거 해제 edit_profile: 프로필 수정 send message: 메시지 보내기 diary: 일기 @@ -2715,6 +2744,7 @@ ko: flash: 이 차단을 해제했습니다. revoke_all: revoke: 해제! + flash: 모든 차단 내역이 비활성화되었습니다. helper: time_future_html: '%{time}에 끝납니다.' until_login: 사용자가 로그인할 때까지 활성합니다. @@ -2763,8 +2793,14 @@ ko: reason: 차단 이유 status: 상태 revoker_name: 해제자 + older: 옛 차단내역 + newer: 최근 차단내역 navigation: all_blocks: 모든 차단 + blocks_on_me: 나의 차단내역 + blocks_on_user: '%{user}님의 차단내역' + blocks_by_me: 내가 차단한 내역 + blocks_by_user: '%{user}님이 차단한 내역' block: '#%{id} 차단' user_mutes: index: @@ -2772,7 +2808,14 @@ ko: thead: actions: 동작 tbody: + unmute: 음소거 해제 send_message: 메시지 보내기 + create: + notice: '%{name}님을 음소거했습니다.' + error: '%{name}님을 음소거할 수 없습니다. %{full_message}.' + destroy: + notice: '%{name}님의 음소거를 해제했습니다.' + error: 유저의 음소거를 해제할 수 없습니다. 다시 시도해 주세요. notes: index: title: '%{user} 님이 제출했거나 덧글을 남긴 참고' @@ -2817,6 +2860,8 @@ ko: title: 새로운 참고 intro: 실수했거나 없는 무언가를 발견했나요? 다른 매퍼에게 알려주어 ê³ ì¹  수 있게 해주세요. 마커를 올바른 위치로 이동하고, 참고를 남겨 문제를 설명해주세요. + anonymous_warning_log_in: 로그인 + anonymous_warning_sign_up: 가입하기 advice: 노트는 공개되어 지도 업데이트에 쓰일 수 있으므로 개인정보 또는 저작권이 있는 지도나 디렉터리 리스팅의 정보를 입력하지 마십시오. add: 참고 추가 javascripts: @@ -2890,13 +2935,6 @@ ko: queryfeature_tooltip: 지물 정보 queryfeature_disabled_tooltip: 지물 정보를 확인하려면 확대 embed_html_disabled: 이 지도 레이어에는 HTML 임베딩을 사용할 수 없습니다. - changesets: - show: - comment: 의견 - subscribe: 구독 - unsubscribe: 구독 해지 - hide_comment: 숨기기 - unhide_comment: 숨기기 취소 edit_help: 편집하려는 위치에 지도를 이동하고 확대한 다음, 여기를 클릭하세요. directions: ascend: 올라가기 diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index c658a429a..9b69c798e 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -449,8 +449,13 @@ ku-Latn: join_discussion: Ji bo ku beșdarî guftûgoyan bibî têkeve still_open: Qeyda guhartinan hê jî vekirî ye - wê gotûbêj piştî ku qeyda guhartinan hate girtin vebibe. + subscribe: Bibe abone + unsubscribe: Ji abonetiyê derkeve comment_by_html: Şîroveya ji %{user} %{time_ago} hidden_comment_by_html: Şîroveya veşartî ji %{user} %{time_ago} + hide_comment: veşêre + unhide_comment: neveşêre + comment: Şîrove changesetxml: Desteya guhartinan a XML osmchangexml: osmChange XML paging_nav: @@ -568,7 +573,8 @@ ku-Latn: all: title: Nivîsên rojane yên OpenStreetMapê description: Nivîsên rojane yên bikarhênerên OpenStreetMapê - comments: + diary_comments: + index: title: Şîroveyên Rojnivîskê ji aliyê %{user} ve hatiye kirin heading: Şîroveyên Rojnivîskê yên %{user} subheading_html: Şîroveyên Rojnivîskê ji aliyê %{user} ve hatiye tevlîkirin @@ -1933,9 +1939,6 @@ ku-Latn: hatiye neçalakkirin. js_2: OpenStreetMap ji bo nîşandana nexşeya xwe ya şemetok JavaScriptê bi kar tîne. - permalink: Lînka daîmî - shortlink: Lînka kurt - createnote: Notek binivîse license: copyright: Mafê daneriyê ya OpenStreetMapê û beşdarên me, di bin lîsansa vekirî de ne @@ -2784,13 +2787,6 @@ ku-Latn: map_data_zoom_in_tooltip: Ji bo ku daneyên nexşeyê bibînî nêzîk bike queryfeature_tooltip: Taybetmendiyan nîşan bide queryfeature_disabled_tooltip: Ji bo ku taybetmendiyan bibînî nêzîk bike - changesets: - show: - comment: Şîrove - subscribe: Bibe abone - unsubscribe: Ji abonetiyê derkeve - hide_comment: veşêre - unhide_comment: neveşêre edit_help: Nexşeyê bide hereketkirin û li cihê ku tu dixwazî biguherînî nêzîk bike, piştre jî bitikîne ser vir. directions: diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 3616a2344..22eea7485 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -440,6 +440,11 @@ lb: join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal wéi den Ännerungssaz zou ass. + subscribe: Abonéieren + unsubscribe: Ofbestellen + hide_comment: verstoppen + unhide_comment: nees weisen + comment: Kommentéieren changesetxml: XML mam Set vun Ännerungen osmchangexml: osmChange XML paging_nav: @@ -512,6 +517,8 @@ lb: title: Blog vun %{user} | %{title} user_title: Blog vun %{user} discussion: Diskussioun + subscribe: Abonéieren + unsubscribe: Ofbestellen leave_a_comment: Eng Bemierkung maachen login_to_leave_a_comment_html: '%{login_link} fir eng Bemierkung ze schreiwen' login: Aloggen @@ -553,7 +560,8 @@ lb: all: title: OpenStreetMap Blogbäiträg description: Neiest Bloganträg vun OpenStreetMap-Benotzer - comments: + diary_comments: + index: title: Tagebuch Kommentarer bäigefüügt vum %{user} heading: '%{user}''s Tagebuch Kommentarer' subheading_html: Tagebuch Kommentarer bäigefüügt vum %{user} @@ -1561,7 +1569,7 @@ lb: subject: '[OpenStreetMap] GPX-Import erfollegräich' signup_confirm: subject: '[OpenStreetMap] Wëllkomm bei OpenStreetMap' - greeting: Bonjour ! + greeting: Moien! created: Iergendeen (hoffentlech du) huet grad bei %{site_url} e Benotzerkont erstallt confirm: Ier mir eppes ënnerhuelen, brauche mir eng Bestätegung, datt dës Ufro @@ -1905,9 +1913,6 @@ lb: js_1: Dir hutt entweder e Browser dee JavaScript net ënnerstëtzt oder Dir hutt JavaScript desaktivéiert. js_2: OpenStreetMap benotzt JavaScript fir d'Kaartenduerstellung - permalink: Permanentlink - shortlink: Kuerze Link - createnote: Eng Notiz derbäisetzen license: copyright: Copyright OpenStreetMap a Matwierkend, ënner enger oppener Lizenz edit: @@ -2115,7 +2120,6 @@ lb: description_without_count: GPX-Fichier vum %{user} application: oauth_10a_disabled: 'OAuth 1.0 an 1.0a sinn desaktivéiert: %{link}' - auth_disabled_link: https://wiki.openstreetmap.org/wiki/2024_authentication_update settings_menu: account_settings: Astellunge vum Benotzerkont oauth1_settings: OAuth 1-Astellungen @@ -2263,6 +2267,7 @@ lb: notes: Notizen op der Kaart remove as friend: Frënd ewechhuelen add as friend: Frënd derbäisetzen + no activity yet: Nach keng Aktivitéit email address: 'E-Mail-Adress:' status: 'Status:' role: @@ -2466,13 +2471,6 @@ lb: map_data_zoom_in_tooltip: Vergréisser d'Kaart, fir 'Donnéeën ze gesinn queryfeature_tooltip: Objetsoffro queryfeature_disabled_tooltip: Fir Objetsoffro vergréisseren - changesets: - show: - comment: Kommentéieren - subscribe: Abonéieren - unsubscribe: Ofbestellen - hide_comment: verstoppen - unhide_comment: nees weisen edit_help: Vergréisser a verschib d'Kaart un en Uert, deens du beaarbechte wëlls, a klick hei directions: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 50cc53138..301b45961 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -514,8 +514,13 @@ lt: join_discussion: Prisijunkite norėdami dalyvauti aptarime still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius pakeitimą. + subscribe: Užsisakyti + unsubscribe: Atsisakyti comment_by_html: Komentaras nuo %{user} %{time_ago} hidden_comment_by_html: Paslėptas komentaras nuo %{user} %{time_ago} + hide_comment: slėpti + unhide_comment: neslėpti + comment: Komentuoti changesetxml: Pakeitimo XML osmchangexml: osmChange XML paging_nav: @@ -630,7 +635,8 @@ lt: all: title: OpenStreetMap dienoraščio įraÅ¡ai description: Paskutiniai OpenStreetMap naudotojų dienoraščių įraÅ¡ai - comments: + diary_comments: + index: title: Dienoraščio komentarus pridėjo %{user} heading: Naudotojo %{user} dienoraščio komentarai subheading_html: Dienoraščio komentarus pridėjo %{user} @@ -2074,9 +2080,6 @@ lt: js_1: JÅ«s arba naudojate narÅ¡yklę, nepalaikančią JavaScript, arba iÅ¡jungėte JavaScript palaikymą. js_2: OpenStreetMap naudoja JavaScript savo 'slidžiam' žemėlapiui - permalink: Nuoroda į Å¡ią vietą - shortlink: Trumpoji nuoroda - createnote: Pridėti pastabą license: copyright: Teisės priklauso OpenStreetMap ir prie projekto prisidėjusiems, pagal atvirą licenciją. @@ -2964,13 +2967,6 @@ lt: map_data_zoom_in_tooltip: Padidinkite, norėdami matyti žemėlapio duomenis queryfeature_tooltip: IeÅ¡koti objektų queryfeature_disabled_tooltip: Padidinkite, norėdami ieÅ¡koti objektų - changesets: - show: - comment: Komentuoti - subscribe: Užsisakyti - unsubscribe: Atsisakyti - hide_comment: slėpti - unhide_comment: neslėpti edit_help: Pastumkite žemėlapį ir padidinkite vietą, kurią norite keisti, tada spauskite čia. directions: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 1fd74892d..66e48d179 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -366,6 +366,11 @@ lv: closed_ago_html: Slēgts %{time_ago} discussion: Diskusija join_discussion: Ieejiet sistēmā lai pievienotos diskusijai + subscribe: Abonēt + unsubscribe: Atteikties no abonējuma + hide_comment: paslēpt + unhide_comment: parādÄ«t + comment: Komentēt changesetxml: Izmaiņu kopas XML osmchangexml: osmChange XML paging_nav: @@ -473,7 +478,8 @@ lv: all: title: OpenStreetMap dienasgrāmatu ieraksti description: Pēdējie dienasgrāmatu ieraksti no OpenStreetMap lietotājiem - comments: + diary_comments: + index: post: Publicēt when: Kad comment: Komentārs @@ -1546,9 +1552,6 @@ lv: js_1: Vai nu jÅ«s lietojat pārlÅ«kprogrammu, kas neatbalsta JavaScript, vai arÄ« jÅ«su pārlÅ«kprogrammā JavaScript ir atslēgts. js_2: OpenStreetMap kartes rādÄ«Å¡anai lieto JavaScript. - permalink: PastāvÄ«gā saite - shortlink: Īsā saite - createnote: Pievienot piezÄ«mi license: copyright: AutortiesÄ«bas OpenStreetMap un tā veidotāji, zem atvērtas licences remote_failed: Rediģēšana neizdevās - pārbaudi, ka JOSM vai Merkaartor ir ieslēgts @@ -2232,13 +2235,6 @@ lv: map_data_zoom_in_tooltip: Pietuvināt, lai redzētu kartes datus queryfeature_tooltip: Vaicājuma funkcijas queryfeature_disabled_tooltip: Tuvināt pie kārtas funkcijām - changesets: - show: - comment: Komentēt - subscribe: Abonēt - unsubscribe: Atteikties no abonējuma - hide_comment: paslēpt - unhide_comment: parādÄ«t edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied Å¡eit. directions: ascend: Kāpums diff --git a/config/locales/mk.yml b/config/locales/mk.yml index f39d10c1f..03f1a137d 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -485,8 +485,13 @@ mk: join_discussion: Најавете се за да се приклучите во разговорот still_open: Измените сè уште се отворени — разговорот ќе се отвори штом ќе се затворат измените. + subscribe: Претплати се + unsubscribe: Отпиши ме comment_by_html: Коментар од %{user} %{time_ago} hidden_comment_by_html: Скриен коментар од %{user} %{time_ago} + hide_comment: скриј + unhide_comment: откриј + comment: Коментирај changesetxml: XML за измените osmchangexml: osmChange XML paging_nav: @@ -560,6 +565,8 @@ mk: title: Дневникот на %{user} | %{title} user_title: Дневникот на %{user} discussion: Разговор + subscribe: Претплати се + unsubscribe: Отпиши ме leave_a_comment: Напиши коментар login_to_leave_a_comment_html: '%{login_link} за да оставите коментар' login: Најава @@ -603,7 +610,14 @@ mk: all: title: Дневнички ставки description: Скорешни дневнички ставки од корисници на OpenStreetMap - comments: + subscribe: + heading: Да ве претплатам на разговорот во следната дневничка ставка? + button: Претплати се на разговорот + unsubscribe: + heading: Да ве отпишам од претплатата на разговорот во следната дневничка ставка? + button: Отпиши се од разговорот + diary_comments: + index: title: Дневнички коментари додадени од %{user} heading: Дневнички коментари на %{user} subheading_html: Дневнички коментари додадени од %{user} @@ -613,12 +627,6 @@ mk: comment: Коментар newer_comments: Понови коментари older_comments: Постари коментари - subscribe: - heading: Да ве претплатам на разговорот во следната дневничка ставка? - button: Претплати се на разговорот - unsubscribe: - heading: Да ве отпишам од претплатата на разговорот во следната дневничка ставка? - button: Отпиши се од разговорот doorkeeper: errors: messages: @@ -1730,8 +1738,8 @@ mk: Белешката се наоѓа близу %{place}.' commented_note_html: '%{commenter} реши картографска белешка на која имате коментирано. Белешката се наоѓа близу %{place}.' - details: Поподробно за белешката на %{url}. - details_html: Поподробно за белешката на %{url}. + details: Одговорете или дознајте повеќе за белешката на %{url}. + details_html: Одговорете или дознајте повеќе за белешката на %{url}. changeset_comment_notification: description: Измени бр. %{id} во OpenStreetMap hi: Здраво %{to_user}, @@ -1750,8 +1758,8 @@ mk: partial_changeset_with_comment: со коментарот „%{changeset_comment}“ partial_changeset_with_comment_html: со коментарот „%{changeset_comment}“ partial_changeset_without_comment: без коментар - details: Поподробно за промената на %{url}. - details_html: Поподробно за промената на %{url}. + details: Одговорете или дознајте повеќе за промената на %{url}. + details_html: Одговорете или дознајте повеќе за промената на %{url}. unsubscribe: Можете да се отпишете од подновите за овие измени на %{url}. unsubscribe_html: Можете да се отпишете од подновите за овие измени на %{url}. confirmations: @@ -2190,9 +2198,6 @@ mk: js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го оневозможиле тој програм. js_2: OpenStreetMap користи JavaScript за нејзината лизгава карта. - permalink: Постојана врска - shortlink: Кратка врска - createnote: Додај белешка license: copyright: Авторски права OpenStreetMap и учесниците, под отворена лиценца remote_failed: Уредувањето не успеа - проверете дали е вчитан JOSM или Merkaartor @@ -2587,7 +2592,6 @@ mk: application: basic_auth_disabled: 'Оневозможена е основната заверка со HTTP: %{link}' oauth_10a_disabled: 'OAuth 1.0 и 1.0a се оневозможени: %{link}' - auth_disabled_link: https://wiki.openstreetmap.org/wiki/2024_authentication_update permission_denied: Немате дозвола за ова дејство require_cookies: cookies_needed: Изгледа сте оневозможиле колачиња - дозволете колачиња во прелистувачот @@ -2869,6 +2873,8 @@ mk: remove as friend: Отстрани од пријатели add as friend: Додај во пријатели mapper since: 'Картограф од:' + last map edit: 'Последно уредување на картата:' + no activity yet: Сè уште нема активности uid: 'Корисничка назнака:' ct status: 'Услови за учество:' ct undecided: Неодлучено @@ -3229,13 +3235,6 @@ mk: queryfeature_tooltip: Пребарување на елементи queryfeature_disabled_tooltip: Зголеми на пребарувањето на елементи embed_html_disabled: Вградувањето на HTML не е достапно за овој слој на картата - changesets: - show: - comment: Коментирај - subscribe: Претплати се - unsubscribe: Отпиши ме - hide_comment: скриј - unhide_comment: откриј edit_help: Поместете ја картата и приближете во местото што сакате да го уредите, па стиснете тука. directions: diff --git a/config/locales/mo.yml b/config/locales/mo.yml index 8e4055d51..58e626d6a 100644 --- a/config/locales/mo.yml +++ b/config/locales/mo.yml @@ -173,7 +173,8 @@ mo: confirm: Конфирмаре location: edit: Редактаре - comments: + diary_comments: + index: post: Месаж when: Кынд comment: Коментариу diff --git a/config/locales/mr.yml b/config/locales/mr.yml index e7bec4be0..6047d55a6 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -303,6 +303,7 @@ mr: show: title: 'बदलसंच: %{id}' join_discussion: चर्चेत सहभागी होण्यासाठी सनोंद प्रवेश करा + comment: टिप्पणी changesetxml: बदलसंच XML osmchangexml: osmChange XML paging_nav: @@ -397,7 +398,8 @@ mr: all: title: ओपनस्ट्रीटमॅप अनुदिनीतील नोंदी description: ओपनस्ट्रीटमॅप सदस्यांकडून अलीकडील अनुदिनी-नोंदी - comments: + diary_comments: + index: post: पाठवा when: कधी comment: टिप्पणी @@ -1073,9 +1075,6 @@ mr: js_1: आपण जावास्क्रीप्ट चालवू न शकणारा न्याहाळक वापरत आहात, किंवा जावास्क्रीप्ट निष्क्रिय आहे. js_2: ओपनस्ट्रीटमॅप सरकत्या नकाशासाठी जावास्क्रीप्टचा वापर करते. - permalink: शाश्वत दुवा - shortlink: लघुदुवा - createnote: टीप जोडा license: copyright: प्रताधिकार ओपनस्ट्रीटमॅप आणि योगदाते, खुल्या परवान्यांतर्गत remote_failed: संपादन अयशस्वी - JOSM किंवा Merkaartor चालू केले आहे आणि रिमोट @@ -1415,9 +1414,6 @@ mr: createnote_disabled_tooltip: नकाशावर टीप जोडण्यासाठी झूम करा queryfeature_tooltip: वस्तूंची विचारणा queryfeature_disabled_tooltip: वस्तूंची विचारणा करण्यासाठी झूम करा - changesets: - show: - comment: टिप्पणी directions: instructions: offramp_right_with_exit: उजवीकडील %{exit}ने बाहेर पडा diff --git a/config/locales/ms.yml b/config/locales/ms.yml index e73c511c1..4c98423b3 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -383,6 +383,11 @@ ms: title: 'Set Ubah: %{id}' discussion: Perbincangan join_discussion: Daftar masuk untuk perbincangan + subscribe: Langgan + unsubscribe: Berhenti melanggan + hide_comment: sorokkan + unhide_comment: Dedahkan + comment: Komen changesetxml: XML Set Ubah osmchangexml: XML osmChange paging_nav: @@ -482,7 +487,8 @@ ms: all: title: Catatan diari OpenStreetMap description: Catatan-catatan diari terbaru oleh pengguna OpenStreetMap - comments: + diary_comments: + index: no_comments: Tiada ulasan diari post: Muat Naik when: Bila @@ -1469,7 +1475,7 @@ ms: url: URL richtext_field: edit: Sunting - preview: Pralihat + preview: Pratayang site: about: next: Berikutnya @@ -1545,9 +1551,6 @@ ms: js_1: Anda sedang menggunakan pelayar web yang tidak menyokong JavaScript, ataupun anda tidak menghidupkan JavaScript. js_2: OpenStreetMap menggunakan JavaScript untuk peta licinnya. - permalink: Pautan Kekal - shortlink: Pautan Ringkas - createnote: Tambah nota license: copyright: Hak cipta OpenStreetMap dan para penyumbang di bawah lesen terbuka remote_failed: Penyuntingan gagal - pastikan JOSM atau Merkaartor dimuatkan @@ -2243,13 +2246,6 @@ ms: createnote_disabled_tooltip: Zum dekat untuk meletakkan nota pada peta map_notes_zoom_in_tooltip: Zum dekat untuk membaca nota peta map_data_zoom_in_tooltip: Zum dekat untuk membaca data peta - changesets: - show: - comment: Komen - subscribe: Langgan - unsubscribe: Berhenti melanggan - hide_comment: sorokkan - unhide_comment: Dedahkan edit_help: Alihkan peta dan zum dekat pada lokasi yang ingin anda sunting, kemudian klik di sini. directions: diff --git a/config/locales/my.yml b/config/locales/my.yml index d192e2ad2..5ecbe410f 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -179,6 +179,8 @@ my: show: discussion: ဆွေးနွေးချက် join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ + hide_comment: ဝှက် + unhide_comment: မဝှက်တော့ရန် changeset_comments: comment: commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်' @@ -215,7 +217,8 @@ my: location: 'တည်နေရာ:' view: ကြည့်ရန် edit: ပြင်ဆင်ရန် - comments: + diary_comments: + index: comment: မှတ်ချက် newer_comments: ပိုသစ်သော မှတ်ချက်များ older_comments: ပိုဟောင်းသော မှတ်ချက်များ @@ -634,8 +637,6 @@ my: legal_babble: title_html: မူပိုင်ခွင့်နှင့် လိုင်စင် contributors_title_html: မိမိတို့၏ ပံ့ပို့ပေးသူများ - index: - permalink: ပုံသေလိပ်စာ edit: user_page_link: အသုံးပြုသူ စာမျက်နှာ export: @@ -795,10 +796,6 @@ my: image: ရုပ်ပုံ long_link: လင့် download: ဒေါင်းလုဒ် - changesets: - show: - hide_comment: ဝှက် - unhide_comment: မဝှက်တော့ရန် directions: distance: အကွာအဝေး time: အချိန် diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 29c43db56..fefdc51be 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -1,6 +1,7 @@ # Messages for Norwegian BokmÃ¥l (norsk bokmÃ¥l) # Exported from translatewiki.net # Export driver: phpyaml +# Author: 6400 # Author: Abbe98 # Author: Citadell # Author: Danieldegroot2 @@ -30,7 +31,6 @@ # Author: SuperPotato # Author: The real emj # Author: Yupik -# Author: 6400 --- nb: time: @@ -446,6 +446,11 @@ nb: join_discussion: Logg inn for Ã¥ delta i diskusjonen still_open: Endringssettet er fortsatt Ã¥pent – diskusjonen Ã¥pner nÃ¥r endringssettet er lukket. + subscribe: Abonner + unsubscribe: Avslutt abonnement + hide_comment: skjul + unhide_comment: vis + comment: Kommenter changesetxml: XML for endringssett osmchangexml: osmChange-XML paging_nav: @@ -555,7 +560,8 @@ nb: all: title: Innlegg i OpenStreetMap-dagboka description: Nye innlegg i dagbøkene til OpenStreetMap-brukere - comments: + diary_comments: + index: post: Artikkel when: NÃ¥r comment: Kommentar @@ -1737,9 +1743,6 @@ nb: js_1: Du har en nettleser som ikke støtter JavaScript eller sÃ¥ har du slÃ¥tt av JavaScript. js_2: OpenStreetMap bruker JavaScript pÃ¥ kartsidene. - permalink: Permanent lenke - shortlink: Kort lenke - createnote: Legg til en merknad license: copyright: Rettighetshaver OpenStreetMap og bidragsytere, under en Ã¥pen lisens remote_failed: Klarte ikke redigere - forsikre deg at JOSM eller Merkaartor @@ -2473,13 +2476,6 @@ nb: map_data_zoom_in_tooltip: Forstørr utvalg for Ã¥ se kartdata queryfeature_tooltip: Se over elementer queryfeature_disabled_tooltip: Forstørr utvalg for Ã¥ se over elementer - changesets: - show: - comment: Kommenter - subscribe: Abonner - unsubscribe: Avslutt abonnement - hide_comment: skjul - unhide_comment: vis edit_help: Flytt kartet og forstørr utvalg til et sted du vil redigere, og klikk sÃ¥ her. directions: diff --git a/config/locales/nds.yml b/config/locales/nds.yml index 0d121bd28..dea3256ca 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -482,9 +482,6 @@ nds: copyright: native: title: Över disse Siet - index: - permalink: Permalink - shortlink: Kortlink edit: user_page_link: Brukersied export: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 8d7b4561e..9752989d2 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -4,6 +4,7 @@ # Author: Bada Kaji # Author: Danieldegroot2 # Author: Drjpoudel +# Author: Gravitystorm # Author: Haribanshi # Author: Krish Dulal # Author: Nirajan pant @@ -17,9 +18,13 @@ # Author: हिमाल सुबेदी --- ne: + html: + dir: ltr time: formats: friendly: '%e %B %Y मा %H:%M' + count: + at_least_pattern: '%{count}+' helpers: file: prompt: फाइल छान्नुहोस् @@ -39,10 +44,23 @@ ne: oauth2_application: create: दर्ता गर्नुहाेस् update: अद्यावधिक गर्नुहोस् + redaction: + create: डेटा हटाउनुहोस् + update: डेटा हटाउने सङ्ग्रह गर्नुहोस् trace: - create: अपलोड गर्ने - update: परिवर्तनहरू संग्रह गर्ने + create: अपलोड गर्नुहोस् + update: परिवर्तनहरू संग्रह गर्नुहोस् + user_block: + create: ब्लक सिर्जना गर्नुहोस् + update: ब्लक अद्यावधिक गर्नुहाेस् activerecord: + errors: + messages: + invalid_email_address: इमेल मान्य देखिँदैन + email_address_not_routable: राउटेबल छैन + models: + user_mute: + is_already_muted: पहिले नै म्युट गरिएको छ models: acl: अनुमति नियन्त्रण सूची changeset: परिवर्तनहरू सूची @@ -51,6 +69,7 @@ ne: diary_comment: डायरी टिप्पणी diary_entry: डायरी प्रविष्टी friend: साथी + issue: इस्यु language: भाषा message: सन्देश node: नोड @@ -66,6 +85,7 @@ ne: relation: रिलेशन relation_member: रिलेशन सदस्य relation_tag: सम्बन्ध चिनो + report: रिपोर्ट गर्नुहोस् session: सत्र trace: ट्रेस tracepoint: ट्रेस बिन्दु @@ -77,48 +97,118 @@ ne: way_node: बाटो नोड way_tag: मार्ग चिनो attributes: + client_application: + name: नाम (आवश्यक) + url: मुख्य एप्लिकेसन युआरएल (आवश्यक) + callback_url: कलब्याक युआरएल + support_url: सहायता युआरएल + allow_read_prefs: उनीहरूको प्रयोगकर्ता अभिरुचीहरू पढ्नुहोस् + allow_write_prefs: उनीहरूको प्रयोगकर्ता अभिरुचीहरू परिमार्जन गर्नुहोस् + allow_write_diary: डायरी प्रविष्टी गर्नुहोस्, टिप्पणीहरू र साथी बनाउनुहोस् + allow_write_api: नक्सा परिमार्जन गर्नुहोस् + allow_read_gpx: उनीहरूको निजी जिपिएस ट्रेसहरू पढ्नुहोस् + allow_write_gpx: जिपिएस ट्रेसहरू अपलोड गर्नुहोस् + allow_write_notes: टिपोटहरू परिमार्जन गर्नुहोस् diary_comment: body: बडी diary_entry: user: प्रयोगकर्ता title: विषय + body: बडी latitude: अक्षांश longitude: देशान्तर language_code: भाषा + doorkeeper/application: + name: नाम + redirect_uri: रिडाइरेक्ट युआरआइहरू + confidential: गोप्य एप्लिकेसन? + scopes: अनुमतिहरू friend: user: प्रयोगकर्ता friend: साथी trace: user: प्रयोगकर्ता visible: देखिने - name: नाम + name: फाइल नाम size: आकार latitude: अक्षांश longitude: देशान्तर public: सार्वजनिक description: वर्णन - gpx_file: 'जिपिएक्स फाइल उर्ध्वभरण गर्नुहाेस्:' - visibility: 'दृश्यक्षमता:' - tagstring: ट्यागहरूः + gpx_file: GPX फाइल अपलोड गर्नुहोस् + visibility: प्रदर्शन + tagstring: ट्यागहरू message: sender: पठाउने title: विषय body: बडी recipient: प्रापक redaction: + title: शीर्षक description: वर्णन + report: + category: तपाईँको रिपोर्टको कारण छान्नुहोस् + details: कृपया समस्या बारे केही थप विवरणहरू प्रदान गर्नुहोस् (आवश्यक)। user: + auth_provider: प्रमाणीकरण प्रदायक + auth_uid: प्रमाणीकरण युआइडी email: इमेल + new_email: नयाँ इमेल ठेगाना active: सक्रिय display_name: देखाउने नाम - description: वर्णन - home_lat: 'देशान्तर:' - home_lon: 'अक्षांश:' - languages: भाषाहरू + description: प्रोफाइल विवरण + home_lat: अक्षांश + home_lon: देशान्तर + languages: रुचाइएका भाषाहरू + preferred_editor: रुचाइएको सम्पादक pass_crypt: पासवर्ड + pass_crypt_confirmation: पासवर्ड निश्चित गर्नुहोस् help: + doorkeeper/application: + redirect_uri: प्रति युआरआई एउटा पङ्क्ति प्रयोग गर्नुहोस् trace: tagstring: अल्पविरामले छुट्याएको + user: + new_email: (सार्वजनिक रूपमा कहिल्यै देखाइएको छैन) + datetime: + distance_in_words_ago: + about_x_hours: + one: लगभग %{count} घण्टा अघि + other: लगभग %{count} घण्टा अघि + about_x_months: + one: लगभग %{count} महिना अघि + other: लगभग %{count} महिना अघि + about_x_years: + one: लगभग %{count} घण्टा अघि + other: लगभग %{count} घण्टा अघि + almost_x_years: + one: लगभग %{count} वर्ष पहिले + other: लगभग %{count} वर्ष पहिले + half_a_minute: आधा मिनेट अघि + less_than_x_seconds: + one: '%{count} सेकेन्ड भन्दा कम' + other: '%{count} सेकेन्ड अघि' + less_than_x_minutes: + one: '%{count} मिनेट भन्दा कम' + other: '%{count} मिनेट अघि' + over_x_years: + one: लगभग %{count} वर्ष पहिले + other: लगभग %{count} वर्ष पहिले + x_seconds: + one: '%{count} सेकेन्ड अघि' + other: '%{count} सेकेन्ड अघि' + x_minutes: + one: '%{count} मिनेट पहिले' + other: '%{count} मिनेट पहिले' + x_days: + one: '%{count} दिन अघि' + other: '%{count} दिन अघि' + x_months: + one: '%{count} महिना अघि' + other: '%{count} महिना अघि' + x_years: + one: लगभग %{count} वर्ष पहिले + other: लगभग %{count} वर्ष पहिले editor: default: पूर्वस्थापित(अहिलेको %{name}) id: @@ -126,25 +216,52 @@ ne: description: iD (ब्राउजर सम्पादक) remote: name: रिमोट कन्ट्रोल - description: रिमोट कन्ट्रोल (JOSM वा Merkaartor) + description: रिमोट कन्ट्रोल (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: कुनै पनि होइन + google: गुगल + facebook: फेसबुक + github: गिटहब + wikipedia: विकिपिडिया api: notes: + comment: + commented_at_by_html: '%{user} द्वारा %{when} पहिले अद्यावधिक गरिएको' + rss: + title: ओपनस्ट्रिटम्याप टिप्पणीहरू entry: comment: टिप्पणी + full: पूर्ण टिप्पणी + account: + deletions: + show: + title: मेरो खाता मेटाउनुहोस् + delete_account: खाता मेटाउनुहोस् + confirm_delete: निश्चित हुनुहुन्छ ? + cancel: रद्द गर्नुहोस् accounts: edit: - my settings: मेरो अनुकुलताहरु + title: खाता सम्पादन गर्नुहोस् + my settings: मेरो सेटिङहरू + current email address: हालको इमेल ठेगाना + external auth: वाह्य अथेन्टिकेसन openid: + link: https://wiki.openstreetmap.org/wiki/OpenID link text: यो के हो ? public editing: heading: सार्वजनिक सम्पादन + enabled: सक्रिय। Not anonymous and can edit data. enabled link text: यो के हो ? disabled link text: म किन सम्पादन गर्न सक्दिन? contributor terms: + heading: योगदानकर्ता सर्तहरू + agreed: तपाईँले नयाँ योगदानकर्ता सर्तहरू स्वीकार गर्नुभएको छ। + not yet agreed: तपाईँले नयाँ योगदानकर्ता सर्तहरू स्वीकार गर्नुभएको छैन। link text: यो के हो ? save changes button: परिवर्तनहरू संग्रह गर्नुहोस् go_public: - heading: 'सार्वजनिक सम्पादन:' + heading: सार्वजनिक सम्पादन update: success_confirm_needed: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो। Check your email for a note to confirm your new email address. @@ -211,7 +328,7 @@ ne: feature_warning: '%{num_features}वटा सुविधाहरु लोड हुँदै छन्, जसले गर्दा तपाईंको ब्राउजर सुस्त वा अनुत्तरदायी बनाउन सक्छ । तपाईं साँच्चै यो जानकारी हेर्न चाहनुहुन्छ ?' - load_data: डेटा लोडगर्ने + load_data: डेटा लोड गर्नुहोस् loading: खुल्दै छ… tag_details: tags: ट्यागहरू @@ -245,7 +362,7 @@ ne: title: परिवर्नहरू title_user: '%{user}द्वरा गरिएका परिवर्तनहरू' title_friend: तपाईको मित्रहरूद्वारा गरिएका परिवर्तनहरू - title_nearby: तपाईं नजिक हुनुभएका प्रयोगकर्ताहरूद्वारा गरिएका परिवर्तनहरू + title_nearby: तपाईँको नजिक हुनुभएका प्रयोगकर्ताहरूद्वारा गरिएका परिवर्तनहरू empty: कुनै पनि परिवर्तनहरू भेटिएनन्। empty_area: यो क्षेत्रमा कुनै परिवर्तनहरू छैनन्। empty_user: यस प्रयोगकर्ताद्वारा कुनै परिवर्तनहरू गरिएका छैनन्। @@ -259,10 +376,18 @@ ne: created: सृजना गरिएको closed: समापन भएको belongs_to: रचयिता + heading: + title: 'परिवर्तनहरू: %{id}' + no_such_entry: + heading: '%{id} आइडी भएको कुनै अभिलेख भेटिएन' show: title: 'परिवर्तनहरू: %{id}' discussion: छलफल join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस् + subscribe: सदस्यता लिनुहोस् + unsubscribe: सदस्यता खारेज गर्नुहोस् + hide_comment: लुकाउ + comment: टिप्पणी changesetxml: चेन्जसेट XML osmchangexml: osmChange XML paging_nav: @@ -273,12 +398,14 @@ ne: relations: सम्बन्धहरू (%{count}) relations_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) timeout: - sorry: माफ गर्नुहोला, तपाईंले खोज्नुभएको परिवर्तनहरूको सूची प्राप्त गर्न निकै + sorry: माफ गर्नुहोला, तपाईँले खोज्नुभएको परिवर्तनहरूको सूची प्राप्त गर्न निकै समय लाग्यो । changeset_comments: comment: - comment: ' %{author}द्वारा #%{changeset_id}मा नयाँ टिप्पणी' - commented_at_by_html: ' %{user} द्वारा %{when} पहिले अद्यावधिक गरिएको' + comment: '%{author}द्वारा #%{changeset_id}मा नयाँ टिप्पणी' + commented_at_by_html: '%{user} द्वारा %{when} पहिले अद्यावधिक गरिएको' + comments: + comment: '%{author}द्वारा #%{changeset_id}मा नयाँ टिप्पणी' index: title_all: OpenStreetMap परिवर्वतन सूची छलफल title_particular: 'OpenStreetMap परिवर्तन सूची #%{changeset_id} छलफल' @@ -292,13 +419,14 @@ ne: friend: साथी show: my friends: मेरा साथीहरू - no friends: तपाईं कुनै साथीहरूलाई जोड्नु भएको छैन + no friends: तपाईँ कुनै साथीहरूलाई थप्नु भएको छैन + nearby users: अन्य नजिकका प्रयोगकर्ताहरू diary_entries: new: title: नयाँ दैनिकी प्रविष्टी form: - location: 'स्थान:' - use_map_link: नक्सा प्रयोगर्ने + location: स्थान + use_map_link: नक्सा प्रयोग गर्ने index: title: प्रयोगकर्ताका डायरीहरू title_friends: साथीहरूका डायरीहरू @@ -306,17 +434,21 @@ ne: user_title: '%{user}को डायरी' in_language_title: '%{language} भाषामा भएका दैनिकीहरू' new: नयाँ दैनिकी - new_title: तपाईंको डायरीमा नयाँ दैनिकी सिर्जना गर्नुहोस् + new_title: तपाईँको डायरीमा नयाँ दैनिकी सिर्जना गर्नुहोस् + my_diary: मेरो डायरी no_entries: कुनै पनि अभिलेखहरू भेटिएनन् recent_entries: हालैका दैनिकीहरू older_entries: पुराना अभिलेखहरू newer_entries: नयाँ अभिलेखहरू edit: - title: दैनिकी प्रविष्ठी सम्पादन गर्ने - marker_text: दैनिकी प्रविष्ठी स्थान + title: डायरी प्रविष्ठी सम्पादन गर्नुहोस् + marker_text: डायरी प्रविष्ठी स्थान show: title: '%{user}को डायरी | %{title}' user_title: '%{user}को डायरी' + discussion: छलफल + subscribe: सदस्यता लिनुहोस् + unsubscribe: सदस्यता खारेज गर्नुहोस् leave_a_comment: टिप्पणी छोड्ने login_to_leave_a_comment_html: '%{login_link} टिप्पणी छोड्नलाई' login: प्रवेश @@ -329,7 +461,7 @@ ne: posted_by_html: '%{link_user}द्वारा %{created}मा %{language_link}भाषामा पोस्ट गरिएको' comment_link: यस प्रविष्टीमा टिप्पणी गर्ने - reply_link: यो प्रविष्टीमा जवाफ लेख्ने + reply_link: लेखकलाई सन्देश पठाउनुहोस् comment_count: zero: कुनै टिप्पणीहरू छैनन् one: '%{count} टिप्पणी' @@ -337,41 +469,55 @@ ne: edit_link: यो प्रविष्टी सम्पादन गर्ने hide_link: यो प्रविष्टी लुकाउने confirm: निश्चित गर्नुहोस् - report: यो प्रविष्टीको उजुरी गर्ने + report: यो प्रविष्टीको उजुरी गर्नुहोस् diary_comment: comment_from_html: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी' hide_link: यो टिप्पणी लुकाउनुहोस् confirm: निश्चित गर्नुहोस् location: location: 'स्थान:' - view: अवलोकन गर्ने - edit: सम्पादन + view: अवलोकन गर्नुहोस् + edit: सम्पादन गर्नुहोस् + coordinates: '%{latitude}; %{longitude}' feed: user: - title: '%{user}को लागि ओपनस्ट्रीटम्याप दैनिकी' - description: '%{user}को लागि हालैका ओपनस्ट्रीटम्याप दैनिकीहरू' + title: '%{user}को लागि OpenStreetMap डायरी' + description: '%{user}को लागि हालैका OpenStreetMap डायरी' language: title: '%{language_name} भाषामा OpenStreetMap दैनिकी' - description: '%{language_name} भाषामा ओपनस्ट्रीटम्याप प्रयोगकर्ताहरूका हालैका - दैनिकी' + description: '%{language_name} भाषामा OpenStreetMap प्रयोगकर्ताहरूका हालैका + डायरी' all: - title: ओपनस्ट्रीटम्याप दैनिकीहरू - description: ओपनस्ट्रीटम्याप प्रयोगकर्ताहरूका हालैका दैनिकीहरू - comments: + title: OpenStreetMap डायरी प्रविष्टीहरू + description: OpenStreetMap प्रयोगकर्ताहरूका हालैका डायरी प्रविष्टीहरू + diary_comments: + index: post: पोष्ट when: कहिले comment: टिप्पणी newer_comments: नयाँ टिप्पणीहरू older_comments: पूरानो टिप्पणीहरू + errors: + forbidden: + title: निषेध गरिएको + internal_server_error: + title: अनुप्रयोगसम्बन्धी त्रुटि + not_found: + title: फाइल फेला परेन friendships: make_friend: button: साथीको रूपमा थप्नुहोस् - success: '%{name} अब तपाईंको मित्र हुनुभएको छ!' + success: '%{name} अब तपाईँको साथी हुनुभएको छ!' failed: माफ गर्नुहोला, %{name}लाई मित्रको रुपमा थप्न सकिएन। - already_a_friend: '%{name} सँग तपाईंले पहिले नै मित्रता गरिसक्नु भएको छ ।' + already_a_friend: '%{name} सँग तपाईँले पहिले साथी हुनुहुन्छ।' + limit_exceeded: तपाईँले हालसालै थुप्रै प्रयोगकर्ताहरूलाई साथी बनाउनु भएको छ। + Please wait a while before trying to friend any more. remove_friend: button: साथीबाट हटाउने geocoder: + search: + title: + latlon: आन्तरिक search_osm_nominatim: prefix: aerialway: @@ -379,17 +525,26 @@ ne: chair_lift: कुर्सी लिफ्ट drag_lift: तान्ने लिफ्ट gondola: गोन्डोला लिफ्ट + pylon: पाइलन station: हवाई मार्ग स्टेशन + t-bar: टि-बार लिफ्ट + "yes": हवाई मार्ग aeroway: aerodrome: हवाईड्रोम + airstrip: हवाई यात्रा apron: तटबन्द - gate: ढोका + gate: विमानस्थलको गेट hangar: ह्याङ्गर helipad: हेलिकप्टर बस्ने ठाउँ + navigationaid: उड्डयन पथप्रदर्शन सहायता + parking_position: पार्किङ स्थिति runway: रनवे + taxilane: ट्याक्सिलेन taxiway: ट्याक्सीको बाटो - terminal: टर्मिनल + terminal: एयरपोर्ट टर्मिनल + windsock: विन्डसक amenity: + animal_boarding: पशु बोर्डिङ animal_shelter: पशु आश्रय arts_centre: कला केन्द्र atm: एटिएम् मेसिन @@ -399,7 +554,9 @@ ne: bench: मेच bicycle_parking: साइकिल पार्किङ् bicycle_rental: साइकिल भाडामा + bicycle_repair_station: साइकल मर्मत स्टेसन biergarten: बियर पिउने ठाउँ + blood_bank: रक्त बैंक boat_rental: ढुङ्गा भाडा सेवा brothel: वेश्यालय bureau_de_change: परिवर्तन व्यूरो @@ -416,6 +573,7 @@ ne: clock: घन्टाघर college: कलेज community_centre: सामुदायिक केन्द्र + conference_centre: सम्मेलन केन्द्र courthouse: अदालत crematorium: श्मशान dentist: दाँतको डाक्टर @@ -423,6 +581,7 @@ ne: drinking_water: पिउने पानी driving_school: ड्राइभिङ स्कूल embassy: दूतावास + events_venue: कार्यक्रम स्थल fast_food: चमेना गृह ferry_terminal: फेरी टर्मिनल fire_station: अग्नि नियन्त्रण स्टेसन् @@ -434,15 +593,20 @@ ne: hospital: अस्पताल hunting_stand: शिकार क्षेत्र ice_cream: बरफ + internet_cafe: इन्टरनेट क्याफे kindergarten: बाल आश्रम + language_school: भाषा विद्यालय library: पुस्तकालय marketplace: बजार क्षेत्र monastery: चैत्य + money_transfer: पैसा पठाउने motorcycle_parking: मोटर साइकल पार्किङ + music_school: सङ्गीत विद्यालय nightclub: रात्री क्लब nursing_home: नर्सिङ होम parking: पार्किङ parking_entrance: पार्किङ प्रवेश + parking_space: पार्किङ स्पेस pharmacy: औषधी पसल place_of_worship: पूजा गर्ने स्थान police: प्रहरी @@ -483,6 +647,10 @@ ne: viaduct: भियाडक्ट "yes": पुल building: + garages: ग्यारेजहरू + hangar: ह्याङ्गर + house: घर + public: सार्वजनिक भवन "yes": भवन craft: brewery: ब्रुएरी @@ -551,6 +719,7 @@ ne: "yes": ऐतिहासिक स्थल landuse: basin: बेसिन + cemetery: अन्त्यष्टी स्थल commercial: व्यवसायिक क्षेत्र conservation: संरक्षण construction: निर्माण @@ -626,6 +795,7 @@ ne: administrative: प्रबन्धकीय स्थल architect: आर्किटेक्ट company: कम्पनी + estate_agent: घरजग्गा एजेन्ट government: सरकारी कार्यालय insurance: बीमा कार्यालय it: आइटी कार्यालय @@ -657,6 +827,7 @@ ne: railway: abandoned: परित्यक्त रेलमार्ग junction: रेलमार्ग जङ्सन + subway: सबवे shop: bakery: बेकरी beauty: सौन्दर्य पसल @@ -704,6 +875,7 @@ ne: sports: खेलकुद सामग्री पसल tailor: सुचीकार toys: खेलौना पसल + travel_agency: ट्राभल एजेन्सी video: भिडियो पसल "yes": पसल tourism: @@ -734,6 +906,7 @@ ne: "yes": जलमार्ग admin_levels: level2: राष्ट्रिय सीमा + level3: क्षेत्र सीमा level4: राज्य सीमा level5: क्षेत्र सीमा level6: इलाका सीमा @@ -759,16 +932,25 @@ ne: reports: new: categories: + diary_entry: + other_label: अन्य + diary_comment: + other_label: अन्य + user: + other_label: अन्य note: other_label: अन्य layouts: + project_name: + title: OpenStreetMap + h1: OpenStreetMap logo: alt_text: OpenStreetMap लोगो logout: निर्गमन log_in: प्रवेश गर्नुहोस् sign_up: खाता खाेल्नुहाेस् start_mapping: म्यापिङ गर्न सुरु गर्नुहोस् - edit: सम्पादन + edit: सम्पादन गर्नुहोस् history: इतिहास export: निर्यात गर्नुहोस् data: डेटा @@ -798,6 +980,10 @@ ne: friendship_notification: hi: नमस्ते %{to_user}, subject: '[OpenStreetMap] %{user} ले तपाईँलाई मित्रको रूपमा थप्नु भयो' + gpx_failure: + hi: नमस्ते %{to_user}, + gpx_success: + hi: नमस्ते %{to_user}, signup_confirm: greeting: नमस्ते! email_confirm: @@ -860,27 +1046,39 @@ ne: title: पासवर्ड बिर्सियो heading: पासवर्ड बिर्सिनुभयो ? email address: 'इमेल ठेगाना:' - new password button: प्रवेस शब्द परिवर्तन गर्ने + new password button: पासवर्ड परिवर्तन गर्नुहोस् edit: - title: प्रवेस शब्द परिवर्तन गर्ने - heading: '%{user}को लागि प्रवेस शब्द परिवर्तन गर्ने' - reset: नयाँ प्रवेशशव्द + title: पासवर्ड परिवर्तन गर्नुहोस् + heading: '%{user}को लागि पासवर्ड परिवर्तन गर्नुहोस्' + reset: पासवर्ड रिसेट गर्नुहोस् update: - flash changed: तपाईंको प्रवेश शब्द परिवर्तन गरिएको छ। + flash changed: तपाईँको पासवर्ड परिवर्तन गरिएको छ। + preferences: + edit: + cancel: रद्द गर्नुहोस् profiles: edit: - image: 'चित्र:' + cancel: रद्द गर्नुहोस् + image: तस्विर home location: 'गृह स्थान:' - no home location: तपाईंले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन। + no home location: तपाईँले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन। + show: देखाउनुहोस् + delete: हटाउनुहोस् sessions: new: title: प्रवेश tab_title: प्रवेश - password: 'पासवर्ड:' + password: पासवर्ड login_button: प्रवेश destroy: title: लगआउट logout_button: निर्गमन + shared: + markdown_help: + link: कडी + image: तस्विर + richtext_field: + edit: सम्पादन गर्नुहोस् site: about: next: अर्को @@ -896,10 +1094,7 @@ ne: legal_babble: more_title_html: थप जान्नको लागि contributors_title_html: हाम्रा योगदान कर्ताहरू - index: - permalink: स्थायी लिङ्क - shortlink: छोटो लिङ्क - createnote: एक टिप्पणी थप्नुहोस् + contributors_fr_france: फ्रान्स edit: user_page_link: प्रयोगकर्ता पृष्ठ export: @@ -970,35 +1165,52 @@ ne: subway: सबवे cable_car: केबल कार chair_lift: कुर्सी लिफ्ट + taxiway: ट्याक्सीको बाटो + city: शहर + vineyard: अङ्गुर-बगैँचा forest: वन wood: कुञ्ज + farmland: खेतीयोग्य जमिन + grass: घाँस + meadow: घाँसेमैदान + sand: बालुवा golf: गल्फ कोर्स park: उद्यान resident: आवासीय क्षेत्र lake: ताल - reservoir: मुहान + reservoir: जलाशय + glacier: हिमनदी + wetland: सिमसार farm: खेती cemetery: अन्त्यष्टी स्थल + beach: समुद्र किनारा school: विद्यालय university: विश्वविद्यालय + hospital: अस्पताल summit: शिखर peak: शिखर bicycle_shop: साइकल पसल bicycle_parking: साकल पार्किङ toilets: शौचालय welcome: - title: स्वागतम्! + title: स्वागत! whats_on_the_map: title: म्यापमा के छ + basic_terms: + node: नोड + way: बाटो rules: title: नियमहरू ! + start_mapping: म्यापिङ गर्न सुरु गर्नुहोस् traces: new: + upload_trace: GPS Trace अपलोड गर्ने visibility_help: यसको मतलाब के हो ? help: सहायता create: upload_trace: GPS Trace अपलोड गर्ने edit: + cancel: रद्द गर्नुहोस् title: ट्रेस सम्पादन गर्दै %{name} heading: ट्रेस सम्पादन गर्दै %{name} visibility_help: यसको मतलब के हो ? @@ -1013,6 +1225,7 @@ ne: uploaded: 'अपलोड गरिएको:' points: 'विन्दुहरू:' start_coordinates: 'सुरूको निर्देशङ्क:' + coordinates_html: '%{latitude}; %{longitude}' map: नक्सा edit: सम्पादन owner: 'मालिक:' @@ -1033,9 +1246,11 @@ ne: public: सार्वजनिक private: निजी index: - public_traces: सारवजनिक GPS ट्रेसहरु - public_traces_from: '%{user}बाट सार्वकनिक GPS ट्रेसहरु' + public_traces: सार्वजनिक GPS ट्रेसहरू + my_gps_traces: मेरो जिपिएस ट्रेसहरू + public_traces_from: '%{user}बाट सार्वजनिक GPS ट्रेसहरू' tagged_with: ' %{tags}हरूद्वारा ट्याग गरिएको' + my_traces: मेरा ट्रेसहरू destroy: scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस make_public: @@ -1049,8 +1264,20 @@ ne: show: confirm: निश्चित हुनुहुन्छ ? oauth2_applications: + index: + name: नाम + permissions: अनुमतिहरू + application: + edit: सम्पादन गर्नुहोस् + delete: हटाउनुहोस् show: + edit: सम्पादन गर्नुहोस् delete: मेट्ने + permissions: अनुमतिहरू + redirect_uris: रिडाइरेक्ट युआरआइहरू + oauth2_authorized_applications: + index: + permissions: अनुमतिहरू users: new: title: खाता खाेल्नुहाेस् @@ -1076,6 +1303,8 @@ ne: my comments: मेरा टिप्पणीहरू edits: सम्पादनहरू traces: ट्रेसहरू + notes: म्याप टिप्पणीहरू + remove as friend: साथीबाट हटाउने add as friend: साथी जोड्नुहोस् status: 'स्थिति:' role: @@ -1083,7 +1312,7 @@ ne: comments: टिप्पणी confirm: निश्चित गर्नुहोस् go_public: - flash success: तपाईंका सबै सम्पादनहरू सार्वाजनिक छन् , तपाईं अब सम्पादन लायक + flash success: तपाईँका सबै सम्पादनहरू सार्वाजनिक छन् , तपाईँ अब सम्पादन लायक हुनु भयो । index: title: प्रयोगकर्ताहरू @@ -1104,7 +1333,7 @@ ne: revoke: title: भूमिका फिर्ता निश्चित गर्ने heading: भूमिका फिर्ता निश्चित गर्ने - are_you_sure: तपाईं भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा + are_you_sure: तपाईँ भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा निश्चित हुनुहुन्छ'? confirm: निश्चित गर्नुहोस् fail: भूमिका `%{role}' ,`%{name}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका @@ -1112,16 +1341,21 @@ ne: user_blocks: show: created: सृजना गरिएको - status: वस्तुस्थिति + status: 'स्थिति:' show: देखाउनुहोस् - edit: सम्पादन + edit: सम्पादन गर्नुहोस् confirm: निश्चित हुनुहुन्छ ? block: show: देखाउनुहोस् - edit: सम्पादन + edit: सम्पादन गर्नुहोस् blocks: creator_name: सर्जक status: वस्तुस्थिति + user_mutes: + index: + table: + tbody: + send_message: सान्देस पठाउ notes: index: id: आईडी @@ -1143,7 +1377,7 @@ ne: share: title: आदान-प्रदान गर्नुहोस् cancel: रद्द गर्नुहोस् - image: छवि + image: तस्विर long_link: कडी embed: एचटीएमएल format: 'ढाँचा:' @@ -1158,12 +1392,8 @@ ne: layers: header: म्याप लेयरहरू notes: म्याप टिप्पणीहरू - changesets: - show: - comment: टिप्पणी - subscribe: सदस्यता लिनुहोस् - unsubscribe: सदस्यता खारेज गर्नुहोस् - hide_comment: लुकाउ + gps: सार्वजनिक GPS ट्रेसहरू + make_a_donation: दान गर्नुहोस् directions: instructions: exit_counts: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index b9577a212..e9d17d84d 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -64,6 +64,7 @@ # Author: Sven L # Author: Tjcool007 # Author: Trijnstel +# Author: Vistaus # Author: Xbaked potatox --- nl: @@ -551,8 +552,13 @@ nl: join_discussion: Meld u aan om mee te praten still_open: Wijzigingenset is nog open – overleg gaat open zodra de wijzigingenset wordt afgesloten. + subscribe: Abonneren + unsubscribe: Uitschrijven comment_by_html: Reactie van %{user}, %{time_ago} hidden_comment_by_html: Verborgen reactie van %{user}, %{time_ago} + hide_comment: verbergen + unhide_comment: zichtbaar maken + comment: Reageren changesetxml: Wijzigingenset-XML osmchangexml: osmChange-XML paging_nav: @@ -626,6 +632,8 @@ nl: title: Dagboek van %{user} | %{title} user_title: Dagboek van %{user} discussion: Overleg + subscribe: Abonneren + unsubscribe: Deabonneren leave_a_comment: Een reactie achterlaten login_to_leave_a_comment_html: U moet moet zich %{login_link} om te kunnen reageren login: Aanmelden @@ -669,7 +677,14 @@ nl: all: title: OpenStreetMap-dagboekberichten description: Recente dagboekberichten van OpenStreetMap-gebruikers - comments: + subscribe: + heading: Abonneren op de volgende dagboekaantekeningendiscussie? + button: Op discussie abonneren + unsubscribe: + heading: Afmelden voor de volgende dagboekaantekeningendiscussie? + button: Van discussie afmelden + diary_comments: + index: title: Dagboekreacties toegevoegd door %{user} heading: Dagboekreacties van %{user} subheading_html: Dagboekreacties toegevoegd door %{user} @@ -679,12 +694,6 @@ nl: comment: Reactie newer_comments: Nieuwere reacties older_comments: Oudere reacties - subscribe: - heading: Abonneren op de volgende dagboekaantekeningendiscussie? - button: Op discussie abonneren - unsubscribe: - heading: Afmelden voor de volgende dagboekaantekeningendiscussie? - button: Van discussie afmelden doorkeeper: errors: messages: @@ -724,6 +733,10 @@ nl: contact_the_community_html: Aarzel niet om %{contact_link} op te nemen met de OpenStreetMap-community als u een niet werkende link of een bug hebt gevonden. Noteer de exacte URL van uw verzoek. + bad_request: + title: Onjuiste aanvraag + description: De bewerking die u op de OpenStreetMap-server hebt aangevraagd + is ongeldig (HTTP 400) forbidden: title: Verboden description: De door u gevraagde bewerking op de OpenStreetMap-server is alleen @@ -1801,8 +1814,8 @@ nl: commented_note_html: '%{commenter} heeft een kaartopmerking waarop u hebt gereageerd opnieuw geactiveerd. De opmerking is gemaakt in de buurt van %{place}.' - details: Meer details over de opmerking zijn te vinden op %{url}. - details_html: Meer details over de opmerking zijn te vinden op %{url}. + details: Reageer of lees meer over de opmerking op %{url}. + details_html: Reageer of lees meer over de opmerking op %{url}. changeset_comment_notification: description: 'OpenStreetMap-wijzigingenreeks #%{id}' hi: Hoi %{to_user}, @@ -1823,8 +1836,8 @@ nl: partial_changeset_with_comment: met reactie "%{changeset_comment}" partial_changeset_with_comment_html: met commentaar "%{changeset_comment}" partial_changeset_without_comment: zonder reactie - details: Meer details over de wijzigingenset kunt u vinden op %{url}. - details_html: Meer details over de wijzigingenset kunt u vinden op %{url}. + details: Reageer of lees meer over de wijzigingenset op %{url}. + details_html: Reageer of lees meer over de wijzigingenset op %{url}. unsubscribe: U kunt afmelden voor updates van deze wijzigingensetop %{url}. unsubscribe_html: U kunt u afmelden voor updates van deze wijzigingenset op %{url}. @@ -2001,6 +2014,8 @@ nl: new: title: Aanmelden tab_title: Aanmelden + login_to_authorize_html: Meld u aan bij OpenStreetMap om toegang te krijgen + tot %{client_app_name}. email or username: 'E-mailadres of gebruikersnaam:' password: 'Wachtwoord:' remember: Aanmeldgegevens onthouden @@ -2008,6 +2023,7 @@ nl: login_button: Aanmelden register now: Nu inschrijven with external: of meld u aan via een derde + or: of auth failure: Met deze gegevens kunt u helaas niet aanmelden. destroy: title: Afmelden @@ -2270,9 +2286,6 @@ nl: js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript uitgeschakeld. js_2: OpenStreetMap gebruikt JavaScript voor de slippykaart. - permalink: Permanente koppeling - shortlink: Korte koppeling - createnote: Opmerking toevoegen license: copyright: Copyright OpenStreetMap en bijdragers, onder een open licentie remote_failed: Bewerken is mislukt. Zorg dat JOSM of Merkaartor is geladen en @@ -2670,6 +2683,8 @@ nl: other: GPX-bestand met %{count} punten van %{user} description_without_count: GPX-bestand van %{user} application: + basic_auth_disabled: 'HTTP-basisauthenticatie is uitgeschakeld: %{link}' + oauth_10a_disabled: 'OAuth 1.0 en 1.0a zijn uitgeschakeld: %{link}' permission_denied: U hebt geen toestemming om toegang te krijgen tot die handeling require_cookies: cookies_needed: U hebt cookies waarschijnlijk uitgeschakeld in uw browser. Schakel @@ -2692,6 +2707,7 @@ nl: muted_users: Gedempte gebruikers auth_providers: openid_logo_alt: Aanmelden met een OpenID + openid_login_button: Doorgaan openid: title: Aanmelden met OpenID alt: Aanmelden met een OpenID URL @@ -2755,6 +2771,9 @@ nl: write_redactions: Kaartgegevens redigeren read_email: E-mailadres lezen skip_authorization: Toepassing automatisch goedkeuren + for_roles: + moderator: Deze toestemming geldt alleen voor acties die alleen toegankelijk + zijn voor moderators oauth_clients: new: title: Nieuwe toepassing registreren @@ -2850,6 +2869,9 @@ nl: users: new: title: Registreren + tab_title: Registreren + signup_to_authorize_html: Registreer u bij OpenStreetMap om toegang te krijgen + tot %{client_app_name}. no_auto_account_create: Helaas is het momenteel niet mogelijk om automatisch een account voor u aan te maken. please_contact_support_html: Neem contact op met de %{support_link} om een account @@ -2861,8 +2883,16 @@ nl: gemaakt door mensen zoals u, en is het voor iedereen gratis te verbeteren, bij te werken, te downloaden en te gebruiken. paragraph_2: Schrijf u in om te beginnen met bijdragen. + welcome: Welkom bij OpenStreetMap + duplicate_social_email: Als u al een OpenStreetMap-account heeft en een identiteitsprovider + van derden wilt gebruiken, log dan in met uw wachtwoord en wijzig de instellingen + van uw account. display name description: Uw openbare gebruikersnaam. U kunt deze later in uw voorkeuren wijzigen. + by_signing_up_html: Door u aan te melden, gaat u akkoord met onze %{tou_link}, + %{privacy_policy_link} en %{contributor_terms_link}. + tou: gebruiksvoorwaarden + contributor_terms: bijdragevoorwaarden external auth: 'Authenticatie van derden:' continue: Registreren terms accepted: Dank u wel voor het aanvaarden van de nieuwe bijdragersovereenkomst! @@ -2870,6 +2900,9 @@ nl: voor meer informatie. privacy_policy: privacybeleid privacy_policy_title: OSMF-privacybeleid, met een kopje over e-mailadressen + consider_pd_html: Ik beschouw mijn bijdragen als onderdeel van het %{consider_pd_link}. + consider_pd: publiek domein + or: of use external auth: of schrijf u in via een derde partij terms: title: Voorwaarden @@ -2935,6 +2968,8 @@ nl: remove as friend: Vriend verwijderen add as friend: Vriend toevoegen mapper since: 'Mapper sinds:' + last map edit: 'Recentste bewerking:' + no activity yet: Nog geen activiteit uid: 'Gebruikers-ID:' ct status: 'Voorwaarden voor bijdragen:' ct undecided: Onbeslist @@ -3218,6 +3253,10 @@ nl: intro: Een fout gezien of ontbreekt er iets? Laat het andere mappers weten zodat wij het kunnen oplossen. Verplaats de markering naar de correcte positie en beschrijf het probleem. + anonymous_warning_html: U bent niet aangemeld. Als u updates van uw aantekening + wilt ontvangen, kunt u %{log_in} of %{sign_up}. + anonymous_warning_log_in: aanmelden + anonymous_warning_sign_up: registreren advice: Deze opmerking is openbaar en kan gebruikt worden om de kaart bij te werken. Vul hier dus geen persoonlijke informatie in, en ook geen informatie uit kaarten of telefoonboeken waar auteursrechtelijke bescherming op rust. @@ -3296,13 +3335,6 @@ nl: queryfeature_disabled_tooltip: Inzoomen om objecten op te vragen embed_html_disabled: Het inbedden van HTML-code is voor deze kaartlaag niet mogelijk - changesets: - show: - comment: Reageren - subscribe: Abonneren - unsubscribe: Uitschrijven - hide_comment: verbergen - unhide_comment: zichtbaar maken edit_help: Verplaats de kaart en zoom in op een plaats die u wilt bewerken. Klik daarna hier. directions: diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 2905c7230..77eec99f0 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1,6 +1,7 @@ # Messages for Norwegian Nynorsk (norsk nynorsk) # Exported from translatewiki.net # Export driver: phpyaml +# Author: 6400 # Author: Abaksle # Author: Amire80 # Author: Bjorni @@ -21,7 +22,6 @@ # Author: Pyscowicz # Author: Ranveig # Author: Ruila -# Author: 6400 --- nn: time: @@ -431,8 +431,13 @@ nn: join_discussion: Logg inn for Ã¥ vere med i diskusjonen still_open: Endringssettet er framleis ope – det vert opna for diskusjon nÃ¥r endringssettet vert lukka. + subscribe: Abonnér + unsubscribe: Avslutt abonnement comment_by_html: Kommentar frÃ¥ %{user} %{time_ago} hidden_comment_by_html: Skylt kommentar frÃ¥ %{user} %{time_ago} + hide_comment: gøym + unhide_comment: vis + comment: Kommenter changesetxml: XML for endringssett osmchangexml: osmChange XML paging_nav: @@ -545,7 +550,8 @@ nn: all: title: Oppføringar OpenStreetMap-dagboka description: Nylege oppføringar i dagbøkene til OpenStreetMap-brukarar - comments: + diary_comments: + index: title: Kommentarar i dagboka frÃ¥ %{user} heading: '%{user} sine kommentarar til dagboksoppføringar' subheading_html: Kommentarar i dagboka frÃ¥ %{user} @@ -2001,9 +2007,6 @@ nn: js_1: Du har ein nettleser som ikkje støttar JavaScript eller sÃ¥ har du slÃ¥tt av JavaScript. js_2: OpenStreetMap brukar JavaScript pÃ¥ kartsidene. - permalink: Permanent lenkje - shortlink: Kort lenkje - createnote: Legg til ein notis license: copyright: Kopibeskytta OpenStreetMap og bidragsytarar, under ein open lisens remote_failed: Klarte ikkje redigere - forsikre deg at JOSM eller Merkaartor @@ -2631,13 +2634,6 @@ nn: map_data_zoom_in_tooltip: Zoom inn for Ã¥ sjÃ¥ kartdata queryfeature_tooltip: Finn objekt queryfeature_disabled_tooltip: Forstørra for Ã¥ finna objekt - changesets: - show: - comment: Kommenter - subscribe: Abonnér - unsubscribe: Avslutt abonnement - hide_comment: gøym - unhide_comment: vis directions: ascend: Stigande engines: diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index 396c7ca0e..7e7331dd1 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -398,8 +398,13 @@ nqo: join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫ still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫. + subscribe: ߊ߬ ߡߊߝߘߎ߫ + unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫ comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬ hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫ + hide_comment: ߊ߬ ߢߡߊߘߏ߲߰ + unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫ + comment: ߡߙߌߣߊ߲ changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫ osmchangexml: ߏ.ߛ.ß¡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML paging_nav: @@ -509,7 +514,8 @@ nqo: all: title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ description: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߞߊ߲߬ - comments: + diary_comments: + index: title: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫ heading: '%{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߠߎ߬' subheading_html: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫ @@ -1397,9 +1403,6 @@ nqo: more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫ contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬ index: - permalink: ߛߘߌ߬ߜߋ߲߬ ߓߟߏߕߍ߰ߓߊߟߌ - shortlink: ߛߘߌ߬ߜߋ߲߬ ߛߎߘߎ߲ - createnote: ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬ license: copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲ ߞߘߐ߫ @@ -1879,13 +1882,6 @@ nqo: map_data_zoom_in_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ ߦߋ߫ queryfeature_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫ queryfeature_disabled_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߏ߫ ߟߎ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫ - changesets: - show: - comment: ߡߙߌߣߊ߲ - subscribe: ߊ߬ ߡߊߝߘߎ߫ - unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫ - hide_comment: ߊ߬ ߢߡߊߘߏ߲߰ - unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫ directions: engines: fossgis_osrm_bike: ߣߍ߰ߛߏ (OSRM) diff --git a/config/locales/oc.yml b/config/locales/oc.yml index f54a14a33..d98593a62 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -445,6 +445,11 @@ oc: join_discussion: Se connectar per rejónher la discussion still_open: Ensemble de modificacions totjorn dobèrt — la discussion se dobrirà un còp que l’ensemble de modificacions serà plegat. + subscribe: S'inscriure + unsubscribe: Se desabonar + hide_comment: amagar + unhide_comment: desamagar + comment: Comentari changesetxml: Grop de modificacions XML osmchangexml: osmChange XML paging_nav: @@ -563,7 +568,8 @@ oc: all: title: Entradas de jornau d'OpenStreetMap description: Entradas recentas de jornau deis utilizaires d'OpenStreetMap - comments: + diary_comments: + index: title: Comentaris ajustats au jornau per %{user} heading: Comentaris dau jornau de %{user} subheading_html: Comentaris dau jornau ajustats per %{user} @@ -1860,9 +1866,6 @@ oc: js_1: JavaScript es pas pres en carga pel navigador qu'utilizatz, o alara l’avètz desactivat. js_2: OpenStreetMap utiliza Javascript per sas mapas lisantas. - permalink: Ligam permanent - shortlink: Ligam cort - createnote: Apondre una nòta license: copyright: Copyright OpenStreetMap e sos contributors, jos una licéncia dobèrta remote_failed: L'edicion a mancat. Asseguratz-vos que lo JOSM o lo Merkaartor @@ -2517,13 +2520,6 @@ oc: map_data_zoom_in_tooltip: Zoomatz per veire las donadas sus la mapa queryfeature_tooltip: Requèsta suls objèctes queryfeature_disabled_tooltip: Zoomar mai per recercar d'objèctes - changesets: - show: - comment: Comentari - subscribe: S'inscriure - unsubscribe: Se desabonar - hide_comment: amagar - unhide_comment: desamagar edit_help: Movètz la mapa e fasètz zoom sus una posicion que volètz editar, e de contunh, fasètz clic aicí. directions: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 1439d1c1e..4ee921521 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -4,6 +4,7 @@ # Author: Aalam # Author: Babanwalia # Author: Bgo eiu +# Author: Cabal # Author: Jimidar # Author: Kuldeepburjbhalaike # Author: Satnam S Virdi @@ -16,9 +17,9 @@ pa: helpers: submit: diary_comment: - create: ਸਾਂਭੋ + create: ਟਿੱਪਣੀ diary_entry: - create: ਛਾਪੋ + create: ਸਾਂਭੋ update: ਅੱਪਡੇਟ ਕਰੋ issue_comment: create: ਟਿੱਪਣੀ ਕਰੋ @@ -61,7 +62,7 @@ pa: relation: ਸਬੰਧ relation_member: ਸਬੰਧ ਮੈਂਬਰ relation_tag: ਸਬੰਧ ਟੈਗ - report: ਰਿਪੋਰਟ ਕਰੋ + report: ਇਤਲਾਹ ਦਿਓ session: ਸੈਸ਼ਨ trace: ਟਰੇਸ tracepoint: ਟਰੇਸ ਪੁਆਇੰਟ @@ -74,7 +75,12 @@ pa: way_tag: ਰਾਹ ਟੈਗ attributes: client_application: + name: ਨਾਮ (ਲੋੜੀਂਦਾ) + url: ਮੁੱਢਲਾ Application URL (ਲੋੜੀਂਦਾ ਹੈ) support_url: ਮਦਦ URL + allow_read_prefs: ਉਹਨਾਂ ਦੀਆਂ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹਾਂ ਨੂੰ ਪੜ੍ਹੋ + allow_write_prefs: ਉਹਨਾਂ ਦੀਆਂ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹਾਂ ਨੂੰ ਸੋਧੋ + allow_write_api: ਨਕਸ਼ੇ ਨੂੰ ਸੋਧੋ diary_comment: body: ਮੁੱਖ ਭਾਗ diary_entry: @@ -85,12 +91,13 @@ pa: language_code: ਬੋਲੀ doorkeeper/application: name: ਨਾਂ + scopes: ਇਜਾਜ਼ਤਾਂ friend: user: ਵਰਤੋਂਕਾਰ friend: ਦੋਸਤ trace: user: ਵਰਤੋਂਕਾਰ - visible: ਵਿਖਣਯੋਗ + visible: ਵਿਖਣ-ਯੋਗ name: ਨਾਂ size: ਅਕਾਰ latitude: ਅਕਸ਼ਾਂਸ਼ @@ -105,20 +112,64 @@ pa: body: ਮੁੱਖ ਭਾਗ recipient: ਪ੍ਰਾਪਤਕਰਤਾ redaction: + title: ਸਿਰਲੇਖ description: ਵੇਰਵਾ + report: + category: ਆਪਣੀ ਇਤਲਾਹ ਦਾ ਕਾਰਨ ਚੁਣੋ + details: ਕਿਰਪਾ ਕਰਕੇ ਸਮੱਸਿਆ ਬਾਰੇ ਕੁਝ ਹੋਰ ਵੇਰਵੇ ਪ੍ਰਦਾਨ ਕਰੋ (ਲੋੜੀਂਦਾ) user: email: ਈਮੇਲ - new_email: 'ਨਵਾਂ ਈ-ਮੇਲ ਪਤਾ:' + new_email: 'ਨਵਾਂ ਈਮੇਲ ਪਤਾ:' active: ਸਰਗਰਮ display_name: ਵਿਖਾਉਣ ਨਾਂ description: ਵੇਰਵਾ home_lat: ਅਕਸ਼ਾਂਸ਼ home_lon: 'ਰੇਖਾਂਸ਼:' - languages: ਬੋਲੀਆਂ + languages: ਤਰਜੀਹੀ ਬੋਲੀਆਂ + preferred_editor: ਤਰਜੀਹੀ ਸੰਪਾਦਕ pass_crypt: ਪਛਾਣ-ਸ਼ਬਦ + help: + user: + new_email: (ਜਨਤਕ ਤੌਰ 'ਤੇ ਕਦੇ ਨਹੀਂ ਪ੍ਰਦਰਸ਼ਿਤ) datetime: distance_in_words_ago: + about_x_hours: + one: ਲਗਭਗ %{count} ਘੰਟਾ ਪਹਿਲਾਂ + other: ਲਗਭਗ %{count} ਘੰਟੇ ਪਹਿਲਾਂ + about_x_months: + one: about %{count} ਮਹੀਨਾ ਪਹਿਲਾਂ + other: ਲਗਭਗ %{count} ਮਹੀਨੇ ਪਹਿਲਾਂ + about_x_years: + one: about %{count} ਸਾਲ ਪਹਿਲਾਂ + other: ਲਗਭਗ %{count} ਸਾਲ ਪਹਿਲਾਂ + almost_x_years: + one: ਲਗਭਗ %{count} ਸਾਲ ਪਹਿਲਾਂ + other: ਲਗਭਗ %{count} ਸਾਲ ਪਹਿਲਾਂ half_a_minute: ਅੱਧਾ ਮਿੰਟ ਪਹਿਲਾਂ + less_than_x_seconds: + one: '%{count} ਸਕਿੰਟ ਤੋਂ ਘੱਟ' + other: '%{count} ਸਕਿੰਟ ਪਹਿਲਾਂ' + less_than_x_minutes: + one: '%{count} ਮਿੰਟ ਤੋਂ ਘੱਟ ਪਹਿਲਾਂ' + other: '%{count} ਮਿੰਟ ਪਹਿਲਾਂ' + over_x_years: + one: ਲਗਭਗ %{count} ਸਾਲ ਪਹਿਲਾਂ + other: ਲਗਭਗ %{count} ਸਾਲ ਪਹਿਲਾਂ + x_seconds: + one: '%{count} ਸਕਿੰਟ ਪਹਿਲਾਂ' + other: '%{count} ਸਕਿੰਟ ਪਹਿਲਾਂ' + x_minutes: + one: '%{count} ਮਿੰਟ ਪਹਿਲਾਂ' + other: '%{count} ਮਿੰਟ ਪਹਿਲਾਂ' + x_days: + one: '%{count} ਦਿਨ ਪਹਿਲਾਂ' + other: '%{count} ਦਿਨ ਪਹਿਲਾਂ' + x_months: + one: '%{count} ਮਹੀਨਾ ਪਹਿਲਾਂ' + other: '%{count} ਮਹੀਨੇ ਪਹਿਲਾਂ' + x_years: + one: '%{count} ਸਾਲ ਪਹਿਲਾਂ' + other: '%{count} ਸਾਲ ਪਹਿਲਾਂ' editor: default: ਮੂਲ (ਮੌਜੂਦਾ %{name}) id: @@ -130,14 +181,41 @@ pa: none: ਕੋਈ ਨਹੀਂ google: ਗੂਗਲ facebook: ਫੇਸਬੁੱਕ - microsoft: ਵਿੰਡੋਜ਼ ਲਾਈਵ + microsoft: ਮਾਈਕ੍ਰੋਸਾਫਟ github: ਗਿੱਟਹੱਬ wikipedia: ਵਿਕੀਪੀਡੀਆ api: notes: + comment: + opened_at_html: '%{when} ਬਣਾਇਆ ਗਿਆ' + opened_at_by_html: '%{when} ਨੂੰ %{user} ਦੁਆਰਾ ਬਣਾਇਆ ਗਿਆ' + closed_at_html: '%{when} ਹੱਲ ਕੀਤਾ' + closed_at_by_html: '%{when} ਨੂੰ %{user} ਦੁਆਰਾ ਹੱਲ ਕੀਤਾ ਗਿਆ' + reopened_at_html: '%{when} ਮੁੜ ਸਰਗਰਮ ਕੀਤਾ' + reopened_at_by_html: '%{when} ਨੂੰ %{user} ਦੁਆਰਾ ਮੁੜ ਸਰਗਰਮ ਕੀਤਾ' entry: - comment: ਟਿੱਪਣੀ ਕਰੋ + comment: ਟਿੱਪਣੀ full: ਪੂਰੀ ਟਿੱਪਣੀ + account: + deletions: + show: + title: ਮੇਰਾ ਖਾਤਾ ਮਿਟਾਓ + warning: ਚੇਤਾਵਨੀ! ਖਾਤਾ ਮਿਟਾਉਣ ਦੀ ਪ੍ਰਕਿਰਿਆ ਅੰਤਿਮ ਹੈ, ਅਤੇ ਇਸਨੂੰ ਵਾਪਸ ਨਹੀਂ ਕੀਤਾ + ਜਾ ਸਕਦਾ ਹੈ। + delete_account: ਖਾਤਾ ਮਿਟਾਓ + delete_introduction: 'ਤੁਸੀਂ ਹੇਠਾਂ ਦਿੱਤੇ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਪਣੇ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ + ਖਾਤੇ ਨੂੰ ਮਿਟਾ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੇ ਵੇਰਵਿਆਂ ਵੱਲ ਧਿਆਨ ਦਿਓ:' + delete_profile: ਤੁਹਾਡੇ ਪ੍ਰੋਫਾਈਲ ਦੀ ਜਾਣਕਾਰੀ, ਜਿਸ ਵਿੱਚ ਤੁਹਾਡਾ ਅਵਤਾਰ, ਵੇਰਵਾ ਅਤੇ + ਘਰ ਦੇ ਟਿਕਾਣੇ ਸ਼ਾਮਲ ਹੈ, ਨੂੰ ਮਿਦਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। + retain_caveats: 'ਹਾਲਾਂਕਿ, ਤੁਹਾਡੇ ਬਾਰੇ ਕੁਝ ਜਾਣਕਾਰੀ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ''ਤੇ ਬਰਕਰਾਰ + ਰੱਖੀ ਜਾਵੇਗੀ, ਭਾਵੇਂ ਤੁਹਾਡਾ ਖਾਤਾ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਹੋਵੇ:' + retain_edits: ਨਕਸ਼ੇ ਦੇ ਭੰਡਾਰ ਵਿੱਚ ਤੁਹਾਡੇ ਸੰਪਾਦਨ, ਜੇ ਕੋਈ ਹਨ, ਨੂੰ ਬਰਕਰਾਰ ਰੱਖਿਆ + ਜਾਵੇਗਾ। + retain_email: ਤੁਹਾਡਾ ਈਮੇਲ ਪਤਾ ਬਰਕਰਾਰ ਰੱਖਿਆ ਜਾਵੇਗਾ। + recent_editing_html: ਜਿਵੇਂ ਕਿ ਤੁਸੀਂ ਹਾਲ ਹੀ ਵਿੱਚ ਸੰਪਾਦਿਤ ਕੀਤਾ ਹੈ ਤੁਹਾਡੇ ਖਾਤੇ + ਨੂੰ ਵਰਤਮਾਨ ਵਿੱਚ ਮਿਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। %{time} ਵਿੱਚ ਮਿਟਾਉਣਾ ਸੰਭਵ ਹੋਵੇਗਾ। + confirm_delete: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ? + cancel: ਰੱਦ ਕਰੋ accounts: edit: title: ਖਾਤਾ ਸੋਧੋ @@ -150,23 +228,40 @@ pa: enabled link text: ਇਹ ਕੀ ਹੈ? disabled link text: ਮੈਂ ਸੋਧ ਕਿਉਂ ਨਹੀਂ ਕਰ ਸਕਦਾ? contributor terms: - heading: 'ਯੋਗਦਾਨੀ ਦੀਆਂ ਸ਼ਰਤਾਂ:' + heading: 'ਯੋਗਦਾਨ ਦੀਆਂ ਸ਼ਰਤਾਂ:' agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਜਤਾਈ ਹੈ। not yet agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਨਹੀਂ ਜਤਾਈ। link text: ਇਹ ਕੀ ਹੈ? save changes button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ + delete_account: ਖਾਤਾ ਮਿਟਾਓ go_public: + heading: ਜਨਤਕ ਸੁਧਾਈ + currently_not_public: ਵਰਤਮਾਨ ਵਿੱਚ ਤੁਹਾਡੇ ਸੰਪਾਦਨ ਅਗਿਆਤ ਹਨ ਅਤੇ ਲੋਕ ਤੁਹਾਨੂੰ ਸੁਨੇਹੇ + ਨਹੀਂ ਭੇਜ ਸਕਦੇ ਜਾਂ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਨਹੀਂ ਦੇਖ ਸਕਦੇ। ਇਹ ਦਿਖਾਉਣ ਲਈ ਕਿ ਤੁਸੀਂ ਕੀ ਸੰਪਾਦਿਤ + ਕੀਤਾ ਹੈ ਅਤੇ ਲੋਕਾਂ ਨੂੰ ਵੈੱਬਸਾਈਟ ਰਾਹੀਂ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿੱਤੀ + ਹੈ, ਹੇਠਾਂ ਦਿੱਤੇ ਬਟਨ 'ਤੇ ਕਲਿੱਕ ਕਰੋ। + find_out_why: ਪਤਾ ਕਰੋ ਕਿਉਂ + email_not_revealed: ਤੁਹਾਡਾ ਈਮੇਲ ਪਤਾ ਜਨਤਕ ਹੋਣ ਨਾਲ ਪ੍ਰਗਟ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। + not_reversible: ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਵਾਪਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ ਅਤੇ ਸਾਰੇ ਨਵੇਂ ਵਰਤੋਂਕਾਰ + ਹੁਣ ਮੂਲ ਰੂਪ ਵਿੱਚ ਜਨਤਕ ਹਨ। make_edits_public_button: ਮੇਰੀਆਂ ਸਾਰੀਆਂ ਸੋਧਾਂ ਜਨਤਕ ਕਰੋ + destroy: + success: ਖਾਤਾ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ। browse: + deleted_ago_by_html: '%{time_ago} ਨੂੰ %{user} ਦੁਆਰਾ ਮਿਟਾਇਆ ਗਿਆ' + edited_ago_by_html: '%{time_ago} ਨੂੰ %{user} ਦੁਆਰਾ ਸੋਧਿਆ ਗਿਆ' version: ਵਰਜਨ in_changeset: ਤਬਦੀਲੀਆਂ anonymous: ਬੇਪਛਾਣ no_comment: (ਕੋਈ ਟਿੱਪਣੀ ਨਹੀਂ) part_of: ਦਾ ਹਿੱਸਾ + part_of_relations: + one: '%{count} ਸਬੰਧ' + other: '%{count} ਸਬੰਧ' download_xml: XML ਲਾਹੋ view_history: ਅਤੀਤ ਵੇਖੋ view_details: ਵੇਰਵੇ ਵੇਖੋ - location: 'ਸਥਿਤੀ:' + location: 'ਟਿਕਾਣਾ:' relation: members: ਜੀਅ relation_member: @@ -175,7 +270,12 @@ pa: node: ਨੋਡ way: ਰਾਹ relation: ਸਬੰਧ + containing_relation: + entry_html: ਸਬੰਧ %{relation_name} + entry_role_html: ਸਬੰਧ %{relation_name} (%{relation_role} ਵਜੋਂ) not_found: + title: ਨਹੀਂ ਲੱਭਿਆ + sorry: 'ਮਾਫ਼ ਕਰਨਾ, %{type} #%{id} ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।' type: node: ਨੋਡ way: ਰਾਹ @@ -195,15 +295,22 @@ pa: way: ਰਾਹ relation: ਸਬੰਧ start_rjs: - load_data: ਡਾਟਾ ਲੋਡ ਕਰੋ - loading: ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ… + load_data: ਡੇਟਾ ਲੱਦੋ + loading: ਲੱਦ ਰਿਹਾ ਹੈ... tag_details: tags: ਟੈਗ wikipedia_link: '%{page} ਲੇਖ ਵਿਕਿਪੀਡਿਆ ਉੱਤੇ' telephone_link: '%{phone_number} ਨੂੰ ਫੋਨ ਕਰੋ' + colour_preview: ਰੰਗ %{colour_value} ਝਲਕ + email_link: ਈਮੇਲ %{email} + query: + title: ਪੁੱਛਗਿੱਛ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ + introduction: ਨੇੜਲੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਲੱਭਣ ਲਈ ਨਕਸ਼ੇ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ। + nearby: ਨੇੜਲੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ + enclosing: ਨੱਥੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ changesets: changeset_paging_nav: - showing_page: ਵਰਕਾ %{page} + showing_page: ਸਫ਼ਾ %{page} next: ਅਗਲਾ » previous: « ਪਿਛਲਾ changeset: @@ -213,10 +320,10 @@ pa: id: ਸ਼ਨਾਖ਼ਤ user: ਵਰਤੋਂਕਾਰ comment: ਟਿੱਪਣੀ - area: ਇਲਾਕਾ + area: ਖੇਤਰ index: title: ਤਬਦੀਲੀਆਂ - load_more: ਹੋਰ ਲੋਡ ਕਰੋ + load_more: ਹੋਰ ਪੜ੍ਹੋ feed: title: ਤਬਦੀਲੀ ਲੜੀ %{id} title_comment: ਤਬਦੀਲੀ ਲੜੀ %{id} - %{comment} @@ -225,24 +332,35 @@ pa: belongs_to: ਲੇਖਕ show: title: 'ਤਬਦੀਲੀ ਲੜੀ: %{id}' - discussion: ਚਰਚਾ + created: 'ਬਣਾਇਆ ਗਿਆ: %{when}' + closed: 'ਬੰਦ ਕੀਤਾ: %{when}' + created_ago_html: '%{time_ago} ਬਣਾਇਆ ਗਿਆ' + closed_ago_html: '%{time_ago} ਬੰਦ ਕੀਤਾ' + created_ago_by_html: '%{time_ago} ਨੂੰ %{user} ਦੁਆਰਾ ਬਣਾਇਆ ਗਿਆ' + closed_ago_by_html: '%{time_ago} ਨੂੰ %{user} ਦੁਆਰਾ ਬੰਦ ਕੀਤਾ ਗਿਆ' + discussion: ਗੱਲ-ਬਾਤ + join_discussion: ਗੱਲਬਾਤ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਦਾਖ਼ਲ ਹੋਵੋ + comment_by_html: '%{user} %{time_ago} ਤੋਂ ਟਿੱਪਣੀ' + hidden_comment_by_html: '%{user} %{time_ago} ਤੋਂ ਲੁਕਵੀਂ ਟਿੱਪਣੀ' changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML dashboards: contact: km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ' m away: '%{count}ਮੀਟਰ ਪਰ੍ਹਾਂ' - latest_edit_html: 'ਆਖ਼ਰੀ ਸੋਧ %{ago}:' + latest_edit_html: 'ਤਾਜ਼ੇ ਸੋਧ (%{ago}):' popup: your location: ਤੁਹਾਡੀ ਸਥਿਤੀ friend: ਦੋਸਤ show: + my friends: ਮੇਰੇ ਦੋਸਤ no friends: ਤੁਸੀਂ ਅਜੇ ਕੋਈ ਮਿੱਤਰ ਨਹੀਂ ਜੋੜਿਆ। nearby users: ਨੇੜੇ-ਤੇੜੇ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰ diary_entries: form: - location: 'ਸਥਿਤੀ:' + location: ਟਿਕਾਣਾ use_map_link: ਨਕਸ਼ਾ ਵਰਤੋ show: + discussion: ਗੱਲ-ਬਾਤ leave_a_comment: ਕੋਈ ਟਿੱਪਣੀ ਛੱਡੋ login_to_leave_a_comment_html: ਟਿੱਪਣੀ ਛੱਡਣ ਵਾਸਤੇ %{login_link} login: ਦਾਖ਼ਲ ਹੋਵੋ @@ -251,6 +369,7 @@ pa: diary_entry: comment_link: ਇਸ ਇੰਦਰਾਜ 'ਤੇ ਟਿੱਪਣੀ ਕਰੋ reply_link: ਇਸ ਇੰਦਰਾਜ ਦਾ ਜੁਆਬ ਦਿਉ + no_comments: ਕੋਈ ਟਿੱਪਣੀਆਂ ਨਹੀਂ edit_link: ਇਹ ਇੰਦਰਾਜ ਸੋਧੋ hide_link: ਇਹ ਇੰਦਰਾਜ ਲੁਕਾਉ confirm: ਤਸਦੀਕ ਕਰੋ @@ -258,15 +377,16 @@ pa: hide_link: ਇਹ ਟਿੱਪਣੀ ਲੁਕਾਉ confirm: ਤਸਦੀਕ ਕਰੋ location: - location: 'ਸਥਿਤੀ:' + location: 'ਟਿਕਾਣਾ:' view: ਵੇਖੋ edit: ਸੋਧੋ - comments: + diary_comments: + index: post: ਡਾਕ when: ਕਦੋਂ comment: ਟਿੱਪਣੀ - newer_comments: ਹੋਰ ਨਵੀਆਂ ਟਿੱਪਣੀਆਂ - older_comments: ਹੋਰ ਪੁਰਾਣੀਆਂ ਟਿੱਪਣੀਆਂ + newer_comments: ਨਵੀਆਂ ਟਿੱਪਣੀਆਂ + older_comments: ਪੁਰਾਣੀਆਂ ਟਿੱਪਣੀਆਂ friendships: make_friend: heading: '%{user} ਨਾਲ਼ ਯਾਰੀ ਪਾਉਣੀ ਹੈ?' @@ -282,7 +402,7 @@ pa: aeroway: aerodrome: ਏਰੋਡਰੋਮ apron: ਐਪਰਨ - gate: ਦਰਵਾਜ਼ਾ + gate: ਹਵਾਈ ਅੱਡੇ ਦਾ ਦਰਵਾਜ਼ਾ helipad: ਹੈਲੀਪੈਡ runway: ਉਡਾਣ-ਪੱਟੀ taxiway: ਟੈਕਸੀਵੇਅ @@ -369,7 +489,7 @@ pa: waste_basket: ਕੂੜਾਦਾਨ waste_disposal: ਕੂੜੇਦਾਨ boundary: - administrative: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ + administrative: ਪ੍ਰਬੰਧਕੀ ਸਰਹੱਦ census: ਮਰਦਮਸ਼ੁਮਾਰੀ ਸਰਹੱਦ national_park: ਕੌਮੀ ਬਾਗ਼ protected_area: ਸੁਰੱਖਿਅਤ ਖੇਤਰ @@ -477,7 +597,7 @@ pa: recreation_ground: ਮਨੋਰੰਜਨ ਮੈਦਾਨ reservoir: ਸਰੋਵਰ residential: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ - retail: ਪਰਚੂਨ + retail: ਪਰਚੂਨ ਖੇਤਰ village_green: ਸ਼ਾਮਲਾਤ vineyard: ਅੰਗੂਰਾਂ ਦਾ ਬਾਗ਼ leisure: @@ -723,18 +843,19 @@ pa: more_results: ਹੋਰ ਨਤੀਜੇ layouts: logo: - alt_text: ਓਪਨਸਟਰੀਟਮੈਪ ਲੋਗੋ + alt_text: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਮਾਰਕਾ home: ਘਰੇਲੂ ਟਿਕਾਣੇ 'ਤੇ ਜਾਉ logout: ਵਿਦਾਈ ਲਉ log_in: ਦਾਖ਼ਲ ਹੋਵੋ sign_up: ਭਰਤੀ ਹੋਵੋ start_mapping: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ edit: ਸੋਧੋ - history: ਅਤੀਤ + history: ਪੁਰਾਣਾ export: ਬਰਾਮਦ data: ਸਮੱਗਰੀ export_data: ਸਮੱਗਰੀ ਬਰਾਮਦ ਕਰੋ edit_with: '%{editor} ਨਾਲ ਸੋਧੋ' + intro_header: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਉੱਤੇ ਜੀ ਆਇਆਂ ਨੂੰ intro_2_create_account: ਇੱਕ ਵਰਤੋਂਕਾਰ ਖਾਤਾ ਬਣਾਉ partners_partners: ਜੋੜੀਦਾਰ help: ਮਦਦ @@ -748,9 +869,25 @@ pa: learn_more: ਹੋਰ ਜਾਣੋ more: ਹੋਰ user_mailer: + message_notification: + subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] %{message_title}' + header: '%{from_user} ਨੇ ਤੁਹਾਨੂੰ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਰਾਹੀਂ %{subject}: ਵਿਸ਼ੇ ਨਾਲ + ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ।' + header_html: '%{from_user} ਨੇ ਤੁਹਾਨੂੰ %{subject} ਵਿਸ਼ੇ ਦੇ ਨਾਲ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ + ਰਾਹੀਂ ਇੱਕ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ:' + friendship_notification: + subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] %{user} ਨੇ ਤੁਹਾਨੂੰ ਇੱਕ ਦੋਸਤ ਵਜੋਂ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ' + had_added_you: '%{user} ਨੇ ਤੁਹਾਨੂੰ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ''ਤੇ ਇੱਕ ਦੋਸਤ ਵਜੋਂ ਸ਼ਾਮਲ + ਕੀਤਾ ਹੈ।' + gpx_failure: + subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] GPX ਦਰਾਮਦ ਅਸਫਲਤਾ' + gpx_success: + subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] GPX ਦਰਾਮਦ ਸਫਲਤਾ' signup_confirm: + subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] ਉੱਤੇ ਜੀ ਆਈਆਂ ਨੂੰ' greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ ਜੀ! email_confirm: + subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] ਆਪਣੇ ਈਮੇਲ ਪਤੇ ਦੀ ਤਸਦੀਕ ਕਰੋ' greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ, lost_password: greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ, @@ -772,6 +909,8 @@ pa: failure: ਵਰਤੋਂਕਾਰ %{name} ਨਹੀਂ ਲੱਭਿਆ। confirm_email: heading: ਈਮੇਲ ਪਤੇ ਦੀ ਤਬਦੀਲੀ ਤਸਦੀਕ ਕਰਾਉ + press confirm button: ਆਪਣੇ ਨਵੇਂ ਈਮੇਲ ਪਤੇ ਦੀ ਤਸਦੀਕ ਕਰਨ ਲਈ ਹੇਠਾਂ ਦਿੱਤੇ ਤਸਦੀਕੀ + ਬਟਨ ਨੂੰ ਦਬਾਓ। button: ਤਸਦੀਕ ਕਰੋ messages: inbox: @@ -783,7 +922,7 @@ pa: date: ਮਿਤੀ message_summary: reply_button: ਜੁਆਬ - destroy_button: ਮਿਟਾਉ + destroy_button: ਮਿਟਾਓ new: title: ਸੁਨੇਹਾ ਘੱਲੋ create: @@ -799,7 +938,7 @@ pa: unread_button: ਅਣ-ਪੜ੍ਹਿਆ ਨਿਸ਼ਾਨ ਲਾਉ back: ਪਿੱਛੇ sent_message_summary: - destroy_button: ਮਿਟਾਉ + destroy_button: ਮਿਟਾਓ heading: my_inbox: ਮੇਰਾ ਇਨਬਾਕਸ destroy: @@ -808,7 +947,7 @@ pa: new: title: ਪਛਾਣ ਸ਼ਬਦ ਗੁੰਮ ਗਿਆ heading: ਪਛਾਣ ਸ਼ਬਦ ਭੁੱਲ ਗਿਆ? - email address: 'ਈਮੇਲ ਪਤਾ:' + email address: ਈਮੇਲ ਪਤਾ new password button: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ edit: title: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ @@ -824,7 +963,7 @@ pa: keep image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਰੱਖੋ delete image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਹਟਾਉ replace image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਵਟਾਉ - home location: 'ਘਰ ਦੀ ਸਥਿਤੀ:' + home location: ਘਰ ਦਾ ਟਿਕਾਣਾ no home location: ਤੁਸੀਂ ਆਪਣੇ ਘਰ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਦੱਸੀ ਹੈ। sessions: new: @@ -837,12 +976,13 @@ pa: login_button: ਦਾਖ਼ਲ ਹੋਵੋ register now: ਹੁਣੇ ਰਜਿਸਟਰ ਕਰੋ destroy: - title: ਲੌਗਆਊਟ - heading: ਓਪਨ ਸਟਰੀਟ ਮੈਪ ਤੋਂ ਲੌਗਆਊਟ ਕਰੋ - logout_button: ਲੌਗਆਊਟ + title: ਬਾਹਰ ਆਉ + heading: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਤੋਂ ਬਾਹਰ ਆਓ + logout_button: ਬਾਹਰ ਆਉ site: about: next: ਅੱਗੇ + heading_html: '%{copyright}ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ %{br} ਯੋਗਦਾਨੀ' local_knowledge_title: ਸਥਾਨੀ ਗਿਆਨ open_data_title: ਓਪਨ ਡਾਟਾ legal_title: ਕਾਨੂੰਨੀ @@ -857,19 +997,19 @@ pa: mapping_link: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ legal_babble: title_html: ਨਕਲ-ਹੱਕ ਤੇ ਲਾਇਸੰਸ + introduction_1_osm_foundation: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਸੰਸਥਾ + credit_title_html: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਨੂੰ ਕਿਵੇਂ ਸੇਹਰਾ ਦੇਣਾ ਹੈ + credit_1_html: 'ਜਿੱਥੇ ਤੁਸੀਂ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਡੇਟਾ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋ, ਤੁਹਾਨੂੰ + ਹੇਠ ਲਿਖੀਆਂ ਦੋ ਚੀਜ਼ਾਂ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ:' more_title_html: ਹੋਰ ਜਾਣਕਾਰੀ ਲੱਭਣ ਵਾਸਤੇ contributors_title_html: ਸਾਡੇ ਯੋਗਦਾਨੀ - index: - permalink: ਪੱਕੀ ਕੜੀ - shortlink: ਛੋਟੀ ਕੜੀ - createnote: ਟਿੱਪਣੀ ਜੋੜੋ edit: user_page_link: ਵਰਤੋਂਕਾਰ ਵਰਕਾ anon_edits_link_text: ਪਤਾ ਕਰੋ ਕਿ ਮਾਮਲਾ ਇਸ ਤਰ੍ਹਾਂ ਕਿਉਂ ਹੈ। export: title: ਬਰਾਮਦ manually_select: ਆਪਣੇ ਆਪ ਇੱਕ ਵੱਖਰਾ ਖੇਤਰ ਚੁਣੋ - licence: ਲਾਇਸੰਸ + licence: ਲਸੰਸ too_large: other: title: ਹੋਰ ਸਰੋਤ @@ -879,7 +1019,7 @@ pa: how_to_help: title: ਮਦਦ ਕਿਵੇਂ ਕਰਨੀ ਹੈ join_the_community: - title: ਭਾਈਚਾਰੇ ਨਾਲ਼ ਜੁੜੋ + title: ਭਾਈਚਾਰੇ ਨਾਲ ਜੁੜੋ other_concerns: title: ਹੋਰ ਫ਼ਿਕਰ help: @@ -903,7 +1043,7 @@ pa: get_directions: ਦਿਸ਼ਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ from: ਵੱਲੋਂ to: ਵੱਲ - where_am_i: ਮੈਂ ਕਿੱਥੇ ਹਾਂ? + where_am_i: ਇਹ ਕਿੱਥੇ ਹੈ? submit_text: ਜਾਉ key: table: @@ -923,9 +1063,9 @@ pa: runway: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ taxiway: ਟੈਕਸੀਵੇਅ apron: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ - admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ + admin: ਪ੍ਰਬੰਧਕੀ ਸਰਹੱਦ forest: ਜੰਗਲ - wood: ਜੰਗਲ + wood: ਲੱਕੜ golf: ਗੋਲਫ਼ ਮੈਦਾਨ park: ਪਾਰਕ common: ਸ਼ਾਮਲਾਟ @@ -1022,9 +1162,10 @@ pa: header: ਮੁਫ਼ਤ ਅਤੇ ਸੋਧਣਯੋਗ continue: ਭਰਤੀ ਹੋਵੋ terms: - title: ਯੋਗਦਾਨੀ ਦੀਆਂ ਸ਼ਰਤਾਂ - heading: ਯੋਗਦਾਨੀ ਦੀਆਂ ਸ਼ਰਤਾਂ + title: ਸ਼ਰਤਾਂ + heading: ਸ਼ਰਤਾਂ consider_pd_why: ਇਹ ਕੀ ਹੈ? + informal_translations: ਗ਼ੈਰ-ਰਸਮੀ ਤਰਜਮਾ decline: ਮਨਜ਼ੂਰ ਨਹੀਂ legale_select: 'ਆਪਣੀ ਰਿਹਾਇਸ਼ ਦਾ ਦੇਸ਼ ਚੁਣੋ:' legale_names: @@ -1059,10 +1200,10 @@ pa: created from: 'ਕਿੱਥੋਂ ਉਸਾਰਿਆ:' status: 'ਦਰਜਾ:' role: - administrator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਪ੍ਰਸ਼ਾਸਕ ਹੈ। + administrator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੈ। moderator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਵਿਚੋਲਾ ਹੈ। grant: - administrator: ਪ੍ਰਸ਼ਾਸਕੀ ਹੱਕ ਦਿਉ + administrator: ਪ੍ਰਬੰਧਕੀ ਹੱਕ ਦਿਓ moderator: ਵਿਚੋਲਗੀ ਦੇ ਹੱਕ ਦਿਉ comments: ਟਿੱਪਣੀਆਂ create_block: ਇਸ ਵਰਤੋਂਕਾਰ 'ਤੇ ਰੋਕ ਲਾਉ @@ -1102,7 +1243,7 @@ pa: helper: block_duration: hours: - one: ੧ ਘੰਟਾ + one: '%{count} ਘੰਟਾ' other: '%{count} ਘੰਟੇ' show: status: ਹਾਲਾਤ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 88ac2cc08..b43068952 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -466,7 +466,7 @@ pl: entry_role_html: Relacja %{relation_name} (jako %{relation_role}) not_found: title: Nie znaleziono - sorry: 'Niestety, nie odnaleziono %{type} #%{id}.' + sorry: 'Nie odnaleziono %{type} #%{id}.' type: node: węzła way: linii @@ -512,6 +512,15 @@ pl: introduction: Kliknij na mapie, by wyszukać pobliskie obiekty. nearby: Obiekty w pobliżu enclosing: Większe, otaczające obiekty + old_nodes: + not_found: + sorry: 'Nie odnaleziono węzła #%{id} w wersji %{version}.' + old_ways: + not_found: + sorry: 'Nie odnaleziono linii #%{id} w wersji %{version}.' + old_relations: + not_found: + sorry: 'Nie odnaleziono relacji #%{id} w wersji %{version}.' changesets: changeset_paging_nav: showing_page: Strona %{page} @@ -560,8 +569,13 @@ pl: join_discussion: Zaloguj się, aby dołączyć do dyskusji still_open: Zestaw zmian jest wciąż otwarty – dyskusja będzie możliwa, gdy zostanie on zamknięty. + subscribe: Obserwuj + unsubscribe: Nie obserwuj comment_by_html: Komentarz od %{user} %{time_ago} hidden_comment_by_html: Ukryty komentarz od użytkownika %{user} %{time_ago} + hide_comment: ukryj + unhide_comment: pokaż + comment: Komentarz changesetxml: XML w formacie zestawu zmian osmchangexml: XML w formacie osmChange paging_nav: @@ -679,7 +693,8 @@ pl: all: title: Wpisy dzienników OpenStreetMap description: Ostatnie wpisy dzienników od użytkowników OpenStreetMap - comments: + diary_comments: + index: title: Komentarze do dzienników dodane przez %{user} heading: Komentarze do dzienników użytkownika %{user} subheading_html: Komentarze do dzienników dodane przez %{user} @@ -742,7 +757,7 @@ pl: search: title: results_from_html: Wyniki z %{results_link} - latlon: Wewnętrzny + latlon: Internal osm_nominatim: Nominatim osm_nominatim_reverse: Nominatim search_osm_nominatim: @@ -1911,6 +1926,10 @@ pl: new password button: Wyczyść hasło help_text: Proszę wprowadzić adres e-mail używany do logowania. Zostanie wysłany na niego odnośnik służący do wyczyszczenia hasła. + create: + send_paranoid_instructions: Jeśli twój adres e-mail istnieje w naszej bazie + danych, otrzymasz link do odzyskania hasła na swój adres e-mail w ciągu kilku + minut. edit: title: Wyczyść hasło heading: Czyszczenie hasła użytkownika %{user} @@ -1918,6 +1937,7 @@ pl: flash token bad: Nie znaleziono tokenu, sprawdź URL update: flash changed: Hasło zostało zmienione. + flash token bad: Nie znalaziono tego tokena. Sprawdź adres URL. preferences: show: title: Preferencje @@ -1981,7 +2001,9 @@ pl: support: supportem shared: markdown_help: - heading_html: Przeanalizowano za pomocą %{kramdown_link} + heading_html: Składnia %{kramdown_link} + kramdown_url: https://kramdown.gettalong.org/quickref.html + kramdown: kramdown headings: Nagłówki heading: Nagłówki subheading: Podtytuł @@ -2116,6 +2138,14 @@ pl: contributors_fr_credit_html: '%{france}: Zawiera dane uzyskane z Direction Générale des Impôts.' contributors_fr_france: Francja + contributors_hr_credit_html: |- + %{croatia}: Zawiera dane z %{dgu_link} i %{open_data_portal} + (informacje publiczne Chorwacji). + contributors_hr_croatia: Chorwacja + contributors_hr_dgu: Państwowej Administracji Geodezyjnej Chorwacji (Državna + geodetska uprava) + contributors_hr_open_data_portal: Krajowego portalu otwartych danych (Portal + otvorenih podataka) contributors_nl_credit_html: '%{netherlands}: Zawiera dane © AND, 2007 (%{and_link})' contributors_nl_netherlands: Holandia @@ -2124,8 +2154,12 @@ pl: contributors_nz_new_zealand: Nowa Zelandia contributors_nz_linz_data_service: LINZ Data Service contributors_nz_cc_by: CC BY 4.0 + contributors_rs_credit_html: |- + %{serbia}: Zawiera dane z %{rgz_link} i %{open_data_portal} + (informacje publiczne Serbii), 2018. contributors_rs_serbia: Serbia - contributors_rs_open_data_portal: Krajowy Portal Otwartych Danych + contributors_rs_rgz: Serbskiego Urzędu Geodezyjnego + contributors_rs_open_data_portal: Krajowego portalu otwartych danych contributors_si_credit_html: '%{slovenia}: Zawiera dane %{gu_link} oraz %{mkgp_link} (informacja publiczna Słowenii).' contributors_si_slovenia: Słowenia @@ -2146,7 +2180,7 @@ pl: contributors_gb_united_kingdom: Wielka Brytania contributors_2_html: Szczegóły tych i innych źródeł, które zostały wykorzystane, aby udoskonalić OpenStreetMap, są dostępne na stronie %{contributors_page_link}. - contributors_2_contributors_page: Contributors (en) + contributors_2_contributors_page: Contributors contributors_footer_2_html: Włączenie danych do OpenStreetMap nie musi oznaczać, że udostępniający je podmiot popiera OpenStreetMap, udziela jakiejkolwiek gwarancji lub ponosi jakąkolwiek odpowiedzialność. @@ -2169,9 +2203,6 @@ pl: js_1: Twoja przeglądarka internetowa nie obsługuje JavaScriptu bądź też masz wyłączoną jego obsługę. js_2: OpenStreetMap używa JavaScriptu do wyświetlania tej mapy. - permalink: Permalink - shortlink: Skrócony link - createnote: Dodaj uwagę license: copyright: Prawa autorskie należą do OpenStreetMap i jego autorów na warunkach otwartej licencji @@ -2327,6 +2358,7 @@ pl: farmland: Grunty rolne grass: Trawnik meadow: Łąka + bare_rock: Odkryte skały sand: Piaski golf: Pole golfowe park: Park @@ -2340,6 +2372,7 @@ pl: scrubland: Zarośla lake: Jezioro reservoir: Zbiornik + intermittent_water: Okresowy ciek glacier: Lodowiec reef: Rafa wetland: Mokradła @@ -2553,6 +2586,7 @@ pl: oauth2_authorizations: Autoryzacje OAuth 2 auth_providers: openid_logo_alt: Zaloguj się przez OpenID + openid_login_button: Kontynuuj openid: title: Zaloguj się przez OpenID alt: Zaloguj się za pomocą adresu URL OpenID @@ -2713,6 +2747,7 @@ pl: users: new: title: Zarejestruj się + tab_title: Rejestracja no_auto_account_create: Niestety nie możemy aktualnie stworzyć ci konta automatycznie. please_contact_support_html: Skontaktuj się z %{support_link} w celu umówienia się na założenie konta – postaramy się rozpatrzyć prośbę jak najszybciej. @@ -2735,7 +2770,7 @@ pl: privacy_policy_title: Polityka prywatności OSMF, w tym sekcja dotycząca adresów e-mail or: lub - use external auth: Alternatywnie, zaloguj się przez... + use external auth: 'Alternatywnie, zarejestruj się przez:' terms: title: Warunki heading: Warunki @@ -2798,6 +2833,8 @@ pl: remove as friend: usuń ze znajomych add as friend: dodaj do znajomych mapper since: 'Mapuje od:' + last map edit: 'Ostatnia edycja mapy:' + no activity yet: — uid: 'Identyfikator użytkownika:' ct status: 'Warunki uczestnictwa:' ct undecided: niezdecydowane @@ -2809,14 +2846,18 @@ pl: role: administrator: Ten użytkownik jest administratorem moderator: Ten użytkownik jest moderatorem + importer: Ten użytkownik jest importerem grant: administrator: Przyznaj dostęp administratora moderator: Przyznaj dostęp moderatora + importer: Przyznaj rolę importera revoke: administrator: Cofnij dostęp administratora moderator: Cofnij dostęp moderatora + importer: Odwołaj rolę importera block_history: aktywne blokady moderator_history: nałożone blokady + revoke_all_blocks: Odwołaj wszystkie blokady comments: komentarze create_block: Zablokuj tego użytkownika activate_user: Aktywuj tego użytkownika @@ -2922,6 +2963,18 @@ pl: confirm: Czy na pewno chcesz odwołać tę blokadę? revoke: Odwołaj! flash: Blokada została odwołana. + revoke_all: + title: Odwoływanie wszystkich blokad nałożonych na użytkownika %{block_on} + heading_html: Odwoływanie wszystkich blokad nałożonych na użytkownika %{block_on} + empty: Użytkownik %{name} nie ma aktywnych blokad. + confirm: Jesteś pewny, że chcesz odwołać %{active_blocks}? + active_blocks: + one: '%{count} aktywna blokada' + few: '%{count} aktywne blokady' + many: '%{count} aktywnych blokad' + other: "" + revoke: Odwołaj! + flash: Wszystkie aktywne blokady zostały odwołane. helper: time_future_html: Blokada wygasa za %{time}. until_login: Aktywna do momentu zalogowania się użytkownika. @@ -2957,7 +3010,7 @@ pl: blocks_on: title: Blokady na użytkownika %{name} heading_html: Lista blokad na użytkownika %{name} - empty: '%{name} nie był jeszcze zablokowany.' + empty: Użytkownik %{name} nie był jeszcze zablokowany. blocks_by: title: Blokady nałożone przez %{name} heading_html: Lista blokad nałożonych przez %{name} @@ -2986,14 +3039,31 @@ pl: reason: Powód blokady status: Status revoker_name: Odwołana przez + older: Starsze blokady + newer: Nowsze blokady + navigation: + all_blocks: Wszystkie blokady + blocks_on_me: Blokady nałożone na mnie + blocks_on_user: Blokady na %{user} + blocks_by_me: Blokady nałożone przeze mnie + blocks_by_user: Blokady nałożone przez %{user} + block: Blokada nr %{id} user_mutes: index: + user_mute_explainer: Wiadomości od wyciszonych użytkowników są przenoszone do + osobnej skrzynki odbiorczej, a ty nie otrzymasz powiadomień e-mailem. + user_mute_admins_and_moderators: Możesz wyciszyć administratorów i moderatorów, + jednak ich wiadomości nie będą wyciszone. table: tbody: unmute: Wyłącz wyciszenie send_message: Wyślij wiadomość create: - notice: Wyciszyłeś %{name}. + notice: Wyciszyłeś użytkownika %{name}. + error: Nie udało się wyciszyć użytkownika %{name}. %{full_message} + destroy: + notice: Odciszyłeś użytkownika %{name}. + error: Nie udało się odciszyć użytkownika. Spróbuj ponownie. notes: index: title: Uwagi użytkownika %{user} @@ -3043,6 +3113,10 @@ pl: intro: Zauważyłeś błąd lub brak czegoś? Daj znać innym mapującym, aby mogli to poprawić. Przesuń znacznik do właściwej pozycji i wpisz notatkę opisującą problem. + anonymous_warning_html: Nie jesteś zalogowany. %{log_in} lub %{sign_up}, jeśli + chcesz otrzymywać aktualizacje tej uwagi. + anonymous_warning_log_in: Zaloguj się + anonymous_warning_sign_up: zarejestruj advice: Twoja uwaga jest publiczna i może zostać użyta do zaktualizowania mapy, nie podawaj tu więc informacji osobistych oraz informacji z map i źródeł chronionych prawami autorskimi. @@ -3113,6 +3187,7 @@ pl: osm_france: OpenStreetMap France thunderforest_credit: Kafelki dzięki uprzejmości %{thunderforest_link} andy_allan: Andy'ego Allana + tracestrack_credit: Kafelki dzięki uprzejmości %{tracestrack_link} hotosm_credit: 'Styl kafelków: %{hotosm_link}. Hosting: %{osm_france_link}' hotosm_name: Humanitarian OpenStreetMap Team site: @@ -3125,13 +3200,6 @@ pl: queryfeature_tooltip: Pobierz i wyświetl obiekty queryfeature_disabled_tooltip: Przybliż mapę, aby obejrzeć dane obiektów embed_html_disabled: Osadzanie HTML nie jest dostępne dla tej warstwy mapy - changesets: - show: - comment: Komentarz - subscribe: Obserwuj - unsubscribe: Nie obserwuj - hide_comment: ukryj - unhide_comment: pokaż edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie kliknąć tutaj. directions: diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml index 2a7f0d269..726e4c665 100644 --- a/config/locales/pnb.yml +++ b/config/locales/pnb.yml @@ -400,6 +400,9 @@ pnb: title: 'تبدیلیاں: %{id}' discussion: گل بات join_discussion: ایہہ گل بات جوڑن لئی تسیں لوگ‌این کر سکدیو + hide_comment: لُکاؤ + unhide_comment: نہیں لُکاؤ + comment: ٹپݨی کرو changesetxml: تبدیلیاں لئی سروت دی فائل osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ paging_nav: @@ -513,7 +516,8 @@ pnb: all: title: نقشے بارے وچ روزنامچے دے لیکھ description: حالیہ نقشے بارے وچ روزنامچے دے لیکھ - comments: + diary_comments: + index: title: ایہہ روزنامچے وچ «%{user}» دیاں ٹپݨیاں پائیاں heading: روزنامچے وچ «%{user}» دیاں ٹپݨیاں subheading_html: ایہہ روزنامچے وچ «%{user}» دیاں ٹپݨیاں پائیاں @@ -1504,9 +1508,6 @@ pnb: index: js_1: تہاڈے براؤزر جاواسکرپٹ نہیں ورتیئے، یا تسیں جاواسکرپٹ بند کیتے سی۔ js_2: ایس ویب‌سائیٹ دا نقشہ جاواسکرپٹ ورتدا۔ - permalink: پکی کڑی - shortlink: چھوٹی کڑی - createnote: نوٹ پایو license: copyright: اوپن سٹریٹ میپ تے لیکھک لئی آزاد لائیسنس نال ویب سائیٹ چھپیا سی۔ remote_failed: سودھ کر نہیں سکدے۔ خبرے جو اَیپ چالو تے ریموٹ کنٹرول چالو وکھیو۔ @@ -2069,11 +2070,6 @@ pnb: map_data_zoom_in_tooltip: ڈیٹے دکھݨ لئی وڈا کریو queryfeature_tooltip: نقشاں لئی پرشن queryfeature_disabled_tooltip: نقش دے پرشن لئی وڈا کریو - changesets: - show: - comment: ٹپݨی کرو - hide_comment: لُکاؤ - unhide_comment: نہیں لُکاؤ directions: engines: fossgis_osrm_bike: سائیکل (او ایس آر ایم) diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 8f529e5c8..3e143c68b 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -142,7 +142,8 @@ ps: location: 'ځای:' view: کتل edit: سمول - comments: + diary_comments: + index: when: کله comment: تبصره friendships: diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 1dc5c537a..2626cbc11 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -361,8 +361,8 @@ pt-PT: destroy: success: Conta apagada. browse: - deleted_ago_by_html: Eliminado há %{time_ago} por %{user} - edited_ago_by_html: Editado há %{time_ago} por %{user} + deleted_ago_by_html: Eliminado %{time_ago} por %{user} + edited_ago_by_html: Editado %{time_ago} por %{user} version: Versão redacted_version: Versão reduzida in_changeset: Conjunto de alterações @@ -522,16 +522,21 @@ pt-PT: title: 'Conjunto de alterações: %{id}' created: 'Criado: %{when}' closed: 'Fechado: %{when}' - created_ago_html: Criado há %{time_ago} - closed_ago_html: Fechado há %{time_ago} - created_ago_by_html: Criado há %{time_ago} por %{user} - closed_ago_by_html: Fechado há %{time_ago} por %{user} + created_ago_html: Criado %{time_ago} + closed_ago_html: Fechado %{time_ago} + created_ago_by_html: Criado %{time_ago} por %{user} + closed_ago_by_html: Fechado %{time_ago} por %{user} discussion: Discussão join_discussion: Inicia sessão para te juntares à discussão still_open: O conjunto de alterações continua aberto. A discussão será iniciada assim que o conjunto de alterações for fechado. - comment_by_html: Comentário de %{user} há %{time_ago} - hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} + subscribe: Subscrever + unsubscribe: Anular subscrição + comment_by_html: Comentário de %{user} %{time_ago} + hidden_comment_by_html: Comentário ocultado por %{user} %{time_ago} + hide_comment: ocultar + unhide_comment: desocultar + comment: Comentar changesetxml: XML do conjunto de alterações osmchangexml: XML no formato osmChange paging_nav: @@ -608,6 +613,8 @@ pt-PT: title: Diário de %{user} | %{title} user_title: Diário de %{user} discussion: Discussão + subscribe: Subscrever + unsubscribe: Cancelar subscrição leave_a_comment: Deixar um comentário login_to_leave_a_comment_html: '%{login_link} para deixar um comentário' login: Iniciar sessão @@ -652,7 +659,15 @@ pt-PT: all: title: Publicações no diário de mapeadores do OpenStreetMap description: Publicações recentes no diário OpenStreetMap - comments: + subscribe: + heading: Pretendes acompanhar a seguinte discussão sobre a entrada no diário? + button: Acompanhar discussão + unsubscribe: + heading: Pretendes deixar de acompanhar a seguinte discussão sobre a entrada + no diário? + button: Deixar de acompanhar a discussão + diary_comments: + index: title: Comentários no Diário feitos por %{user} heading: Comentários no Diário de %{user} subheading_html: Comentários no Diário feitos por %{user} @@ -662,13 +677,6 @@ pt-PT: comment: Comentário newer_comments: Comentários mais recentes older_comments: Comentários mais antigos - subscribe: - heading: Pretendes acompanhar a seguinte discussão sobre a entrada no diário? - button: Acompanhar discussão - unsubscribe: - heading: Pretendes deixar de acompanhar a seguinte discussão sobre a entrada - no diário? - button: Deixar de acompanhar a discussão doorkeeper: errors: messages: @@ -710,6 +718,10 @@ pt-PT: contact_the_community_html: Fique à vontade para %{contact_link} a comunidade OpenStreetMap caso tenha encontrado uma ligação inativa ou um erro. Deixe uma nota da URL exata da sua solicitação. + bad_request: + title: Pedido inválido + description: A operação solicitada no servidor OpenStreetMap não é válida (HTTP + 400) forbidden: title: Proibido description: A operação solicitada no servidor do OpenStreetMap só está disponível @@ -1778,8 +1790,8 @@ pt-PT: perto de %{place}.' commented_note_html: '%{commenter} reabriu uma nota comentada por ti. A nota fica perto de %{place}.' - details: Podes ver mais detalhes sobre a nota em %{url}. - details_html: Podes ver mais detalhes sobre a nota em %{url}. + details: Responde ou descobre mais sobre a nota em %{url}. + details_html: Responde ou descobre mais sobre a nota em %{url}. changeset_comment_notification: description: Conjunto de alterações n.º %{id} hi: Olá, %{to_user}. @@ -1800,10 +1812,8 @@ pt-PT: partial_changeset_with_comment: com o comentário '%{changeset_comment}' partial_changeset_with_comment_html: com o comentário '%{changeset_comment}' partial_changeset_without_comment: sem comentários - details: Podes encontrar mais informações sobre o conjunto de alterações em - %{url}. - details_html: Podes encontrar mais informações sobre o conjunto de alterações - em %{url}. + details: Responde ou descobre mais sobre o conjunto de alterações em %{url}. + details_html: Responde ou descobre mais sobre o conjunto de alterações em %{url}. unsubscribe: Podes deixar de acompanhar as atualizações deste conjunto de alterações em %{url}. unsubscribe_html: Podes deixar de acompanhar as atualizações deste conjunto @@ -1980,13 +1990,15 @@ pt-PT: new: title: Entrar tab_title: Iniciar sessão + login_to_authorize_html: Inicia sessão no OpenStreetMap para acederes a %{client_app_name}. email or username: 'E-mail ou Nome de utilizador:' password: Palavra-passe remember: Ficar autenticado entre sessões lost password link: Perdeste a tua palavra-passe? login_button: Iniciar sessão register now: Regista-te agora - with external: 'Em alternativa, usa um serviço externo para iniciares sessão:' + with external: ou inicia sessão com uma aplicação de terceiros + or: ou auth failure: Lamentamos, mas não foi possível iniciar sessão com os dados fornecidos. destroy: title: Sair @@ -2157,6 +2169,12 @@ pt-PT: contributors_fr_credit_html: '%{france}: contém dados provenientes da Direção Geral de Impostos.' contributors_fr_france: França + contributors_hr_credit_html: |- + %{croatia}: Contém dados de %{dgu_link} e %{open_data_portal} + (informação pública da Croácia). + contributors_hr_croatia: Croácia + contributors_hr_dgu: Administração Geodésica Estatal da Croácia + contributors_hr_open_data_portal: Portal Nacional de Dados Abertos contributors_nl_credit_html: '%{netherlands}: Contém © e dados, 2007 (%{and_link})' contributors_nl_netherlands: Países Baixos @@ -2219,9 +2237,6 @@ pt-PT: js_1: Está a usar um navegador de Internet que não suporta JavaScript ou tem o JavaScript desativado. js_2: É necessário ter o JavaScript ativado para visualizar mapas no OpenStreetMap. - permalink: Ligação permanente - shortlink: Atalho - createnote: Adicionar nota license: copyright: Direitos de autor do OpenStreetMap e seus contribuidores, sob uma licença aberta @@ -2617,6 +2632,8 @@ pt-PT: other: Ficheiro GPX com %{count} pontos de %{user} description_without_count: Ficheiro GPX de %{user} application: + basic_auth_disabled: 'A Autenticação Básica HTTP está desativada: %{link}' + oauth_10a_disabled: 'OAuth 1.0 e 1.0a estão desativados: %{link}' permission_denied: Não tens permissões para realizar essa operação require_cookies: cookies_needed: Parece que tens os "cookies" desativados - por favor, ativa-os @@ -2639,6 +2656,7 @@ pt-PT: muted_users: Utilizadores Silenciados auth_providers: openid_logo_alt: Iniciar sessão com um OpenID + openid_login_button: Continuar openid: title: Iniciar sessão com OpenID alt: Iniciar sessão com um URL do OpenID @@ -2703,6 +2721,8 @@ pt-PT: write_redactions: Rever dados do mapa read_email: ‎Ler e-mail de utilizador skip_authorization: Aprovar a aplicação automaticamente + for_roles: + moderator: Esta permissão é para ações disponíveis apenas para moderadores oauth_clients: new: title: Registar uma nova aplicação @@ -2798,20 +2818,29 @@ pt-PT: users: new: title: Criar conta + tab_title: Registar + signup_to_authorize_html: Inicia sessão no OpenStreetMap para acederes a %{client_app_name}. no_auto_account_create: Infelizmente, e de momento, não é possível criar uma conta automaticamente. please_contact_support_html: Por favor, contacta %{support_link} para pedir a criação de uma conta - tentaremos tratar do pedido o mais rapidamente possível. support: apoio about: - header: Livre e editável + header: Gratuito e editável. paragraph_1: Ao contrário de outros mapas, o OpenStreetMap é completamente criado por pessoas como tu, e qualquer pessoa o pode corrigir, transferir e usar de forma gratuita. - paragraph_2: Regista-te para começares a contribuir. Iremos enviar um e-mail - para confirmar a tua conta. + paragraph_2: Regista-te para começares a contribuir. + welcome: Bem-vind@ ao OpenStreetMap + duplicate_social_email: Se já tens uma conta OpenStreetMap e desejas utilizar + um provedor de identidade externo, inicia sessão com a tua palavra-passe e + modifica as definições da tua conta. display name description: O nome de utilizador ficará visível publicamente. Poderás alterar o nome posteriormente nas configurações do teu perfil. + by_signing_up_html: Ao registares-te, aceitas os nossos %{tou_link}, %{privacy_policy_link} + e %{contributor_terms_link}. + tou: Termos de Utilização + contributor_terms: Termos de Contribuidor external auth: 'Autenticação por terceiros:' continue: Criar conta terms accepted: Obrigado por aceitares os novos termos de contribuidor! @@ -2820,7 +2849,10 @@ pt-PT: privacy_policy: política de privacidade privacy_policy_title: Política de privacidade da OSMF incluindo secção sobre endereços de correio eletrónico - use external auth: Em alternativa, usa um serviço externo para iniciares sessão + consider_pd_html: Considero que as minhas contribuições estão no %{consider_pd_link}. + consider_pd: domínio público + or: ou + use external auth: ou regista-te com um serviço externo terms: title: Termos heading: Termos @@ -2888,6 +2920,8 @@ pt-PT: remove as friend: Remover amigo add as friend: Adicionar aos amigos mapper since: 'A mapear desde:' + last map edit: 'Última edição do mapa:' + no activity yet: Ainda sem atividade uid: 'Id de utilizador:' ct status: 'Termos do Contribuidor:' ct undecided: Por decidir @@ -3091,6 +3125,13 @@ pt-PT: revoker_name: Revogado por older: Blocos mais antigos newer: Blocos mais recentes + navigation: + all_blocks: Todos os bloqueios + blocks_on_me: Quem me bloqueou + blocks_on_user: Bloqueios a %{user} + blocks_by_me: Os meus bloqueios + blocks_by_user: Bloqueios de %{user} + block: 'Bloqueio #%{id}' user_mutes: index: title: Utilizadores Silenciados @@ -3136,15 +3177,15 @@ pt-PT: open_title: Nota não resolvida n.º %{note_name} closed_title: Nota resolvida n.º %{note_name} hidden_title: Nota oculta n.º %{note_name} - event_opened_by_html: Criada por %{user} há %{time_ago} - event_opened_by_anonymous_html: Criada por anónimo há %{time_ago} - event_commented_by_html: Comentada por %{user} há %{time_ago} - event_commented_by_anonymous_html: Comentada por anónimo há %{time_ago} - event_closed_by_html: Resolvida por %{user} há %{time_ago} - event_closed_by_anonymous_html: Resolvida por anónimo há %{time_ago} - event_reopened_by_html: Reativada por %{user} há %{time_ago} - event_reopened_by_anonymous_html: Reativada por anónimo há %{time_ago} - event_hidden_by_html: Escondida por %{user} há %{time_ago} + event_opened_by_html: Criada por %{user} %{time_ago} + event_opened_by_anonymous_html: Criada por anónimo %{time_ago} + event_commented_by_html: Comentada por %{user} %{time_ago} + event_commented_by_anonymous_html: Comentada por anónimo %{time_ago} + event_closed_by_html: Resolvida por %{user} %{time_ago} + event_closed_by_anonymous_html: Resolvida por anónimo %{time_ago} + event_reopened_by_html: Reativada por %{user} %{time_ago} + event_reopened_by_anonymous_html: Reativada por anónimo %{time_ago} + event_hidden_by_html: Escondida por %{user} %{time_ago} report: denunciar esta nota anonymous_warning: Esta nota inclui comentários de utilizadores anónimos que devem ser confirmados por fonte independente. @@ -3166,6 +3207,10 @@ pt-PT: o mais pormenorizada possível sobre o que pretendes ver alterado no mapa, para que outros mapeadores te possam ajudar. Posiciona o marcador no local correto e escreve uma nota que explique o problema. + anonymous_warning_html: Não tens sessão iniciada. Por favor, %{log_in} ou %{sign_up} + se quiseres receber atualizações sobre a tua nota. + anonymous_warning_log_in: inicia sessão + anonymous_warning_sign_up: regista-te advice: 'Lembra-te: a tua nota é pública e poderá ser usada para atualizar o mapa, portanto, não introduzas informações pessoais, dados de mapas ou catálogos protegidos por direitos de autor.' @@ -3244,13 +3289,6 @@ pt-PT: queryfeature_disabled_tooltip: Amplia para consultares elementos embed_html_disabled: A incorporação de HTML não está disponível para esta camada do mapa - changesets: - show: - comment: Comentar - subscribe: Subscrever - unsubscribe: Anular subscrição - hide_comment: ocultar - unhide_comment: desocultar edit_help: Move o mapa, amplia-o no local que pretendes editar e clica aqui. directions: ascend: Ascenção diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b2e05b488..8080db17a 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -531,8 +531,13 @@ pt: join_discussion: Entrar para participar da discussão still_open: O conjunto de alterações continua em aberto - A discussão será iniciada assim que for fechado o conjunto de alterações. + subscribe: Inscrever + unsubscribe: Cancelar inscrição comment_by_html: Comentário de %{user} há %{time_ago} hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} + hide_comment: esconder + unhide_comment: exibir + comment: Comentar changesetxml: XML do conjunto de alterações osmchangexml: XML osmChange paging_nav: @@ -648,7 +653,8 @@ pt: all: title: Publicações no diário do OpenStreetMap description: Publicações no diário recentes de usuários do OpenStreetMap - comments: + diary_comments: + index: title: Comentários no diário feitos por %{user} heading: Comentários no diário de %{user} subheading_html: Comentários no diário feitos por %{user} @@ -2214,9 +2220,6 @@ pt: js_1: Você está usando um navegador sem suporte a JavaScript, ou está com o JavaScript desativado. js_2: O OpenStreetMap usa JavaScript para a navegação dos mapas. - permalink: Link permanente - shortlink: Link Curto - createnote: Incluir uma nota license: copyright: Direitos autorais do OpenStreetMap e contribuidores sob uma licença aberta @@ -3247,13 +3250,6 @@ pt: queryfeature_disabled_tooltip: Aproxime para consultar elementos embed_html_disabled: A incorporação de HTML não está disponível para esta camada do mapa - changesets: - show: - comment: Comentar - subscribe: Inscrever - unsubscribe: Cancelar inscrição - hide_comment: esconder - unhide_comment: exibir edit_help: Mover o mapa e ampliar uma localização que pretende editar e clique aqui. directions: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 28bac391a..c0b0cc636 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -488,8 +488,13 @@ ro: join_discussion: Conectați-vă pentru a vă alătura discuției still_open: Setul de schimbări este deschis - discuția se va deschide atunci când setul de schimbări este închis. + subscribe: Abonare + unsubscribe: Dezabonare comment_by_html: Comentariu de la %{user} %{time_ago} hidden_comment_by_html: Comentariu ascuns de la %{user} %{time_ago} + hide_comment: ascunde + unhide_comment: arată + comment: Comentariu changesetxml: Set de modificări XML osmchangexml: XML osmChange paging_nav: @@ -607,7 +612,8 @@ ro: all: title: Înregistrări în jurnalul OpenStreetMap description: Înregistrări recente în jurnale de la utilizatorii OpenStreetMap - comments: + diary_comments: + index: title: Comentarii din jurnal adăugate de %{user} heading: Comentariile la jurnal a lui %{user} subheading_html: Comentarii din jurnal adăugate de %{user} @@ -2163,9 +2169,6 @@ ro: js_1: Utilizați fie un browser care nu acceptă JavaScript, fie aveți JavaScript dezactivat. js_2: OpenStreetMap folosește JavaScript pentru hărțile goale. - permalink: Legătură permanentă - shortlink: Legătură scurtată - createnote: Adaugă o notă license: copyright: Drepturi de autor OpenStreetMap și contribuitori, sub licență deschisă remote_failed: Editarea a eșuat - asigurați-vă că JOSM sau Merkaartor este încărcat @@ -3145,13 +3148,6 @@ ro: queryfeature_disabled_tooltip: Mărește caracteristicile de interogare embed_html_disabled: Încorporarea HTML nu este disponibilă pentru acest strat de hartă - changesets: - show: - comment: Comentariu - subscribe: Abonare - unsubscribe: Dezabonare - hide_comment: ascunde - unhide_comment: arată edit_help: Deplasați harta și măriți o locație pe care doriți să o editați, apoi faceți click aici. directions: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 83a1f5f28..1e1f2a844 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -630,8 +630,13 @@ ru: join_discussion: Войдите в систему, чтобы присоединиться к обсуждению still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет правок будет закрыт. + subscribe: Подписаться + unsubscribe: Отписаться comment_by_html: Комментарий от %{user} %{time_ago} hidden_comment_by_html: Скрытый комментарий от %{user} %{time_ago} + hide_comment: скрыть + unhide_comment: показать + comment: Комментировать changesetxml: XML пакета правок osmchangexml: osmChange XML paging_nav: @@ -705,6 +710,8 @@ ru: title: Дневник пользователя %{user} | %{title} user_title: Дневник пользователя %{user} discussion: Обсуждение + subscribe: Подписаться + unsubscribe: Отписаться leave_a_comment: Оставить комментарий login_to_leave_a_comment_html: '%{login_link}, чтобы оставить комментарий' login: Войти @@ -750,7 +757,14 @@ ru: all: title: Записи в дневнике OpenStreetMap description: Последние записи в дневнике от пользователей OpenStreetMap - comments: + subscribe: + heading: Подписаться на обсуждение следующей записи в дневнике? + button: Подписаться на обсуждение + unsubscribe: + heading: Отписаться от обсуждения следующей записи в дневнике? + button: Отписаться от обсуждения + diary_comments: + index: title: Комментарии к записям в дневнике, добавленные пользователем %{user} heading: Комментарии к записям в дневнике пользователя %{user} subheading_html: Комментарии к записям в дневнике, добавленные пользователем @@ -761,12 +775,6 @@ ru: comment: Комментарий newer_comments: Более новые комментарии older_comments: Более старые комментарии - subscribe: - heading: Подписаться на обсуждение следующей записи в дневнике? - button: Подписаться на обсуждение - unsubscribe: - heading: Отписаться от обсуждения следующей записи в дневнике? - button: Отписаться от обсуждения doorkeeper: errors: messages: @@ -1834,8 +1842,8 @@ ru: заметок недалеко от %{place}.' commented_note_html: '%{commenter} открыл заново одну из вами прокомментированных заметок недалеко от %{place}.' - details: Подробнее о заметке %{url}. - details_html: 'Подробнее о заметке: %{url}.' + details: Ответить или узнать больше о заметке %{url}. + details_html: 'Ответить или узнать больше о заметке: %{url}.' changeset_comment_notification: hi: Здравствуйте, %{to_user}, greeting: Здравствуйте, @@ -1855,8 +1863,8 @@ ru: partial_changeset_with_comment: с комментарием '%{changeset_comment}' partial_changeset_with_comment_html: с комментарием '%{changeset_comment}' partial_changeset_without_comment: без комментария - details: Дополнительные сведения о пакете правок можно найти на %{url}. - details_html: Дополнительные сведения о пакете правок можно найти на %{url}. + details: 'Ответить или узнать больше о пакете правок: %{url}.' + details_html: Ответить или узнать больше о пакете правок можно на %{url}. unsubscribe: Чтобы отказаться от новых сообщений для этого пакета правок, перейдите по ссылке %{url} и нажмите кнопку "Отписаться". unsubscribe_html: Чтобы отказаться от подписки на обновления этого набора изменений, @@ -2205,9 +2213,6 @@ ru: index: js_1: Вы используете браузер, в котором не поддерживается или отключён JavaScript. js_2: OpenStreetMap использует JavaScript для отображения карт. - permalink: Постоянная ссылка - shortlink: Короткая ссылка - createnote: Добавить заметку license: copyright: Авторские права принадлежат OpenStreetMap и его участникам на условиях открытой лицензии @@ -3168,13 +3173,6 @@ ru: queryfeature_tooltip: Что здесь? queryfeature_disabled_tooltip: Приблизьте карту для информации об объектах embed_html_disabled: Встраивание HTML недоступно для этого слоя карты - changesets: - show: - comment: Комментировать - subscribe: Подписаться - unsubscribe: Отписаться - hide_comment: скрыть - unhide_comment: показать edit_help: Передвиньте карту и увеличьте место, которые вы хотите править, затем кликните здесь. directions: diff --git a/config/locales/sat.yml b/config/locales/sat.yml index 9c891f96c..0bc77b753 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -213,6 +213,8 @@ sat: belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ show: discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ + hide_comment: ᱫᱟᱱᱟᱝ + comment: ᱚᱠᱛᱟ paging_nav: nodes: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ ways: (%{count}) ᱦᱚᱨᱠᱚ @@ -260,7 +262,8 @@ sat: location: 'ᱡᱟᱭᱜᱟ:' view: ᱧᱮᱞ ᱢᱮ edit: ᱥᱟᱯᱲᱟᱣ - comments: + diary_comments: + index: when: ᱛᱤᱥ comment: ᱚᱠᱛᱟ newer_comments: ᱱᱟᱶᱟᱱᱟ ᱚᱠᱛᱟᱠᱚ @@ -555,8 +558,6 @@ sat: copyright: native: mapping_link: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ - index: - createnote: ᱠᱷᱟᱴᱚ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ edit: user_page_link: ᱵᱮᱵᱦᱟᱨᱤᱭᱟᱜ ᱥᱟᱦᱴᱟ export: @@ -709,10 +710,6 @@ sat: edit_tooltip: ᱱᱟᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ edit_disabled_tooltip: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱵᱷᱤᱛᱨᱤ ᱥᱮᱫ ᱡᱩᱢ ᱢᱮ createnote_tooltip: ᱱᱚᱠᱥᱟ ᱨᱮ ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ - changesets: - show: - comment: ᱚᱠᱛᱟ - hide_comment: ᱫᱟᱱᱟᱝ directions: engines: fossgis_osrm_bike: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ (OSRM) diff --git a/config/locales/sc.yml b/config/locales/sc.yml index c6d0c1b60..f91dcca38 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -465,8 +465,13 @@ sc: join_discussion: Intra pro t'aunire a s'arresonu still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando s'annantu de modìficas s'at a serrare. + subscribe: Sutaiscrie·ti + unsubscribe: Annulla s'iscritzione comment_by_html: Cummentu de %{user} %{time_ago} hidden_comment_by_html: Cummentu cuadu de %{user} %{time_ago} + hide_comment: cua + unhide_comment: ammustra + comment: Cummentu changesetxml: XML de s'annantu de modìficas osmchangexml: XML in formadu osmChange paging_nav: @@ -582,7 +587,8 @@ sc: all: title: Intradas de diàriu de OpenStreetMap description: Intradas de diàriu reghentes de sos utentes de OpenStreetMap - comments: + diary_comments: + index: title: Cummentos de su diàriu annantos dae %{user} heading: Cummentos de su diàriu de %{user} subheading_html: Cummentos de su diàriu annantos dae %{user} @@ -2148,9 +2154,6 @@ sc: js_1: Ses impreende unu navigadore chi non tenet su suportu pro JavaScript o as inabilitadu JavaScript. js_2: OpenStreetMap impreat JavaScript pro sa mapa dinàmica sua. - permalink: Ligàmene permanente - shortlink: Ligàmene curtzu - createnote: Annanghe una nota license: copyright: Deretu de autore de OpenStreetMap e de sos collaboradores suos suta de una litzèntzia aberta @@ -3107,13 +3110,6 @@ sc: map_data_zoom_in_tooltip: Ismànnia pro bìdere sos datos de sa mapa queryfeature_tooltip: Chirca de elementos queryfeature_disabled_tooltip: Ismànnia pro chircare elementos - changesets: - show: - comment: Cummentu - subscribe: Sutaiscrie·ti - unsubscribe: Annulla s'iscritzione - hide_comment: cua - unhide_comment: ammustra edit_help: Move sa mapa, ismànnia in una positzione chi boles modificare e a pustis incarca inoghe directions: diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 40da1ef4a..3cddda069 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -359,6 +359,11 @@ scn: title: 'Gruppu di canciamenti: %{id}' discussion: Discussioni join_discussion: Pi participari ntâ discussioni trasi + subscribe: Abbònati + unsubscribe: Annulla l’abbunamentu + hide_comment: ammuccia + unhide_comment: Ammustra + comment: Cummenta changesetxml: XML dû gruppu di canciamenti osmchangexml: XML osmChange paging_nav: @@ -462,7 +467,8 @@ scn: all: title: Vuci dû diariu d'OpenStreetMap description: Vuci ricenti dû diariu di l'utenti d'OpenStreetMap - comments: + diary_comments: + index: post: Missaggiu when: Quannu comment: Cummentu @@ -1361,9 +1367,6 @@ scn: js_1: O stai adupirannu nu browser chi nun supporta lu JavaScript, o puru hai lu JavaScript disattivatu. js_2: OpenStreetMap adòpira lu JavaScript pâ sò cartina scurritura. - permalink: Culligamentu pirmanenti - shortlink: Culligamentu accurzatu - createnote: Agghiunci na nota license: copyright: Copyright OpenStreetMap e li sò cuntribbutura, sutta a na licenza graputa @@ -2031,13 +2034,6 @@ scn: map_data_zoom_in_tooltip: Zumma pi putiri a vìdiri li dati dâ cartina queryfeature_tooltip: Arricerca elimenti queryfeature_disabled_tooltip: Zumma pi putiri circari l'elimenti - changesets: - show: - comment: Cummenta - subscribe: Abbònati - unsubscribe: Annulla l’abbunamentu - hide_comment: ammuccia - unhide_comment: Ammustra edit_help: Sposta la cartina e zumma ntôn postu chi voi canciari, e appoi clicca ccà. directions: diff --git a/config/locales/sco.yml b/config/locales/sco.yml index ac968b36b..20bd6cbf0 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -283,7 +283,8 @@ sco: all: title: OpenStreetMap diary entries description: Recent diary entries frae uisers o OpenStreetMap - comments: + diary_comments: + index: post: Post when: When comment: Comment diff --git a/config/locales/sh.yml b/config/locales/sh.yml index a785e4229..5cf829265 100644 --- a/config/locales/sh.yml +++ b/config/locales/sh.yml @@ -666,9 +666,6 @@ sh: js_1: Ili koristite internet preglednik koji ne podržava JavaScript, ili ste onemogućili taj program. js_2: OpenStreetMap koristi JavaScript za slippy kartu. - permalink: Trajni link - shortlink: Kratki link - createnote: Dodaj biljeÅ¡ku license: copyright: Autorska prava pripadaju OpenStreetMap-u i doprinositeljima, pod otvorenom licencom diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d9778d5fd..5f2f00275 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -64,6 +64,9 @@ sk: invalid_email_address: nevyzerá ako platná e-mailová adresa email_address_not_routable: nie je routovateľná display_name_is_user_n: nemôže byÅ¥ user_n, pokiaľ n nie je vaÅ¡e ID používateľa + models: + user_mute: + is_already_muted: je už stlmený/á. models: acl: Zoznam prístupových práv changeset: Sada zmien @@ -273,6 +276,7 @@ sk: reopened_at_by_html: Opätovne aktivované %{when} používateľom %{user} rss: title: Poznámky OpenStreetMap + description_all: Zoznam nahlásených, komentovaných alebo uzavretých poznámok description_area: Zoznam poznámok nahlásených, komentovaných alebo uzavretých vo vaÅ¡ej oblasti [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: RSS kanál k poznámke %{id} @@ -304,6 +308,8 @@ sk: retain_notes: VaÅ¡e mapové poznámky a komentáre budú zachované, ale skryté. retain_changeset_discussions: VaÅ¡e prípadné diskusie k sadám zmien budú zachované. retain_email: VaÅ¡a emailová adresa bude uchovaná. + recent_editing_html: Keďže ste nedávno upravovali, váš účet momentálne nie + je možné odstrániÅ¥. Odstránenie bude možné o %{time}. confirm_delete: Ste si istý/á? cancel: ZruÅ¡iÅ¥ accounts: @@ -335,7 +341,16 @@ sk: delete_account: OdstrániÅ¥ účet... go_public: heading: Verejné úpravy + currently_not_public: V súčasnosti sú vaÅ¡e úpravy anonymné a ľudia vám nemôžu + posielaÅ¥ správy ani vidieÅ¥ vaÅ¡u polohu. Ak chcete zobraziÅ¥, čo ste upravili + a umožniÅ¥ ľuďom kontaktovaÅ¥ vás prostredníctvom webovej lokality, kliknite + na tlačidlo nižšie. + only_public_can_edit: Od prechodu na API 0.6 môžu mapové údaje upravovaÅ¥ iba + verejní používatelia. find_out_why: zistite prečo + email_not_revealed: VaÅ¡a e-mailová adresa nebude zverejnená. + not_reversible: Túto akciu nie je možné vrátiÅ¥ späť a vÅ¡etci noví používatelia + sú teraz v predvolenom nastavení verejní. make_edits_public_button: ZverejniÅ¥ vÅ¡etky moje úpravy update: success_confirm_needed: Používateľské údaje boli úspeÅ¡ne aktualizované. Skontrolujte @@ -347,6 +362,7 @@ sk: deleted_ago_by_html: Odstránené %{time_ago} používateľom %{user} edited_ago_by_html: Upravené %{time_ago} používateľom %{user} version: Verzia + redacted_version: Upravená verzia in_changeset: Sada zmien anonymous: anonym no_comment: (bez komentára) @@ -363,7 +379,10 @@ sk: other: '%{count} ciest' download_xml: StiahnuÅ¥ XML view_history: ZobraziÅ¥ históriu + view_unredacted_history: ZobraziÅ¥ neredigovanú históriu view_details: ZobraziÅ¥ detaily + view_redacted_data: ZobraziÅ¥ upravené údaje + view_redaction_message: ZobraziÅ¥ správu o úprave location: 'Poloha:' node: title_html: 'Uzol: %{name}' @@ -500,8 +519,13 @@ sk: join_discussion: Zapojte sa do diskusie still_open: Sada zmien stále otvorená - diskusia bude otvorená, keď bude sada zmien uzatvorená. + subscribe: OdoberaÅ¥ + unsubscribe: ZruÅ¡iÅ¥ odoberanie comment_by_html: Komentár od používateľa %{user} %{time_ago} hidden_comment_by_html: Skrytý komentár od používateľa %{user} %{time_ago} + hide_comment: skryÅ¥ + unhide_comment: zobraziÅ¥ + comment: OkomentovaÅ¥ changesetxml: XML sady zmien osmchangexml: osmChange XML paging_nav: @@ -618,7 +642,8 @@ sk: all: title: Záznamy denníka OpenStreetMap description: Nedávne položky denníkov používateľov OpenStreetMap - comments: + diary_comments: + index: title: Komentáre k denníkom pridané používateľom %{user} heading: Komentáre v denníku používateľa %{user} subheading_html: Komentáre v denníku pridané používateľom %{user} @@ -1553,12 +1578,25 @@ sk: see_their_profile_html: Jeho/jej profil si môžete pozrieÅ¥ na %{userurl}. befriend_them: Môžete ich tiež pridaÅ¥ ako priateľov na %{befriendurl}. befriend_them_html: Môžete ho/ju tiež pridaÅ¥ ako priateľov na %{befriendurl}. + gpx_description: + description_with_tags_html: 'Vyzerá, že váš GPX súbor %{trace_name} s popisom + %{trace_description} a nasledujúcimi značkami: %{tags}' + description_with_no_tags_html: Vyzerá, že váš súbor GPX %{trace_name} s popisom + %{trace_description} a bez značiek gpx_failure: hi: Ahoj %{to_user}, failed_to_import: 'sa nepodarilo naimportovaÅ¥. Chybové hlásenie:' + more_info_html: Viac informácií o zlyhaniach importu GPX a o tom, ako sa im + vyhnúť, nájdete na %{url}. subject: '[OpenStreetMap] NeúspeÅ¡ný import GPX' gpx_success: hi: Ahoj %{to_user}, + loaded: + one: sa úspeÅ¡ne načítal s %{trace_points} z možného %{count} bodu. + few: sa úspeÅ¡ne načítal s %{trace_points} z možných %{count} bodov. + many: sa úspeÅ¡ne načítal s %{trace_points} z možných %{count} bodov. + other: sa úspeÅ¡ne načítal s %{trace_points} z možných %{count} bodov. + all_your_traces_html: VÅ¡etky vami úspeÅ¡ne nahrané GPX stopy nájdete na %{url}. subject: '[OpenStreetMap] GPX import úspeÅ¡ný' signup_confirm: subject: '[OpenStreetMap] Vitajte v OpenStreetMap' @@ -1591,14 +1629,14 @@ sk: subject_own: '[OpenStreetMap] %{commenter} pridal komentár k vaÅ¡ej poznámke' subject_other: '[OpenStreetMap] %{commenter} pridal komentár k poznámke, o ktorú sa zaujímate' - your_note: '%{commenter} zanechal komentár k vaÅ¡ej poznámke na mape blízko + your_note: '%{commenter} zanechal(a) komentár k vaÅ¡ej poznámke na mape blízko %{place}.' - your_note_html: '%{commenter} zanechal komentár k vaÅ¡ej poznámke na mape blízko - %{place}.' - commented_note: '%{commenter} zanechal komentár k poznámke, ktorú ste komentovali. + your_note_html: '%{commenter} zanechal(a) komentár k vaÅ¡ej poznámke na mape + blízko %{place}.' + commented_note: '%{commenter} zanechal(a) komentár k poznámke, ktorú ste komentovali. Poznámka je blízko %{place}.' - commented_note_html: '%{commenter} zanechal komentár k poznámke, ktorú ste - komentovali. Poznámka je blízko %{place}.' + commented_note_html: '%{commenter} zanechal(a) komentár k poznámke, ktorú + ste komentovali. Poznámka je blízko %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} vyrieÅ¡il vaÅ¡u poznámku' subject_other: '[OpenStreetMap] %{commenter} vyrieÅ¡il poznámku, o ktorú sa @@ -1629,12 +1667,13 @@ sk: subject_own: '[OpenStreetMap] %{commenter} pridal komentár k vaÅ¡ej sade zmien' subject_other: '[OpenStreetMap] %{commenter} pridal komentár k sade zmien, o ktorú sa zaujímate' - your_changeset: '%{commenter} zanechal komentár o %{time} k vaÅ¡ej sade zmien' - your_changeset_html: '%{commenter} zanechal komentár o %{time} k vaÅ¡ej sade - zmien,' - commented_changeset: '%{commenter} zanechal komentár o %{time} k vami sledovanej + your_changeset: '%{commenter} zanechal(a) komentár o %{time} k vaÅ¡ej sade + zmien' + your_changeset_html: '%{commenter} zanechal(a) komentár o %{time} k vaÅ¡ej + sade zmien,' + commented_changeset: '%{commenter} zanechal(a) komentár o %{time} k vami sledovanej sade zmien, ktorú vytvoril %{changeset_author}' - commented_changeset_html: '%{commenter} zanechal komentár o %{time} k vami + commented_changeset_html: '%{commenter} zanechal(a) komentár o %{time} k vami sledovanej sade zmien, ktorú vytvoril %{changeset_author}' partial_changeset_with_comment: s popisom '%{changeset_comment}' partial_changeset_with_comment_html: s popisom '%{changeset_comment}' @@ -1710,6 +1749,8 @@ sk: no_sent_messages_html: Nemáte odoslané správy. Prečo ste sa nespojili s niekým z %{people_mapping_nearby_link}? people_mapping_nearby: blízko mapujúci ľudia + muted: + title: Stlmené správy reply: wrong_user: Ste prihlásený ako „%{user}“, ale správa, na ktorú chcete odpovedaÅ¥, nebola odoslaná tomuto používateľovi. Ak na ňu chcete odpovedaÅ¥, prihláste @@ -1728,6 +1769,7 @@ sk: heading: my_inbox: Doručená poÅ¡ta my_outbox: Odoslané + muted_messages: Stlmené správy mark: as_read: Správa označená ako prečítaná as_unread: Správa označená ako neprečítaná @@ -1983,9 +2025,6 @@ sk: index: js_1: Používate prehliadač bez podpory JavaScriptu, alebo máte JavaScript vypnutý. js_2: OpenStreetMap používa pre interaktívnu mapu JavaScript. - permalink: Trvalý odkaz - shortlink: Krátky odkaz - createnote: PridaÅ¥ poznámku license: copyright: Chránené autorskými právami OpenStreetMap a prispievateľov pod slobodnou licenciou @@ -2336,6 +2375,7 @@ sk: oauth1_settings: Nastavenia OAuth 1 oauth2_applications: Aplikácie OAuth 2 oauth2_authorizations: Autorizácie OAuth 2 + muted_users: Stlmení používatelia auth_providers: openid_logo_alt: Prihlásenie pomocou OpenID openid: @@ -2364,6 +2404,7 @@ sk: alt: Prihlásenie sa pomocou AOL OpenID oauth: authorize: + title: Povoľte prístup k vášmu účtu request_access_html: Aplikácia %{app_name} požaduje prístup k vášmu kontu (%{user}). Vyberte si, či si želáte, aby mala aplikácia nasledujúce oprávnenie. Môžete zvoliÅ¥ ľubovoľný počet oprávnení. @@ -2377,10 +2418,13 @@ sk: allow_write_notes: meniÅ¥ poznámky. grant_access: UdeliÅ¥ prístup authorize_success: + title: Požiadavka na autorizáciu povolená allowed_html: Udelili ste aplikácii %{app_name} prístup k vášmu účtu. verification: Váš overovací kód je %{code}. authorize_failure: + title: Požiadavka na autorizáciu zlyhala denied: Odopreli ste aplikácii %{app_name} prístup k vášmu účtu. + invalid: Autorizačný token je neplatný. revoke: flash: Prístup pre aplikáciu %{application} bol odvolaný. permissions: @@ -2452,6 +2496,7 @@ sk: oauth2_authorizations: new: introduction: PovoliÅ¥ %{application} prístup k vášmu účtu s nasledovnými oprávneniami? + authorize: AutorizovaÅ¥ show: title: Autorizačný kód oauth2_authorized_applications: @@ -2459,6 +2504,7 @@ sk: title: Moje autorizované aplikácie application: Aplikácia permissions: Oprávnenia + last_authorized: Posledná autorizácia no_applications_html: Zatiaľ ste nepovolili žiadne %{oauth2} aplikácie. application: revoke: OdobraÅ¥ prístup @@ -2532,6 +2578,7 @@ sk: remove as friend: OdstrániÅ¥ z priateľov add as friend: PridaÅ¥ priateľa mapper since: 'Mapuje od:' + last map edit: 'Posledná úprava mapy:' ct status: 'Podmienky prispievania:' ct undecided: Nerozhodnuté ct declined: Odmietnuté @@ -2699,6 +2746,16 @@ sk: reason: Dôvod pre blokovanie status: Stav revoker_name: ZruÅ¡il + user_mutes: + index: + title: Stlmení používatelia + my_muted_users: Mnou stlmení používatelia + table: + thead: + muted_user: Stlmený používateľ + create: + notice: Stlmili ste používateľa %{name}. + error: Používateľa %{name} nebolo možné stlmiÅ¥. %{full_message}. notes: index: title: Poznámky vytvorené alebo komentované používateľom %{user} @@ -2823,13 +2880,6 @@ sk: map_data_zoom_in_tooltip: Priblížením zobrazíte údaje mapy queryfeature_tooltip: Prieskum prvkov queryfeature_disabled_tooltip: Pre prieskum prvkov priblížte - changesets: - show: - comment: OkomentovaÅ¥ - subscribe: OdoberaÅ¥ - unsubscribe: ZruÅ¡iÅ¥ odoberanie - hide_comment: skryÅ¥ - unhide_comment: zobraziÅ¥ edit_help: Posuňte mapu a priblížte ju na miesto, ktoré chcete upraviÅ¥, potom kliknite sem. directions: diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml index d220aae7f..862e65a85 100644 --- a/config/locales/skr-arab.yml +++ b/config/locales/skr-arab.yml @@ -266,6 +266,11 @@ skr-arab: created_ago_html: '%{time_ago} خلقیا' closed_ago_html: '%{time_ago} بند تھیا' discussion: بحث مباحثہ + subscribe: سبسکرائب کرو + unsubscribe: اݨ سبسکرائب کرو + hide_comment: لُکاؤ + unhide_comment: ݙکھاؤ + comment: تبصرہ paging_nav: nodes: نوݙاں(%{count}) ways: رستے(%{count}) @@ -290,6 +295,7 @@ skr-arab: newer_entries: نویاں انٹریاں show: user_title: '%{user} دی ڈائری' + subscribe: سبسکرائب کرو leave_a_comment: رائے ݙیوو login: لاگ ان تھیوو diary_entry: @@ -308,7 +314,8 @@ skr-arab: location: 'محل وقوع:' view: ݙکھالے edit: لکھو - comments: + diary_comments: + index: post: پوسٹ when: کڈݨ comment: رائے @@ -1158,10 +1165,6 @@ skr-arab: contributors_za_south_africa: جنوبی افریقہ trademarks_title: ٹریڈ مارک trademarks_1_1_trademark_policy: ٹریڈمارک پالیسی - index: - permalink: پکا لنک - shortlink: مختصر لنک - createnote: نوٹ شامل کرو export: title: ٻاہر بھیڄو licence: لائیسنس @@ -1363,13 +1366,6 @@ skr-arab: embed: ایچ ٹی ایم ایل format: فارمیٹ scale: 'پیمانہ:' - changesets: - show: - comment: تبصرہ - subscribe: سبسکرائب کرو - unsubscribe: اݨ سبسکرائب کرو - hide_comment: لُکاؤ - unhide_comment: ݙکھاؤ directions: engines: fossgis_valhalla_bicycle: سائیکل (ول ہلا) diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 7c3a19f10..013f5f445 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -15,6 +15,7 @@ # Author: Mtej # Author: Peter Klofutar # Author: Pickle12 +# Author: Pipi Ferry # Author: Ruila # Author: Skalcaa # Author: Stefanb @@ -522,6 +523,8 @@ sl: in povezavo, ki ste jo kliknili. show: title: 'Nabor sprememb: %{id}' + created: 'Ustvarjeno: %{when}' + closed: 'Zaprto: %{when}' created_ago_html: Ustvaril_a %{time_ago} closed_ago_html: Zaprto %{time_ago} created_ago_by_html: Ustvaril %{user} %{time_ago} @@ -530,8 +533,13 @@ sl: join_discussion: Prijavite se za pridružitev pogovoru still_open: Nabor sprememb je Å¡e vedno odprt – pogovor se bo začel, ko bo nabor sprememb zaprt. + subscribe: Naroči me + unsubscribe: Odnaroči comment_by_html: Komentar %{user} %{time_ago} hidden_comment_by_html: Skrit komentar %{user} %{time_ago} + hide_comment: skrij + unhide_comment: razkrij + comment: Komentiraj changesetxml: Nabor sprememb XML osmchangexml: osmChange XML paging_nav: @@ -603,6 +611,7 @@ sl: show: title: Dnevnik uporabnika %{user} | %{title} user_title: Dnevnik uporabnika %{user} + discussion: Pogovor leave_a_comment: NapiÅ¡i komentar login_to_leave_a_comment_html: '%{login_link} za vpis komentarja' login: Prijava @@ -647,7 +656,8 @@ sl: all: title: DnevniÅ¡ki zapisi OpenStreetMap description: Nedavni dnevniÅ¡ki zapisi uporabnikov OpenStreetmap - comments: + diary_comments: + index: title: DnevniÅ¡ki komentarji, ki jih je dodal_a %{user} heading: DnevniÅ¡ki komentarji %{user} subheading_html: DnevniÅ¡ki komentarji, ki jih je dodal_a %{user} @@ -802,7 +812,7 @@ sl: fountain: Vodomet fuel: Polnilna postaja gambling: Igre na srečo - grave_yard: Pokopališče + grave_yard: Pokopališče v bližini cerkve grit_bin: Posoda za pesek hospital: BolniÅ¡nica hunting_stand: Lovska preža @@ -832,9 +842,9 @@ sl: post_office: PoÅ¡ta prison: Zapor pub: Pivnica - public_bath: Kopališče + public_bath: Javno kopališče public_bookcase: Javna knjižna omara - public_building: Javne stavba + public_building: Javna stavba ranger_station: Gozdarska postaja recycling: Reciklirna točka restaurant: Restavracija @@ -874,7 +884,7 @@ sl: "yes": Meja bridge: aqueduct: Akvadukt - boardwalk: Sprehajališče + boardwalk: Sprehajališče iz desk suspension: Viseči most swing: Vrteči most viaduct: Viadukt @@ -885,7 +895,7 @@ sl: barn: Skedenj bungalow: Bungalov cabin: Brunarica - chapel: Kapelica + chapel: Kapela church: Cerkveno poslopje civic: Občinska stavba college: VIsokoÅ¡olska stavba @@ -894,7 +904,7 @@ sl: detached: Osamljena hiÅ¡a dormitory: Å tudentski dom duplex: Dvostanovanjska hiÅ¡a - farm: Kmetija + farm: HiÅ¡a kmetije farm_auxiliary: Pomožna kmetijska stavba garage: Garaža garages: Garaže @@ -903,7 +913,7 @@ sl: hospital: Poslopje bolniÅ¡nice hotel: Poslopje hotela house: HiÅ¡a - houseboat: Bivalni čoln + houseboat: Bivalni čoln - HiÅ¡a-čoln hut: Koča industrial: Industrijski objekt kindergarten: Poslopje vrtca @@ -918,10 +928,10 @@ sl: semidetached_house: Dvojček service: Servisna stavba shed: Lopa - stable: Hlev + stable: Hlev za konje static_caravan: Stanovanjska prikolica temple: Tempelj - terrace: Terasa + terrace: Vrstne hiÅ¡e train_station: Poslopje železniÅ¡ke postaje university: Univerza warehouse: Skladišče @@ -1009,7 +1019,7 @@ sl: stop: Stop znak street_lamp: Ulična svetilka tertiary: Lokalna cesta - tertiary_link: Terciarna cesta + tertiary_link: Priključek na lokalno cesto track: Kolovoz traffic_mirror: Prometno ogledalo traffic_signals: Prometna signalizacija @@ -1018,7 +1028,7 @@ sl: trunk_link: Priključek na hitro cesto turning_circle: Obračališče turning_loop: Obračališče - unclassified: Neopredeljena cesta + unclassified: Neopredeljena cesta - Neklasificirana cesta "yes": Cesta historic: aircraft: Zgodovinsko letalo @@ -1052,7 +1062,7 @@ sl: tomb: Grobnica tower: Stolp wayside_chapel: Obcestna kapelica - wayside_cross: Križ + wayside_cross: Obpotni križ wayside_shrine: Kapelica wreck: Razbitina "yes": Zgodovinski kraj @@ -1062,13 +1072,13 @@ sl: allotments: Vrtički aquaculture: Akvakultura basin: Čistilni bazen - brownfield: Gradbišče - cemetery: Pokopališče + brownfield: Opuščeno območje, kjer so bile stavbe + cemetery: Pokopališče, ki ni ob cerkvi commercial: Poslovna cona conservation: Zaščiteno območje construction: Gradbišče farmland: Kmetijsko zemljišče - farmyard: Kmetija + farmyard: Dvorišče kmetije forest: Gozd garages: Garaže grass: Trata @@ -1146,15 +1156,15 @@ sl: crane: Žerjav cross: Križ dolphin: Privez - dyke: Nasip + dyke: Protipoplavni nasip embankment: Nasip flagpole: Zastavni drog - gasometer: Plinometer + gasometer: Rezervoar za plin groyne: Valobran kiln: Peč lighthouse: Svetilnik manhole: Vhodna odprtina - mast: Steber + mast: Jambor mine: Rudnik mineshaft: RudniÅ¡ki jaÅ¡ek monitoring_station: Opazovalna postaja @@ -1171,7 +1181,7 @@ sl: surveillance: Nadzor telescope: Teleskop tower: Stolp - utility_pole: Drog + utility_pole: Drog za infrastrukturo wastewater_plant: Čistilna naprava watermill: Vodno kolo water_tap: Vodna pipa @@ -1303,7 +1313,7 @@ sl: funicular: Žična vzpenjača halt: ŽelezniÅ¡ko postajališče junction: Križišče železnic - level_crossing: Prehod + level_crossing: Nivojski prehod light_rail: Mestna železnica miniature: Miniaturna železnica monorail: Monorail @@ -1368,7 +1378,7 @@ sl: erotic: Erotična trgovina estate_agent: Nepremičninska agencija fabric: Prodajalna blaga - farm: Kmečka trgovina + farm: Kmetijska trgovina fashion: Modna trgovina fishing: Prodajalna ribiÅ¡ke opreme florist: Cvetličarna @@ -1442,7 +1452,7 @@ sl: wine: Vinoteka "yes": Trgovina tourism: - alpine_hut: Koča + alpine_hut: Alpska koča apartment: PočitniÅ¡ki apartma artwork: Umetnina attraction: Zanimivost @@ -1450,7 +1460,7 @@ sl: cabin: Turistično prenočišče camp_pitch: Prostor za kampiranje camp_site: Kamp - caravan_site: Kamp + caravan_site: Kamp - Prostor za avtodome/bivalne prikolice chalet: PočitniÅ¡ka hiÅ¡ica gallery: Galerija guest_house: Penzion @@ -1485,7 +1495,7 @@ sl: stream: Potok wadi: Vadi waterfall: Slap - weir: Zapornica + weir: Nizek jez "yes": Vodotok admin_levels: level2: Državna meja @@ -2173,6 +2183,10 @@ sl: %{france}: Vsebuje podatke iz Direction Générale des Impôts. contributors_fr_france: Francija + contributors_hr_credit_html: |- + %{croatia}: Vsebuje podatke iz %{dgu_link} in %{open_data_portal} + (javne informacije HrvaÅ¡ke). + contributors_hr_croatia: HrvaÅ¡ka contributors_nl_credit_html: '%{netherlands}: Vsebuje podatke © IN, 2007 (%{and_link})' contributors_nl_netherlands: Nizozemska contributors_nz_credit_html: |- @@ -2240,9 +2254,6 @@ sl: js_1: Bodisi uporabljate brskalnik, ki ne podpira Javascripta, ali pa je izvajanje Javascripta onemogočeno. js_2: OpenStreetMap za prikaz zemljevida uporablja Javascript. - permalink: Trajna povezava - shortlink: Kratka povezava - createnote: Dodajte opombo license: copyright: Avtorske pravice OpenStreetMap in sodelavci, pod odprto licenco remote_failed: Urejanje ni uspelo - poskrbite da je JOSM ali Merkaartor naložen @@ -3189,6 +3200,8 @@ sl: intro: Ste opazili napako ali pomanjkljivost? Obvestite druge kartografe o tem, da lahko to popravimo. Premaknite označevalec na pravo mesto in vpiÅ¡ite opombo, v kateri pojasnite težavo. + anonymous_warning_log_in: Prijavite se + anonymous_warning_sign_up: Registrirajte se advice: VaÅ¡a opomba je javna in se lahko uporabi za posodobitev zemljevida. Ne vnaÅ¡ajte osebnih podatkov ali podatkov iz avtorsko varovanih zemljevidov ali imenikov. @@ -3271,13 +3284,6 @@ sl: queryfeature_tooltip: Preveri značilnosti queryfeature_disabled_tooltip: Približajte za preverjanje značilnosti embed_html_disabled: Za ta sloj zemljevida vdelava HTML ni na voljo - changesets: - show: - comment: Komentiraj - subscribe: Naroči me - unsubscribe: Odnaroči - hide_comment: skrij - unhide_comment: razkrij edit_help: Premaknite zemljevid in približajte lokacijo, ki jo želite urediti, nato pa kliknite tukaj. directions: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index a0ab8c0e7..f1aa317ee 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -362,7 +362,8 @@ sq: all: title: Shënimet e ditarit të OpenStreetMap description: Shënimet e fundit në ditar nga përdoruesit e OpenStreetMap - comments: + diary_comments: + index: post: Posto when: Kur comment: Koment diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index f426266ec..44a9b0f81 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -297,7 +297,8 @@ sr-Latn: all: title: Unosi u dnevniku Openstritmapa description: SkoraÅ¡nji unosi u dnevniku od korisnika Openstritmapa - comments: + diary_comments: + index: post: Postavi when: Kada comment: Komentar @@ -965,8 +966,6 @@ sr-Latn: index: js_1: Koristite pregledač koji ne podržava javaskript ili ste ga onemogućili. js_2: Openstritmap koristi javaskript za prikazivanje mapa. - permalink: Trajna veza - shortlink: Kratka veza remote_failed: Uređivanje nije uspelo. Proverite da li je JOSM ili Merkaartor učitan i da je mogućnost daljinskog upravljanja omogućena edit: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index b09af786c..976f87f10 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -432,8 +432,13 @@ sr: closed_ago_by_html: Затворио(ла) %{user} %{time_ago} discussion: Дискусија join_discussion: Пријавите се да бисте се придружили дискусији + subscribe: Пријави ме + unsubscribe: Одјави ме comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}' hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago} + hide_comment: сакриј + unhide_comment: прикажи + comment: Коментариши changesetxml: XML скуп промена osmchangexml: osmChange XML paging_nav: @@ -544,16 +549,17 @@ sr: all: title: Уноси у дневнику OpenStreetMap-а description: Недавни уноси у дневнику корисника OpenStreetMap-а - comments: + subscribe: + button: Прати дискусију + unsubscribe: + button: Прекини праћење дискусије + diary_comments: + index: post: Објава when: Када comment: Коментар newer_comments: Новији коментари older_comments: Старији коментари - subscribe: - button: Прати дискусију - unsubscribe: - button: Прекини праћење дискусије doorkeeper: scopes: address: Види своју физичку адресу @@ -1462,7 +1468,7 @@ sr: места %{place}.' commented_note: '%{commenter} је реактивирао белешку мапе коју сте коментарисали. Белешка је у близини места %{place}.' - details: Више информација о белешци може да се пронађе на %{url}. + details: Одговорите или сазнајте више о белешци на %{url}. changeset_comment_notification: hi: Поздрав, %{to_user}, greeting: Поздрав, @@ -1477,7 +1483,7 @@ sr: мапе који надгледате и који је направио %{changeset_author}' partial_changeset_with_comment: са коментаром „%{changeset_comment}” partial_changeset_without_comment: без коментара - details: Више информација о чејнџсетовима може да се пронађе на %{url}. + details: Одговорите или сазнајте више о сетовима промена на %{url}. unsubscribe: Можете одјавити обавештења овог скупа измена на %{url}. confirmations: confirm: @@ -1750,9 +1756,6 @@ sr: index: js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили. js_2: OpenStreetMap користи јаваскрипт за приказивање мапа. - permalink: Трајна веза - shortlink: Кратка веза - createnote: Додај белешку license: copyright: Ауторска права Опенстритмап и доприносиоци, под отвореном лиценцом remote_failed: Уређивање није успело. Проверите да ли је JOSM или Merkaartor @@ -2511,13 +2514,6 @@ sr: map_data_zoom_in_tooltip: Увећај да видиш податке са карте queryfeature_tooltip: Информације о објектима queryfeature_disabled_tooltip: Зумирај на информације о објектима - changesets: - show: - comment: Коментариши - subscribe: Пријави ме - unsubscribe: Одјави ме - hide_comment: сакриј - unhide_comment: прикажи edit_help: Помери карту и увећај на место које хоћеш да уредиш, затим кликни овде. directions: ascend: Растуће diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 184082f24..dd36d9c47 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -369,6 +369,7 @@ sv: deleted_ago_by_html: Raderades %{time_ago} av %{user} edited_ago_by_html: Redigerades %{time_ago} av %{user} version: Version + redacted_version: Redigerad version in_changeset: Ändringsuppsättning anonymous: anonym no_comment: (inga kommentarer) @@ -381,7 +382,10 @@ sv: other: '%{count} sträckor' download_xml: Ladda ner XML view_history: Visa historik + view_unredacted_history: Visa oredigerad historik view_details: Visa detaljer + view_redacted_data: Visa redigerad data + view_redaction_message: Visa redigeringsmeddelande location: 'Plats:' node: title_html: 'Nod: %{name}' @@ -503,8 +507,24 @@ sv: created: Skapad closed: Stängd belongs_to: Författare + subscribe: + heading: Prenumerera pÃ¥ följande diskussion om ändringsuppsättning? + button: Prenumerera pÃ¥ diskussion + unsubscribe: + heading: Avsluta prenumeration pÃ¥ följande diskussion om ändringsuppsättning? + button: Sluta prenumerera pÃ¥ diskussion + heading: + title: Ändringsuppsättning %{id} + created_by_html: Skapades av %{link_user} %{created}. + no_such_entry: + title: Ingen sÃ¥dan ändringsuppsättning + heading: 'Inget inlägg med ID: %{id}' + body: Det finns tyvärr ingen ändringsuppsättning med ID:t %{id}. Kontrollera + stavningen eller sÃ¥ kanske du tryckt pÃ¥ fel länk. show: title: 'Ändringsuppsättning: %{id}' + created: 'Skapades: %{when}' + closed: 'Stängdes: %{when}' created_ago_html: Skapades %{time_ago} closed_ago_html: Stängdes %{time_ago} created_ago_by_html: Skapades %{time_ago} av %{user} @@ -513,8 +533,13 @@ sv: join_discussion: Logga in för att delta i diskussionen still_open: Ändringsuppsättningen är fortfarande öppen - diskussionen kommer att öppnas när ändringsuppsättning har stängts. + subscribe: Prenumerera + unsubscribe: Avsluta prenumeration comment_by_html: Kommenterades frÃ¥n %{user} %{time_ago} hidden_comment_by_html: Dold kommentar frÃ¥n %{user} %{time_ago} + hide_comment: dölj + unhide_comment: Sluta dölja + comment: Kommentera changesetxml: XML för ändringsuppsättning osmchangexml: osmChange XML paging_nav: @@ -588,6 +613,7 @@ sv: show: title: '%{user}s dagbok | %{title}' user_title: '%{user}s dagbok' + discussion: Diskussion leave_a_comment: Lämna en kommentar login_to_leave_a_comment_html: '%{login_link} för att lämna en kommentar' login: Logga in @@ -630,7 +656,14 @@ sv: all: title: OpenStreetMap-dagboksinlägg description: Senaste dagboksinlägg frÃ¥n användare av OpenStreetMap - comments: + subscribe: + heading: Prenumerera pÃ¥ följande diskussion om dagboksinlägg? + button: Prenumerera pÃ¥ diskussion + unsubscribe: + heading: Avsluta prenumeration pÃ¥ följande diskussion om dagboksinlägg? + button: Avsluta prenumeration pÃ¥ diskussion + diary_comments: + index: title: Dagbokskommentarer tillagda av %{user} heading: '%{user}s dagbokskommentarer' subheading_html: Dagbokskommentarer tillagda av %{user} @@ -676,6 +709,10 @@ sv: contact: kontakta contact_the_community_html: GÃ¥ gärna till %{contact_link} OpenStreetMap-gemenskapen om du har hittat en trasig länk/bugg. Anteckna din förfrÃ¥gas exakta webbadress. + bad_request: + title: Felaktig förfrÃ¥gan + description: Operationen du begärde frÃ¥n OpenStreetMaps server är inte giltig + (HTTP 400) forbidden: title: Förbjudet description: Åtgärden du begärde pÃ¥ OpenStreetMap-servern är endast tillgänglig @@ -1607,6 +1644,7 @@ sv: och fri att använda under en öppen licens. intro_2_create_account: Skapa ett användarkonto partners_fastly: Fastly + partners_corpmembers: OSMF-företagsmedlemmar partners_partners: partners tou: Användarvillkor osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, dÃ¥ nödvändigt @@ -1628,6 +1666,7 @@ sv: more: Mer user_mailer: diary_comment_notification: + description: 'OpenStreetMap dagboksinlägg #%{id}' subject: '[OpenStreetMap] %{user} kommenterade pÃ¥ ett dagboksinlägg' hi: Hej %{to_user}, header: '%{from_user} har kommenterat dagboksinlägget pÃ¥ OpenStreetMap med rubriken @@ -1638,6 +1677,9 @@ sv: %{commenturl} eller skicka ett meddelande till författaren pÃ¥ %{replyurl} footer_html: Du kan ocksÃ¥ läsa kommentaren pÃ¥ %{readurl} och du kan kommentera pÃ¥ %{commenturl} eller skicka ett meddelande till författaren pÃ¥ %{replyurl} + footer_unsubscribe: Du kan avsluta prenumerationen frÃ¥n diskussionen pÃ¥ %{unsubscribeurl} + footer_unsubscribe_html: Du kan avsluta prenumerationen frÃ¥n diskussionen pÃ¥ + %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Hej %{to_user}, @@ -1698,6 +1740,7 @@ sv: click_the_link: Om det är du, klicka pÃ¥ länken nedan för att Ã¥terställa ditt lösenord. note_comment_notification: + description: 'OpenStreetMap not #%{id}' anonymous: En anonym användare greeting: Hej, commented: @@ -1736,9 +1779,10 @@ sv: pÃ¥. Anteckningen är nära %{place}.' commented_note_html: '%{commenter} har Ã¥teraktiverat en kartanteckning du har kommenterat pÃ¥. Anteckningen är nära %{place}.' - details: Fler detaljer om anteckningen finns pÃ¥ %{url}. - details_html: Fler detaljer om anteckningen finns pÃ¥ %{url}. + details: Svara eller ta reda pÃ¥ mer anteckningen pÃ¥ %{url}. + details_html: Svara eller ta reda pÃ¥ mer om anteckningen pÃ¥ %{url}. changeset_comment_notification: + description: 'OpenStreetMap ändringsuppsättning #%{id}' hi: Hej %{to_user}, greeting: Hej, commented: @@ -1756,12 +1800,12 @@ sv: partial_changeset_with_comment: med kommentar '%{changeset_comment}' partial_changeset_with_comment_html: med kommentar '%{changeset_comment}' partial_changeset_without_comment: utan kommentar - details: Fler detaljer om ändringsuppsättningen finns pÃ¥ %{url}. - details_html: Fler detaljer om ändringsuppsättningen finns pÃ¥ %{url}. - unsubscribe: För att avsluta prenumerationen av uppdateringar i denna ändringsuppsättning, - besök %{url} och klicka pÃ¥ "Avprenumerera". - unsubscribe_html: För att avsluta prenumerationen av uppdateringar i denna ändringsuppsättning, - besök %{url} och klicka pÃ¥ "Avprenumerera". + details: Svara eller ta reda pÃ¥ mer om ändringsuppsättningen pÃ¥ %{url}. + details_html: Svara eller ta reda pÃ¥ mer om ändringsuppsättningen pÃ¥ %{url}. + unsubscribe: Du kan avsluta prenumeration pÃ¥ uppdateringar i denna ändringsuppsättning + pÃ¥ %{url}. + unsubscribe_html: Du kan avsluta prenumeration pÃ¥ uppdateringar i denna ändringsuppsättning + pÃ¥ %{url}. confirmations: confirm: heading: Kontrollera din e-post! @@ -1928,13 +1972,15 @@ sv: new: title: Logga in tab_title: Logga in + login_to_authorize_html: Logga in pÃ¥ OpenStreetMap för att komma Ã¥t %{client_app_name}. email or username: E-postadress eller Användarnamn password: Lösenord remember: Kom ihÃ¥g mig lost password link: Glömt ditt lösenord? login_button: Logga in register now: Registrera dig nu - with external: 'Alternativt kan du använda en tredje part för att logga in:' + with external: eller logga in med en tredje part + or: eller auth failure: Kunde inte logga in med de uppgifterna. destroy: title: Logga ut @@ -2096,6 +2142,8 @@ sv: contributors_at_cc_by_at_with_amendments: CC BY AT med tillägg contributors_au_australia: Australien contributors_au_geoscape_australia: Geoscape Australien + contributors_au_cc_licence: Creative Commons Erkännande 4.0 Internationell-licens + (CC BY 4.0) contributors_ca_credit_html: |- %{canada}: InnehÃ¥ller data frÃ¥n GeoBase®, GeoGratis (© Department of Natural @@ -2103,13 +2151,23 @@ sv: Resources Canada), och StatCan (Geography Division, Statistics Canada). contributors_ca_canada: Kanada + contributors_cz_credit_html: '%{czechia}: InnehÃ¥ller data frÃ¥n den statliga + administrationen för landmäteri och Cadastre licensierad under %{cc_licence_link}' contributors_cz_czechia: Tjeckien + contributors_cz_cc_licence: Creative Commons Erkännande 4.0 Internationell + (CC BY 4.0) + contributors_fi_credit_html: '%{finland}: InnehÃ¥ller data frÃ¥n Lantmäteriet + i Finlands Terrängdatabas och andra datauppsättningar, under %{nlsfi_license_link}.' contributors_fi_finland: Finland contributors_fi_nlsfi_license: NLSFI-licens contributors_fr_credit_html: |- %{france}: InnehÃ¥ller data hämtade frÃ¥n Direction Générale des Impôts. contributors_fr_france: Frankrike + contributors_hr_credit_html: '%{croatia}: InnehÃ¥ller data frÃ¥n %{dgu_link} + och %{open_data_portal} (offentlig information om Kroatien)' + contributors_hr_croatia: Kroatien + contributors_hr_dgu: Kroatiens statliga geodatiska förvaltning contributors_nl_credit_html: '%{netherlands}: InnehÃ¥ller © AND data, 2007 (%{and_link}).' contributors_nl_netherlands: Nederländerna @@ -2123,7 +2181,12 @@ sv: %{serbia}: InnehÃ¥ller data frÃ¥n %{rgz_link} och %{open_data_portal} (offentlig information om Serbien), 2018. contributors_rs_serbia: Serbien + contributors_rs_rgz: Serbiens geodetiska myndighet + contributors_rs_open_data_portal: Nationell portal för öppen data + contributors_si_credit_html: '%{slovenia}: InnehÃ¥ller data frÃ¥n %{gu_link} + och %{mkgp_link} (offentlig information om Slovenien)' contributors_si_slovenia: Slovenien + contributors_si_gu: Lantmäteri- och kartverket contributors_si_mkgp: Ministeriet för Jordbruk, Skogsbruk och Livsmedel contributors_es_credit_html: |- %{spain}: InnehÃ¥ller data hämtade frÃ¥n @@ -2166,9 +2229,6 @@ sv: js_1: Du använder antingen en webbläsare som inte stöder JavaScript, eller sÃ¥ har du inaktiverat JavaScript. js_2: OpentStreetMap använder JavaScript för slippy-kartan. - permalink: Permanent länk - shortlink: Kortlänk - createnote: Lägg till en anteckning license: copyright: Upphovsrätten tillhör OpenStreetMap och bidragsgivare, under en öppen licens @@ -2349,7 +2409,7 @@ sv: heathland: Hed scrubland: Buskskog lake: Sjö - reservoir: vattenmagasin + reservoir: Vattenmagasin intermittent_water: Intermittent vattenkropp glacier: Glaciär reef: Rev @@ -2527,6 +2587,8 @@ sv: identifiable: IDENTIFIERBAR private: PRIVAT trackable: SPÅRBAR + details_with_tags_html: '%{time_ago} av %{user} i %{tags}' + details_without_tags_html: '%{time_ago} av %{user}' index: public_traces: Publika GPS-spÃ¥r my_gps_traces: Mina GPS-spÃ¥r @@ -2559,6 +2621,8 @@ sv: other: GPX-fil med %{count} punkter frÃ¥n %{user} description_without_count: GPX-fil frÃ¥n %{user} application: + basic_auth_disabled: 'Grundläggande HTTP-autentisering är inaktiverat: %{link}' + oauth_10a_disabled: 'OAuth 1.0 och 1.0a är inaktiverade: %{link}' permission_denied: Du har inte behörighet för denna Ã¥tgärd require_cookies: cookies_needed: Du verkar ha inaktiverat kakor - aktivera kakor i din webbläsare @@ -2581,6 +2645,7 @@ sv: muted_users: Tystade användare auth_providers: openid_logo_alt: Logga in med ett OpenID + openid_login_button: Fortsätt openid: title: Logga in med OpenID alt: Logga in med en OpenID-URL @@ -2646,6 +2711,9 @@ sv: write_redactions: Omarbeta kartdata read_email: Läs användarens e-postadress skip_authorization: Godkänn applikation automatiskt + for_roles: + moderator: Denna behörighet är till för Ã¥tgärder som endast är tillgängliga + för moderatorer oauth_clients: new: title: Registrera en ny applikation @@ -2741,20 +2809,25 @@ sv: users: new: title: Registrera + tab_title: Registrera + signup_to_authorize_html: Registrera dig pÃ¥ OpenStreetMap för att fÃ¥ Ã¥tkomst + till %{client_app_name} no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto Ã¥t dig automatiskt. please_contact_support_html: Kontakta %{support_link} för att ordna att ett konto ska skapas - vi kommer att försöka ta itu med begäran sÃ¥ fort som möjligt. support: support about: - header: Fri och redigerbar + header: Fri och redigerbar. paragraph_1: Till skillnad frÃ¥n andra kartor är OpenStreetMap helt skapad av människor som du, och det är gratis för alla att fixa, uppdatera, ladda ner och använda. - paragraph_2: Registrera dig för att börja bidra. Vi skickar ett e-postmeddelande - för att bekräfta ditt konto. + paragraph_2: Registrera dig för att börja bidra. + welcome: Välkommen till OpenStreetMap display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i alternativ. + tou: användarvillkor + contributor_terms: bidragsvillkor external auth: 'Tredjepartsautentisering:' continue: Registrera terms accepted: Tack för att du accepterat de nya villkoren för bidrag till @@ -2763,7 +2836,10 @@ sv: för mer information. privacy_policy: integritetspolicy privacy_policy_title: OSMFs integritetspolicy inklusive avsnitt om e-postadresser - use external auth: Alternativt kan du använda en tredje part för att logga in + consider_pd_html: Jag anser mina bidrag vara i %{consider_pd_link}. + consider_pd: public domain + or: eller + use external auth: eller registrera med en tredje part terms: title: Villkor för deltagare heading: Villkor för deltagare @@ -2868,6 +2944,11 @@ sv: index: title: Användare heading: Användare + older: Äldre användare + newer: Nyare användare + found_users: + one: '%{count} användare hittade' + other: '%{count} användare hittade' summary_html: '%{name} skapades frÃ¥n %{ip_address} den %{date}' summary_no_ip_html: '%{name} skapad den %{date}' confirm: Bekräfta valda användare @@ -3024,6 +3105,15 @@ sv: reason: Orsak till blockering status: Status revoker_name: Återkallad av + older: Äldre blockeringar + newer: Nya blockeringar + navigation: + all_blocks: Alla blockeringar + blocks_on_me: Blockeringar pÃ¥ mig + blocks_on_user: Blockeringar pÃ¥ %{user} + blocks_by_me: Blockeringar av mig + blocks_by_user: Blockeringar av %{user} + block: 'Blockering #%{id}' user_mutes: index: title: Tystade användare @@ -3096,6 +3186,10 @@ sv: intro: Upptäckt ett misstag eller nÃ¥got som saknas? LÃ¥t andra karterare veta sÃ¥ att vi kan fixa det. Flytta markören till rätt position och skriv in en kommentar som förklarar problemet. + anonymous_warning_html: Du är inte inloggad. %{log_in} eller %{sign_up} om du + vill fÃ¥ uppdateringar för din anteckning. + anonymous_warning_log_in: logga in + anonymous_warning_sign_up: registrera dig advice: Din anteckning är offentlig och kan användas för att uppdatera kartan, sÃ¥ skriv inte personuppgifter eller information frÃ¥n upphovsrättsligt skyddade kartor eller kataloger. @@ -3144,6 +3238,7 @@ sv: standard: Standard cycle_map: Cykelkarta transport_map: Transportkarta + tracestracktop_topo: Tracetrack Topo hot: Humanitärt layers: header: Kartskikt @@ -3172,13 +3267,6 @@ sv: queryfeature_tooltip: Undersök kartobjekt queryfeature_disabled_tooltip: Zooma in för att undersöka kartobjekt embed_html_disabled: HTML-inbäddning är inte tillgänglig för det här kartlagret - changesets: - show: - comment: Kommentera - subscribe: Prenumerera - unsubscribe: Avsluta prenumeration - hide_comment: dölj - unhide_comment: Sluta dölja edit_help: Flytta kartan och zooma in pÃ¥ en plats som du vill redigera, klicka sedan här. directions: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index d7359ff76..c8f269e54 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -341,7 +341,8 @@ ta: location: 'இடம்:' view: காண் edit: தொகு - comments: + diary_comments: + index: post: பதியவும் when: எப்பொழுது comment: கருத்துரை diff --git a/config/locales/te.yml b/config/locales/te.yml index 73afebf56..f92484f4c 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -429,6 +429,11 @@ te: discussion: చర్చ join_discussion: చర్చలో పాల్గొనేందుకు లాగినవండి still_open: మార్పులసమితి ఇంకా తెరిచే ఉంది - దాన్ని మూసివేయగానే చర్చ తెరుచుకుంటుంది. + subscribe: గమనింపులలో చేర్చు + unsubscribe: గమనింపులనుండి తొలగించు + hide_comment: దాచు + unhide_comment: చూపించు + comment: వ్యాఖ్య changesetxml: మార్పులసమితి XML osmchangexml: osmChange XML paging_nav: @@ -541,7 +546,8 @@ te: all: title: OpenStreetMap డైరీ పద్దులు description: OpenStreetMap వాడుకరులు ఇటీవల చేర్చిన డైరీ పద్దులు - comments: + diary_comments: + index: title: '%{user} చేర్చిన డైరీ వ్యాఖ్యలు' heading: '%{user} గారి డైరీ వ్యాఖ్యలు' subheading_html: '%{user} డైరీ వ్యాఖ్యలను చేర్చారు' @@ -1846,10 +1852,6 @@ te: infringement_2_1_online_filing_page: ఆన్‌లైన్ ఫైలింగ్ పేజీ trademarks_title: ట్రేడ్‌మార్క్‌లు trademarks_1_1_trademark_policy: ట్రేడ్మార్క్ విధానం - index: - permalink: స్థిరలంకె - shortlink: చిన్నలింకు - createnote: ఓ నోట్‍ను చేర్చండి edit: user_page_link: వాడుకరి పేజీ anon_edits_link_text: ఇది ఇలా ఎందుకుందో తెలుసుకోండి. @@ -2461,13 +2463,6 @@ te: map_data_zoom_in_tooltip: మ్యాపు డేటాను చూసేందుకు జూమిన్ చెయ్యి queryfeature_tooltip: క్వెరీ విశేషాలు queryfeature_disabled_tooltip: క్వెరీ చిశేషాల కోసం జూమిన్ చెయ్యండి - changesets: - show: - comment: వ్యాఖ్య - subscribe: గమనింపులలో చేర్చు - unsubscribe: గమనింపులనుండి తొలగించు - hide_comment: దాచు - unhide_comment: చూపించు edit_help: మ్యాపును జరిపి, మీరు సరిదిద్దాలనుకున్న స్థలంపై జూమిన్ చేసి, అప్పుడు ఇక్కడ నొక్కండి. directions: diff --git a/config/locales/th.yml b/config/locales/th.yml index ad6dc41a1..816651756 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -401,8 +401,13 @@ th: discussion: การอภิปราย join_discussion: เข้าสู่ระบบเพื่อเข้าร่วมการอภิปราย still_open: ชุดการเปลี่ยนแปลงกำลังเปิดอยู่ การอภิปรายจะเริ่มได้หลังจากปิดชุดการเปลี่ยนแปลงแล้ว + subscribe: บอกรับข้อมูล + unsubscribe: เลิกรับข้อมูล comment_by_html: ความคิดเห็นจาก %{user} %{time_ago} hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago} + hide_comment: ซ่อน + unhide_comment: แสดง + comment: ความคิดเห็น changesetxml: ชุดการเปลี่ยนแปลง XML osmchangexml: เอ็กซ์เอ็มแอลของ osmChange paging_nav: @@ -508,7 +513,8 @@ th: all: title: รายการบันทึก OpenStreetMap description: รายการบันทึกล่าสุดจากผู้ใช้ OpenStreetMap - comments: + diary_comments: + index: post: เผยแพร่ when: เมื่อ comment: แสดงความเห็น @@ -1506,9 +1512,6 @@ th: index: js_1: ท่านกำลังใช้เบราว์เซอร์ที่ไม่รองรับจาวาสคริปต์ หรือท่านปิดใช้งานจาวาสคริปต์ js_2: OpenStreetMap ใช้จาวาสคริปต์ในการแสดงแผนที่ - permalink: ลิงก์ถาวร - shortlink: ลิงก์ย่อ - createnote: เพิ่มหมายเหตุ license: copyright: สงวนลิขสิทธิ์โดย OpenStreetMap และผู้มีส่วนร่วม ภายใต้สัญญาอนุญาตแบบเปิด remote_failed: การแก้ไขล้มเหลว - ตรวจสอบให้แน่ใจว่าได้โหลด JOSM หรือ Merkaartor @@ -2073,13 +2076,6 @@ th: createnote_tooltip: ใส่หมายเหตุลงในแผนที่ queryfeature_tooltip: แสดงส่วนประกอบ queryfeature_disabled_tooltip: ต้องซูมเข้ามากกว่านี้ จึงจะตรวจสอบส่วนประกอบได้ - changesets: - show: - comment: ความคิดเห็น - subscribe: บอกรับข้อมูล - unsubscribe: เลิกรับข้อมูล - hide_comment: ซ่อน - unhide_comment: แสดง directions: ascend: ลาดขึ้น engines: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index a5133d852..25c1f4a5d 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -395,6 +395,10 @@ tl: join_discussion: Lumagda para sumali sa talakayan still_open: Bukas pa rin ang pangkat ng pagbabago - magbubukas ang talakayan pag naisara na ang pangkat ng pagbabago. + subscribe: Sumuskribi + hide_comment: itago + unhide_comment: pawalang-bisa ang pag-tago + comment: Pumuna changesetxml: XML ng pangkat ng pagbabago osmchangexml: XML ng osmChange paging_nav: @@ -501,7 +505,8 @@ tl: title: Mga ipinasok sa talaarawan ng OpenStreetMap description: Kamakailang mga pagpapasok sa talaarawan mula sa mga tagagamit ng OpenStreetMap - comments: + diary_comments: + index: title: Mga Puna sa Talaarawan ay idinagdag ni %{user} heading: Mga Puna sa Talaarawan ni %{user} subheading_html: Mga Puna sa Talaarawan ay idinagdag ni %{user} @@ -1546,9 +1551,6 @@ tl: js_1: Maaaring gumagamit ka ng isang pantingin-tingin na hindi tumatangkilik ng JavaScript, o hindi mo pinagagana ang JavaScript. js_2: Ang OpenStreetMap ay gumagamit ng JavaScript para sa madulas nitong mapa. - permalink: Permalink - shortlink: Maikling kawing - createnote: Magdagdag ng tala license: copyright: Karapatang-sipi ng OpenStreetMap at mga tagapag-ambag nito, sa ilalim ng isang bukas na lisensya @@ -2192,12 +2194,6 @@ tl: map_data_zoom_in_tooltip: Lumapit upang makita ang datos ng mapa queryfeature_tooltip: Usisain ang mga tampok queryfeature_disabled_tooltip: Lumapit upang usisain ang mga tampok - changesets: - show: - comment: Pumuna - subscribe: Sumuskribi - hide_comment: itago - unhide_comment: pawalang-bisa ang pag-tago directions: ascend: Umakyat engines: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 2b7c2c0fe..dfd2a166f 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Agaafd +# Author: Ahmetlii # Author: Alerque # Author: Alidemirtas # Author: Alpkant @@ -533,8 +534,13 @@ tr: join_discussion: Tartışmaya katılmak için lütfen giriş yapın still_open: Değişiklik kaydı hâlâ açık - tartışma, değişiklik serisi kapatıldığında açılacaktır. + subscribe: Abone ol + unsubscribe: Abonelikten çık comment_by_html: '%{user} tarafından %{time_ago} yapılan yorum' hidden_comment_by_html: '%{user} tarafından %{time_ago} yapılan gizli yorum' + hide_comment: gizle + unhide_comment: göster + comment: Yorum changesetxml: ' XML değişiklik kaydı' osmchangexml: osmChange XML paging_nav: @@ -653,7 +659,14 @@ tr: all: title: OpenStreetMap günlük girdileri description: OpenStreetMap kullanıcıların en son günlük girdileri - comments: + subscribe: + heading: Aşağıdaki günlük girdisi tartışmasına abone olmak ister misiniz? + button: Tartışmaya abone ol + unsubscribe: + heading: Aşağıdaki günlük girdisi tartışmasının aboneliği iptal edilsin mi? + button: Tartışma aboneliğinden çık + diary_comments: + index: title: '%{user} tarafından yapılan günlük yorumları' heading: '%{user} Kullanıcısının Günlük Yorumları' subheading_html: '%{user} tarafından yapılan günlük yorumları' @@ -663,12 +676,6 @@ tr: comment: Yorum newer_comments: Daha Yeni Yorumlar older_comments: Daha Eski Yorumlar - subscribe: - heading: Aşağıdaki günlük girdisi tartışmasına abone olmak ister misiniz? - button: Tartışmaya abone ol - unsubscribe: - heading: Aşağıdaki günlük girdisi tartışmasının aboneliği iptal edilsin mi? - button: Tartışma aboneliğinden çık doorkeeper: errors: messages: @@ -708,6 +715,10 @@ tr: contact_the_community_html: Bozuk bir bağlantı/hata bulduysanız OpenStreetMap topluluğuna %{contact_link} bağlantısıyla iletmekten çekinmeyin. Ä°steğinizin tam URL'sini not edin. + bad_request: + title: Geçersiz Ä°stek + description: OpenStreetMap sunucusunda talep ettiğiniz işlem geçerli değil (HTTP + 400) forbidden: title: Yasaklı description: OpenStreetMap sunucusunda talep ettiğiniz işlem sadece yöneticiler @@ -1240,7 +1251,7 @@ tr: scree: Kayşat scrub: Çalılık shingle: Çakıl tabanlı sahil plaj - spring: Ä°lkbahar + spring: Pınar/Kaynak stone: Taş strait: Boğaz tree: Ağaç @@ -1782,8 +1793,10 @@ tr: Not, %{place} yakınlarında yer almakta.' commented_note_html: '%{commenter}, yorumladığınız bir harita notunu yeniden etkinleştirdi. Not, %{place} yakınlarında yer almakta.' - details: Not hakkındaki ayrıntılı bilgiler %{url} bağlantısında görülebilir. - details_html: Notla ilgili daha fazla ayrıntı %{url} adresinde bulunabilir. + details: '%{url} bağlantısındaki notu yanıtlayın veya not hakkında daha fazla + bilgi edinin.' + details_html: '%{url} bağlantısındaki notu yanıtlayın veya not hakkında daha + fazla bilgi edinin.' changeset_comment_notification: description: 'OpenStreetMap Değişiklik Kaydı #%{id}' hi: Merhaba %{to_user}, @@ -1804,9 +1817,10 @@ tr: partial_changeset_with_comment: '''%{changeset_comment}'' yorumuyla' partial_changeset_with_comment_html: '''%{changeset_comment}'' yorumuyla' partial_changeset_without_comment: yorumsuz - details: Değişiklik kaydıyla ilgili daha fazla bilgi %{url} sayfasından edinebilirsiniz. - details_html: Değişiklik kümesiyle ilgili daha fazla ayrıntı %{url} adresinde - bulunabilir. + details: '%{url} bağlantısına yanıt verin veya değişiklik seti hakkında daha + fazla bilgi edinin.' + details_html: '%{url} bağlantısına yanıt verin veya değişiklik seti hakkında + daha fazla bilgi edinin.' unsubscribe: Bu değişiklik kaydındaki güncellemelere ilişkin aboneliğinizi %{url} adresinden iptal edebilirsiniz. unsubscribe_html: Bu değişiklik kaydındaki güncellemelere ilişkin aboneliğinizi @@ -2243,9 +2257,6 @@ tr: js_1: JavaScript desteklemeyen bir tarayıcı kullanıyorsunuz ya da JavaScript devre dışı bırakılmış. js_2: OpenStreetMap harita gösterim için JavaScript kullanıyor. - permalink: Kalıcı Bağlantı - shortlink: Kısa Bağlantı - createnote: Bir not ekle license: copyright: Telif Hakkı OpenStreetMap ve katılımcılar, açık lisans altında remote_failed: Düzenleme başarısız - JOSM veya Merkaartor'un yüklendiğinden @@ -2643,6 +2654,8 @@ tr: other: '%{user} tarafından %{count} noktalı GPX dosyası' description_without_count: '%{user} tarafından GPX dosyası' application: + basic_auth_disabled: 'HTTP Temel Kimlik Doğrulaması devre dışı: %{link}' + oauth_10a_disabled: 'OAuth 1.0 ve 1.0a devre dışı bırakıldı: %{link}' permission_denied: Bu eyleme erişme izniniz yok require_cookies: cookies_needed: Çerezleri devre dışı bırakmış görünüyorsunuz - devam etmeden @@ -3293,13 +3306,6 @@ tr: queryfeature_tooltip: Özellikleri göster queryfeature_disabled_tooltip: Özellikler görmek için yakınlaştır embed_html_disabled: Bu harita katmanı için HTML yerleştirme kullanılamıyor - changesets: - show: - comment: Yorum - subscribe: Abone ol - unsubscribe: Abonelikten çık - hide_comment: gizle - unhide_comment: göster edit_help: Haritayı sürükleyip ve düzenleme yapmak istediğiniz konuma yakınlaştırdıktan sonra buraya tıklayın. directions: diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 3f576290b..61a981503 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -419,6 +419,8 @@ tt: мөмкин булыр. comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}' hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}' + hide_comment: яшерү + unhide_comment: күрсәтү changesetxml: Үзгәртүләр өеменең XMLы osmchangexml: osmChange XML paging_nav: @@ -455,7 +457,8 @@ tt: location: 'Урын:' view: Карау edit: Төзәтмә - comments: + diary_comments: + index: when: Кайчан comment: Шәрех newer_comments: Яңарак шәрехләр @@ -987,10 +990,6 @@ tt: standard: Стандарт layers: title: Катламнар - changesets: - show: - hide_comment: яшерү - unhide_comment: күрсәтү directions: ascend: Менү engines: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index a2b46449b..20e1768d2 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -100,7 +100,7 @@ uk: diary_comment: Коментарі щоденника diary_entry: Запис щоденника friend: Друг - issue: Звіт + issue: Звернення language: Мова message: Повідомлення node: Точка @@ -570,17 +570,22 @@ uk: join_discussion: Увійдіть в систему, щоб приєднатися до обговорення still_open: Набір змін досі відкритий — обговорення буде відкрито, як тільки він стане закритим. + subscribe: Підписатися + unsubscribe: Відписатись comment_by_html: Коментар від %{user} %{time_ago} hidden_comment_by_html: Прихований коментар від %{user} %{time_ago} - changesetxml: XML опис набору змін + hide_comment: приховати + unhide_comment: показати + comment: Коментар + changesetxml: Набір змін в XML osmchangexml: osmChange XML paging_nav: nodes: Точки (%{count}) - nodes_paginated: Точки (%{x}-%{y} із %{count}) + nodes_paginated: Точки (%{x}-%{y} з %{count}) ways: Лінії (%{count}) - ways_paginated: Лінії (%{x}-%{y} із %{count}) + ways_paginated: Лінії (%{x}-%{y} з %{count}) relations: Зв’язки (%{count}) - relations_paginated: Зв’язки (%{x}-%{y} із %{count}) + relations_paginated: Зв’язки (%{x}-%{y} з %{count}) timeout: sorry: На жаль, перелік наборів змін, який ви запросили, потребує забагато часу для завантаження. @@ -688,7 +693,14 @@ uk: all: title: Записи щоденника OpenStreetMap description: Останні записи в щоденниках від учасників OpenStreetMap - comments: + subscribe: + heading: Підписатись на обговорення цього допису щоденника? + button: Підписатись на обговорення + unsubscribe: + heading: Відписатись від обговорення цього допису щоденника? + button: Відписатися від обговорення + diary_comments: + index: title: Коментарі до щоденника додав %{user} heading: Коментарі щоденника %{user} subheading_html: Коментарі до щоденника додав %{user} @@ -698,12 +710,6 @@ uk: comment: Коментар newer_comments: Нові коментарі older_comments: Старіші коментарі - subscribe: - heading: Підписатись на обговорення цього допису щоденника? - button: Підписатись на обговорення - unsubscribe: - heading: Відписатись від обговорення цього допису щоденника? - button: Відписатися від обговорення doorkeeper: errors: messages: @@ -742,6 +748,10 @@ uk: contact_the_community_html: Будь ласка, %{contact_link} зі спільнотою OpenStreetMap, якщо ви знайшли несправне посилання або помилку. Запишіть точну URL-адресу вашого запиту. + bad_request: + title: Хибний запит + description: Операція, яку ви запитали на сервері OpenStreetMap, не є дійсною + (HTTP 400) forbidden: title: Заборонено description: Дія, яку ви намагались виконати, доступна лише адміністраторам @@ -1089,7 +1099,7 @@ uk: memorial: Меморіал milestone: Історичний межовий стовп mine: Копальня - mine_shaft: Шахтний вал + mine_shaft: Шахтний ствол monument: Пам’ятник railway: Історична залізниця roman_road: Римська дорога @@ -1590,7 +1600,7 @@ uk: other: "" no_reports: Скарг немає report_created_at_html: Вперше повідомлено %{datetime} - last_resolved_at_html: Востаннє розв'язано %{datetime} + last_resolved_at_html: Востаннє розвʼязано %{datetime} last_updated_at_html: В останнє оновлено %{datetime}, %{displayname} resolve: Розв'язати ignore: Ігнорувати @@ -1736,7 +1746,7 @@ uk: had_added_you: '%{user} додав Вас як друга в OpenStreetMap.' see_their_profile: Ви можете побачити їх профіль на %{userurl}. see_their_profile_html: Ви можете ознайомитись з його/її профілем - %{userurl}. - befriend_them: Ви також можете додати їх у якості друзів %{befriendurl}. + befriend_them: Ви також можете додати їх як друзів %{befriendurl}. befriend_them_html: Ви також можете додати його/її до друзів %{befriendurl}. gpx_description: description_with_tags_html: 'Схоже це ваш файл GPX %{trace_name}, що має опис @@ -1818,8 +1828,8 @@ uk: біля %{place}.' commented_note_html: '%{commenter} поновив нотатку, прокоментовану вами, що знаходиться біля %{place}.' - details: Докладніше про нотатку %{url}. - details_html: Докладніше про нотатку %{url}. + details: Дайте відповідь або дізнайтеся більше про нотатку за %{url}. + details_html: Дайте відповідь або дізнайтеся більше про нотатку за %{url}. changeset_comment_notification: description: 'Набір змін OpenStreetMap #%{id}' hi: Привіт %{to_user}, @@ -1840,8 +1850,8 @@ uk: partial_changeset_with_comment: з коментарем '%{changeset_comment}' partial_changeset_with_comment_html: з коментарем '%{changeset_comment}' partial_changeset_without_comment: без коментарів - details: Більше деталей про зміни, які можуть бути знайдені в %{url}. - details_html: Більше деталей про набір змін можна знайти за посиланням - %{url}. + details: Дайте відповідь або дізнайтеся більше про набір змін за %{url}. + details_html: Дайте відповідь або дізнайтеся більше про набір змін за %{url}. unsubscribe: Щоб відмовитись від отримання повідомлень для цього набору змін за посиланням %{url}. unsubscribe_html: Щоб відмовитись від отримання повідомлень для цього набору @@ -1988,7 +1998,7 @@ uk: preferred_languages: Типові мови edit_preferences: Зміна вподобань edit: - title: Зміна налаштувань + title: Зміна вподобань save: Зберегти вподобання cancel: Скасувати update: @@ -2025,13 +2035,15 @@ uk: new: title: Ласкаво просимо tab_title: Ласкаво просимо + login_to_authorize_html: Увійдіть до OpenStreetMap, щоб отримати доступ до %{client_app_name}. email or username: Ел. пошта або прізвисько password: Пароль remember: Запам’ятати мене lost password link: Забули пароль? login_button: Увійти register now: Зареєструйтеся зараз - with external: 'Або використовуйте, облікові записи з інших ресурсів:' + with external: Або використовуйте, облікові записи з інших ресурсів + or: або auth failure: Вибачте, вхід з цими ім’ям або паролем неможливий. destroy: title: Вийти @@ -2275,9 +2287,6 @@ uk: index: js_1: Ви користуєтесь оглядачем, в якому не підтримується або відключений JavaScript. js_2: OpenStreetMap використовує JavaScript для мапи. - permalink: Постійне посилання - shortlink: Кор.посил. - createnote: Додати нотатку license: copyright: Авторські права за OpenStreetMap та його учасниками на умовах відкритої ліцензії @@ -2683,6 +2692,8 @@ uk: other: "" description_without_count: GPX файл від %{user} application: + basic_auth_disabled: 'HTTP Basic Authentication вимкнено: %{link}' + oauth_10a_disabled: 'OAuth 1.0 та 1.0a вимкнено: %{link}' permission_denied: Вибачте, у вас недостатньо прав для виконання цієї дії. require_cookies: cookies_needed: Схоже, що у вас вимкнені куки. Будь ласка, увімкніть куки у @@ -2704,10 +2715,11 @@ uk: oauth2_authorizations: авторизації OAuth 2 muted_users: Стишені учасники auth_providers: - openid_logo_alt: Увійти з допомогою OpenID + openid_logo_alt: Увійти з OpenID + openid_login_button: Продовжити openid: - title: Увійти за допомогою OpenID - alt: Увійти за допомогою OpenID URL + title: Увійти за OpenID + alt: Увійти за OpenID URL google: title: Увійти через Google alt: Увійти через Google OpenID @@ -2770,6 +2782,8 @@ uk: write_redactions: Виконувати очищення даних read_email: Отримувати адресу е-пошти skip_authorization: Автоматичне схвалення заявки + for_roles: + moderator: Цей дозвіл призначений для дій, доступних лише модераторам oauth_clients: new: title: Зареєструвати новий застосунок @@ -2865,6 +2879,9 @@ uk: users: new: title: Реєстрація + tab_title: Реєстрація + signup_to_authorize_html: Увійдіть до свого облікового запису OpenStreetMap, + щоб отримати доступ до %{client_app_name}. no_auto_account_create: На жаль, наразі ми не в змозі створити для вас обліковий запис автоматично. please_contact_support_html: Будь ласка, зв’яжіться з %{support_link}, щоб домовитися @@ -2872,14 +2889,22 @@ uk: швидше. support: підтримкою about: - header: Вільні й доступні для редагування + header: Вільні й доступні для редагування. paragraph_1: На відміну від інших мап, OpenStreetMap повністю створено людьми, такими ж як ви, і кожен може вільно виправляти, оновлювати, завантажувати та використовувати дані OpenStreetMap. - paragraph_2: Зареєструйтеся, щоб почати мапити. Ми надішлемо електронного - листа для підтвердження вашого облікового запису. + paragraph_2: Зареєструйтеся, щоб почати мапити. + welcome: Ласкаво просимо до OpenStreetMap + duplicate_social_email: Якщо у вас вже є обліковий запис OpenStreetMap і ви + хочете використовувати стороннього постачальника ідентифікаційних даних, будь + ласка, увійдіть, використовуючи свій пароль, і змініть налаштування свого + облікового запису. display name description: Ваше ім’я учасника, доступне всім. Ви можете змінити його потім у ваших налаштуваннях. + by_signing_up_html: Реєструючись, ви приймаєте наші %{tou_link}, %{privacy_policy_link} + і %{contributor_terms_link}. + tou: умови використання + contributor_terms: умови співпраці external auth: 'Автентифікація через:' continue: Зареєструватись terms accepted: Дякуємо за прийняття нових умов співпраці! @@ -2888,7 +2913,10 @@ uk: privacy_policy: Політикою конфіденційності privacy_policy_title: Політика конфіденційності OSMF, включаючи розділ про адреси електронної пошти - use external auth: Або використовуйте, облікові записи з інших ресурсів для + consider_pd_html: Я вважаю, що мій внесок належать до %{consider_pd_link}. + consider_pd: суспільного надбання + or: або + use external auth: або використовуйте, облікові записи з інших ресурсів для входу terms: title: Умови @@ -3250,6 +3278,10 @@ uk: intro: Помітили помилку або чогось не вистачає? Дайте знати іншим маперам, щоб можна було це виправити. Перемістіть позначку в потрібне місце та додайте пояснення проблеми. + anonymous_warning_html: Ви не ввійшли в систему. Будь ласка, %{log_in} або %{sign_up}, + якщо ви хочете отримувати оновлення щодо своєї нотатки. + anonymous_warning_log_in: увійдіть + anonymous_warning_sign_up: зареєструйтесь advice: Ваша нотатка є публічною та може бути використана для оновлення мапи. Будь ласка, не додавайте персональні дані або інформацію, яка міститься на захищених авторським правом мапах чи каталогах. @@ -3333,17 +3365,10 @@ uk: queryfeature_tooltip: Отримати об’єкти queryfeature_disabled_tooltip: Наблизитись для отримання об’єктів embed_html_disabled: Вбудовування HTML недоступне для цього шару мапи - changesets: - show: - comment: Коментар - subscribe: Підписатися - unsubscribe: Відписатись - hide_comment: приховати - unhide_comment: показати edit_help: Перемістіть мапу і наблизьтесь до місця, яке ви бажаєте змінити, потім клацніть тут. directions: - ascend: Вгору + ascend: Підйом engines: fossgis_osrm_bike: Велосипед (OSRM) fossgis_osrm_car: Машина (OSRM) @@ -3354,7 +3379,7 @@ uk: fossgis_valhalla_bicycle: Велосипед (Valhalla) fossgis_valhalla_car: Машина (Valhalla) fossgis_valhalla_foot: Пішки (Valhalla) - descend: Вниз + descend: Спуск directions: Маршрут distance: Відстань distance_m: '%{distance} м' diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 5566e2f97..000e4394f 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -489,8 +489,13 @@ vi: join_discussion: Đăng nhập để tham gia thảo luận still_open: Bộ thay đổi đang mở – có thể thảo luận sau khi bộ thay đổi được đóng. + subscribe: Theo dõi + unsubscribe: Không theo dõi comment_by_html: Nhận xét của %{user} từ %{time_ago} hidden_comment_by_html: Nhận xét ẩn của %{user} từ %{time_ago} + hide_comment: ẩn + unhide_comment: bỏ ẩn + comment: Bình luận changesetxml: Bộ thay đổi XML osmchangexml: osmChange XML paging_nav: @@ -603,7 +608,14 @@ vi: all: title: Các mục nhật ký OpenStreetMap description: Những mục nhật ký gần đây từ người dùng OpenStreetMap - comments: + subscribe: + heading: Theo dõi cuộc thảo luận về mục nhật ký sau đây? + button: Theo dõi cuộc thảo luận + unsubscribe: + heading: Ngừng theo dõi cuộc thảo luận về mục nhật ký sau đây? + button: Ngừng theo dõi cuộc thảo luận + diary_comments: + index: title: Bình luận Nhật ký do %{user} Đăng heading: Bình luận Nhật ký của %{user} subheading_html: Bình luận Nhật ký do %{user} Đăng @@ -613,12 +625,6 @@ vi: comment: Nhận xét newer_comments: Các Nhận xét Mới hÆ¡n older_comments: Các Nhận xét CÅ© hÆ¡n - subscribe: - heading: Theo dõi cuộc thảo luận về mục nhật ký sau đây? - button: Theo dõi cuộc thảo luận - unsubscribe: - heading: Ngừng theo dõi cuộc thảo luận về mục nhật ký sau đây? - button: Ngừng theo dõi cuộc thảo luận doorkeeper: errors: messages: @@ -2037,9 +2043,6 @@ vi: index: js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript. js_2: OpenStreetMap sá»­ dụng JavaScript cho chức năng bản đồ trÆ¡n. - permalink: Liên kết Thường trá»±c - shortlink: Liên kết Ngắn gọn - createnote: Thêm ghi chú license: copyright: Bản quyền của OpenStreetMap và những người đóng góp, được phát hành theo giấy phép mở @@ -3033,13 +3036,6 @@ vi: queryfeature_tooltip: Thăm dò yếu tố queryfeature_disabled_tooltip: Phóng to để thăm dò yếu tố embed_html_disabled: Chức năng nhúng HTML không có sẵn đối với lớp bản đồ này - changesets: - show: - comment: Bình luận - subscribe: Theo dõi - unsubscribe: Không theo dõi - hide_comment: ẩn - unhide_comment: bỏ ẩn edit_help: Di chuyển bản đồ và phóng to một vị trí mà bạn muốn sá»­a đổi, rồi nhấn chuột vào đây. directions: diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml index 2b2ea8bae..1dd1afa81 100644 --- a/config/locales/xmf.yml +++ b/config/locales/xmf.yml @@ -492,7 +492,8 @@ xmf: title: OpenStreetMap დღარიშ დინნაჭარეფი გეჸვენჯი ნინაშა %{language_name} all: title: OpenStreetMap დღარიშ დინნაჭარეფი - comments: + diary_comments: + index: no_comments: დღარი კომენტარეფი ვა რე post: პოსტი when: მუჟამს diff --git a/config/locales/yi.yml b/config/locales/yi.yml index d366c22a3..b3f7cb663 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -80,6 +80,8 @@ yi: feed: created: געשאַפֿן closed: געשלאסן + show: + hide_comment: באַהאַלטן geocoder: search_osm_nominatim: prefix: @@ -171,9 +173,6 @@ yi: short_url: קורץ URL center_marker: צענטרירן מאפע אויף מארקירונג view_larger_map: באקוקן גרעסערע מאפע - changesets: - show: - hide_comment: באַהאַלטן context: show_address: ווײַזן אדרעס ... diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index bb1028915..2f13b6d25 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -537,8 +537,13 @@ zh-CN: discussion: 讨论 join_discussion: 登录以加入讨论 still_open: 变更集依然开放——一旦变更集关闭讨论将开放。 + subscribe: 订阅 + unsubscribe: 取消订阅 comment_by_html: '%{user} 于 %{time_ago} 的评论' hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论' + hide_comment: 隐藏 + unhide_comment: 取消隐藏 + comment: 评论 changesetxml: 变更集 XML osmchangexml: osmChange XML paging_nav: @@ -608,6 +613,8 @@ zh-CN: title: '%{user} 的日记 | %{title}' user_title: '%{user}的日记' discussion: 讨论 + subscribe: 订阅 + unsubscribe: 取消订阅 leave_a_comment: 留下评论 login_to_leave_a_comment_html: '%{login_link}以留下评论' login: 登录 @@ -649,7 +656,14 @@ zh-CN: all: title: OpenStreetMap 日记文章 description: 最近的 OpenStreetMap 用户日记文章 - comments: + subscribe: + heading: 订阅以下日记讨论吗？ + button: 订阅讨论 + unsubscribe: + heading: 退订以下日记讨论吗？ + button: 退订讨论 + diary_comments: + index: title: '%{user} 已添加日记评论' heading: '%{user} 的日记评论' subheading_html: '%{user} 已添加日记评论' @@ -659,12 +673,6 @@ zh-CN: comment: 评论 newer_comments: 较新评论 older_comments: 较旧评论 - subscribe: - heading: 订阅以下日记讨论吗？ - button: 订阅讨论 - unsubscribe: - heading: 退订以下日记讨论吗？ - button: 退订讨论 doorkeeper: errors: messages: @@ -702,6 +710,9 @@ zh-CN: contact: 联系 contact_the_community_html: 如果您发现有损坏的链接/错误，请随时%{contact_link} OpenStreetMap 社区。并记下您请求的确切 URL。 + bad_request: + title: 错误请求 + description: 您在 OpenStreetMap 服务器上请求的操作无效 (HTTP 400) forbidden: title: 禁止 description: 您在 OpenStreetMap 服务器上请求的操作仅限管理员使用（HTTP 403） @@ -1717,8 +1728,8 @@ zh-CN: subject_other: '[OpenStreetMap] %{commenter} 已经解决了一个您感兴趣的注记' your_note: '%{commenter} 解决了您在 %{place} 附近的一个注记。' your_note_html: '%{commenter} 解决了您在 %{place} 附近的一个注记。' - commented_note: '%{commenter} 解决了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' - commented_note_html: '%{commenter} 解决了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' + commented_note: '%{commenter} 解决了您留言的地图注记。该注记位于 %{place} 附近。' + commented_note_html: '%{commenter} 解决了您留言的地图注记。该注记位于 %{place} 附近。' reopened: subject_own: '[OpenStreetMap] %{commenter} 重新激活了您的一个注记' subject_other: '[OpenStreetMap] %{commenter} 重新激活了您感兴趣的一个注记' @@ -1726,8 +1737,8 @@ zh-CN: your_note_html: '%{commenter} 重新激活了您在 %{place} 附近的一个注记。' commented_note: '%{commenter} 重新激活了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' commented_note_html: '%{commenter} 重新激活了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' - details: 更多关于笔记的详细信息可以在%{url}找到。 - details_html: 更多关于笔记的详细信息可以在%{url}找到。 + details: 在 %{url} 回复或了解更多有关注记的信息。 + details_html: 在 %{url} 回复或了解更多有关注记的信息。 changeset_comment_notification: description: 'OpenStreetMap 变更集 #%{id}' hi: 您好，%{to_user}： @@ -1742,8 +1753,8 @@ zh-CN: partial_changeset_with_comment: 带评论“%{changeset_comment}” partial_changeset_with_comment_html: 带有评论“%{changeset_comment}” partial_changeset_without_comment: 没有评论 - details: 更多关于变更集的详细信息可以在 %{url} 找到。 - details_html: 更多有关变更集的详细信息，请参见 %{url}。 + details: 在 %{url} 回复或了解更多有关变更集的信息。 + details_html: 在 %{url} 回复或了解更多有关变更集的信息。 unsubscribe: 您可访问%{url}以从该变更集中退订。 unsubscribe_html: 您可访问%{url}以从该变更集中退订。 confirmations: @@ -2097,9 +2108,6 @@ zh-CN: index: js_1: 您或许正在使用不支持 JavaScript 的浏览器，或您禁用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。 - permalink: 固定链接 - shortlink: 短链接 - createnote: 添加注记 license: copyright: 版权所有 OpenStreetMap及其贡献者，采用开放授权协议 remote_failed: 编辑失败 - 请确保已加载 JOSM 或 Merkaartor 并启用了远程控制 @@ -2438,6 +2446,8 @@ zh-CN: other: 来自 %{user} 的带 %{count} 点的GPX文件 description_without_count: 来自 %{user} 的 GPX 文件 application: + basic_auth_disabled: HTTP 基本身份验证已禁用：%{link} + oauth_10a_disabled: OAuth 1.0 和 1.0a 已禁用：%{link} permission_denied: 您没有权限来执行此操作 require_cookies: cookies_needed: 您似乎停用了 cookie - 请在继续操作前启用您的浏览器 cookie。 @@ -2688,6 +2698,8 @@ zh-CN: remove as friend: 删除朋友 add as friend: 添加朋友 mapper since: 绘图者注册于： + last map edit: 最后地图编辑于： + no activity yet: 尚无活动 uid: 用户ID： ct status: 贡献者条款： ct undecided: 未决定 @@ -2947,6 +2959,9 @@ zh-CN: new: title: 新注记 intro: 发现错误或遗漏了什么？请告诉其他绘图者以便于我们更正错误。将标记移动到正确的位置并输入备注说明问题。 + anonymous_warning_html: 您尚未登录。如果您想接收笔记的更新信息，请%{log_in}或%{sign_up}。 + anonymous_warning_log_in: 登录 + anonymous_warning_sign_up: 注册 advice: 您的注释会公开，并可能用于更新地图，所以不要输入个人信息，或是来自版权保护地图的信息或目录列表。 add: 添加注记 javascripts: @@ -3024,13 +3039,6 @@ zh-CN: queryfeature_tooltip: 查询特征 queryfeature_disabled_tooltip: 放大以查询特征 embed_html_disabled: HTML 嵌入不适用于此地图图层 - changesets: - show: - comment: 评论 - subscribe: 订阅 - unsubscribe: 取消订阅 - hide_comment: 隐藏 - unhide_comment: 取消隐藏 edit_help: 移动地图并在您想编辑的位置放大，然后点击这里。 directions: ascend: 上升 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 97c636616..a10de6929 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -374,7 +374,8 @@ zh-HK: description: 近期以%{language_name}撰寫的OpenStreetMap用戶日記文章 all: description: 近期的OpenStreetMap用戶日記文章 - comments: + diary_comments: + index: post: 貼文 when: 於 comment: 評論 @@ -1096,8 +1097,6 @@ zh-HK: destroy: title: 登出 site: - index: - createnote: 添加註記 edit: not_public: 您尚未把編輯公開。 not_public_description_html: 您不這樣設定的話就將再無法編輯地圖。您可以在%{user_page}將閣下的編輯設為公開。 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index eb8fabd0b..14635ba16 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -40,9 +40,11 @@ # Author: Tntchn # Author: TongcyDai # Author: Wehwei +# Author: WiiUf # Author: Winston Sung # Author: Wrightbus # Author: Xiplus +# Author: Yuchenglinedu # Author: 予弦 # Author: 列维劳德 # Author: 捍粵者 @@ -86,7 +88,7 @@ zh-TW: errors: messages: invalid_email_address: 似乎不是有效的電子郵件信箱地址。 - email_address_not_routable: 不可繞送 + email_address_not_routable: 不可發送 display_name_is_user_n: 不能是「user_n」除非「n」是您的使用者 ID models: user_mute: @@ -122,21 +124,21 @@ zh-TW: tracetag: 軌跡標籤 user: 使用者 user_preference: 使用者偏好設定 - user_token: 使用者令牌 + user_token: 使用者Token way: 路徑 way_node: 路徑節點 way_tag: 路徑標籤 attributes: client_application: - name: 名稱（必需） - url: 主程式 URL（必需） - callback_url: 回呼 (Callback) URL + name: 名稱（必填） + url: 主要應用程式 URL（必填） + callback_url: 回撥 (Callback) URL support_url: 支援 URL - allow_read_prefs: 讀取他們的使用者偏好設定 - allow_write_prefs: 修改他們的使用者偏好設定 + allow_read_prefs: 讀取使用者偏好設定 + allow_write_prefs: 修改使用者偏好設定 allow_write_diary: 建立日記、評論和加入好友 allow_write_api: 修改地圖 - allow_read_gpx: 讀取他們的私人GPS軌跡 + allow_read_gpx: 讀取個人GPS軌跡 allow_write_gpx: 上傳 GPS 軌跡 allow_write_notes: 修改註記 diary_comment: @@ -164,7 +166,7 @@ zh-TW: latitude: 緯度 longitude: 經度 public: 公開 - description: 說明 + description: 描述 gpx_file: 上傳 GPX 檔案 visibility: 能見度 tagstring: 標籤 @@ -175,18 +177,18 @@ zh-TW: recipient: 收件者 redaction: title: 標題 - description: 說明 + description: 描述 report: - category: 選擇您回報的原因 - details: 請提供有關問題的更多些詳情（必需） + category: 選擇你回報的原因 + details: 請提供更多有關問題的詳情（必填） user: - auth_provider: 認證提供方 + auth_provider: 認證提供者 auth_uid: 認證 UID email: 電子郵件 new_email: 新的電子郵件地址 - active: 開啟中 + active: 活躍 display_name: 顯示名稱 - description: 基本資料說明 + description: 個人檔案描述 home_lat: 緯度 home_lon: 經度 languages: 偏好的語言 @@ -196,14 +198,14 @@ zh-TW: help: doorkeeper/application: confidential: 應用程式會在客戶端密鑰可以維持機密時使用（本地端移動應用程式和單一頁面應用程式不保密） - redirect_uri: 一行一URI + redirect_uri: 每條 URI 使用一行 trace: - tagstring: 逗點分隔 + tagstring: 以逗點分隔 user_block: - reason: 封鎖使用者的理由。請盡量以平靜、合理態度詳細描述情況，並記住訊息公開可見。請注意，並非所有使用者都了解社群術語，所以請盡量使用通俗說法。 + reason: 封鎖使用者的理由。請盡量以平靜、合理的態度詳細描述情況，並記住訊息公開可見。請注意，並非所有使用者都了解社群術語，所以請盡量使用通俗說法。 needs_view: 解封前是否需要使用者登入？ user: - new_email: （永不公開顯示） + new_email: (永遠不公開顯示) datetime: distance_in_words_ago: about_x_hours: @@ -215,34 +217,22 @@ zh-TW: about_x_years: one: 約 %{count} 年前 other: 約 %{count} 年前 - almost_x_years: - one: 將近 %{count} 年前 - other: 將近 %{count} 年前 + almost_x_years: 將近 %{count} 年前 half_a_minute: 半分鐘前 - less_than_x_seconds: - one: 小於 %{count} 秒前 - other: 小於 %{count} 秒前 - less_than_x_minutes: - one: 小於 %{count} 分前 - other: 小於 %{count} 分前 + less_than_x_seconds: 不到 %{count} 秒前 + less_than_x_minutes: 不到 %{count} 分鐘前 over_x_years: - one: 超過 %{count} 年前 - other: 超過 %{count} 年前 + one: 超過1年前 + other: 超過%{count}年前 x_seconds: - one: '%{count} 秒前' - other: '%{count} 秒前' - x_minutes: - one: '%{count} 分鐘前' - other: '%{count} 分鐘前' - x_days: - one: '%{count} 天前' - other: '%{count} 天前' + one: 1秒前 + other: '%{count}秒前' + x_minutes: '%{count} 分鐘前' + x_days: '%{count} 天前' x_months: one: '%{count} 個月前' other: '%{count} 個月前' - x_years: - one: '%{count} 年前' - other: '%{count} 年前' + x_years: '%{count} 年前' printable_name: current_and_old_links_html: '%{current_link}，%{old_link}' editor: @@ -274,13 +264,13 @@ zh-TW: reopened_at_by_html: 於%{when}由%{user}重新開啟 rss: title: OpenStreetMap 註記 - description_all: 已報告、評論、或是關閉註記的清單 + description_all: 報告、評論、或關閉的註記清單 description_area: 在你的區域[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]所報告、評論或關閉的註記的清單 description_item: 註記 %{id} 的 RSS feed opened: 新的註記 (在 %{place} 附近) commented: 新的評論 (在 %{place} 附近) closed: 關閉的註記 (在 %{place} 附近) - reopened: 重新開啟的註記 (在 %{place} 附近) + reopened: 重新開啟的註記（在%{place}附近） entry: comment: 評論 full: 註記原文 @@ -288,20 +278,20 @@ zh-TW: deletions: show: title: 刪除我的帳號 - warning: 警告！帳號刪除處理是完全徹底、無法還原的。 + warning: 警告！帳號刪除程序不可逆轉，無法復原。 delete_account: 刪除帳號 - delete_introduction: 您可以使用下方按鈕來刪除您的 OpenStreetMap 帳號。並請注意以下細節： - delete_profile: 您的個人檔案資訊，包含像是您的頭像圖片、描述，以及住家位置將會移除。 - delete_display_name: 您的顯示名稱將會移除，並且會被其他帳號拿來重覆使用。 - retain_caveats: 然而，即使您的帳號被刪除後，一些關於您的資訊仍會繼續保留在 OpenStreetMap 裡： - retain_edits: 若有您對於地圖資料庫的編輯次數，這將會繼續保留。 - retain_traces: 若有您上傳過的軌跡資料內容，這將會繼續保留。 - retain_diary_entries: 若有您的日記項目與日記評論內容，這將會繼續保留。 - retain_notes: 若有您的地圖註記與註記評論內容，這將會繼續保留；不過會隱藏起來。 - retain_changeset_discussions: 若有您的變更集討論，這將會繼續保留。 - retain_email: 您的電子郵件地址將會繼續保留。 - recent_editing_html: 因為您最近有作過編輯，目前無法刪除您的帳號。在 %{time} 後才可刪除。 - confirm_delete: 您確定嗎？ + delete_introduction: 你可以使用下方按鈕來刪除你的 OpenStreetMap 帳號。並請留意以下細節： + delete_profile: 你的個人檔案資訊，包含：例如你的頭像圖片、描述，以及住家位置將會移除。 + delete_display_name: 你的顯示名稱將會移除，並且會被其他帳號拿來重覆使用。 + retain_caveats: 然而，即使你的帳號被刪除後，一些關於你的資訊仍會繼續保留在 OpenStreetMap 裡： + retain_edits: 你對於地圖資料庫的編輯次數，假如存在，這將會繼續保留。 + retain_traces: 若有你上傳過的軌跡資料內容，這將會繼續保留。 + retain_diary_entries: 若有你的日誌項目與日誌評論內容，這將會繼續保留。 + retain_notes: 若有你的地圖註記與註記評論內容，這將會繼續保留；不過會隱藏起來。 + retain_changeset_discussions: 若有你的變更集討論，這將會繼續保留。 + retain_email: 你的電子郵件地址將會繼續保留。 + recent_editing_html: 因為你最近進行過編輯，目前無法刪除你的帳號。在 %{time} 後才可刪除。 + confirm_delete: 你確定嗎？ cancel: 取消 accounts: edit: @@ -315,28 +305,28 @@ zh-TW: heading: 公開編輯 enabled: 已開啟。非匿名且可以編輯資料。 enabled link text: 這是什麼？ - disabled: 已停用且不能編輯資料，所有先前的編輯都會成為匿名的。 + disabled: 已停用且不能編輯資料，所有你先前的編輯都會成為匿名的。 disabled link text: 為什麼我不能編輯？ contributor terms: heading: 貢獻者條款 - agreed: 您已同意新的貢獻者條款。 - not yet agreed: 您未同意新的貢獻者條款。 + agreed: 你已同意新的貢獻者條款。 + not yet agreed: 你未同意新的貢獻者條款。 review link text: 請跟隨此連結，方便你檢視並接受新的貢獻者條款。 - agreed_with_pd: 您亦同意將您的編輯放到公共領域 + agreed_with_pd: 你亦同意將你的編輯放到公共領域 link text: 這是什麼？ save changes button: 儲存變更 delete_account: 刪除帳號… go_public: heading: 公開編輯 - currently_not_public: 目前你的編輯都是暱名的，其他人無法寄給你訊息或是知道你的位置。要讓別人知道你編輯什麼，以及透過網站聯繫你，你點下面的按鈕。 + currently_not_public: 目前你的編輯都是暱名的，其他人無法寄給你訊息或是知道你的位置。要讓別人知道你編輯什麼，以及透過網站聯繫你，請你點以下的按鈕。 only_public_can_edit: 自從 API 0.6 版本上線，只有公共帳號的使用者可以編輯地圖資料。 find_out_why_html: (%{link})。 - find_out_why: 找出來為什麼 - email_not_revealed: 你的電子郵件地址不會揭露公開。 + find_out_why: 找出原因 + email_not_revealed: 你的電子郵件地址不會公開洩漏。 not_reversible: 這項操作無法撤銷，所有的新使用者都是預設公開的。 - make_edits_public_button: 將我所有的編輯設為公開 + make_edits_public_button: 將與我有關的所有的編輯設為公開 update: - success_confirm_needed: 使用者資訊成功的更新。請檢查您的電子郵件，以確認收到新電子郵件地址的通知。 + success_confirm_needed: 使用者資訊成功的更新。請檢查你的電子郵件，以便確認收到新電子郵件地址的通知。 success: 使用者資訊已成功更新。 destroy: success: 帳號已刪除。 @@ -346,21 +336,21 @@ zh-TW: version: 版本 redacted_version: 編修版本 in_changeset: 變更集 - anonymous: 匿名 + anonymous: 匿名使用者 no_comment: (沒有評論) part_of: 屬於： part_of_relations: - one: '%{count} 個關聯' + one: 1 個關聯 other: '%{count} 個關聯' part_of_ways: one: '%{count} 條路徑' other: '%{count} 條路徑' download_xml: 下載 XML view_history: 檢視歷史 - view_unredacted_history: 查看未編修的歷史 + view_unredacted_history: 查看未編輯的歷史記錄 view_details: 檢視詳細資料 view_redacted_data: 查看編修資料 - view_redaction_message: 查看編修訊息 + view_redaction_message: 查看密文訊息 location: 位置： node: title_html: 節點：%{name} @@ -503,8 +493,13 @@ zh-TW: discussion: 討論 join_discussion: 登入以參加討論 still_open: 變更集仍為開啟 - 討論要在變更集關閉後才會開啟。 + subscribe: 訂閱 + unsubscribe: 取消訂閱 comment_by_html: 來自%{user}%{time_ago}的評論 hidden_comment_by_html: '%{user}%{time_ago}隱藏評論' + hide_comment: 隱藏 + unhide_comment: 取消隱藏 + comment: 評論 changesetxml: 變更集 XML osmchangexml: osmChange 格式 XML paging_nav: @@ -574,6 +569,8 @@ zh-TW: title: '%{user} 的日記|%{title}' user_title: '%{user} 的日記' discussion: 討論 + subscribe: 訂閱 + unsubscribe: 取消訂閱 leave_a_comment: 留下評論 login_to_leave_a_comment_html: '%{login_link}來留下評論' login: 登入 @@ -615,7 +612,14 @@ zh-TW: all: title: OpenStreetMap 日記項目 description: OpenStreetMap 使用者最近的日記項目 - comments: + subscribe: + heading: 訂閱以下日記項目討論？ + button: 訂閱討論 + unsubscribe: + heading: 取消訂閱以下日記項目討論？ + button: 取消訂閱討論 + diary_comments: + index: title: 日記評論由%{user}添加 heading: '%{user}的日記評論' subheading_html: 日記評論由%{user}添加 @@ -625,12 +629,6 @@ zh-TW: comment: 評論 newer_comments: 較新的評論 older_comments: 較舊的評論 - subscribe: - heading: 訂閱以下日記項目討論？ - button: 訂閱討論 - unsubscribe: - heading: 取消訂閱以下日記項目討論？ - button: 取消訂閱討論 doorkeeper: errors: messages: @@ -1687,11 +1685,11 @@ zh-TW: commented_note_html: '%{commenter} 在你感興趣的地圖註記評論。該註記在 %{place} 附近。' closed: subject_own: '[OpenStreetMap] %{commenter} 解決你其中一筆註記 %{commenter}' - subject_other: '[OpenStreetMap]%{commenter} 已經解決一筆你興趣的註記' - your_note: '%{commenter} 已經解決你其中一筆接近 %{place} 的註記。' - your_note_html: '%{commenter} 已經解決你其中一筆接近 %{place} 的註記。' - commented_note: '%{commenter} 已經解決一筆你留言過的地圖註記。這筆在 %{place} 附近。' - commented_note_html: '%{commenter} 已經解決一筆你留言過的地圖註記。這筆在 %{place} 附近。' + subject_other: '[OpenStreetMap]%{commenter} 已解決一項你感興趣的註記' + your_note: '%{commenter} 已解決你在 %{place} 附近的註記之一。' + your_note_html: '%{commenter} 已解決你在 %{place} 附近的註記之一。' + commented_note: '%{commenter} 已解決你留言過的地圖註記。該註記在 %{place} 附近。' + commented_note_html: '%{commenter} 已解決你留言過的地圖註記。該註記在 %{place} 附近。' reopened: subject_own: '[OpenStreetMap] %{commenter} 再次開啟你其中一筆註記。' subject_other: '[OpenStreetMap] %{commenter} 再次開啟你感興趣的註記。' @@ -1700,7 +1698,7 @@ zh-TW: commented_note: '%{commenter} 重新開啟了一個您曾評論的地圖註記。該註記位於 %{place} 附近。' commented_note_html: '%{commenter} 重新開啟了一個您曾評論的地圖註記。該註記位於 %{place} 附近。' details: 關於註記的更多詳細資料可在 %{url} 找到。 - details_html: 關於註記的更多詳細資料可在 %{url} 找到。 + details_html: 在%{url}回覆或是瞭解更多有關註記的訊息。 changeset_comment_notification: description: 'OpenStreetMap 變更集 #%{id}' hi: 嗨 %{to_user}， @@ -1715,8 +1713,8 @@ zh-TW: partial_changeset_with_comment: 評論 "%{changeset_comment}" partial_changeset_with_comment_html: 評論 "%{changeset_comment}" partial_changeset_without_comment: 沒有評論 - details: 關於變更集的詳情可在 %{url} 找到。 - details_html: 關於變更集的詳情可在 %{url} 找到。 + details: 在 %{url} 回覆或瞭解更多有關於變更集的資訊。 + details_html: 在 %{url} 回覆或瞭解更多有關變更集的資訊。 unsubscribe: 您可以在 %{url} 取消訂閱此變更集的更新內容。 unsubscribe_html: 您可以在 %{url} 取消訂閱此變更集的更新內容。 confirmations: @@ -2069,9 +2067,6 @@ zh-TW: index: js_1: 您使用不支援 JavaScript 的瀏覽器，或者停用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 讓地圖更平順。 - permalink: 固定連結 - shortlink: 簡短連結 - createnote: 新增註記 license: copyright: 版權所有，由 OpenStreetMap 及貢獻者根據開放的授權協議提供 remote_failed: 編輯失敗 - 請確定已載入 JOSM 或 Merkaartor 並開啟遠端控制選項 @@ -2171,7 +2166,7 @@ zh-TW: search: 搜尋 get_directions: 取得方向指引 get_directions_title: 尋找兩點之間的路線 - from: 來自 + from: 從 to: 到 where_am_i: 這是哪裡？ where_am_i_title: 使用搜尋引擎描述目前的位置 @@ -2422,7 +2417,6 @@ zh-TW: application: basic_auth_disabled: HTTP 基本認證已停用：%{link} oauth_10a_disabled: OAuth 1.0 與 1.0a 已停用：%{link} - auth_disabled_link: https://wiki.openstreetmap.org/wiki/2024_authentication_update permission_denied: 您沒有權限來存取該操作。 require_cookies: cookies_needed: 您似乎已停用 cookies - 請在瀏覽器中開啟 cookies，然後繼續。 @@ -2674,6 +2668,8 @@ zh-TW: remove as friend: 移除好友 add as friend: 加入為好友 mapper since: 註冊為製圖者日期： + last map edit: 最後地圖編輯於： + no activity yet: 尚無活動 uid: 使用者 ID： ct status: 貢獻者條款： ct undecided: 未決定 @@ -2929,7 +2925,7 @@ zh-TW: report_link_html: 如果此註記含有需要移除的敏感資訊，您可以%{link}。 other_problems_resolve: 對於註記的所有其他問題，您可以依據評論內容來自行處理。 other_problems_resolved: 對於其他類型回報，解決已經足夠了。 - disappear_date_html: 已經解決的註記會從地圖的 %{disappear_in} 消失 + disappear_date_html: 已解決的註記會在%{disappear_in}後從地圖中消失 new: title: 新增註記 intro: 發現錯誤或缺少些什麼東西嗎？請告訴其他地圖製作者以便於我們處理。將標記移動到正確的位置並輸入註記，以解釋問題。 @@ -3012,13 +3008,6 @@ zh-TW: queryfeature_tooltip: 查詢圖徵 queryfeature_disabled_tooltip: 放大地圖以查询圖徵 embed_html_disabled: HTML 內嵌對此地圖圖層不可用 - changesets: - show: - comment: 評論 - subscribe: 訂閱 - unsubscribe: 取消訂閱 - hide_comment: 隱藏 - unhide_comment: 取消隱藏 edit_help: 將地圖移至你想編輯的位置並放大，然後按這裡。 directions: ascend: 上升 diff --git a/config/routes.rb b/config/routes.rb index c44064ba3..acf2256a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -237,7 +237,7 @@ OpenStreetMap::Application.routes.draw do get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/user/:display_name/diary/comments/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary/comments") - get "/user/:display_name/diary/comments" => "diary_entries#comments", :as => :diary_comments + get "/user/:display_name/diary/comments" => "diary_comments#index", :as => :diary_comments get "/user/:display_name/diary" => "diary_entries#index" get "/diary/:language" => "diary_entries#index" scope "/user/:display_name" do @@ -246,8 +246,8 @@ OpenStreetMap::Application.routes.draw do post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/, :as => :comment_diary_entry post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry - post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment - post "/user/:display_name/diary/:id/unhidecomment/:comment" => "diary_entries#unhidecomment", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment + post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_comments#hide", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment + post "/user/:display_name/diary/:id/unhidecomment/:comment" => "diary_comments#unhide", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment match "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :via => [:get, :post], :as => :diary_entry_subscribe, :id => /\d+/ match "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :via => [:get, :post], :as => :diary_entry_unsubscribe, :id => /\d+/ diff --git a/config/settings.yml b/config/settings.yml index ec868b651..fa7207721 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -73,6 +73,13 @@ max_changes_per_hour: 100000 days_to_max_changes: 7 importer_changes_per_hour: 1000000 moderator_changes_per_hour: 1000000 +# Size limit for changes +min_size_limit: 10000000 +initial_size_limit: 30000000 +max_size_limit: 5400000000 +days_to_max_size_limit: 28 +importer_size_limit: 5400000000 +moderator_size_limit: 5400000000 # Domain for handling message replies #messages_domain: "messages.openstreetmap.org" # MaxMind GeoIPv2 database diff --git a/db/migrate/20240605134916_add_notes_and_diary_comments_counter_caches.rb b/db/migrate/20240605134916_add_notes_and_diary_comments_counter_caches.rb new file mode 100644 index 000000000..d90521595 --- /dev/null +++ b/db/migrate/20240605134916_add_notes_and_diary_comments_counter_caches.rb @@ -0,0 +1,21 @@ +class AddNotesAndDiaryCommentsCounterCaches < ActiveRecord::Migration[7.1] + def self.up + add_column :users, :diary_comments_count, :integer, :default => 0 + add_column :users, :note_comments_count, :integer, :default => 0 + + users_with_diary_comments = DiaryComment.distinct.pluck(:user_id) + users_with_diary_comments.each do |user_id| + User.reset_counters(user_id, :diary_comments) + end + + users_with_note_comments = NoteComment.where.not(:author_id => nil).distinct.pluck(:author_id) + users_with_note_comments.each do |author_id| + User.reset_counters(author_id, :note_comments) + end + end + + def self.down + remove_column :users, :diary_comments_count + remove_column :users, :note_comments_count + end +end diff --git a/db/migrate/20240618193051_api_size_limit.rb b/db/migrate/20240618193051_api_size_limit.rb new file mode 100644 index 000000000..ce97a9f0e --- /dev/null +++ b/db/migrate/20240618193051_api_size_limit.rb @@ -0,0 +1,13 @@ +class ApiSizeLimit < ActiveRecord::Migration[7.1] + def up + safety_assured do + execute DatabaseFunctions::API_SIZE_LIMIT + end + end + + def down + safety_assured do + execute "DROP FUNCTION api_size_limit(bigint)" + end + end +end diff --git a/db/structure.sql b/db/structure.sql index 829595e7c..e9d5efc3f 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -176,6 +176,63 @@ CREATE FUNCTION public.api_rate_limit(user_id bigint) RETURNS integer $$; +-- +-- Name: api_size_limit(bigint); Type: FUNCTION; Schema: public; Owner: - +-- + +CREATE FUNCTION public.api_size_limit(user_id bigint) RETURNS bigint + LANGUAGE plpgsql STABLE + AS $$ + DECLARE + min_size_limit int8 := 10000000; + initial_size_limit int8 := 30000000; + max_size_limit int8 := 5400000000; + days_to_max_size_limit int4 := 28; + importer_size_limit int8 := 5400000000; + moderator_size_limit int8 := 5400000000; + roles text[]; + last_block timestamp without time zone; + first_change timestamp without time zone; + active_reports int4; + time_since_first_change double precision; + size_limit int8; + BEGIN + SELECT ARRAY_AGG(user_roles.role) INTO STRICT roles FROM user_roles WHERE user_roles.user_id = api_size_limit.user_id; + + IF 'moderator' = ANY(roles) THEN + size_limit := moderator_size_limit; + ELSIF 'importer' = ANY(roles) THEN + size_limit := importer_size_limit; + ELSE + SELECT user_blocks.created_at INTO last_block FROM user_blocks WHERE user_blocks.user_id = api_size_limit.user_id ORDER BY user_blocks.created_at DESC LIMIT 1; + + IF FOUND THEN + SELECT changesets.created_at INTO first_change FROM changesets WHERE changesets.user_id = api_size_limit.user_id AND changesets.created_at > last_block ORDER BY changesets.created_at LIMIT 1; + ELSE + SELECT changesets.created_at INTO first_change FROM changesets WHERE changesets.user_id = api_size_limit.user_id ORDER BY changesets.created_at LIMIT 1; + END IF; + + IF NOT FOUND THEN + first_change := CURRENT_TIMESTAMP AT TIME ZONE 'UTC'; + END IF; + + SELECT COUNT(*) INTO STRICT active_reports + FROM issues INNER JOIN reports ON reports.issue_id = issues.id + WHERE issues.reported_user_id = api_size_limit.user_id AND issues.status = 'open' AND reports.updated_at >= COALESCE(issues.resolved_at, '1970-01-01'); + + time_since_first_change := EXTRACT(EPOCH FROM CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - first_change); + + size_limit := max_size_limit * POWER(time_since_first_change, 2) / POWER(days_to_max_size_limit * 24 * 60 * 60, 2); + size_limit := GREATEST(initial_size_limit, LEAST(max_size_limit, FLOOR(size_limit))); + size_limit := size_limit / POWER(2, active_reports); + size_limit := GREATEST(min_size_limit, LEAST(max_size_limit, size_limit)); + END IF; + + RETURN size_limit; + END; + $$; + + SET default_tablespace = ''; SET default_table_access_method = heap; @@ -1565,7 +1622,9 @@ CREATE TABLE public.users ( image_use_gravatar boolean DEFAULT false NOT NULL, auth_provider character varying, home_tile bigint, - tou_agreed timestamp without time zone + tou_agreed timestamp without time zone, + diary_comments_count integer DEFAULT 0, + note_comments_count integer DEFAULT 0 ); @@ -3519,6 +3578,8 @@ INSERT INTO "schema_migrations" (version) VALUES ('23'), ('22'), ('21'), +('20240618193051'), +('20240605134916'), ('20240405083825'), ('20240307181018'), ('20240307180830'), diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb index 0cc4c5fd4..462f45a9f 100644 --- a/lib/bounding_box.rb +++ b/lib/bounding_box.rb @@ -88,6 +88,14 @@ class BoundingBox end end + def linear_size + if complete? + (max_lon - min_lon) + (max_lat - min_lat) + else + 0 + end + end + def complete? to_a.exclude?(nil) end diff --git a/lib/database_functions.rb b/lib/database_functions.rb index f9e09ac70..d58736fdf 100644 --- a/lib/database_functions.rb +++ b/lib/database_functions.rb @@ -55,4 +55,58 @@ module DatabaseFunctions END; $$ LANGUAGE plpgsql STABLE; ).freeze + + API_SIZE_LIMIT = %( + CREATE OR REPLACE FUNCTION api_size_limit(user_id int8) + RETURNS int8 + AS $$ + DECLARE + min_size_limit int8 := #{Settings.min_size_limit}; + initial_size_limit int8 := #{Settings.initial_size_limit}; + max_size_limit int8 := #{Settings.max_size_limit}; + days_to_max_size_limit int4 := #{Settings.days_to_max_size_limit}; + importer_size_limit int8 := #{Settings.importer_size_limit}; + moderator_size_limit int8 := #{Settings.moderator_size_limit}; + roles text[]; + last_block timestamp without time zone; + first_change timestamp without time zone; + active_reports int4; + time_since_first_change double precision; + size_limit int8; + BEGIN + SELECT ARRAY_AGG(user_roles.role) INTO STRICT roles FROM user_roles WHERE user_roles.user_id = api_size_limit.user_id; + + IF 'moderator' = ANY(roles) THEN + size_limit := moderator_size_limit; + ELSIF 'importer' = ANY(roles) THEN + size_limit := importer_size_limit; + ELSE + SELECT user_blocks.created_at INTO last_block FROM user_blocks WHERE user_blocks.user_id = api_size_limit.user_id ORDER BY user_blocks.created_at DESC LIMIT 1; + + IF FOUND THEN + SELECT changesets.created_at INTO first_change FROM changesets WHERE changesets.user_id = api_size_limit.user_id AND changesets.created_at > last_block ORDER BY changesets.created_at LIMIT 1; + ELSE + SELECT changesets.created_at INTO first_change FROM changesets WHERE changesets.user_id = api_size_limit.user_id ORDER BY changesets.created_at LIMIT 1; + END IF; + + IF NOT FOUND THEN + first_change := CURRENT_TIMESTAMP AT TIME ZONE 'UTC'; + END IF; + + SELECT COUNT(*) INTO STRICT active_reports + FROM issues INNER JOIN reports ON reports.issue_id = issues.id + WHERE issues.reported_user_id = api_size_limit.user_id AND issues.status = 'open' AND reports.updated_at >= COALESCE(issues.resolved_at, '1970-01-01'); + + time_since_first_change := EXTRACT(EPOCH FROM CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - first_change); + + size_limit := max_size_limit * POWER(time_since_first_change, 2) / POWER(days_to_max_size_limit * 24 * 60 * 60, 2); + size_limit := GREATEST(initial_size_limit, LEAST(max_size_limit, FLOOR(size_limit))); + size_limit := size_limit / POWER(2, active_reports); + size_limit := GREATEST(min_size_limit, LEAST(max_size_limit, size_limit)); + END IF; + + RETURN size_limit; + END; + $$ LANGUAGE plpgsql STABLE; + ).freeze end diff --git a/lib/osm.rb b/lib/osm.rb index 65eab6907..dd273418e 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -8,7 +8,7 @@ module OSM # The base class for API Errors. class APIError < RuntimeError def initialize(message = "Generic API Error") - super(message) + super end def status @@ -364,6 +364,17 @@ module OSM end end + # Raised when a size limit is exceeded + class APISizeLimitExceeded < APIError + def initialize + super("Size limit exceeded") + end + + def status + :payload_too_large + end + end + # Helper methods for going to/from mercator and lat/lng. class Mercator include Math diff --git a/lib/rich_text.rb b/lib/rich_text.rb index 56d358bd8..f19d3d3a9 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -49,6 +49,10 @@ module RichText (spammy_phrases * 40) end + def image + nil + end + protected def simple_format(text) @@ -80,12 +84,33 @@ module RichText class Markdown < Base def to_html - linkify(sanitize(Kramdown::Document.new(self).to_html), :all) + linkify(sanitize(document.to_html), :all) end def to_text to_s end + + def image + return @image if defined? @image + + @image = first_image_element(document.root)&.attr&.[]("src") + end + + private + + def document + @document ||= Kramdown::Document.new(self) + end + + def first_image_element(element) + return element if element.type == :img + + element.children.find do |child| + nested_image = first_image_element(child) + break nested_image if nested_image + end + end end class Text < Base diff --git a/lib/tasks/update_functions.rake b/lib/tasks/update_functions.rake index 605d3c9ad..f10257215 100644 --- a/lib/tasks/update_functions.rake +++ b/lib/tasks/update_functions.rake @@ -2,5 +2,6 @@ namespace :db do desc "Update database function definitions" task :update_functions => :environment do ActiveRecord::Base.connection.execute DatabaseFunctions::API_RATE_LIMIT + ActiveRecord::Base.connection.execute DatabaseFunctions::API_SIZE_LIMIT end end diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb index 139f270fe..58ef2b514 100644 --- a/test/abilities/abilities_test.rb +++ b/test/abilities/abilities_test.rb @@ -17,13 +17,21 @@ class GuestAbilityTest < AbilityTest test "diary permissions for a guest" do ability = Ability.new nil - [:index, :rss, :show, :comments].each do |action| + [:index, :rss, :show].each do |action| assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries" end - [:create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action| + [:index].each do |action| + assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComments" + end + + [:create, :edit, :comment, :subscribe, :unsubscribe, :hide, :unhide].each do |action| assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries" end + + [:hide, :unhide].each do |action| + assert ability.cannot?(action, DiaryComment), "should not be able to #{action} DiaryComments" + end end test "note permissions for a guest" do @@ -47,12 +55,17 @@ class UserAbilityTest < AbilityTest test "Diary permissions" do ability = Ability.new create(:user) - [:index, :rss, :show, :comments, :create, :edit, :comment, :subscribe, :unsubscribe].each do |action| + [:index, :rss, :show, :create, :edit, :comment, :subscribe, :unsubscribe].each do |action| assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries" end - [:hide, :hidecomment].each do |action| + [:index].each do |action| + assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComments" + end + + [:hide, :unhide].each do |action| assert ability.cannot?(action, DiaryEntry), "should not be able to #{action} DiaryEntries" + assert ability.cannot?(action, DiaryComment), "should not be able to #{action} DiaryComment" end [:index, :show, :resolve, :ignore, :reopen].each do |action| @@ -77,8 +90,9 @@ class ModeratorAbilityTest < AbilityTest assert ability.cannot?(action, UserRole), "should not be able to #{action} UserRoles" end - [:hide, :hidecomment].each do |action| + [:hide, :unhide].each do |action| assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries" + assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComment" end end end @@ -86,9 +100,13 @@ end class AdministratorAbilityTest < AbilityTest test "Diary for an administrator" do ability = Ability.new create(:administrator_user) - [:index, :rss, :show, :comments, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action| + [:index, :rss, :show, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :unhide].each do |action| assert ability.can?(action, DiaryEntry), "should be able to #{action} DiaryEntries" end + + [:index, :hide, :unhide].each do |action| + assert ability.can?(action, DiaryComment), "should be able to #{action} DiaryComments" + end end test "User Roles permissions for an administrator" do diff --git a/test/controllers/api/capabilities_controller_test.rb b/test/controllers/api/capabilities_controller_test.rb index 46ebb6a37..7d2feed29 100644 --- a/test/controllers/api/capabilities_controller_test.rb +++ b/test/controllers/api/capabilities_controller_test.rb @@ -71,5 +71,75 @@ module Api assert_equal "online", js["api"]["status"]["gpx"] assert_equal Settings.imagery_blacklist.length, js["policy"]["imagery"]["blacklist"].length end + + def test_capabilities_api_readonly + with_settings(:status => "api_readonly") do + get api_capabilities_path + assert_response :success + assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do + assert_select "api", :count => 1 do + assert_select "status[database='online']", :count => 1 + assert_select "status[api='readonly']", :count => 1 + assert_select "status[gpx='online']", :count => 1 + end + end + end + end + + def test_capabilities_api_offline + with_settings(:status => "api_offline") do + get api_capabilities_path + assert_response :success + assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do + assert_select "api", :count => 1 do + assert_select "status[database='online']", :count => 1 + assert_select "status[api='offline']", :count => 1 + assert_select "status[gpx='online']", :count => 1 + end + end + end + end + + def test_capabilities_database_readonly + with_settings(:status => "database_readonly") do + get api_capabilities_path + assert_response :success + assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do + assert_select "api", :count => 1 do + assert_select "status[database='readonly']", :count => 1 + assert_select "status[api='readonly']", :count => 1 + assert_select "status[gpx='readonly']", :count => 1 + end + end + end + end + + def test_capabilities_database_offline + with_settings(:status => "database_offline") do + get api_capabilities_path + assert_response :success + assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do + assert_select "api", :count => 1 do + assert_select "status[database='offline']", :count => 1 + assert_select "status[api='offline']", :count => 1 + assert_select "status[gpx='offline']", :count => 1 + end + end + end + end + + def test_capabilities_gpx_offline + with_settings(:status => "gpx_offline") do + get api_capabilities_path + assert_response :success + assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do + assert_select "api", :count => 1 do + assert_select "status[database='online']", :count => 1 + assert_select "status[api='online']", :count => 1 + assert_select "status[gpx='offline']", :count => 1 + end + end + end + end end end diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index be1033ea6..17a9ad9d3 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -749,7 +749,11 @@ module Api end def test_upload_large_changeset - auth_header = basic_authorization_header create(:user).email, "test" + user = create(:user) + auth_header = basic_authorization_header user.email, "test" + + # create an old changeset to ensure we have the maximum rate limit + create(:changeset, :user => user, :created_at => Time.now.utc - 28.days) # create a changeset put changeset_create_path, :params => "", :headers => auth_header @@ -1048,14 +1052,14 @@ module Api diff = <<~CHANGESET - - - - - - - - + + + + + + + + CHANGESET @@ -1329,9 +1333,9 @@ module Api diff = <<~CHANGESET - - - + + + @@ -1352,9 +1356,9 @@ module Api diff = <<~CHANGESET - - - + + + @@ -1384,9 +1388,9 @@ module Api diff = <<~CHANGESET - - - + + + @@ -1407,9 +1411,9 @@ module Api diff = <<~CHANGESET - - - + + + @@ -1478,14 +1482,14 @@ module Api changeset_id = @response.body.to_i old_way = create(:way) - create(:way_node, :way => old_way, :node => create(:node, :lat => 1, :lon => 1)) + create(:way_node, :way => old_way, :node => create(:node, :lat => 0.1, :lon => 0.1)) diff = XML::Document.new diff.root = XML::Node.new "osmChange" modify = XML::Node.new "modify" xml_old_way = xml_node_for_way(old_way) nd_ref = XML::Node.new "nd" - nd_ref["ref"] = create(:node, :lat => 3, :lon => 3).id.to_s + nd_ref["ref"] = create(:node, :lat => 0.3, :lon => 0.3).id.to_s xml_old_way << nd_ref xml_old_way["changeset"] = changeset_id.to_s modify << xml_old_way @@ -1498,10 +1502,10 @@ module Api # check the bbox changeset = Changeset.find(changeset_id) - assert_equal 1 * GeoRecord::SCALE, changeset.min_lon, "min_lon should be 1 degree" - assert_equal 3 * GeoRecord::SCALE, changeset.max_lon, "max_lon should be 3 degrees" - assert_equal 1 * GeoRecord::SCALE, changeset.min_lat, "min_lat should be 1 degree" - assert_equal 3 * GeoRecord::SCALE, changeset.max_lat, "max_lat should be 3 degrees" + assert_equal 0.1 * GeoRecord::SCALE, changeset.min_lon, "min_lon should be 0.1 degree" + assert_equal 0.3 * GeoRecord::SCALE, changeset.max_lon, "max_lon should be 0.3 degrees" + assert_equal 0.1 * GeoRecord::SCALE, changeset.min_lat, "min_lat should be 0.1 degree" + assert_equal 0.3 * GeoRecord::SCALE, changeset.max_lat, "max_lat should be 0.3 degrees" end ## @@ -1798,6 +1802,71 @@ module Api assert_response :too_many_requests, "upload did not hit rate limit" end + ## + # test initial size limit + def test_upload_initial_size_limit + # create a user + user = create(:user) + + # create a changeset that puts us near the initial size limit + changeset = create(:changeset, :user => user, + :min_lat => (-0.5 * GeoRecord::SCALE).round, :min_lon => (0.5 * GeoRecord::SCALE).round, + :max_lat => (0.5 * GeoRecord::SCALE).round, :max_lon => (2.5 * GeoRecord::SCALE).round) + + # create authentication header + auth_header = basic_authorization_header user.email, "test" + + # simple diff to create a node + diff = <<~CHANGESET + + + + + + + + + CHANGESET + + # upload it + post changeset_upload_path(changeset), :params => diff, :headers => auth_header + assert_response :payload_too_large, "upload did not hit size limit" + end + + ## + # test size limit after one week + def test_upload_week_size_limit + # create a user + user = create(:user) + + # create a changeset to establish our initial edit time + create(:changeset, :user => user, :created_at => Time.now.utc - 7.days) + + # create a changeset that puts us near the initial size limit + changeset = create(:changeset, :user => user, + :min_lat => (-0.5 * GeoRecord::SCALE).round, :min_lon => (0.5 * GeoRecord::SCALE).round, + :max_lat => (0.5 * GeoRecord::SCALE).round, :max_lon => (2.5 * GeoRecord::SCALE).round) + + # create authentication header + auth_header = basic_authorization_header user.email, "test" + + # simple diff to create a node way and relation using placeholders + diff = <<~CHANGESET + + + + + + + + + CHANGESET + + # upload it + post changeset_upload_path(changeset), :params => diff, :headers => auth_header + assert_response :payload_too_large, "upload did not hit size limit" + end + ## # when we make some simple changes we get the same changes back from the # diff download. @@ -1829,14 +1898,14 @@ module Api diff = <<~CHANGESET - - - - - - - - + + + + + + + + CHANGESET @@ -1935,15 +2004,15 @@ module Api diff = <<~CHANGESET - + - - - + + + - + @@ -2034,7 +2103,7 @@ module Api # FIXME: This should really be moded to a integration test due to the with_controller def test_changeset_bbox way = create(:way) - create(:way_node, :way => way, :node => create(:node, :lat => 3, :lon => 3)) + create(:way_node, :way => way, :node => create(:node, :lat => 0.3, :lon => 0.3)) auth_header = basic_authorization_header create(:user).email, "test" @@ -2046,7 +2115,7 @@ module Api # add a single node to it with_controller(NodesController.new) do - xml = "" + xml = "" put node_create_path, :params => xml, :headers => auth_header assert_response :success, "Couldn't create node." end @@ -2054,14 +2123,14 @@ module Api # get the bounding box back from the changeset get changeset_show_path(:id => changeset_id) assert_response :success, "Couldn't read back changeset." - assert_select "osm>changeset[min_lon='1.0000000']", 1 - assert_select "osm>changeset[max_lon='1.0000000']", 1 - assert_select "osm>changeset[min_lat='2.0000000']", 1 - assert_select "osm>changeset[max_lat='2.0000000']", 1 + assert_select "osm>changeset[min_lon='0.1000000']", 1 + assert_select "osm>changeset[max_lon='0.1000000']", 1 + assert_select "osm>changeset[min_lat='0.2000000']", 1 + assert_select "osm>changeset[max_lat='0.2000000']", 1 # add another node to it with_controller(NodesController.new) do - xml = "" + xml = "" put node_create_path, :params => xml, :headers => auth_header assert_response :success, "Couldn't create second node." end @@ -2069,10 +2138,10 @@ module Api # get the bounding box back from the changeset get changeset_show_path(:id => changeset_id) assert_response :success, "Couldn't read back changeset for the second time." - assert_select "osm>changeset[min_lon='1.0000000']", 1 - assert_select "osm>changeset[max_lon='2.0000000']", 1 - assert_select "osm>changeset[min_lat='1.0000000']", 1 - assert_select "osm>changeset[max_lat='2.0000000']", 1 + assert_select "osm>changeset[min_lon='0.1000000']", 1 + assert_select "osm>changeset[max_lon='0.2000000']", 1 + assert_select "osm>changeset[min_lat='0.1000000']", 1 + assert_select "osm>changeset[max_lat='0.2000000']", 1 # add (delete) a way to it, which contains a point at (3,3) with_controller(WaysController.new) do @@ -2084,10 +2153,10 @@ module Api # get the bounding box back from the changeset get changeset_show_path(:id => changeset_id) assert_response :success, "Couldn't read back changeset for the third time." - assert_select "osm>changeset[min_lon='1.0000000']", 1 - assert_select "osm>changeset[max_lon='3.0000000']", 1 - assert_select "osm>changeset[min_lat='1.0000000']", 1 - assert_select "osm>changeset[max_lat='3.0000000']", 1 + assert_select "osm>changeset[min_lon='0.1000000']", 1 + assert_select "osm>changeset[max_lon='0.3000000']", 1 + assert_select "osm>changeset[min_lat='0.1000000']", 1 + assert_select "osm>changeset[max_lat='0.3000000']", 1 end ## diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index badc7301b..7855079cc 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -40,9 +40,9 @@ module Api # FIXME: Move this test to being an integration test since it spans multiple controllers def test_version private_user = create(:user, :data_public => false) - private_node = create(:node, :with_history, :version => 4, :changeset => create(:changeset, :user => private_user)) + private_node = create(:node, :with_history, :version => 4, :lat => 0, :lon => 0, :changeset => create(:changeset, :user => private_user)) user = create(:user) - node = create(:node, :with_history, :version => 4, :changeset => create(:changeset, :user => user)) + node = create(:node, :with_history, :version => 4, :lat => 0, :lon => 0, :changeset => create(:changeset, :user => user)) create_list(:node_tag, 2, :node => node) # Ensure that the current tags are propagated to the history too propagate_tags(node, node.old_nodes.last) @@ -65,8 +65,8 @@ module Api # randomly move the node about 3.times do # move the node somewhere else - xml_node["lat"] = precision((rand * 180) - 90).to_s - xml_node["lon"] = precision((rand * 360) - 180).to_s + xml_node["lat"] = precision(rand - 0.5).to_s + xml_node["lon"] = precision(rand - 0.5).to_s with_controller(NodesController.new) do put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :forbidden, "Should have rejected node update" @@ -113,8 +113,8 @@ module Api # randomly move the node about 3.times do # move the node somewhere else - xml_node["lat"] = precision((rand * 180) - 90).to_s - xml_node["lon"] = precision((rand * 360) - 180).to_s + xml_node["lat"] = precision(rand - 0.5).to_s + xml_node["lon"] = precision(rand - 0.5).to_s with_controller(NodesController.new) do put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :success diff --git a/test/controllers/api/relations_controller_test.rb b/test/controllers/api/relations_controller_test.rb index e69dcdfe2..982df1dd7 100644 --- a/test/controllers/api/relations_controller_test.rb +++ b/test/controllers/api/relations_controller_test.rb @@ -641,15 +641,15 @@ module Api # box of all its members into the changeset. def test_tag_modify_bounding_box relation = create(:relation) - node1 = create(:node, :lat => 3, :lon => 3) - node2 = create(:node, :lat => 5, :lon => 5) + node1 = create(:node, :lat => 0.3, :lon => 0.3) + node2 = create(:node, :lat => 0.5, :lon => 0.5) way = create(:way) create(:way_node, :way => way, :node => node1) create(:relation_member, :relation => relation, :member => way) create(:relation_member, :relation => relation, :member => node2) # the relation contains nodes1 and node2 (node1 - # indirectly via the way), so the bbox should be [3,3,5,5]. - check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id, auth_header| + # indirectly via the way), so the bbox should be [0.3,0.3,0.5,0.5]. + check_changeset_modify(BoundingBox.new(0.3, 0.3, 0.5, 0.5)) do |changeset_id, auth_header| # add a tag to an existing relation relation_xml = xml_for_relation(relation) relation_element = relation_xml.find("//osm/relation").first @@ -879,14 +879,14 @@ module Api # still technically valid. def test_remove_all_members relation = create(:relation) - node1 = create(:node, :lat => 3, :lon => 3) - node2 = create(:node, :lat => 5, :lon => 5) + node1 = create(:node, :lat => 0.3, :lon => 0.3) + node2 = create(:node, :lat => 0.5, :lon => 0.5) way = create(:way) create(:way_node, :way => way, :node => node1) create(:relation_member, :relation => relation, :member => way) create(:relation_member, :relation => relation, :member => node2) - check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id, auth_header| + check_changeset_modify(BoundingBox.new(0.3, 0.3, 0.5, 0.5)) do |changeset_id, auth_header| relation_xml = xml_for_relation(relation) relation_xml .find("//osm/relation/member") diff --git a/test/controllers/api/versions_controller_test.rb b/test/controllers/api/versions_controller_test.rb index 1c70831c9..d2b353a8e 100644 --- a/test/controllers/api/versions_controller_test.rb +++ b/test/controllers/api/versions_controller_test.rb @@ -46,5 +46,17 @@ module Api assert_response :success assert_select "osm[version]", :count => 0 end + + def test_versions_available_while_offline + with_settings(:status => "api_offline") do + get api_versions_path + assert_response :success + assert_select "osm[generator='#{Settings.generator}']", :count => 1 do + assert_select "api", :count => 1 do + assert_select "version", Settings.api_version + end + end + end + end end end diff --git a/test/controllers/diary_comments_controller_test.rb b/test/controllers/diary_comments_controller_test.rb new file mode 100644 index 000000000..e2ad4c91b --- /dev/null +++ b/test/controllers/diary_comments_controller_test.rb @@ -0,0 +1,135 @@ +require "test_helper" + +class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest + def setup + super + # Create the default language for diary entries + create(:language, :code => "en") + end + + def test_routes + assert_routing( + { :path => "/user/username/diary/comments", :method => :get }, + { :controller => "diary_comments", :action => "index", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/diary/1/hidecomment/2", :method => :post }, + { :controller => "diary_comments", :action => "hide", :display_name => "username", :id => "1", :comment => "2" } + ) + assert_routing( + { :path => "/user/username/diary/1/unhidecomment/2", :method => :post }, + { :controller => "diary_comments", :action => "unhide", :display_name => "username", :id => "1", :comment => "2" } + ) + + get "/user/username/diary/comments/1" + assert_redirected_to "/user/username/diary/comments" + end + + def test_index + user = create(:user) + other_user = create(:user) + suspended_user = create(:user, :suspended) + deleted_user = create(:user, :deleted) + + # Test a user with no comments + get diary_comments_path(:display_name => user.display_name) + assert_response :success + assert_template :index + assert_select "h4", :html => "No diary comments" + + # Test a user with a comment + create(:diary_comment, :user => other_user) + + get diary_comments_path(:display_name => other_user.display_name) + assert_response :success + assert_template :index + assert_dom "a[href='#{user_path(other_user)}']", :text => other_user.display_name + assert_select "table.table-striped tbody" do + assert_select "tr", :count => 1 + end + + # Test a suspended user + get diary_comments_path(:display_name => suspended_user.display_name) + assert_response :not_found + + # Test a deleted user + get diary_comments_path(:display_name => deleted_user.display_name) + assert_response :not_found + end + + def test_index_invalid_paged + user = create(:user) + + %w[-1 0 fred].each do |id| + get diary_comments_path(:display_name => user.display_name, :before => id) + assert_redirected_to :controller => :errors, :action => :bad_request + + get diary_comments_path(:display_name => user.display_name, :after => id) + assert_redirected_to :controller => :errors, :action => :bad_request + end + end + + def test_hide + user = create(:user) + diary_entry = create(:diary_entry, :user => user) + diary_comment = create(:diary_comment, :diary_entry => diary_entry) + + # Try without logging in + post hide_diary_comment_path(user, diary_entry, diary_comment) + assert_response :forbidden + assert DiaryComment.find(diary_comment.id).visible + + # Now try as a normal user + session_for(user) + post hide_diary_comment_path(user, diary_entry, diary_comment) + assert_redirected_to :controller => :errors, :action => :forbidden + assert DiaryComment.find(diary_comment.id).visible + + # Try as a moderator + session_for(create(:moderator_user)) + post hide_diary_comment_path(user, diary_entry, diary_comment) + assert_redirected_to diary_entry_path(user, diary_entry) + assert_not DiaryComment.find(diary_comment.id).visible + + # Reset + diary_comment.reload.update(:visible => true) + + # Finally try as an administrator + session_for(create(:administrator_user)) + post hide_diary_comment_path(user, diary_entry, diary_comment) + assert_redirected_to diary_entry_path(user, diary_entry) + assert_not DiaryComment.find(diary_comment.id).visible + end + + def test_unhide + user = create(:user) + diary_entry = create(:diary_entry, :user => user) + diary_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false) + + # Try without logging in + post unhide_diary_comment_path(user, diary_entry, diary_comment) + assert_response :forbidden + assert_not DiaryComment.find(diary_comment.id).visible + + # Now try as a normal user + session_for(user) + post unhide_diary_comment_path(user, diary_entry, diary_comment) + assert_redirected_to :controller => :errors, :action => :forbidden + assert_not DiaryComment.find(diary_comment.id).visible + + # Now try as a moderator + session_for(create(:moderator_user)) + post unhide_diary_comment_path(user, diary_entry, diary_comment) + assert_redirected_to diary_entry_path(user, diary_entry) + assert DiaryComment.find(diary_comment.id).visible + + # Reset + diary_comment.reload.update(:visible => true) + + # Finally try as an administrator + session_for(create(:administrator_user)) + post unhide_diary_comment_path(user, diary_entry, diary_comment) + assert_redirected_to diary_entry_path(user, diary_entry) + assert DiaryComment.find(diary_comment.id).visible + end +end diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb index d13a50163..d0453bf08 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -49,11 +49,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest { :controller => "diary_entries", :action => "rss", :display_name => "username", :format => :rss } ) - assert_routing( - { :path => "/user/username/diary/comments", :method => :get }, - { :controller => "diary_entries", :action => "comments", :display_name => "username" } - ) - assert_routing( { :path => "/diary/new", :method => :get }, { :controller => "diary_entries", :action => "new" } @@ -86,14 +81,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest { :path => "/user/username/diary/1/unhide", :method => :post }, { :controller => "diary_entries", :action => "unhide", :display_name => "username", :id => "1" } ) - assert_routing( - { :path => "/user/username/diary/1/hidecomment/2", :method => :post }, - { :controller => "diary_entries", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" } - ) - assert_routing( - { :path => "/user/username/diary/1/unhidecomment/2", :method => :post }, - { :controller => "diary_entries", :action => "unhidecomment", :display_name => "username", :id => "1", :comment => "2" } - ) assert_routing( { :path => "/user/username/diary/1/subscribe", :method => :get }, { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" } @@ -110,9 +97,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest { :path => "/user/username/diary/1/unsubscribe", :method => :post }, { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" } ) - - get "/user/username/diary/comments/1" - assert_redirected_to "/user/username/diary/comments" end def test_new_no_login @@ -752,6 +736,72 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest end end + def test_show_og_image_with_no_image + user = create(:user) + diary_entry = create(:diary_entry, :user => user, :body => "nothing") + + get diary_entry_path(user, diary_entry) + assert_response :success + assert_dom "head meta[property='og:image']" do + assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url) + end + end + + def test_show_og_image + user = create(:user) + diary_entry = create(:diary_entry, :user => user, :body => "![some picture](https://example.com/picture.jpg)") + + get diary_entry_path(user, diary_entry) + assert_response :success + assert_dom "head meta[property='og:image']" do + assert_dom "> @content", "https://example.com/picture.jpg" + end + end + + def test_show_og_image_with_relative_uri + user = create(:user) + diary_entry = create(:diary_entry, :user => user, :body => "![some local picture](/picture.jpg)") + + get diary_entry_path(user, diary_entry) + assert_response :success + assert_dom "head meta[property='og:image']" do + assert_dom "> @content", "#{root_url}picture.jpg" + end + end + + def test_show_og_image_with_spaces + user = create(:user) + diary_entry = create(:diary_entry, :user => user, :body => "![some picture](https://example.com/the picture.jpg)") + + get diary_entry_path(user, diary_entry) + assert_response :success + assert_dom "head meta[property='og:image']" do + assert_dom "> @content", "https://example.com/the%20picture.jpg" + end + end + + def test_show_og_image_with_relative_uri_and_spaces + user = create(:user) + diary_entry = create(:diary_entry, :user => user, :body => "![some local picture](/the picture.jpg)") + + get diary_entry_path(user, diary_entry) + assert_response :success + assert_dom "head meta[property='og:image']" do + assert_dom "> @content", "#{root_url}the%20picture.jpg" + end + end + + def test_show_og_image_with_invalid_uri + user = create(:user) + diary_entry = create(:diary_entry, :user => user, :body => "![](:)") + + get diary_entry_path(user, diary_entry) + assert_response :success + assert_dom "head meta[property='og:image']" do + assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url) + end + end + def test_hide user = create(:user) diary_entry = create(:diary_entry, :user => user) @@ -814,114 +864,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert DiaryEntry.find(diary_entry.id).visible end - def test_hidecomment - user = create(:user) - diary_entry = create(:diary_entry, :user => user) - diary_comment = create(:diary_comment, :diary_entry => diary_entry) - - # Try without logging in - post hide_diary_comment_path(user, diary_entry, diary_comment) - assert_response :forbidden - assert DiaryComment.find(diary_comment.id).visible - - # Now try as a normal user - session_for(user) - post hide_diary_comment_path(user, diary_entry, diary_comment) - assert_redirected_to :controller => :errors, :action => :forbidden - assert DiaryComment.find(diary_comment.id).visible - - # Try as a moderator - session_for(create(:moderator_user)) - post hide_diary_comment_path(user, diary_entry, diary_comment) - assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id - assert_not DiaryComment.find(diary_comment.id).visible - - # Reset - diary_comment.reload.update(:visible => true) - - # Finally try as an administrator - session_for(create(:administrator_user)) - post hide_diary_comment_path(user, diary_entry, diary_comment) - assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id - assert_not DiaryComment.find(diary_comment.id).visible - end - - def test_unhidecomment - user = create(:user) - diary_entry = create(:diary_entry, :user => user) - diary_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false) - - # Try without logging in - post unhide_diary_comment_path(user, diary_entry, diary_comment) - assert_response :forbidden - assert_not DiaryComment.find(diary_comment.id).visible - - # Now try as a normal user - session_for(user) - post unhide_diary_comment_path(user, diary_entry, diary_comment) - assert_redirected_to :controller => :errors, :action => :forbidden - assert_not DiaryComment.find(diary_comment.id).visible - - # Now try as a moderator - session_for(create(:moderator_user)) - post unhide_diary_comment_path(user, diary_entry, diary_comment) - assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id - assert DiaryComment.find(diary_comment.id).visible - - # Reset - diary_comment.reload.update(:visible => true) - - # Finally try as an administrator - session_for(create(:administrator_user)) - post unhide_diary_comment_path(user, diary_entry, diary_comment) - assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id - assert DiaryComment.find(diary_comment.id).visible - end - - def test_comments - user = create(:user) - other_user = create(:user) - suspended_user = create(:user, :suspended) - deleted_user = create(:user, :deleted) - - # Test a user with no comments - get diary_comments_path(:display_name => user.display_name) - assert_response :success - assert_template :comments - assert_select "h4", :html => "No diary comments" - - # Test a user with a comment - create(:diary_comment, :user => other_user) - - get diary_comments_path(:display_name => other_user.display_name) - assert_response :success - assert_template :comments - assert_dom "a[href='#{user_path(other_user)}']", :text => other_user.display_name - assert_select "table.table-striped tbody" do - assert_select "tr", :count => 1 - end - - # Test a suspended user - get diary_comments_path(:display_name => suspended_user.display_name) - assert_response :not_found - - # Test a deleted user - get diary_comments_path(:display_name => deleted_user.display_name) - assert_response :not_found - end - - def test_comments_invalid_paged - user = create(:user) - - %w[-1 0 fred].each do |id| - get diary_comments_path(:display_name => user.display_name, :before => id) - assert_redirected_to :controller => :errors, :action => :bad_request - - get diary_comments_path(:display_name => user.display_name, :after => id) - assert_redirected_to :controller => :errors, :action => :bad_request - end - end - def test_subscribe_page user = create(:user) other_user = create(:user) diff --git a/test/factories/node.rb b/test/factories/node.rb index 392d67a84..bfb8b16fe 100644 --- a/test/factories/node.rb +++ b/test/factories/node.rb @@ -16,7 +16,7 @@ FactoryBot.define do trait :with_history do after(:create) do |node, _evaluator| (1..node.version).each do |n| - create(:old_node, :node_id => node.id, :version => n, :changeset => node.changeset) + create(:old_node, :node_id => node.id, :version => n, :latitude => node.latitude, :longitude => node.longitude, :changeset => node.changeset) end # For deleted nodes, make sure the most recent old_node is also deleted. diff --git a/test/helpers/browse_tags_helper_test.rb b/test/helpers/browse_tags_helper_test.rb index f47c215c0..9bd11f052 100644 --- a/test/helpers/browse_tags_helper_test.rb +++ b/test/helpers/browse_tags_helper_test.rb @@ -186,33 +186,41 @@ class BrowseTagsHelperTest < ActionView::TestCase assert_equal "Test", link[:title] link = wikipedia_link("wikipedia", "de:Test") - assert_equal "https://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url] + assert_equal "https://de.wikipedia.org/wiki/Test?uselang=en", link[:url] assert_equal "de:Test", link[:title] + link = wikipedia_link("wikipedia:fr", "Portsea") + assert_equal "https://fr.wikipedia.org/wiki/Portsea?uselang=en", link[:url] + assert_equal "Portsea", link[:title] + link = wikipedia_link("wikipedia:fr", "de:Test") - assert_equal "https://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url] + assert_equal "https://de.wikipedia.org/wiki/Test?uselang=en", link[:url] assert_equal "de:Test", link[:title] link = wikipedia_link("wikipedia", "de:Englischer Garten (München)#Japanisches Teehaus") - assert_equal "https://de.wikipedia.org/wiki/de:Englischer Garten (München)?uselang=en#Japanisches_Teehaus", link[:url] + assert_equal "https://de.wikipedia.org/wiki/Englischer_Garten_%28M%C3%BCnchen%29?uselang=en#Japanisches_Teehaus", link[:url] assert_equal "de:Englischer Garten (München)#Japanisches Teehaus", link[:title] link = wikipedia_link("wikipedia", "de:Alte Brücke (Heidelberg)#Brückenaffe") - assert_equal "https://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br%C3%BCckenaffe", link[:url] + assert_equal "https://de.wikipedia.org/wiki/Alte_Br%C3%BCcke_%28Heidelberg%29?uselang=en#Br%C3%BCckenaffe", link[:url] assert_equal "de:Alte Brücke (Heidelberg)#Brückenaffe", link[:title] link = wikipedia_link("wikipedia", "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus") - assert_equal "https://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br%C3%BCckenstra%C3%9Fe_1%2C_Ehemaliges_Bauernhaus", link[:url] + assert_equal "https://de.wikipedia.org/wiki/Liste_der_Baudenkm%C3%A4ler_in_Eichst%C3%A4tt?uselang=en#Br%C3%BCckenstra%C3%9Fe_1%2C_Ehemaliges_Bauernhaus", link[:url] assert_equal "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus", link[:title] + link = wikipedia_link("wikipedia", "en:Are Years What? (for Marianne Moore)") + assert_equal "https://en.wikipedia.org/wiki/Are_Years_What%3F_%28for_Marianne_Moore%29?uselang=en", link[:url] + assert_equal "en:Are Years What? (for Marianne Moore)", link[:title] + I18n.with_locale "pt-BR" do link = wikipedia_link("wikipedia", "zh-classical:Test#Section") - assert_equal "https://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url] + assert_equal "https://zh-classical.wikipedia.org/wiki/Test?uselang=pt-BR#Section", link[:url] assert_equal "zh-classical:Test#Section", link[:title] end link = wikipedia_link("subject:wikipedia", "en:Catherine McAuley") - assert_equal "https://en.wikipedia.org/wiki/en:Catherine McAuley?uselang=en", link[:url] + assert_equal "https://en.wikipedia.org/wiki/Catherine_McAuley?uselang=en", link[:url] assert_equal "en:Catherine McAuley", link[:title] link = wikipedia_link("foo", "Test") diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index c2883c2c0..3cd53e169 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -111,7 +111,7 @@ class UserHelperTest < ActionView::TestCase def test_openid_logo logo = openid_logo - assert_match %r{^$}, logo + assert_match %r{^$}, logo end def test_auth_button diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 4611860d0..1b0933d32 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -45,47 +45,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_select "form > div > input.is-invalid#user_email" end - def test_user_create_association_bad_auth_provider - assert_difference("User.count", 0) do - assert_no_difference("ActionMailer::Base.deliveries.size") do - perform_enqueued_jobs do - post "/user/new", - :params => { :user => { :email => "test@example.com", - :display_name => "new_tester", - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest", - :auth_provider => "noprovider", - :auth_uid => "123454321", - :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "noprovider", :origin => "/user/new") - post response.location - end - end - end - assert_response :not_found - end - - def test_user_create_association_no_auth_uid - OmniAuth.config.mock_auth[:google] = :invalid_credentials - assert_difference("User.count", 0) do - assert_no_difference("ActionMailer::Base.deliveries.size") do - perform_enqueued_jobs do - post "/user/new", - :params => { :user => { :email => "test@example.com", - :display_name => "new_tester", - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest", - :auth_provider => "google", - :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - post response.location - end - end - end - follow_redirect! - assert_redirected_to auth_failure_path(:strategy => "google", :message => "invalid_credentials", :origin => "/user/new") - end - def test_user_create_association_submit_duplicate_email dup_email = create(:user).email display_name = "new_tester" @@ -275,6 +234,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_openid_success new_email = "newtester-openid@osm.org" display_name = "new_tester-openid" + openid_url = "http://localhost:1000/new.tester" auth_uid = "http://localhost:1123/new.tester" OmniAuth.config.add_mock(:openid, @@ -284,8 +244,8 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do - post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + post auth_path(:provider => "openid", :openid_url => openid_url, :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "openid", :openid_url => openid_url, :origin => "/user/new") follow_redirect! assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email, :auth_provider => "openid", :auth_uid => auth_uid @@ -294,11 +254,8 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :auth_provider => "openid", - :auth_uid => "http://localhost:1123/new.tester", + :auth_uid => auth_uid, :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - post response.location - follow_redirect! end end end @@ -335,22 +292,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_openid_failure OmniAuth.config.mock_auth[:openid] = :connection_failed - new_email = "newtester-openid2@osm.org" - display_name = "new_tester-openid2" assert_difference("User.count", 0) do 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 => "" } } - assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/user/new") follow_redirect! @@ -363,6 +308,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_openid_redirect + openid_url = "http://localhost:1000/new.tester" auth_uid = "http://localhost:1123/new.tester" new_email = "redirect_tester_openid@osm.org" display_name = "redirect_tester_openid" @@ -374,8 +320,8 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do - post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + post auth_path(:provider => "openid", :openid_url => openid_url, :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "openid", :openid_url => openid_url, :origin => "/user/new") follow_redirect! assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email, :auth_provider => "openid", :auth_uid => auth_uid @@ -386,11 +332,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "openid", :auth_uid => auth_uid, :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end end @@ -454,10 +395,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_uid => auth_uid, :consider_pd => "1" }, :email_hmac => email_hmac } - assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "google") - follow_redirect! assert_redirected_to welcome_path follow_redirect! end @@ -499,22 +436,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_google_failure OmniAuth.config.mock_auth[:google] = :connection_failed - new_email = "newtester-google2@osm.org" - display_name = "new_tester-google2" assert_difference("User.count", 0) do 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", - :auth_uid => "123454321", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "google") + post auth_path(:provider => "google", :origin => "/user/new") + assert_response :redirect follow_redirect! assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/user/new") follow_redirect! @@ -555,11 +481,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "google", :auth_uid => auth_uid, :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "google") - follow_redirect! - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + assert_response :redirect follow_redirect! end end @@ -622,10 +544,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_uid => auth_uid, :consider_pd => "1" }, :email_hmac => email_hmac } - assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "facebook") - follow_redirect! assert_redirected_to welcome_path follow_redirect! end @@ -666,22 +584,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_facebook_failure OmniAuth.config.mock_auth[:facebook] = :connection_failed - new_email = "newtester-facebook2@osm.org" - display_name = "new_tester-facebook2" assert_difference("User.count", 0) do 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", - :auth_uid => "123454321", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "facebook") + post auth_path(:provider => "facebook", :origin => "/user/new") + assert_response :redirect follow_redirect! assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/user/new") follow_redirect! @@ -723,11 +630,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "facebook", :auth_uid => auth_uid, :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "facebook") - follow_redirect! - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name assert_response :redirect follow_redirect! end @@ -790,10 +692,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_uid => auth_uid, :consider_pd => "1" }, :email_hmac => email_hmac } - assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "microsoft") - follow_redirect! assert_redirected_to welcome_path follow_redirect! end @@ -834,22 +732,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_microsoft_failure OmniAuth.config.mock_auth[:microsoft] = :connection_failed - new_email = "newtester-microsoft2@osm.org" - display_name = "new_tester-microsoft2" assert_difference("User.count", 0) do 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 => "microsoft", - :auth_uid => "123454321", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "microsoft") + post auth_path(:provider => "microsoft", :origin => "/user/new") + assert_response :redirect follow_redirect! assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new") follow_redirect! @@ -890,11 +777,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "microsoft", :auth_uid => auth_uid, :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "microsoft") - follow_redirect! - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name assert_response :redirect follow_redirect! end @@ -962,10 +844,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :read_ct => 1, :read_tou => 1, :email_hmac => email_hmac } - assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "github") - follow_redirect! assert_redirected_to welcome_path follow_redirect! end @@ -1007,22 +885,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_github_failure OmniAuth.config.mock_auth[:github] = :connection_failed - new_email = "newtester-github2@osm.org" - display_name = "new_tester-github2" assert_difference("User.count", 0) do 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", - :auth_uid => "123454321", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "github") + post auth_path(:provider => "github", :origin => "/user/new") follow_redirect! assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/user/new") follow_redirect! @@ -1062,11 +928,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "github", :auth_uid => auth_uid, :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "github") - follow_redirect! - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name assert_response :redirect follow_redirect! end @@ -1133,10 +994,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :read_ct => 1, :read_tou => 1, :email_hmac => email_hmac } - assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! assert_redirected_to welcome_path follow_redirect! end @@ -1175,22 +1032,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_wikipedia_failure OmniAuth.config.mock_auth[:wikipedia] = :connection_failed - new_email = "newtester-wikipedia2@osm.org" - display_name = "new_tester-wikipedia2" assert_difference("User.count", 0) do 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", - :auth_uid => "123454321", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") + post auth_path(:provider => "wikipedia", :origin => "/user/new") + assert_response :redirect follow_redirect! assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/user/new") follow_redirect! @@ -1232,11 +1078,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "wikipedia", :auth_uid => auth_uid, :consider_pd => "1" } } - assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - post response.location - assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name assert_response :redirect follow_redirect! end diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb index 033a221d4..8dc9e49b1 100644 --- a/test/lib/rich_text_test.rb +++ b/test/lib/rich_text_test.rb @@ -250,6 +250,31 @@ class RichTextTest < ActiveSupport::TestCase assert_equal 141, r.spam_score.round end + def test_text_no_image + r = RichText.new("text", "foo https://example.com/ bar") + assert_nil r.image + end + + def test_html_no_image + r = RichText.new("html", "foo bar baz") + assert_nil r.image + end + + def test_markdown_no_image + r = RichText.new("markdown", "foo [bar](https://example.com/) baz") + assert_nil r.image + end + + def test_markdown_image + r = RichText.new("markdown", "foo ![bar](https://example.com/image.jpg) baz") + assert_equal "https://example.com/image.jpg", r.image + end + + def test_markdown_first_image + r = RichText.new("markdown", "foo ![bar1](https://example.com/image1.jpg) baz\nfoo ![bar2](https://example.com/image2.jpg) baz") + assert_equal "https://example.com/image1.jpg", r.image + end + private def assert_html(richtext, &block) diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 94cb5ec81..9efe9a9c9 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -98,8 +98,9 @@ class NodeTest < ActiveSupport::TestCase end def test_update - node = create(:node) - create(:old_node, :node_id => node.id, :version => 1) + node = create(:node, :lat => 12.6543, :lon => 65.1234) + create(:old_node, :node_id => node.id, :version => 1, :lat => node.lat, :lon => node.lon) + node_template = Node.find(node.id) assert_not_nil node_template diff --git a/yarn.lock b/yarn.lock index 0c3bd5c63..040bf124c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,10 +19,19 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8" integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw== -"@eslint/eslintrc@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.0.2.tgz#36180f8e85bf34d2fe3ccc2261e8e204a411ab4e" - integrity sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg== +"@eslint/config-array@^0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.16.0.tgz#bb3364fc39ee84ec3a62abdc4b8d988d99dfd706" + integrity sha512-/jmuSd74i4Czf1XXn7wGRWZCuyaUZ330NH1Bek0Pplatt4Sy1S5haN21SCLLdbeKslQ+S0wEJ+++v5YibSi+Lg== + dependencies: + "@eslint/object-schema" "^2.1.4" + debug "^4.3.1" + minimatch "^3.0.5" + +"@eslint/eslintrc@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6" + integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -34,34 +43,25 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.2.0.tgz#b0a9123e8e91a3d9a2eed3a04a6ed44fdab639aa" - integrity sha512-ESiIudvhoYni+MdsI8oD7skpprZ89qKocwRM2KEvhhBJ9nl5MRh7BXU5GTod7Mdygq+AUl+QzId6iWJKR/wABA== +"@eslint/js@9.5.0": + version "9.5.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.5.0.tgz#0e9c24a670b8a5c86bff97b40be13d8d8f238045" + integrity sha512-A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w== -"@humanwhocodes/config-array@^0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748" - integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw== - dependencies: - "@humanwhocodes/object-schema" "^2.0.3" - debug "^4.3.1" - minimatch "^3.0.5" +"@eslint/object-schema@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" + integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" - integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== - -"@humanwhocodes/retry@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.2.3.tgz#c9aa036d1afa643f1250e83150f39efb3a15a631" - integrity sha512-X38nUbachlb01YMlvPFojKoiXq+LzZvuSce70KPMPdeM1Rj03k4dR7lDslhbqXn3Ang4EU3+EAmwEAsbrjHW3g== +"@humanwhocodes/retry@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" + integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -246,17 +246,17 @@ eslint-visitor-keys@^4.0.0: integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== eslint@^9.0.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.2.0.tgz#0700ebc99528753315d78090876911d3cdbf19fe" - integrity sha512-0n/I88vZpCOzO+PQpt0lbsqmn9AsnsJAQseIqhZFI8ibQT0U1AkEKRxA3EVMos0BoHSXDQvCXY25TUjB5tr8Og== + version "9.5.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.5.0.tgz#11856034b94a9e1a02cfcc7e96a9f0956963cd2f" + integrity sha512-+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^3.0.2" - "@eslint/js" "9.2.0" - "@humanwhocodes/config-array" "^0.13.0" + "@eslint/config-array" "^0.16.0" + "@eslint/eslintrc" "^3.1.0" + "@eslint/js" "9.5.0" "@humanwhocodes/module-importer" "^1.0.1" - "@humanwhocodes/retry" "^0.2.3" + "@humanwhocodes/retry" "^0.3.0" "@nodelib/fs.walk" "^1.2.8" ajv "^6.12.4" chalk "^4.0.0" @@ -266,7 +266,7 @@ eslint@^9.0.0: eslint-scope "^8.0.1" eslint-visitor-keys "^4.0.0" espree "^10.0.1" - esquery "^1.4.2" + esquery "^1.5.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^8.0.0" @@ -294,10 +294,10 @@ espree@^10.0.1: acorn-jsx "^5.3.2" eslint-visitor-keys "^4.0.0" -esquery@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.2.tgz#c6d3fee05dd665808e2ad870631f221f5617b1d1" - integrity sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng== +esquery@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== dependencies: estraverse "^5.1.0" @@ -512,9 +512,9 @@ keyv@^4.5.4: json-buffer "3.0.1" leaflet.locatecontrol@^0.81.0: - version "0.81.0" - resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.81.0.tgz#75e92d07c19edade910a2b5a177ac24cef7d10e7" - integrity sha512-5Dqj6VXVFl1vPquYZW95hQYegvzqSI4eLIpZrBMuHuyoAo5i9y6js3z02TF//XXZByIyTI/XBtlxlZLUM08Pcg== + version "0.81.1" + resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.81.1.tgz#8aec3124ef5cdda3476fd9013315789b4e301a45" + integrity sha512-ZtsdScGufPw330X3UIaGGjnfQ1NrhLySnlruWufIMnfzsHgQPz0+mSxsCQMVh7QgOBoefCGb/lioSejiaNx1EQ== leaflet@^1.8.0: version "1.9.4" @@ -576,9 +576,9 @@ optionator@^0.9.3: type-check "^0.4.0" osm-community-index@^5.2.0: - version "5.6.3" - resolved "https://registry.yarnpkg.com/osm-community-index/-/osm-community-index-5.6.3.tgz#8c7621683a2a4c1037ddb14d060b8442a3aa15cb" - integrity sha512-UnJBRbaMPIM3J08CA1crKeAok6c1HYiK6tB8AdnjvrvGNnl2JXPxdztA4Jcb3pbrjq/0q14v1mBr300TmtMwbQ== + version "5.7.1" + resolved "https://registry.yarnpkg.com/osm-community-index/-/osm-community-index-5.7.1.tgz#2341666c83d14c00ef3d9a90298c96d5e791b56c" + integrity sha512-E+Xib5m//WliNq2iqeUXyKqZk7yhZu/vSJbwwyxDAPzcNWxgIMoO0B7cUMeFNckhMQsKM2UuC2BAjWuVfbYf1Q== dependencies: diacritics "^1.3.0"