From: Andy Allan Date: Wed, 29 Aug 2018 06:49:26 +0000 (+0800) Subject: Merge pull request #1938 from jguthrie100/fix_no_trace_description_error X-Git-Tag: live~3721 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/942e62117ff7f12d40618a94ea3f4e86f8cb25af?hp=c38a50fc5f43a185dda39fd1aa235a2bda8ad83b Merge pull request #1938 from jguthrie100/fix_no_trace_description_error Fixes "new trace" validation error --- diff --git a/.gitignore b/.gitignore index 920ca1120..1a2d35c6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ log config/piwik.yml +app/assets/javascripts/i18n public/assets public/attachments public/export diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a64be7273..f012237b3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -54,7 +54,7 @@ Metrics/AbcSize: # Offense count: 41 # Configuration parameters: CountComments, ExcludedMethods. Metrics/BlockLength: - Max: 258 + Max: 261 # Offense count: 11 # Configuration parameters: CountBlocks. diff --git a/.travis.yml b/.travis.yml index 48ddb4a1d..8ce7f5f30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ before_script: - psql -U postgres -c "CREATE FUNCTION xid_to_int4(xid) RETURNS int4 AS '/tmp/libpgosm', 'xid_to_int4' LANGUAGE C STRICT" openstreetmap - cp config/travis.database.yml config/database.yml - bundle exec rake db:migrate + - bundle exec rake i18n:js:export script: - bundle exec rubocop -f fuubar - bundle exec rake jshint diff --git a/Gemfile b/Gemfile index 9d759548c..9ba270313 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem "json" gem "pg", "~> 0.18" # Use SCSS for stylesheets -gem "sass-rails", "~> 5.0" +gem "sassc-rails" # Use Uglifier as compressor for JavaScript assets gem "uglifier", ">= 1.3.0" @@ -38,7 +38,7 @@ gem "bootsnap", ">= 1.1.0", :require => false gem "r2", "~> 0.2.7" # Use autoprefixer to generate CSS prefixes -gem "autoprefixer-rails" +gem "autoprefixer-rails", "~> 8.6.3" # Use image_optim to optimise images gem "image_optim_rails" diff --git a/Gemfile.lock b/Gemfile.lock index 2fd538882..2f6eb8406 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - aasm (4.12.3) + aasm (5.0.0) concurrent-ruby (~> 1.0) actioncable (5.2.0) actionpack (= 5.2.0) @@ -54,19 +54,19 @@ GEM rake (>= 10.4, < 13.0) arel (9.0.0) ast (2.4.0) - autoprefixer-rails (8.6.3) + autoprefixer-rails (8.6.5) execjs - better_errors (2.4.0) + better_errors (2.5.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bigdecimal (1.1.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.0) + bootsnap (1.3.1) msgpack (~> 1.0) builder (3.2.3) - canonical-rails (0.2.3) + canonical-rails (0.2.4) rails (>= 4.1, < 5.3) capybara (2.18.0) addressable @@ -88,9 +88,9 @@ GEM composite_primary_keys (11.0.3) activerecord (~> 5.2.0) concurrent-ruby (1.0.5) - coveralls (0.8.21) + coveralls (0.8.22) json (>= 1.8, < 3) - simplecov (~> 0.14.1) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) thor (~> 0.19.4) tins (~> 1.6) @@ -99,15 +99,15 @@ GEM crass (1.0.4) dalli (2.7.8) debug_inspector (0.0.3) - docile (1.1.5) + docile (1.3.1) dynamic_form (1.1.4) erubi (1.7.1) execjs (2.7.0) exifr (1.3.4) - factory_bot (4.10.0) + factory_bot (4.11.0) activesupport (>= 3.0.0) - factory_bot_rails (4.10.0) - factory_bot (~> 4.10.0) + factory_bot_rails (4.11.0) + factory_bot (~> 4.11.0) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -122,19 +122,19 @@ GEM http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.0.9) + i18n-js (3.0.11) i18n (>= 0.6.6, < 2) - image_optim (0.26.1) + image_optim (0.26.2) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) - image_size (~> 1.5) + image_size (>= 1.5, < 3) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) image_optim_rails (0.4.1) image_optim (~> 0.24) rails sprockets - image_size (1.5.0) + image_size (2.0.0) in_threads (1.5.0) jaro_winkler (1.5.1) jquery-rails (4.3.3) @@ -172,11 +172,11 @@ GEM marcel (0.3.2) mimemagic (~> 0.3.2) method_source (0.9.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mimemagic (0.3.2) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) msgpack (1.2.4) @@ -184,7 +184,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nio4r (2.3.1) - nokogiri (1.8.3) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) nokogumbo (1.5.0) nokogiri @@ -235,7 +235,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) pg (0.21.0) poltergeist (1.18.1) @@ -245,8 +245,8 @@ GEM powerpack (0.1.2) progress (3.4.0) psych (3.0.2) - public_suffix (3.0.2) - puma (3.11.4) + public_suffix (3.0.3) + puma (3.12.0) quad_tile (1.0.1) r2 (0.2.7) rack (2.0.5) @@ -254,7 +254,7 @@ GEM rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) rails (5.2.0) @@ -301,36 +301,40 @@ GEM rack (>= 1.4) rinku (2.0.4) rotp (3.3.1) - rubocop (0.57.2) + rubocop (0.58.2) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sanitize (4.6.5) + sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sass (3.5.6) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sassc (1.12.1) + ffi (~> 1.9.6) + sass (>= 3.3.0) + sassc-rails (1.3.0) + railties (>= 4.0.0) + sass + sassc (~> 1.9) + sprockets (> 2.11) + sprockets-rails + tilt secure_headers (6.0.0) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) @@ -354,7 +358,7 @@ GEM tins (1.16.3) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.12) + uglifier (4.1.18) execjs (>= 0.3.0, < 3) unicode-display_width (1.4.0) validates_email_format_of (1.6.3) @@ -378,7 +382,7 @@ DEPENDENCIES aasm actionpack-page_caching annotate - autoprefixer-rails + autoprefixer-rails (~> 8.6.3) better_errors bigdecimal (~> 1.1.0) binding_of_caller @@ -433,7 +437,7 @@ DEPENDENCIES rotp rubocop sanitize - sass-rails (~> 5.0) + sassc-rails secure_headers uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4461c5ab7..654b01680 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ //= require leaflet.map //= require leaflet.zoom //= require leaflet.locationfilter -//= require i18n/translations +//= require i18n //= require oauth //= require piwik //= require richtext diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb index 15839a2ec..36b23666a 100644 --- a/app/assets/javascripts/embed.js.erb +++ b/app/assets/javascripts/embed.js.erb @@ -1,6 +1,7 @@ //= require leaflet //= require leaflet.osm -//= require i18n/translations +//= require i18n +//= require i18n/embed window.onload = function () { if (navigator.languages) { diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index 81c62e183..2f9498d03 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -119,9 +119,9 @@ function OSRMEngine() { namedRoad = false; } - if (step.maneuver.type.match(/exit (rotary|roundabout)/)) { + if (step.maneuver.type.match(/^exit (rotary|roundabout)$/)) { instText += I18n.t(template, { name: name }); - } else if (step.maneuver.type.match(/rotary|roundabout/)) { + } else if (step.maneuver.type.match(/^(rotary|roundabout)$/)) { if (step.maneuver.exit) { if (step.maneuver.exit <= 10) { instText += I18n.t(template + '_with_exit_ordinal', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name }); @@ -131,9 +131,9 @@ function OSRMEngine() { } else { instText += I18n.t(template + '_without_exit', { name: name }); } - } else if (step.maneuver.type.match(/on ramp|off ramp/)) { + } else if (step.maneuver.type.match(/^(on ramp|off ramp)$/)) { var params = {}; - if (step.exits && step.maneuver.type.match(/off ramp/)) params.exit = step.exits; + if (step.exits && step.maneuver.type.match(/^off ramp$/)) params.exit = step.exits; if (step.destinations) params.directions = destinations; if (namedRoad) params.directions = name; if (Object.keys(params).length > 0) { diff --git a/app/assets/stylesheets/errors.scss b/app/assets/stylesheets/errors.scss new file mode 100644 index 000000000..fd1400232 --- /dev/null +++ b/app/assets/stylesheets/errors.scss @@ -0,0 +1,8 @@ +.logo { + float: left; + margin: 10px; +} + +.details { + float: left; +} diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb new file mode 100644 index 000000000..465194ef9 --- /dev/null +++ b/app/controllers/errors_controller.rb @@ -0,0 +1,15 @@ +class ErrorsController < ApplicationController + layout "error" + + def forbidden + render :status => :forbidden + end + + def not_found + render :status => :not_found + end + + def internal_server_error + render :status => :internal_server_error + end +end diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 384f2c24c..d92da72b1 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -39,18 +39,44 @@ class GeocoderController < ApplicationController def search_latlon lat = params[:lat].to_f lon = params[:lon].to_f - if lat < -90 || lat > 90 - @error = "Latitude #{lat} out of range" - render :action => "error" - elsif lon < -180 || lon > 180 - @error = "Longitude #{lon} out of range" - render :action => "error" + + if params[:latlon_digits] + # We've got two nondescript numbers for a query, which can mean both "lat, lon" or "lon, lat". + @results = [] + + if lat >= -90 && lat <= 90 && lon >= -180 && lon <= 180 + @results.push(:lat => lat, :lon => lon, + :zoom => params[:zoom], + :name => "#{lat}, #{lon}") + end + + if lon >= -90 && lon <= 90 && lat >= -180 && lat <= 180 + @results.push(:lat => lon, :lon => lat, + :zoom => params[:zoom], + :name => "#{lon}, #{lat}") + end + + if @results.empty? + @error = "Latitude or longitude are out of range" + render :action => "error" + else + render :action => "results" + end else - @results = [{ :lat => lat, :lon => lon, - :zoom => params[:zoom], - :name => "#{lat}, #{lon}" }] + # Coordinates in a query have come with markers for latitude and longitude. + if lat < -90 || lat > 90 + @error = "Latitude #{lat} out of range" + render :action => "error" + elsif lon < -180 || lon > 180 + @error = "Longitude #{lon} out of range" + render :action => "error" + else + @results = [{ :lat => lat, :lon => lon, + :zoom => params[:zoom], + :name => "#{lat}, #{lon}" }] - render :action => "results" + render :action => "results" + end end end @@ -279,11 +305,11 @@ class GeocoderController < ApplicationController params.merge!(dms_to_decdeg(latlon)).delete(:query) elsif latlon = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/) - params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f).delete(:query) + params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f, :latlon_digits => true).delete(:query) end end - params.permit(:query, :lat, :lon, :zoom, :minlat, :minlon, :maxlat, :maxlon) + params.permit(:query, :lat, :lon, :latlon_digits, :zoom, :minlat, :minlon, :maxlat, :maxlon) end def nsew_to_decdeg(captures) diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb index 52904d5b2..8d1acec75 100644 --- a/app/controllers/issue_comments_controller.rb +++ b/app/controllers/issue_comments_controller.rb @@ -2,6 +2,7 @@ class IssueCommentsController < ApplicationController layout "site" before_action :authorize_web + before_action :set_locale before_action :require_user before_action :check_permission diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 6cbe302d6..efb77e2f5 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -120,7 +120,7 @@ class SiteController < ApplicationController append_content_security_policy_directives( :connect_src => %w[*], :img_src => %w[* blob:], - :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org services.arcgisonline.com serviceslab.arcgisonline.com 'unsafe-eval'], + :script_src => %w[dev.virtualearth.net 'unsafe-eval'], :style_src => %w['unsafe-inline'] ) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 502637c2a..1aa1e1fd3 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -232,6 +232,7 @@ class Changeset < ActiveRecord::Base bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete? el1["comments_count"] = comments.length.to_s + el1["changes_count"] = num_changes.to_s if include_discussion el2 = XML::Node.new("discussion") diff --git a/app/views/errors/forbidden.html.erb b/app/views/errors/forbidden.html.erb new file mode 100644 index 000000000..4c3fb30d2 --- /dev/null +++ b/app/views/errors/forbidden.html.erb @@ -0,0 +1,3 @@ +

Forbidden

+

The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)

+

Feel free to contact the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.

diff --git a/app/views/errors/internal_server_error.html.erb b/app/views/errors/internal_server_error.html.erb new file mode 100644 index 000000000..a2b1ba6f7 --- /dev/null +++ b/app/views/errors/internal_server_error.html.erb @@ -0,0 +1,4 @@ +

Application error

+

The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)

+

Feel free to contact the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.

+

This may be a problem in our Ruby On Rails code. 500 occurs with exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code)

diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb new file mode 100644 index 000000000..6ef39d0d5 --- /dev/null +++ b/app/views/errors/not_found.html.erb @@ -0,0 +1,3 @@ +

File not found

+

Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)

+

Feel free to contact the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 1d294dc82..56c3051b2 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -3,6 +3,7 @@ <%= javascript_include_tag "application" %> + <%= javascript_include_tag "i18n/" + I18n.locale.to_s %> <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %> <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %> diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb new file mode 100644 index 000000000..590f32095 --- /dev/null +++ b/app/views/layouts/error.html.erb @@ -0,0 +1,14 @@ + + + + + OpenStreetMap + <%= stylesheet_link_tag "errors", :media=> "screen" %> + + + <%= image_tag "osm_logo.png", :class => "logo" %> +
+ <%= yield %> +
+ + diff --git a/config/environments/development.rb b/config/environments/development.rb index 9065ed8e3..b7e60eb4f 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -52,6 +52,9 @@ Rails.application.configure do # Suppress logger output for asset requests. config.assets.quiet = true + # Export translations automatically + config.middleware.use I18n::JS::Middleware + # Raises error for missing translations # config.action_view.raise_on_missing_translations = true diff --git a/config/i18n-js.yml b/config/i18n-js.yml index 144954538..fa970345f 100644 --- a/config/i18n-js.yml +++ b/config/i18n-js.yml @@ -1,27 +1,8 @@ -# Split context in several files. -# By default only one file with all translations is exported and -# no configuration is required. Your settings for asset pipeline -# are automatically recognized. -# -# If you want to split translations into several files or specify -# locale contexts that will be exported, just use this file to do -# so. -# -# If you're going to use the Rails 3.1 asset pipeline, change -# the following configuration to something like this: -# -# translations: -# - file: "app/assets/javascripts/i18n/translations.js" -# -# If you're running an old version, you can use something -# like this: -# -# translations: -# - file: "public/javascripts/translations.js" -# only: "*" -# +export_i18n_js: false + translations: - - file: "app/assets/javascripts/i18n/translations.js" + - file: "app/assets/javascripts/i18n/%{locale}.js" + pretty_print: true only: - "*.date" - "*.time" @@ -33,3 +14,7 @@ translations: - "*.diary_entry.edit.marker_text" - "*.layouts.project_name.title" - "*.geocoder.search_osm_nominatim.*" + - file: "app/assets/javascripts/i18n/embed.js" + pretty_print: true + only: + - "*.javascripts.embed.*" diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index cbd93c1d8..7bd35daf6 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -13,12 +13,13 @@ Rails.application.config.assets.paths << Rails.root.join("config") # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. Rails.application.config.assets.precompile += %w[index.js browse.js welcome.js fixthemap.js] -Rails.application.config.assets.precompile += %w[user.js login.js diary_entry.js messages.js edit/*.js] +Rails.application.config.assets.precompile += %w[user.js login.js diary_entry.js messages.js edit/*.js i18n/*.js] Rails.application.config.assets.precompile += %w[screen-ltr.css print-ltr.css] Rails.application.config.assets.precompile += %w[screen-rtl.css print-rtl.css] Rails.application.config.assets.precompile += %w[leaflet-all.css leaflet.ie.css] Rails.application.config.assets.precompile += %w[id.js id.css] Rails.application.config.assets.precompile += %w[embed.js embed.css] +Rails.application.config.assets.precompile += %w[errors.css] Rails.application.config.assets.precompile += %w[html5shiv.js] Rails.application.config.assets.precompile += %w[images/marker-*.png img/*-handle.png] Rails.application.config.assets.precompile += %w[swfobject.js expressInstall.swf] diff --git a/config/initializers/errors.rb b/config/initializers/errors.rb new file mode 100644 index 000000000..226c6b9b6 --- /dev/null +++ b/config/initializers/errors.rb @@ -0,0 +1 @@ +Rails.application.config.exceptions_app = Rails.application.routes diff --git a/config/jshint.yml b/config/jshint.yml index 65996983f..a7e22486b 100644 --- a/config/jshint.yml +++ b/config/jshint.yml @@ -1,6 +1,7 @@ files: - "**/*.js" exclude_paths: + - "app/assets/javascripts/i18n" - "vendor/assets/javascripts" options: eqeqeq: true diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 88735411b..48778993d 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -377,9 +377,12 @@ ar: aerialway: cable_car: عربة قطار هوائي chair_lift: كرسي تلفريك + drag_lift: اسحبها لليسار gondola: تلفريك + platter: مصعد تزلج pylon: نقطة تعليق station: محطة قطار هوائي + t-bar: مصعد تزلج aeroway: aerodrome: المطار airstrip: مهبط طائرات @@ -1308,12 +1311,11 @@ ar: و موقع open_data_title: البيانات المفتوحة - open_data_html: |- - OpenStreetMap هو بيانات مفتوحة : أنت حر في استخدامها لأي غرض - طالما أنك تقوم باعتماد OpenStreetMap والمساهمين فيه. إذا قمت بتغيير أو - بناء على البيانات بطرق معينة ، يجوز لك توزيع النتيجة فقط - تحت نفس الرخصة. راجع حقوق الطبع والنشر و - صفحة الترخيص للحصول على التفاصيل. + open_data_html: "خريطة الشارع المفتوحة بيانات مفتوحة: أنت حر في استخدامها + لأي غرض\nطالما أنك تقوم بإحالة خريطة الشارع المفتوحة والمساهمين فيها، إذا + عدلت أو \nبنيت على البيانات بطرق معينة، فلا يجوز لك توزيع النتيجة إلا \nتحت + نفس الترخيص، راجع صفحة حقوق\nالطبع والنشر والترخيص + للتفاصيل." legal_title: قانوني legal_html: |- هذا الموقع والعديد من الخدمات الأخرى ذات الصلة يتم تشغيلها رسميا من قبل OpenStreetMapمؤسسة(OSMF) نيابة عن المجتمع. يخضع استخدام جميع خدمات تشغيل OSMF الينا @@ -1718,10 +1720,9 @@ ar: التعديلات التلقائية . questions: title: هل هناك أسئلة ؟ - paragraph_1_html: |- - يحتوي OpenStreetMap على العديد من الموارد للتعلم حول المشروع ، حيث يطلب ويجيب - الأسئلة ، ومناقشة وتوثيق مواضيع رسم الخرائط بشكل تعاوني. - احصل على المساعدة هنا . + paragraph_1_html: "تحتوي خريطة الشارع المفتوحة على العديد من الموارد للتعلم + حول المشروع، وطرح \nالأسئلة والإجابة عليها، ومناقشة مواضيع التخطيط وتوثيقها + بشكل تعاوني،\nاحصل على المساعدة هنا." start_mapping: ابدأ التخطيط add_a_note: title: لا وقت للتعديل؟ أضف ملاحظة! @@ -2024,15 +2025,14 @@ ar: title: أنشئ حسابا no_auto_account_create: للأسف نحن غير قادرين في الوقت الحالي على إنشاء حساب لك تلقائيًا. - contact_webmaster: يرجى الاتصال بمسؤول - الموقع لترتيب الحساب المراد إنشاؤه - وسنحاول التعامل مع هذا الطلب بأسرع - وقت ممكن. + contact_webmaster: يُرجَى الاتصال بمدير الموقع لترتيب + إنشاء حساب، سنحاول التعامل مع الطلب بأسرع وقت ممكن. about: header: حًرَّة وقابلة للتحرير html: |-

على عكس الخرائط الأخرى تماما، يتم إنشاء خريطة الشارع المفتوحة من قبل الناس مثلك، وهي حرة ويمكن لأي أحد الإصلاح والتحديث والتنزيل والاستخدام.

أنشىء حسابا لبدء المساهمة.سنقوم بإرسال بريد إلكتروني لتأكيد حسابك.

- license_agreement: عند تأكيد حسابك ستحتاج إلى الموافقة على شروط + license_agreement: عند تأكيد حسابك ستحتاج إلى الموافقة على شروط المساهم. email address: 'عنوان البريد الإلكتروني:' confirm email address: 'تأكيد عنوان البريد الإلكتروني:' @@ -2417,6 +2417,9 @@ ar: reopened_at_by_html: تم التنشيط قبل %{when} مِن قِبَل %{user} rss: title: ملاحظات خريطة الشارع المفتوحة + description_area: قائمة بالملاحظات أو التقارير أو التعليق عليها أو إغلاقها في + منطقتك [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: خلاصة rss للملاحظة %{id} opened: ملاحظة جديدة (بالقرب من %{place}) commented: تعليق جديد (بالقرب من %{place}) closed: مذكرة مغلقة (بالقرب من %{place}) @@ -2561,21 +2564,39 @@ ar: sharp_left_without_exit: إلى أقصى اليسار نحو%{name} turn_left_without_exit: انعطف يسارا إلى %{name} offramp_left: اسلك الطريق المنحدر على اليسار + offramp_left_with_exit: اسلك المخرج %{exit} على اليسار + offramp_left_with_exit_name: اسلك المخرج %{exit} على اليسار باتجاه %{name} + offramp_left_with_exit_directions: اسلك المخرج %{exit} على اليسار باتجاه %{directions} + offramp_left_with_exit_name_directions: اسلك المخرج %{exit} على اليسار باتجاه + %{name}، نحو %{directions} offramp_left_with_name: خذ الطريق المنحدرة إلى اليسار إلى %{name} + offramp_left_with_directions: اسلك الطريق المنحدر إلى اليسار نحو %{directions} + offramp_left_with_name_directions: اسلك الطريق المنحدر إلى اليسار نحو %{name}، + نحو %{directions} onramp_left_without_exit: انعطف يسارا على المنحدر إلى %{name} + onramp_left_with_directions: الاتجاه يسارا إلى الطريق المنحدر نحو %{directions} + onramp_left_with_name_directions: الاتجاه يسارا على المنحدر نحو %{name}، نحو + %{directions} + onramp_left_without_directions: الاتجاه يسارا إلى الطريق المنحدر + onramp_left: الاتجاه يسارا إلى الطريق المنحدر endofroad_left_without_exit: في نهاية الطريق انعطف يسارا إلى %{name} merge_left_without_exit: انعطف يسارا إلى %{name} fork_left_without_exit: عند التقاطع انعطف يسارا إلى %{name} slight_left_without_exit: اتجه إلى اليمين قليلا %{name} via_point_without_exit: (نقطة وسيطة) follow_without_exit: اتبع %{name} + roundabout_without_exit: عند الدوران، اسلك المخرج إلى %{name} leave_roundabout_without_exit: ترك الطريق الملتوية - %{name} stay_roundabout_without_exit: البقاء في طريق ملتوية - %{name} - start_without_exit: ابدأ من نهاية %{name} + start_without_exit: البدء من %{name} destination_without_exit: الوصول إلى الوجهة against_oneway_without_exit: الذهاب عكس في طريق اتجاه واحد %{name} end_oneway_without_exit: نهاية طريق اتجاه واحد %{name} + roundabout_with_exit: في الدوار، اسلك المخرج %{exit} إلى %{name} + roundabout_with_exit_ordinal: في الدوار، خذ %{exit} إلى %{name} + exit_roundabout: الخروج من الدوار نحو %{name} unnamed: طريق غير مسمى + courtesy: الاتجاهات مجاملة من %{link} exit_counts: first: الأول second: الثاني @@ -2596,6 +2617,7 @@ ar: error: 'خطأ في الاتصال %{server}: %{error}' timeout: مهلة الاتصال %{server} context: + directions_from: الاتجاهات من هنا directions_to: الاتجاهات إلى هنا add_note: أضف ملاحظةً هنا show_address: أظهر العنوان diff --git a/config/locales/ast.yml b/config/locales/ast.yml index c1bb99ed5..9e4efc1a4 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -1001,6 +1001,37 @@ ast: new: title_html: Informe %{link} missing_params: Nun puede crease un informe nuevu + details: Por favor, apurre más detalles sobro'l problema (obligatoriu). + select: 'Escueye un motivu pal to informe:' + disclaimer: + intro: 'Antes d''unviar l''informe a los moderadores del sitiu, asegúrate + de que:' + not_just_mistake: Tas seguru de que'l problema nun ye namái un fallu + unable_to_fix: Nun puedes iguar el problema tu mesmu o cola ayuda d'otros + miembros de la comunidá. + resolve_with_user: Yá tentasti resolver el problema col usuariu en cuestión. + categories: + diary_entry: + spam_label: Esta entrada del diariu ye/contien spam + threat_label: Esta entrada del diariu contien una amenaza + other_label: Otros + diary_comment: + spam_label: Esti comentariu del diariu ye/contien spam + threat_label: Esti comentariu del diariu contien una amenaza + other_label: Otros + user: + spam_label: Esti perfil d'usuariu ye/contien spam + threat_label: Esti perfil d'usuariu contien una amenaza + vandal_label: Esti usuariu ye un vándalu + other_label: Otros + note: + spam_label: Esta nota ye spam + personal_label: Esta nota contien datos personales + abusive_label: Esta nota ye abusiva + other_label: Otros + create: + successful_report: L'informe rexistróse correutamente + provide_details: Apurre los detalles riquíos layouts: logo: alt_text: Logo d'OpenStreetMap @@ -1014,6 +1045,7 @@ ast: edit: Editar history: Historial export: Esportar + issues: Problemes data: Datos export_data: Esportar datos gps_traces: Traces GPS @@ -1789,8 +1821,13 @@ ast: require_cookies: cookies_needed: Paez que tienes les cookies desactivaes - activa les cookies nel restolador enantes de siguir. + require_admin: + not_an_admin: Has de ser alministrador pa facer esa aición. require_moderator: not_a_moderator: Has de ser moderador pa facer esa aición. + require_moderator_or_admin: + not_a_moderator_or_admin: Has de ser moderador o alministrador pa facer esa + aición. setup_user_auth: blocked_zero_hour: Tienes un mensaxe urxente nel sitiu web d'OpenStreetMap. Tienes de lleer el mensaxe antes de que puedas guardar les ediciones. @@ -2088,6 +2125,7 @@ ast: friends_diaries: entraes de diariu de los amigos nearby_changesets: conxuntos de cambios d'usuarios cercanos nearby_diaries: entraes de diariu d'usuarios cercanos + report: Informar d'esti usuariu popup: your location: El to allugamientu nearby mapper: Mapeador próximu diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index c68e164b6..17687c417 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1387,7 +1387,7 @@ be-Tarask: public editing: heading: 'Публічнае рэдагаваньне:' enabled: Уключана. Вы не ананім і можаце рэдагаваць зьвесткі. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: што гэта? disabled: Забаронены і ня можа рэдагаваць зьвесткі, усе папярэднія рэдагаваньні былі ананімнымі. @@ -1398,7 +1398,7 @@ be-Tarask: ня могуць дасылаць Вам паведамленьні, ці бачыць Вашае месцазнаходжаньне. Каб быў бачны Ваш унёсак і людзі маглі кантактаваць з Вамі праз ўэб-сайт, націсьніце кнопку ніжэй. Пасьля зьменаў API вэрсіі 0.6, толькі даступныя - для сувязі карыстальнікі могуць рэдагаваць зьвесткі на мапе. (даведацца + для сувязі карыстальнікі могуць рэдагаваць зьвесткі на мапе. (даведацца чаму). diff --git a/config/locales/bn.yml b/config/locales/bn.yml index e6d3d3cdf..d06cfb68a 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -24,19 +24,19 @@ bn: activerecord: models: acl: প্রবেশাধিকার নিয়ন্ত্রণ তালিকা - changeset: পরিবর্তনধার্য - changeset_tag: পরিবর্তনধার্য ট্যাগ + changeset: পরিবর্তনসমূহ + changeset_tag: পরিবর্তনসমূহের ট্যাগ country: দেশ - diary_comment: ডাইরি মন্তব্য - diary_entry: ডাইরি ভুক্তি + diary_comment: ডাইরিতে মন্তব্য + diary_entry: ডাইরির ভুক্তি friend: বন্ধু language: ভাষা message: বার্তা node: সংযোগস্থল - node_tag: সংযোগস্থল ট্যাগ + node_tag: সংযোগস্থলের ট্যাগ notifier: অনুস্মারক old_node: পুরাতন সংযোগস্থল - old_node_tag: পুরাতন সংযোগস্থল ট্যাগ + old_node_tag: পুরাতন সংযোগস্থলের ট্যাগ old_relation: পুরনো সম্পর্ক old_relation_member: পুরনো সম্পর্ক সদস্য old_relation_tag: পুরনো সম্পর্ক ট্যাগ @@ -90,13 +90,13 @@ bn: languages: ভাষা pass_crypt: পাসওয়ার্ড editor: - default: ডিফল্ট (বর্তমানে %{name}) + default: পূর্বনির্ধারিত (বর্তমানে %{name}) potlatch: name: পটল্যাচ ১ description: পটল্যাচ ১ (ব্রাউজার থেকে সম্পাদনা) id: name: আইডি - description: আইডি (ব্রাউজার সম্পাদকে) + description: আইডি (ব্রাউজার থেকে সম্পাদনা) potlatch2: name: পটল্যাচ ২ description: পটল্যাচ ২ (ব্রাউজার থেকে সম্পাদনা) @@ -117,16 +117,16 @@ bn: anonymous: নামহীন no_comment: (কোন মন্তব্য নেই) part_of: অংশ - download_xml: এক্সএমএল ডাউনলোড + download_xml: XML ডাউনলোড করুন view_history: ইতিহাস দেখুন view_details: বিস্তারিত দেখুন location: 'অবস্থান:' changeset: title: 'পরিবর্তনধার্য: %{id}' belongs_to: লেখক - node: (%{count}টি) সংযোগস্থল + node: সংযোগস্থল (%{count}টি) node_paginated: সংযোগস্থল (%{count}টির %{x}-%{y}) - way: (%{count}টি) রাস্তা + way: পথসমূহ (%{count}টি) way_paginated: পথসমূহ (%{count}টির %{x}-%{y}) relation: সম্পর্ক (%{count}টি) relation_paginated: সম্পর্ক (%{count}টির %{x}-%{y}) @@ -190,17 +190,17 @@ bn: feature_warning: '%{num_features} বৈশিষ্ট্যগুলো লোড হচ্ছে, যা আপনার ব্রাউজারকে ধীর অথবা সংবেদনহীন করতে পারে। আপনি কি এই তথ্য প্রদর্শনের ব্যপারে নিশ্চিত?' load_data: তথ্য লোড করুন - loading: লোডিং... + loading: লোড হচ্ছে... tag_details: - tags: 'ট্যাগসমূহ:' + tags: ট্যাগসমূহ wiki_link: - key: '%{key} ট্যাগ এর উইকি বর্ণনা পাতা' + key: '%{key} ট্যাগের উইকি বর্ণনার পাতা' tag: '%{key}=%{value} ট্যাগ এর উইকি বর্ণনা পাতা' wikidata_link: উইকিউপাত্ত উপাদানে %{page} wikipedia_link: উইকিপিডিয়াতে %{page} প্রবন্ধ telephone_link: '%{phone_number}-এ কল করুন' note: - title: টীকা:%{id} + title: 'টীকা: %{id}' new_note: নতুন টীকা description: 'বর্ণনা:' open_title: 'অমীমাংসিত টীকা #%{note_name}' @@ -481,6 +481,7 @@ bn: ambulance_station: রুগ্নবাহিকা স্টেশন landing_site: জরুরি অবতরণ ক্ষেত্র phone: জরুরি ফোন + "yes": জরুরী highway: abandoned: পরিত্যক্ত মহাসড়ক bridleway: অঙ্কুশ পথ @@ -596,6 +597,7 @@ bn: military: airfield: সামরিক বিমানপোত barracks: সেনানিবাস + "yes": সামরিক mountain_pass: "yes": গিরিপথ natural: @@ -863,7 +865,7 @@ bn: partners_partners: সহযোগীগণ help: সাহায্য about: পরিচিতি - copyright: মেধাসত্ব + copyright: মেধাস্বত্ব community: সম্প্রদায় community_blogs: সম্প্রদায়ের ব্লগ community_blogs_title: ওপেনস্ট্রীটম্যাপ সম্প্রদায়ের সদস্যগণের ব্লগ @@ -907,10 +909,14 @@ bn: subject: '[ওপেনস্ট্রীটম্যাপ] পাসওয়ার্ড পুনঃধার্য করার অনুরোধ' lost_password_plain: greeting: হাই, + hopefully_you: কোনো একজন (সম্ভবত আপনি) এই ইমেইল ঠিকানার সাথে যুক্ত openstreetmap.org + অ্যাকাউন্টের পাসওয়ার্ড পরিবর্তনের অনুরোধ করেছেন। click_the_link: এটি যদি আপনি হন, তবে পাসওয়ার্ড পুনঃধার্য করতে দয়া করে নিচের লিংকে ক্লিক করুন। lost_password_html: greeting: হাই, + hopefully_you: কোনো একজন (সম্ভবত আপনি) এই ইমেইল ঠিকানার সাথে যুক্ত openstreetmap.org + অ্যাকাউন্টের পাসওয়ার্ড পরিবর্তনের অনুরোধ করেছেন। click_the_link: এটি যদি আপনি হন, তবে পাসওয়ার্ড পুনঃধার্য করতে দয়া করে নিচের লিংকে ক্লিক করুন। note_comment_notification: @@ -1251,6 +1257,13 @@ bn: show: edit: বিবরণ সম্পাদনা করুন confirm: আপনি কি নিশ্চিত? + index: + title: আমার OAuth সংক্রান্ত তথ্য + my_tokens: আমার অনুমোদিত অ্যাপ্লিকেশনসমূহ + list_tokens: 'নিম্নলিখিত টোকেনগুলি আপনার নামে অধীনে অ্যাপ্লিকেশনগুলির জন্য তৈরী + করা হয়েছে:' + application: অ্যাপলিকেশনের নাম + issued_at: অনুমোদনের তারিখ form: name: নাম user: @@ -1260,6 +1273,7 @@ bn: email or username: ইমেইল ঠিকানা অথবা ব্যবহারকারীনাম password: 'পাসওয়ার্ড:' remember: আমাকে মনে রাখো + lost password link: পাসওয়ার্ড ভুলে গেছেন? login_button: প্রবেশ register now: এখনই নিবন্ধন করুন with username: 'ইতিমধ্যে একটি ওপেনস্ট্রিটম্যাপ অ্যাকাউন্ট আছে? দয়া করে ব্যবহারকারী @@ -1284,12 +1298,23 @@ bn: title: প্রস্থান logout_button: প্রস্থান lost_password: + title: পাসওয়ার্ড ভুলে গেছেন heading: পাসওয়ার্ড ভুলে গেছেন? email address: 'ইমেইল ঠিকানা:' + new password button: পাসওয়ার্ড পুনঃনির্ধারণ + help_text: নিবন্ধনের সময় ব্যবহৃত আপনার ইমেইল ঠিকানাটি লিখুন, ইমেইলের মাধ্যমে + আমরা একটি লিঙ্ক পাঠাবো যার মাধ্যমে আপনি পাসওয়ার্ড পরিবর্তন করতে পারবেন। reset_password: + title: পাসওয়ার্ড পুনঃনির্ধারণ password: 'পাসওয়ার্ড:' confirm password: 'পাসওয়ার্ড নিশ্চিত করুন:' + reset: পাসওয়ার্ড পুনঃনির্ধারণ flash changed: আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছে। + new: + password: 'পাসওয়ার্ড:' + confirm password: 'পাসওয়ার্ড নিশ্চিতকরণ:' + auth no password: তৃতীয় কোনো পদ্ধতিতে লগইন সক্রিয় থাকলে পাসওয়ার্ড বাধ্যতামূলক + নয়, কিন্তু অতিরিক্ত কিছু সরঞ্জাম এবং সার্ভারের জন্য কখনো প্রয়োজন হতে পারে। terms: agree: একমত legale_select: 'আপনার দেশ বাছাই করুন:' @@ -1301,11 +1326,13 @@ bn: my edits: আমার সম্পাদনা my profile: আমার প্রোফাইল my settings: আমার সেটিংস + oauth settings: OAuth সেটিংস edits: সম্পাদনাসমূহ email address: 'ই-মেইল ঠিকানা:' description: বিবরণ settings_link_text: সেটিংস my friends: আমার বন্ধুগণ + no friends: আপনি বন্ধুতালিকায় কাউকে যুক্ত করেননি। block_history: সক্রিয় বাধাসমূহ moderator_history: প্রদত্ত বাধাগুলি comments: মন্তব্যসমূহ @@ -1326,16 +1353,27 @@ bn: openid: link: https://wiki.openstreetmap.org/wiki/OpenID public editing: + heading: 'সম্পাদনা উন্মুক্ত:' + enabled: সক্রিয়। নামবিহীন এবং উপাত্ত সম্পাদনা। enabled link text: এটি কী? contributor terms: + agreed: আপনি নতুন অবদানকারীর শর্তাবলীতে সম্মত। + agreed_with_pd: আপনি ঘোষণা করেছেন যে আপনি আপনার সম্পাদনাগুলো পাবলিক ডোমেইনের + অধীনে প্রকাশ করছেন। link text: এটি কী? + profile description: 'প্রোফাইলের বর্ণনা:' + preferred languages: 'পছন্দের ভাষা:' + preferred editor: 'পছন্দের সম্পাদক:' image: 'চিত্র:' gravatar: link text: এটি কী? new image: চিত্র যোগ করুন + delete image: বর্তমান ছবিটি অপসারণ করুন + home location: 'বাড়ির অবস্থান:' latitude: 'অক্ষাংশ:' longitude: 'দ্রাঘিমাংশ:' save changes button: পরিবর্তন সংরক্ষণ + return to profile: প্রোফাইলে ফিরুন confirm: button: নিশ্চিত করুন confirm_email: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 68dec5cfb..65f3180c2 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -12,6 +12,7 @@ # Author: JAn Dudík # Author: Jezevec # Author: Jkjk +# Author: Korytaacheck # Author: Kuvaly # Author: Luk # Author: LukasJandera @@ -46,8 +47,8 @@ cs: changeset: Sada změn changeset_tag: Tag sady změn country: Země - diary_comment: Komentář k deníčku - diary_entry: Deníčkový záznam + diary_comment: Komentář k deníku + diary_entry: Deníkový záznam friend: Přítel language: Jazyk message: Zpráva @@ -55,7 +56,7 @@ cs: node_tag: Tag uzlu notifier: Oznamovatel old_node: Starý uzel - old_node_tag: Starý tag uzlu + old_node_tag: Tag starého uzlu old_relation: Stará relace old_relation_member: Člen staré relace old_relation_tag: Tag staré relace @@ -148,9 +149,9 @@ cs: title: 'Sada změn: %{id}' belongs_to: Autor node: Uzly (%{count}) - node_paginated: Uzly (%{x}–%{y} z %{count}) + node_paginated: Uzly (%{x}-%{y} z %{count}) way: Cesty (%{count}) - way_paginated: Cesty (%{x}–%{y} z %{count}) + way_paginated: Cesty (%{x}-%{y} z %{count}) relation: Relace (%{count}) relation_paginated: Relace (%{x}–%{y} z %{count}) comment: Komentáře (%{count}) @@ -292,22 +293,22 @@ cs: full: Celá diskuse diary_entry: new: - title: Nový záznam do deníčku + title: Nový záznam do deníku publish_button: Publikovat list: - title: Deníčky uživatelů - title_friends: Deníčky přátel - title_nearby: Deníčky uživatelů poblíž - user_title: Deníček uživatele %{user} - in_language_title: Deníčkové záznamy v jazyce %{language} - new: Nový záznam do deníčku + title: Deníky uživatelů + title_friends: Deníky přátel + title_nearby: Deníky uživatelů poblíž + user_title: Deník uživatele %{user} + in_language_title: Deníkové záznamy v jazyce %{language} + new: Nový záznam do deníku new_title: Vložit nový záznam do mého uživatelského deníku - no_entries: Žádné záznamy v deníčku - recent_entries: Nedávné deníčkové záznamy + no_entries: Žádné záznamy v deníku + recent_entries: Nedávné deníkové záznamy older_entries: Starší záznamy newer_entries: Novější záznamy edit: - title: Upravit deníčkový záznam + title: Upravit deníkový záznam subject: 'Předmět:' body: 'Text:' language: 'Jazyk:' @@ -316,19 +317,19 @@ cs: longitude: 'Zeměpisná délka:' use_map_link: použít mapu save_button: Uložit - marker_text: Místo deníčkového záznamu + marker_text: Místo deníkového záznamu view: - title: Deníček uživatele %{user} | %{title} - user_title: Deníček uživatele %{user} + title: Deník uživatele %{user} | %{title} + user_title: Deník uživatele %{user} leave_a_comment: Zanechat komentář login_to_leave_a_comment: '%{login_link} k zanechání komentáře' login: Přihlaste se save_button: Uložit no_such_entry: - title: Deníčkový záznam nenalezen + title: Deníkový záznam nenalezen heading: Záznam s ID %{id} neexistuje - body: Je nám líto, ale žádný deníčkový záznam či komentář s ID %{id} neexistuje. - Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz. + body: Je nám líto, ale žádný deníkový záznam či komentář s ID %{id} neexistuje. + Zkontrolujte překlepy, nebo jste možná klikli na chybný odkaz. diary_entry: posted_by: Zapsal %{link_user} %{created} v jazyce %{language_link} comment_link: Okomentovat tento zápis @@ -353,17 +354,16 @@ cs: edit: Upravit feed: user: - title: Záznamy v OpenStreetMap deníčku uživatele %{user} - description: Nedávné záznamy v OpenStreetMap deníčku uživatele %{user} + title: Záznamy v OpenStreetMap deníku uživatele %{user} + description: Nedávné záznamy v OpenStreetMap deníku uživatele %{user} language: - title: Deníčkové záznamy OpenStreetMap v jazyce %{language_name} - description: Nedávné záznamy v deníčcích uživatelů OpenStreetMap v jazyce - %{language_name} + title: Deníkové záznamy OpenStreetMap v jazyce %{language_name} + description: Nedávné záznamy v denících uživatelů OpenStreetMap v jazyce %{language_name} all: - title: Deníčkové záznamy OpenStreetMap - description: Nedávné záznamy v deníčcích uživatelů OpenStreetMap + title: Deníkové záznamy OpenStreetMap + description: Nedávné záznamy v denících uživatelů OpenStreetMap comments: - has_commented_on: '%{display_name} okomentoval následující záznamy v deníčku' + has_commented_on: '%{display_name} okomentoval následující záznamy v deníku' post: Záznam when: Kdy comment: Komentář @@ -446,10 +446,10 @@ cs: fuel: Čerpací stanice gambling: Hazardní hry grave_yard: Hřbitov - grit_bin: Zrnitý koÅ¡ + grit_bin: KoÅ¡ na Å¡těrk hospital: Nemocnice hunting_stand: Posed - ice_cream: Zmrzlinárna + ice_cream: Zmrzlina kindergarten: Mateřská Å¡kola library: Knihovna marketplace: Tržnice @@ -457,7 +457,7 @@ cs: motorcycle_parking: ParkoviÅ¡tě pro motocykly nightclub: Noční klub nursing_home: Pečovatelský dům - office: Úřad + office: Kancelář parking: ParkoviÅ¡tě parking_entrance: Vjezd na parkoviÅ¡tě parking_space: ParkoviÅ¡tě @@ -472,7 +472,7 @@ cs: public_building: Veřejná budova recycling: Tříděný odpad restaurant: Restaurace - retirement_home: Domov důchodců + retirement_home: Domov pro seniory sauna: Sauna school: Å kola shelter: Přístřeší @@ -486,7 +486,7 @@ cs: taxi: Taxi telephone: Telefonní automat theatre: Divadlo - toilets: Záchody + toilets: WC townhall: Radnice university: Univerzita vending_machine: Prodejní automat @@ -494,16 +494,16 @@ cs: village_hall: Společenský sál waste_basket: Odpadkový koÅ¡ waste_disposal: Popelnice - water_point: Bod vody + water_point: Vodní zdroj youth_centre: Centrum pro mládež boundary: administrative: Administrativní hranice census: Hranice pro potřeby sčítání national_park: Národní park - protected_area: Chráněná oblast + protected_area: Chráněné území bridge: aqueduct: Akvadukt - boardwalk: Tabulová chůze + boardwalk: Dřevěný chodník suspension: Visutý most swing: Otočný most viaduct: Viadukt @@ -970,6 +970,9 @@ cs: issues: index: title: Problémy + select_status: Vybrat status + select_type: Vybrat Typ + select_last_updated_by: Vybrat Naposled aktualizováno od reported_user: Nahlášený uživatel not_updated: Neaktualizováno search: Hledat @@ -978,6 +981,13 @@ cs: issues_not_found: Takové problémy nebyly nalezeny status: Stav reports: Hlášení + last_updated: Poslední změna + last_updated_time_html: před %{time} + last_updated_time_user_html: před %{time} od %{user} + link_to_reports: Zobrazit hlášení + reports_count: + one: 1 Hlášení + other: '%{count} Hlášení' reported_item: Hlášená položka states: ignored: Ignorováno @@ -993,9 +1003,13 @@ cs: zero: žádné one: 1 hlášení other: '%{count} hlášení' + report_created_at: První hlášení v %{datetime} + last_resolved_at: Naposledy vyřeÅ¡eno v %{datetime} + last_updated_at: Poslední aktualizace v %{datetime} od %{displayname} resolve: VyřeÅ¡it ignore: Ignorovat reopen: Znovu otevřít + reports_of_this_issue: Hlášení o tomto vydání read_reports: Číst hlášení new_reports: Nové hlášení other_issues_against_this_user: Další hlášení týkající se tohoto uživatele @@ -1008,8 +1022,10 @@ cs: reopen: reopened: Stav problému změněn na „Otevřeno” comments: + created_at: V %{datetime} reassign_param: Znovu pověřit řeÅ¡ením problému? reports: + updated_at: V %{datetime} reported_by_html: Nahlášeno jako %{category} uživatelem %{user} helper: reportable_title: @@ -1032,10 +1048,20 @@ cs: resolve_with_user: Jste se pokusil/a problém řeÅ¡it přímo s dotčeným uživatelem. categories: diary_entry: + spam_label: Tento deník je / obsahuje spam + offensive_label: Tento deník je obscénní / urážlivý + threat_label: Tento deník obsahuje hrozbu other_label: Ostatní diary_comment: + spam_label: Tento komentář deníku je / obsahuje spam + offensive_label: Tento komentář deníku je obscénní / urážlivý + threat_label: Tento komentář deníku obsahuje hrozbu other_label: Ostatní user: + spam_label: Tento uživatelský profil je / obsahuje spam + offensive_label: Tento uživatelský profil je obscénní / urážlivý + threat_label: Tento uživatelský profil obsahuje hrozbu + vandal_label: Tento uživatel je vandal other_label: Ostatní note: spam_label: Tato poznámka je SPAM diff --git a/config/locales/da.yml b/config/locales/da.yml index 0bc3c825e..6d8ec7423 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -25,6 +25,7 @@ # Author: OleLaursen # Author: Peter Alberti # Author: Ruila +# Author: Saederup92 # Author: The real emj # Author: Winbladh --- @@ -238,6 +239,7 @@ da: reopened_by_anonymous: Genaktiveret af en anonym for %{when} siden hidden_by: Skjult af %{user} for %{when} siden + report: Rapporter dette notat query: title: Find kortobjekter introduction: Klik pÃ¥ kortet for at finde kortobjekter i nærheden. @@ -330,10 +332,12 @@ da: edit_link: Vis dette indlæg hide_link: Skjul dette indlæg confirm: Bekræft + report: Rapporter dette indlæg diary_comment: comment_from: Kommentar fra %{link_user}, %{comment_created_at} hide_link: Skjul denne kommentar confirm: Bekræft + report: Rapporter denne kommentar location: location: 'Sted:' view: Vis @@ -953,6 +957,31 @@ da: results: no_results: Ingen resultater fundet more_results: Flere resultater + issues: + index: + title: Problemer + select_status: Vælg status + select_type: Vælg type + not_updated: Ikke opdateret + search: Søg + user_not_found: Brugeren findes ikke + status: Status + last_updated: Sidst opdateret + states: + ignored: Ignoréret + show: + ignore: Ignorér + reports: + new: + categories: + diary_entry: + other_label: Andet + diary_comment: + other_label: Andet + user: + other_label: Andet + note: + other_label: Andet layouts: logo: alt_text: OpenStreetMap-logo @@ -2054,6 +2083,7 @@ da: friends_diaries: venners blogindlæg nearby_changesets: ændringssæt af brugere i nærheden nearby_diaries: blogindlæg af brugere i nærheden + report: Rapporter denne bruger popup: your location: Din position nearby mapper: Bruger i nærheden diff --git a/config/locales/eo.yml b/config/locales/eo.yml index b72ea0245..5a3f95644 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -857,7 +857,7 @@ eo: organic: Ekologi-manĝaĵa vendejo outdoor: Vojaĝil-vendejo paint: Farb-vendejo - pawnbroker: Lombardejo + pawnbroker: Mon-pruntejo (kontraÅ­ garantiaĵo) pet: Dombest-vendejo pharmacy: Apoteko photo: Fotovendejo diff --git a/config/locales/es.yml b/config/locales/es.yml index 4d8852c29..13f7e9f7b 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -22,6 +22,7 @@ # Author: Invadinado # Author: James # Author: Javiersanp +# Author: Jelou # Author: Johnarupire # Author: Jynus # Author: KATRINE1992 @@ -39,6 +40,7 @@ # Author: Pantareje # Author: PerroVerd # Author: Peter17 +# Author: Pompilos # Author: Remux # Author: Rubenwap # Author: Ruila @@ -69,7 +71,7 @@ es: node_tag: Etiqueta del nodo notifier: Notificador old_node: Nodo antiguo - old_node_tag: Etiqueta del nodo antiguo + old_node_tag: Etiqueta de nodo antiguo old_relation: Relación antigua old_relation_member: Miembro de la relación antigua old_relation_tag: Etiqueta de la relación antigua @@ -84,7 +86,7 @@ es: tracepoint: Punto de la traza tracetag: Etiqueta de la traza user: Usuario - user_preference: Preferencias de usuario + user_preference: Preferencia de usuario user_token: Pase de usuario way: Vía way_node: Nodo de la vía @@ -227,9 +229,9 @@ es: way: vía relation: relación start_rjs: - feature_warning: Cargando %{num_features} características, pueden hacer que - su navegador se ralentice o que no responda. ¿Está seguro de que desea mostrar - estos datos? + feature_warning: Cargando %{num_features} características, lo que puede hacer + que su navegador se ralentice o que no responda. ¿Está seguro de que desea + mostrar estos datos? load_data: Cargar datos loading: Cargando... tag_details: @@ -239,7 +241,7 @@ es: tag: La página en el wiki con la descripción de la etiqueta %{key}=%{value} wikidata_link: El elemento %{page} en Wikidata wikipedia_link: El artículo %{page} en Wikipedia - telephone_link: Llamar %{phone_number} + telephone_link: Llamar al %{phone_number} note: title: 'Nota: %{id}' new_note: Nota nueva @@ -284,10 +286,10 @@ es: title_user: Conjunto de cambios por %{user} title_friend: Conjuntos de cambios realizados por mis amigos title_nearby: Conjuntos de cambios realizados por usuarios cercanos - empty: No hay conjuntos de cambios encontrados. - empty_area: No hay conjuntos de cambios en esta área. + empty: No se han encontrado conjuntos de cambios. + empty_area: No hay conjuntos de cambios en este área. empty_user: No hay conjuntos de cambios por este usuario. - no_more: No hay más conjuntos de cambios encontrados. + no_more: No se han encontrado más conjuntos de cambios. no_more_area: No hay más conjuntos de cambios en esta área. no_more_user: No hay más conjuntos de cambios por este usuario. load_more: Cargar más diff --git a/config/locales/et.yml b/config/locales/et.yml index d7cf49e79..42dac5d62 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -153,24 +153,22 @@ et: relation_member: entry_role: '%{type} %{name} kui %{role}' type: - node: Sõlm + node: sõlm way: joon relation: relatsioon containing_relation: entry: Relatsioon %{relation_name} entry_role: Relatsioon %{relation_name} (kui %{relation_role}) not_found: - sorry: |- - Vabandame, %{type} - #%{id} ei leitud. + sorry: Vabandust, %{type} %{id} ei leitud. type: node: sõlme way: joont relation: relatsiooni changeset: muudatuskogumit - note: märkuse + note: märkust timeout: - sorry: Kahjuks võttis andmete (%{type} id-ga %{id}) laadimine liiga kaua aega. + sorry: Kahjuks võttis %{type} %{id} andmete laadimine liiga kaua aega. type: node: sõlme way: joone @@ -219,6 +217,7 @@ et: reopened_by_anonymous: Taasavatud anonüümse kasutaja poolt %{when} tagasi hidden_by: Peitnud %{user} %{when} tagasi + report: Teata sellest märkusest query: title: Info objektide kohta introduction: Klõpsa kaardil, et leida läheduses asuvad objektid. @@ -310,10 +309,12 @@ et: edit_link: Muuda seda sissekannet hide_link: Peida see sissekanne confirm: Kinnita + report: Teata sellest sissekandest diary_comment: comment_from: Kommentaar kasutajalt %{link_user} %{comment_created_at} hide_link: Peida see kommentaar confirm: Kinnita + report: Teata sellest kommentaarist location: location: 'Asukoht:' view: Vaata @@ -727,7 +728,7 @@ et: river: Jõgi stream: Oja wadi: Vadi - waterfall: Kosk + waterfall: Juga weir: Ülevool "yes": Veetee admin_levels: @@ -750,6 +751,43 @@ et: results: no_results: Ei leidnud midagi more_results: Veel tulemusi + reports: + new: + title_html: Kaebus (%{link}) + missing_params: Ei õnnestu uut kaebust koostada. + details: Palun esita probleemi kohta veel üksikasju (nõutav). + select: 'Vali kaebuse põhjus:' + disclaimer: + intro: Enne kui saadad saidi moderaatoritele kaebuse, veendu et + not_just_mistake: oled kindel, et tegu pole lihtsalt eksitusega; + unable_to_fix: sul ei õnnestu teiste kaastööliste abiga ise probleemi lahendada; + resolve_with_user: oled juba üritanud probleemi klaarida sellega seotud kasutaja + abiga. + categories: + diary_entry: + spam_label: See päeviku sissekanne sisaldab rämpspostitust + offensive_label: See päeviku sissekanne on kohatu või solvav + threat_label: See päeviku sissekanne sisaldab ähvardust + other_label: Muu + diary_comment: + spam_label: See päeviku kommentaar sisaldab rämpspostitust + offensive_label: See päeviku kommentaar on kohatu või solvav + threat_label: See päeviku kommentaar sisaldab ähvardust + other_label: Muu + user: + spam_label: See kasutajaprofiil sisaldab rämpspostitust + offensive_label: See kasutajaprofiil on kohatu või solvav + threat_label: See kasutajaprofiil sisaldab ähvardust + vandal_label: See kasutaja on vandaal + other_label: Muu + note: + spam_label: See märkus on rämpspostitus + personal_label: See märkus sisaldab isiklikke andmeid + abusive_label: See on märkuse väärkasutus + other_label: Muu + create: + successful_report: Sinu kaebus on edukalt vastu võetud. + provide_details: Palun sisesta nõutavad üksikasjad layouts: logo: alt_text: OpenStreetMapi logo @@ -1110,7 +1148,9 @@ et: (2007, www.and.com) contributors_nz_html: |- Uus-Meremaa: Sisaldab kaardiandmeid - asutusest Land Information New Zealand. Krooni autoriõigus kaitstud. + andmeteenusest LINZ, + mis on kasutatavad litsentsi + CC BY 4.0 tingimustel. contributors_si_html: |- Sloveenia: Sisaldab mõõdistus- ja kaardistusteenistuse ning @@ -1145,8 +1185,7 @@ et: trademarks_title_html: Kaubamärgid trademarks_1_html: OpenStreetMap, suurendusklaasi logo ja State of the Map on OpenStreetMap Foundationi registreeritud kaubamärgid. Kui sul on nende - märkide kasutamise kohta küsimusi, siis vaata meie Trademark - Policy">kaubamärgireegleid. + märkide kasutamise kohta küsimusi, siis vaata meie kaubamärgireegleid. index: js_1: Sa kas kasutad veebilehitsejat, mis ei toeta JavaScript'i või sa oled JavaScript'i ära keelanud. @@ -1289,6 +1328,7 @@ et: where_am_i: Kus see asub? where_am_i_title: Määra praegune asukoht otsimootori abil submit_text: Otsi + reverse_directions_text: Pööra suund key: table: entry: @@ -1793,6 +1833,7 @@ et: friends_diaries: sõprade päevikusissekanded nearby_changesets: lähedalasuvate kasutajate muudatuskogumid nearby_diaries: lähedalasuvate kasutajate päevikusissekanded + report: Teata sellest kasutajast popup: your location: Sinu asukoht nearby mapper: Lähedaloevad kaardistajad @@ -2180,6 +2221,7 @@ et: directions: engines: graphhopper_bicycle: Rattaga (GraphHopper) + graphhopper_car: Autoga (GraphHopper) graphhopper_foot: Jalgsi (GraphHopper) mapquest_bicycle: Rattaga (MapQuest) mapquest_car: Autoga (MapQuest) @@ -2191,6 +2233,12 @@ et: no_route: Ei suutnud leida teekonda nende kahe koha vahel. no_place: Kohta "%{place}" ei õnnestunud kahjuks leida. instructions: + continue_without_exit: 'Liigu edasi teele: %{name}' + endofroad_right_without_exit: 'Tee lõpus pööra paremale teele: %{name}' + turn_right_without_exit: 'Pööra paremale teele: %{name}' + turn_left_without_exit: 'Pööra vasakule teele: %{name}' + endofroad_left_without_exit: 'Tee lõpus pööra vasakule teele: %{name}' + start_without_exit: 'Alusta teelt: %{name}' unnamed: nimetu time: Kestus query: diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 63bbffb31..7ed15f7d5 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -650,6 +650,7 @@ eu: water_park: Ur jolas-parkea "yes": Aisialdia man_made: + adit: Galeriara sarrera beacon: Itsas argia beehive: Erlauntza breakwater: Dikea @@ -1407,9 +1408,9 @@ eu: contributors_nl_html: |- Herbehereak: Contains © AND data, 2007 (www.and.com) - contributors_nz_html: |- - Zeelanda Berria: datuak biltzen ditu - Zeelanda Berriko Landako informaziotik. Erregin Copyright erreserbatuta. + contributors_nz_html: 'Zeelanda Berria: LINZ + datu zerbitzuko datuak biltzen ditu, CC + BY 4.0 lizentziaren arabera berrerabili daitezkeenak.' contributors_si_html: |- Eslovenia: datuak biltzen ditu Burutzea eta Mapping Agintaritzatik eta diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 72f68c244..b0808825d 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -152,7 +152,7 @@ fa: hidden_commented_by: نظر مخفی از %{user}،‏ %{when} پیش commented_by: نظر از %{user}،‏ %{when} پیش - changesetxml: تغییرات انجام شده XML + changesetxml: Changeset XML osmchangexml: osmChange XML feed: title: تغییرات انجام شده %{id} @@ -275,8 +275,7 @@ fa: no_more_user: این کاربر تغییرات دیگری انجام نداده. load_more: بارگیری بیشتر timeout: - sorry: پوزش، فهرست تغییرات انجام شده ی درخواستی شما برای بازیابی بیش از حد زمان - میبرد. + sorry: پوزش، بازیابی فهرست تغییرات درخواستی شما خیلی زمان برد. rss: title_all: بحث در مورد جعبه تغییر OpenStreetMap title_particular: 'بحث در مورد جعبه تغییر شماره #% {changeset_id} OpenStreetMap' @@ -1173,7 +1172,7 @@ fa: reply_button: پاسخ unread_button: علامت‌گذاری به عنوان خوانده‌شده destroy_button: حذف - back: عقب + back: برگشت to: به wrong_user: شما بعنوان `%{user}' وارد سامانه شده‌اید اما پیامی که درخواست خواندنش را داده‌اید توسط کاربر ارسال نشده یا به او ارسال نشده‌است. برای امکان خواندن @@ -1534,17 +1533,17 @@ fa: preview: پیش‌نمایش markdown_help: title_html: تجزیه با مارک‌داون - headings: عنوان‌ ها + headings: عنوان‌‌بندی heading: عنوان subheading: عنوان فرعی - unordered: لیست نا مرتب + unordered: لیست نامرتب ordered: لیست مرتب first: اولین مورد second: دومین مورد link: پیوند text: متن image: تصویر - alt: متن جایگزین تصویر + alt: متن جایگزین url: نشانی اینترنتی welcome: title: خوش آمدید! @@ -1596,24 +1595,24 @@ fa: visibility: private: خصوصی (اشترک‌گذاری به‌صورت ناشناس، نقاط نامرتب) public: عمومی (نمایش در فهرست ردها بعنوان ناشناس و با نقاط نامرتب) - trackable: قابل پی‌گیری (اشتراک‌گذاری به‌صورت ناشناس، نقاط مرتب بر اساس زمان) + trackable: قابل ردگیری (اشتراک‌گذاری به‌صورت ناشناس، نقاط مرتب بر اساس زمان) identifiable: قابل شناسایی (نمایش در لیست ردها، قابل شناسایی، نقاط مرتب بر اساس زمان) new: upload_trace: بارگذاری رد GPS - upload_gpx: 'بارگذاری پرونده ی GPX:' + upload_gpx: 'بارگذاری پروندهٔ GPX:' description: 'توضیحات:' tags: 'برچسب‌ها:' - tags_help: جداشده توسط ویرگول + tags_help: جداشده با کاما (,) visibility: 'پدیداری:' visibility_help: این به چه معناست؟ upload_button: بارگذاری help: کمک create: upload_trace: بارگذاری رد GPS - trace_uploaded: پروندهٔ GPX شما بارگذاری شده است و در انتظار درج در پایگاه داده - است. این کار معمولاً کمتر از نیم ساعت طول می‌کشد و در صورت تکمیل، ایمیلی به - شما فرستاده خواهد شد. + trace_uploaded: پروندهٔ GPX شما بارگذاری شده و در انتظار درج در پایگاه‌داده + است. این کار معمولاً کمتر از نیم ساعت طول می‌کشد. هنگامی که انجام شد ایمیلی + برای شما فرستاده می‌شود. traces_waiting: one: شما %{count} رد منتظر بارگذاری دارید. لطفاً قبل از بارگذاری موارد بیشتر منتظر بمانید تا اینها بارگذاری بشوند که صف برای سایر کاربران بسته نشود. @@ -1632,7 +1631,7 @@ fa: owner: 'مالک:' description: 'شرح:' tags: 'برچسب‌ها:' - tags_help: جداشده توسط ویرگول + tags_help: جداشده با کاما (,) save_button: ذخیرهٔ تغییرات visibility: 'پدیداری:' visibility_help: به چه معنی است؟ @@ -1664,7 +1663,7 @@ fa: newer: ردهای تازه‌تر trace: pending: در انتظار - count_points: '‏%{count} نقطه' + count_points: ‏%{count} نقطه ago: '%{time_in_words_ago} پیش' more: بیشتر trace_details: مشاهده جزئیات رد @@ -1680,8 +1679,9 @@ fa: map: نقشه list: public_traces: ردهای GPS عمومی + my_traces: ردهای جی‌پی‌اس من public_traces_from: ردهای GPS عمومی از %{user} - description: مرور آخرین ردهای GPS بارگذاری شده + description: مرور آخرین ردهای GPS بارگذاری‌شده tagged_with: با %{tags} برچسب خورده empty_html: هنوز چیزی اینجا نیست. رد جدیدی بارگذاری کنید یا در صفحه @@ -1690,7 +1690,7 @@ fa: see_all_traces: دیدن همه ردها see_my_traces: ردهای من delete: - scheduled_for_deletion: پی‌گیری برای حذف برنامه ریزی شده + scheduled_for_deletion: این رد برای حذف زمان‌بندی شد make_public: made_public: رد عمومی شد offline_warning: @@ -1946,8 +1946,8 @@ fa: my edits: ویرایش های من my traces: ردهای من my notes: یادداشت‌های من - my messages: پیام های من - my profile: نمایه ی من + my messages: پیام‌های من + my profile: نمایهٔ من my settings: تنظیمات من my comments: نظرات من oauth settings: تنظیمات oauth @@ -1973,8 +1973,8 @@ fa: spam score: 'امتیاز هرزنامه:' description: شرح user location: موقعبت کاربر - if set location: مکان خانه تان را در صفحه ی %{settings_link} تنظیم کنید تا کاربران - نزدیک تان را ببینید. + if set location: مکان خانه‌تان را در صفحهٔ %{settings_link} تنظیم کنید تا کاربران + نزدیکتان را ببینید. settings_link_text: تنظیمات no friends: شما هنوز هیچ دوستی اضافه نکرده‌اید km away: '%{count} کیلومتر فاصله' @@ -2001,9 +2001,9 @@ fa: unhide_user: آشکار ساختن این کاربر delete_user: حذف این کاربر confirm: تأیید - friends_changesets: تغییرات انجام شده ی دوستان + friends_changesets: ویرایش‌های دوستان friends_diaries: روزنوشت‌های دوستان - nearby_changesets: تغییرات انجام شده ی کاربران نزدیک + nearby_changesets: ویرایش‌های کاربران نزدیک nearby_diaries: روزنوشت‌های کاربران نزدیک report: گزارش این کاربر popup: @@ -2104,7 +2104,7 @@ fa: make_friend: heading: افزودن %{user} بعنوان دوست؟ button: افزودن بعنوان دوست - success: '%{name} اکنون دوست شما است!' + success: اکنون %{name} دوست شماست! failed: پوزش، افزودن %{name} به عنوان دوست ناموفق بود. already_a_friend: شما در حال حاضر با %{name} دوست هستید. remove_friend: @@ -2321,15 +2321,15 @@ fa: embed: HTML custom_dimensions: تنظیم ابعاد سفارشی format: 'قالب:' - scale: 'مقیاس:' - image_size: تصویر لایه ی استاندارد را نشان می دهد در + scale: 'مقیاس: ‪' + image_size: 'لایهٔ استاندارد در تصویری به ‌این ابعاد نمایش داده می‌شود: ‎' download: دریافت short_url: آدرس کوتاه include_marker: شامل نشانگر center_marker: مرکز نقشه در نشانگر paste_html: برای درج در وب سایت HTML را جایگذاری کنید view_larger_map: نمایش نقشه بزرگتر - only_standard_layer: فقط از لایه استاندارد میتوان خروجی تصویری گرفت + only_standard_layer: فقط از لایهٔ استاندارد می‌توان خروجی تصویری گرفت embed: report_problem: گزارش مشکل key: @@ -2441,11 +2441,22 @@ fa: roundabout_with_exit: در میدان، خروجی %{exit} به طرف %{name} را انتخاب کنید unnamed: بی نام courtesy: جهت از %{link} + exit_counts: + first: اول + second: دوم + third: سوم + fourth: چهارم + fifth: پنجم + sixth: ششم + seventh: هفتم + eighth: هشتم + ninth: نهم + tenth: دهم time: مدت query: node: گره way: راه - relation: ارتباط + relation: رابطه nothing_found: ویژگی‌ای یافت نشد error: 'خطار در ارتباط %{server}: %{error}' timeout: اتمام زمان %{server} diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 0e099b30c..84aee173e 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -218,7 +218,7 @@ fi: load_data: Lataa tiedot loading: Ladataan tietoja... tag_details: - tags: Tagit + tags: Ominaisuustiedot wiki_link: key: Wikisivu avaimelle %{key} tag: Wikisivu tietueelle %{key}=%{value} @@ -248,6 +248,7 @@ fi: sitten hidden_by: Piilottanut käyttäjä %{user} %{when} sitten + report: Ilmianna karttailmoitus query: title: Ominaisuuskysely introduction: Näytä luettelo lähistön karttakohteista napsauttamalla karttaa. @@ -340,10 +341,12 @@ fi: edit_link: Muokkaa päiväkirjamerkintää hide_link: Piilota tämä merkintä confirm: Vahvista + report: Ilmianna julkaisu diary_comment: comment_from: Kommentti käyttäjältä %{link_user} %{comment_created_at} hide_link: Piilota tämä kommentti confirm: Vahvista + report: Ilmianna kommentti location: location: 'Sijainti:' view: Näytä @@ -964,6 +967,110 @@ fi: results: no_results: Ei hakutuloksia more_results: Lisää tuloksia + issues: + index: + title: Tapaukset + select_status: Valitse tila + select_type: Valitse tyyppi + select_last_updated_by: Valitse viimeisin päivittäjä + reported_user: Ilmiannettu + not_updated: Ei päivitetty + search: Etsi + search_guidance: 'Etsi tapauksia:' + user_not_found: Käyttäjää ei löydy + issues_not_found: Tapahtumia ei löytynyt + status: Tila + reports: Ilmiannot + last_updated: Päivitetty + last_updated_time_html: %{time} sitten + last_updated_time_user_html: käyttäjä %{user} %{time} + sitten + link_to_reports: Näytä ilmiannot + reports_count: + one: 1 ilmoitus + other: '%{count} ilmiantoa' + reported_item: Ilmiannettu kohde + states: + ignored: Aiheeton + open: Käsittelyssä + resolved: Ratkaistu + update: + new_report: Ilmianto on vastaanotettu + successful_update: Ilmianto on päivitetty + provide_details: Täydennä tarvittavat tiedot + show: + title: '%{status} Tapaus #%{issue_id}' + reports: + zero: Ei ilmiantoa + one: Yksi ilmianto + other: '%{count} ilmiantoa' + report_created_at: Ilmoitettu ensimmäisen kerran %{datetime} + last_resolved_at: Ratkaistu %{datetime} + last_updated_at: Viimeisin käsittelijä %{displayname} %{datetime} + resolve: Ratkaise + ignore: Merkitse aiheettomaksi + reopen: Avaa uudelleen + reports_of_this_issue: Ilmianna tapahtuma + read_reports: Lue ilmiantoja + new_reports: Uudet ilmiannot + other_issues_against_this_user: Muut tähän käyttäjään kohdistetut ilmiannot + no_other_issues: Ei muita tähän käyttäjään kohdistuvia ilmiantoja. + comments_on_this_issue: Tapauksen kommentit + resolve: + resolved: Tapaus on merkitty ratkaistuksi + ignore: + ignored: Tapaus on merkitty aiheettomaksi + reopen: + reopened: Tapaus on merkitty käsittelyssä olevaksi + comments: + created_at: '%{datetime}' + reassign_param: Haluatko määrittää tapauksen tilan uudelleen? + reports: + updated_at: '%{datetime}' + reported_by_html: Käyttäjä %{user} ilmiantanut merkinnällä %{category} + helper: + reportable_title: + diary_comment: '%{entry_title}, kommenttitunnus %{comment_id}' + note: Karttailmoitustunnus %{note_id} + issue_comments: + create: + comment_created: Kommentti jätetty + reports: + new: + title_html: Ilmianna %{link} + missing_params: Ilmoituksen luominen epäonnistui + details: Kuvaile ongelmaa (pakollinen) + select: 'Valitse ilmiannon syy:' + disclaimer: + intro: 'Varmista ennen ilmiantoa seuraavat asiat:' + not_just_mistake: Ongelma ei ole vain väärinkäsitys + unable_to_fix: Et voi ratkaista ongelmaa itse tai muun yhteisön tuella + resolve_with_user: Kyseinen käyttäjä ei ole ollut halukas yhteistyöhön + categories: + diary_entry: + spam_label: Päiväkirjamerkintä on roskapostia + offensive_label: Päiväkirjamerkintä on hyökkäävä + threat_label: Päiväkirjamerkintä sisältää uhkauksia + other_label: Muu + diary_comment: + spam_label: Päiväkirjamerkinnän kommentti on roskapostia + offensive_label: Päiväkirjamerkinnän kommentti on hyökkäävä + threat_label: Päiväkirjamerkinnän kommentti sisältää uhkauksia + other_label: Muu + user: + spam_label: Tämä käyttäjäsivu on roskapostia + offensive_label: Käyttäjäsivu on hyökkäävä + threat_label: Käyttäjäsivu sisältää uhkauksia + vandal_label: Käyttäjä harrastaa ilkivaltaa + other_label: Muu + note: + spam_label: Karttailmoitus on roskapostia + personal_label: Karttailmoitus sisältää henkilökohtaisia tietoja + abusive_label: Karttailmoitus on loukkaava + other_label: Muu + create: + successful_report: Ilmianto on rekisteröity + provide_details: Täydennä puuttuvat tiedot layouts: logo: alt_text: OpenStreetMap-logo @@ -977,6 +1084,7 @@ fi: edit: Muokkaa history: Historia export: Vienti + issues: Ilmiannot data: Tiedot export_data: Vie tiedostona gps_traces: GPS-jäljet @@ -1309,8 +1417,9 @@ fi: contributors_nl_html: |- Alankomaat: Sisältää © AND-karttatietoja vuodelta 2007 (www.and.com) - contributors_nz_html: 'Uusi-Seelanti: Sisältää karttatietoja - Land Information New Zealandista. Crown Copyright.' + contributors_nz_html: |- + Uusi-Seelanti: Sisältää karttatietoja LINZ-tietopalvelusta, jotka on lisensoitu jatkokäyttöä varten + CC BY 4.0 -lisenssillä. contributors_si_html: "Slovenia: Sisältää \nMaanmittaus- ja kartoitusviranomaisen sekä\nMaatalous-, metsä- ja ruokaministeriön tuottamia karttatietoja\n(Slovenian julkista @@ -1629,12 +1738,13 @@ fi: identifiable: Tunnistettavissa (näytetään jälkiluettelossa ja pisteet tunnistettavasti järjestettynä aikaleimoineen) new: + upload_trace: Tallenna GPS-jälki upload_gpx: 'Tallenna GPX-tiedosto:' description: 'Kuvaus:' - tags: 'Tagit:' - tags_help: pilkuilla erotettu lista + tags: 'Ominaisuustiedot:' + tags_help: pilkuilla eroteltu lista visibility: 'Näkyvyys:' - visibility_help: mitä tämä tarkoittaa? + visibility_help: Mitä tämä tarkoittaa? visibility_help_url: https://wiki.openstreetmap.org/wiki/Fi:GPS-j%C3%A4lkien_julkisuus upload_button: Tallenna help: Ohje @@ -1665,13 +1775,13 @@ fi: edit: muokkaa owner: 'Käyttäjä:' description: 'Kuvaus:' - tags: 'Tagit:' - tags_help: pilkuilla erotettu lista + tags: 'Ominaisuustiedot:' + tags_help: pilkuilla eroteltu lista save_button: Tallenna muutokset visibility: 'Näkyvyys:' - visibility_help: mitä tämä tarkoittaa? + visibility_help: Mitä tämä tarkoittaa? trace_optionals: - tags: Tagit + tags: Ominaisuustiedot view: title: Näytetään jälkeä %{name} heading: Näytetään jälkeä %{name} @@ -1685,7 +1795,7 @@ fi: edit: muokkaa owner: 'Käyttäjä:' description: 'Kuvaus:' - tags: Tagit + tags: 'Ominaisuustiedot:' none: Ei mitään edit_track: Muokkaa jäljen tietoja delete_track: Poista tämä jälki @@ -1745,8 +1855,12 @@ fi: require_cookies: cookies_needed: Selaimen evästeet on otettu pois päältä - salli evästeiden käyttö selaimessasi ennen jatkamista. + require_admin: + not_an_admin: Vain pääkäyttäjät voivat käyttää tätä toimintoa. require_moderator: not_a_moderator: Tämän toiminnon suorittamiseksi sinun on oltava ylläpitäjä. + require_moderator_or_admin: + not_a_moderator_or_admin: Vain ylläpitäjät voivat käyttää tätä toimintoa. setup_user_auth: blocked_zero_hour: Olet saanut kiireellisen viestin OpenStreetMapin verkkopalvelussa. Viesti on luettava, ennen kuin karttaan voi tallentaa muutoksia. @@ -2037,6 +2151,7 @@ fi: friends_diaries: kaverien päiväkirjamerkinnät nearby_changesets: lähialueen käyttäjien muutoskokoelmat nearby_diaries: lähialueen käyttäjien päiväkirjamerkinnät + report: Ilmianna käyttäjä popup: your location: Oma sijaintisi nearby mapper: Lähellä oleva kartoittaja diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ab2a24bb3..6ace815b4 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1808,10 +1808,10 @@ fr: tags_help: données séparées par des virgules visibility: 'Visibilité :' visibility_help: qu’est-ce que cela veut dire ? - visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces + visibility_help_url: https://wiki.openstreetmap.org/wiki/FR:Visibilit%C3%A9_des_traces_GPS upload_button: Envoyer help: Aide - help_url: https://wiki.openstreetmap.org/wiki/Upload + help_url: https://wiki.openstreetmap.org/wiki/FR:Upload create: upload_trace: Envoyer la trace GPS trace_uploaded: Votre fichier GPX a été envoyé et est en attente de son intégration diff --git a/config/locales/gl.yml b/config/locales/gl.yml index ef31c19eb..ff2a4c122 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -6,6 +6,7 @@ # Author: Elisardojm # Author: Gallaecio # Author: Macofe +# Author: Maria zaos # Author: Navhy # Author: Nemo bis # Author: Toliño @@ -217,6 +218,7 @@ gl: reopened_by_anonymous: Reactivado por un anónimo hai %{when} hidden_by: Agochado por %{user} hai %{when} + report: Informar desta nota query: title: Consultar as características introduction: Prema no mapa para atopar características preto de aquí. @@ -309,10 +311,12 @@ gl: edit_link: Editar esta entrada hide_link: Agochar esta entrada confirm: Confirmar + report: Informar desta entrada diary_comment: comment_from: Comentario de %{link_user} o %{comment_created_at} hide_link: Agochar este comentario confirm: Confirmar + report: Informar deste comentario location: location: 'Localización:' view: Ver @@ -937,27 +941,74 @@ gl: issues: index: title: Problemas + select_status: Seleccionar estado select_type: Seleccionar tipo + select_last_updated_by: Seleccionar última actualización por + reported_user: Usuario denunciado + not_updated: Non Actualizados search: Procurar + search_guidance: 'Procurar problemas:' user_not_found: O usuario non existe + issues_not_found: Non se atoparon problemas status: Estado reports: Informes + last_updated: Última actualización + last_updated_time_html: Hai %{time} + last_updated_time_user_html: Hai %{time} por %{user} link_to_reports: Ver informes + reports_count: + one: 1 informe + other: '%{count} informes' + reported_item: Elemento informado states: ignored: Ignorados + open: Abertos + resolved: Resoltos + update: + new_report: O seu informe rexistrouse con éxito + provide_details: Por favor, achegue os detalles que se lle requiren. show: + last_updated_at: Última actualización o %{datetime} por%{displayname} resolve: Resolver ignore: Ignorar reopen: Reabrir new_reports: Informes novos + resolve: + resolved: O estado da incidencia pasou a "Resolta" + ignore: + ignored: O estado da incidencia pasou a "Ignorada" + reopen: + reopened: O estado da incidencia pasou a "Aberta" + comments: + created_at: O %{datetime} + reports: + updated_at: O %{datetime} + helper: + reportable_title: + note: Nota n.º %{note_id} + issue_comments: + create: + comment_created: O comentario creouse correctamente reports: new: + details: Por favor, achegue máis detalles sobre o problema (requirido) + select: Seleccione unha razón pola que queira informarnos + disclaimer: + not_just_mistake: Vostede está seguro/a de que o problema non é un simple + erro + unable_to_fix: Non é quen de arranxar o problema só ou coa axuda dos membros + da comunidade + resolve_with_user: Vostede xa tentou resolver o problema co usuario en cuestión categories: diary_entry: + spam_label: Esta entrada de diario é/contén spam + offensive_label: Esta entrada do diario é obscena/ofensiva + threat_label: Esta entrada de diario contén unha ameaza other_label: Outro diary_comment: other_label: Outro user: + spam_label: Esta conta de usuario/a é/contén spam offensive_label: Este perfil de usuario é ofensivo/obsceno threat_label: Este perfil de usuario contén unha ameaza vandal_label: Este usuario é un vándalo @@ -967,6 +1018,9 @@ gl: personal_label: Esta nota contén datos persoais abusive_label: Esta nota é abusiva other_label: Outro + create: + successful_report: O seu informe rexistrouse con éxito + provide_details: Por favor, achegue os detalles que se lle solicitan. layouts: logo: alt_text: Logotipo do OpenStreetMap @@ -1670,14 +1724,17 @@ gl: identifiable: Identificable (mostrado na lista de pistas e como identificable; puntos ordenados coa data e hora) new: + upload_trace: Subir traza GPS upload_gpx: 'Cargar un ficheiro GPX:' description: 'Descrición:' tags: 'Etiquetas:' tags_help: separadas por comas visibility: 'Visibilidade:' visibility_help: que significa isto? + visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces upload_button: Subir help: Axuda + help_url: https://wiki.openstreetmap.org/wiki/Upload create: upload_trace: Cargar unha pista GPS trace_uploaded: O seu ficheiro GPX foi cargado e está pendente de inserción @@ -2085,6 +2142,7 @@ gl: friends_diaries: entradas de diario dos amigos nearby_changesets: conxuntos de cambios dos usuarios de lugares próximos nearby_diaries: entradas de diario dos usuarios de lugares próximos + report: Denunciar este usuario popup: your location: A súa localización nearby mapper: Cartógrafo próximo diff --git a/config/locales/he.yml b/config/locales/he.yml index 547f70fff..ffe78393e 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -951,6 +951,7 @@ he: index: title: בעיות select_status: לבחור מצב + select_type: בחר סוג layouts: logo: alt_text: הלוגו של OpenStreetMap diff --git a/config/locales/is.yml b/config/locales/is.yml index f3e45ded4..0371dbf67 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -227,6 +227,7 @@ is: reopened_by_anonymous: Endurvirkjað af nafnlausum notanda fyrir %{when} síðan hidden_by: Falið af %{user} fyrir %{when} síðan + report: Tilkynna þennan minnispunkt query: title: Rannsaka fitjur introduction: Smelltu á kortið til að finna fitjur í nágrenninu. @@ -319,10 +320,12 @@ is: edit_link: Breyta þessari færslu hide_link: Fela þessa færslu confirm: Staðfestu + report: Tilkynna þessa færslu diary_comment: comment_from: Athugasemd eftir %{link_user} sett inn %{comment_created_at} hide_link: Fela þessa athugasemd confirm: Staðfestu + report: Tilkynna þessa athugasemd location: location: 'Staðsetning:' view: kort @@ -943,6 +946,60 @@ is: results: no_results: Ekkert fannst more_results: Fleiri niðurstöður + issues: + index: + title: Vandamál + select_status: Veldu stöðu + select_type: Veldu gerð + select_last_updated_by: Veldu síðast uppfært af + reported_user: Tilkynntur notandi + not_updated: Ekki uppfært + search: Leita + search_guidance: 'Leita að vandamálum:' + user_not_found: Notandi er ekki til + issues_not_found: Engin slík vandamál fundust + status: Staða + reports: Skýrslur + last_updated: Síðast uppfært + last_updated_time_html: fyrir %{time} síðan + last_updated_time_user_html: fyrir %{time} síðan + af %{user} + link_to_reports: Skoða skýrslur + reports_count: + one: 1 skýrsla + other: '%{count} skýrslur' + reported_item: Tilkynnt atriði + states: + ignored: Hunsað + open: Opna + resolved: Leyst + show: + resolve: Leysa + ignore: Hunsa + reopen: Enduropna + read_reports: Lesta skýrslur + new_reports: Nýjar skýrslur + comments: + created_at: Þann %{datetime} + reports: + updated_at: Þann %{datetime} + helper: + reportable_title: + note: 'Minnispunktur #%{note_id}' + reports: + new: + categories: + diary_entry: + other_label: Annað + diary_comment: + other_label: Annað + user: + vandal_label: Þessi notandi er að skemma + other_label: Annað + note: + spam_label: Þessi minnispunktur er ruslpóstur + abusive_label: Þessi minnispunktur er misnotkun + other_label: Annað layouts: project_name: title: OpenStreetMap @@ -959,6 +1016,7 @@ is: edit: Breyta history: Breytingaskrá export: Flytja út + issues: Vandamál data: Gögn export_data: Flytja út gögn gps_traces: GPS ferlar @@ -1325,7 +1383,7 @@ is: (www.and.com) contributors_nz_html: |- Nýja-Sjáland: Inniheldur gögn með uppruna frá - Land Information New Zealand. Með Crown Copyright höfundarrétti. + LINZ Data Service og er með notkunarleyfi til endurnýtingar fyrir CC BY 4.0. contributors_si_html: |- Slóvenía: Inniheldur gögn frá landmælinga og kortagerðaryfirvöldum og @@ -1659,6 +1717,7 @@ is: identifiable: Auðkennanlegur (sýndur í ferlalista sem auðkennanlegir, raðaðir punktar með tímastimpli) new: + upload_trace: Senda inn GPS feril upload_gpx: 'Hlaða inn GPX skrá:' description: 'Lýsing:' tags: 'Merki:' @@ -1770,8 +1829,13 @@ is: require_cookies: cookies_needed: Þú virðist ekki vera með stuðning við vefkökur í vafranum þínum. Þú verður að virkja þann stuðning áður en þú getur haldið áfram. + require_admin: + not_an_admin: Þú þarft að vera möppudýr til að framkvæma þessa aðgerð. require_moderator: not_a_moderator: Þú þarft að vera ritstjóri til að framkvæma þessa aðgerð. + require_moderator_or_admin: + not_a_moderator_or_admin: Þú þarft að vera ritstjóri til að framkvæma þessa + aðgerð setup_user_auth: blocked_zero_hour: Þú átt áríðandi skilaboð á OpenStreetMap vefsvæðinu. Þú verður að lesa þessi skilaboð áður en þú getur aftur vistað neinar breytingar. @@ -2079,6 +2143,7 @@ is: friends_diaries: bloggfærslur vina nearby_changesets: breytingasett vina í næsta nágrenni nearby_diaries: bloggfærslur vina í næsta nágrenni + report: Tilkynna þennan notanda popup: your location: Staðsetning þín nearby mapper: Nálægur notandi diff --git a/config/locales/it.yml b/config/locales/it.yml index 49f32068f..5c553e0cb 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -194,7 +194,7 @@ it: entry: Relazione %{relation_name} entry_role: Relazione %{relation_name} (come %{relation_role}) not_found: - sorry: 'Spiacenti, %{type} #%{id} non può essere trovato.' + sorry: 'Impossibile trovare %{type} #%{id}.' type: node: nodo way: percorso diff --git a/config/locales/ja.yml b/config/locales/ja.yml index ae112dab3..4d9db692c 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1873,6 +1873,7 @@ ja: friends_diaries: 友達の日記エントリ nearby_changesets: 周辺の利用者のメモ nearby_diaries: 周辺のユーザーの日記エントリ + report: この利用者を報告 popup: your location: 自分の位置 nearby mapper: 周辺のマッパー diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 0bfbbb2d7..e88172174 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -1,6 +1,7 @@ # Messages for Kabyle (Taqbaylit) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Alem # Author: Belkacem77 # Author: Mastanabal # Author: Mhenni @@ -136,6 +137,8 @@ kab: title_comment: Agraw n ubeddel %{id} - %{comment} join_discussion: Qqen akken ad tedduḍ ar usqerdec discussion: Asqerdec + still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa + ttwamedlen. node: title: 'Takerrist: %{name}' history_title: 'Amazray n tkerrist: %{name}' @@ -217,6 +220,7 @@ kab: reopened_by_anonymous: Irmed-it useqdac udrig %{when} aya hidden_by: Yeffer-it %{user} %{when} aya + report: Sillef tazmilt agi query: title: Tuttriwin É£ef tÉ£awsiwin introduction: Sit É£ef tkarḍa allen ad tafeḍ tiÉ£awsiwin iqeṛben. @@ -309,10 +313,12 @@ kab: edit_link: Ẓreg anekcam-agi hide_link: Ffer anekcam-agi confirm: Sentem + report: Sillef anekcum agi diary_comment: comment_from: Awennit n %{link_user} di %{comment_created_at} hide_link: Ffer awennit-agi confirm: Sentem + report: Sillef awennit agi location: location: 'Adig:' view: Sken @@ -353,12 +359,18 @@ kab: chair_lift: TilisÉ£imt drag_lift: Tiliski gondola: TilituzdiÉ£t + platter: Asalay n uḍebsi + pylon: Aɛmud station: TaÉ£sert n tilituzdiÉ£t + t-bar: Amessawen n tafeggagt s T aeroway: aerodrome: Anafag + airstrip: Tazribt n tarussi apron: Tamnaḍt n usseÉ£ser gate: Tabburt helipad: Anafag n ukuptir + holding_position: Ideg n taganit + parking_position: Amḍiq n aniÉ£sur runway: TafuÉ£alt taxiway: Abrid n tkeṛṛust n unafag terminal: Anemdu @@ -404,6 +416,7 @@ kab: fuel: AserÉ£u gambling: Uraren yidrimen grave_yard: Tajebbant + grit_bin: Asenduq n tasent hospital: Sbiá¹­ar hunting_stand: Tanefsart n uselfeÉ£ ice_cream: Tamagrist @@ -417,6 +430,7 @@ kab: office: Tanarit parking: AneÉ£sar parking_entrance: Tabburt n uneÉ£sar + parking_space: Amḍiq n aniÉ£sur pharmacy: Tansafart place_of_worship: Amḍiq n weɛbad police: Tamsulta @@ -458,6 +472,8 @@ kab: national_park: Taẓribt taÉ£elnawt protected_area: Tamnaḍt yettwaḥerzen bridge: + aqueduct: Aqadus + boardwalk: Amerreḥ suspension: Tiqená¹­ert iɛelqen swing: Tillegwit yeddawaren viaduct: Tiqená¹­aṛt @@ -476,8 +492,11 @@ kab: tailor: Axeggaḍ "yes": Taḥanutt n Tinḍi emergency: + ambulance_station: TaÉ£sirt n tasindut + assembly_point: Tineqiḍt n timlilit landing_site: Annar n trusi n utrab phone: TiliÉ£ri n utrab + water_tank: Tanutfi n waman utrib highway: abandoned: Abrid agejdan yettwattun bridleway: AÉ£aras n yimnayen diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 51358e602..e6bccdb82 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -981,18 +981,23 @@ ko: successful_update: 보고서가 성공적으로 업데이트되었습니다 provide_details: 필수 상세 정보를 지정해 주십시오 show: + title: '%{status} 문제 #%{issue_id}' reports: zero: 보고서 없음 one: 보고서 1개 other: 보고서 %{count}개 report_created_at: '%{datetime}에 처음 보고됨' + last_resolved_at: '%{datetime}에 마지막으로 해결됨' + last_updated_at: '%{displayname}에 의해 %{datetime}에 마지막으로 갱신됨' resolve: 해결 ignore: 무시 reopen: 다시 열림 reports_of_this_issue: 이 이슈의 ë³´ê³  read_reports: 보고서 읽기 new_reports: 새 보고서 + other_issues_against_this_user: 이 사용자에 대한 다른 문제 no_other_issues: 이 사용자에 대한 다른 이슈가 없습니다. + comments_on_this_issue: 해당 이슈에 대한 의견 resolve: resolved: 이슈 상태가 '해결됨'으로 설정되었습니다 ignore: @@ -1000,9 +1005,18 @@ ko: reopen: reopened: 이슈 상태가 '열림'으로 설정되었습니다 comments: + created_at: '%{datetime}에' reassign_param: 이슈를 다시 할당하시겠습니까? reports: + updated_at: '%{datetime}에' reported_by_html: '%{user}님이 %{category} 분류로 보고함' + helper: + reportable_title: + diary_comment: '%{entry_title}, 댓글 #%{comment_id}' + note: '노트 #%{note_id}' + issue_comments: + create: + comment_created: 댓글이 성공적으로 만들어졌습니다 reports: new: title_html: '%{link} ë³´ê³ ' @@ -1013,11 +1027,14 @@ ko: intro: '보고서를 사이트 운영자에게 보내기 전에 다음을 확인하십시오:' not_just_mistake: 문제가 그저 실수가 아님을 확신합니다 unable_to_fix: 직접 또는 동료 공동체 회원의 도움을 받아 문제를 해결할 수 없습니다 + resolve_with_user: 사용자와 관련된 문제를 이미 해결하려고 시도했습니다 categories: diary_entry: spam_label: 이 일기 항목은 스팸입니다 + offensive_label: 이 일기 항목은 음란물이거나 모욕적입니다 other_label: 기타 diary_comment: + spam_label: 이 일기 댓글은 스팸입니다 other_label: 기타 user: spam_label: 이 사용자 프로필은 스팸이거나 스팸을 포함합니다 @@ -1025,11 +1042,16 @@ ko: vandal_label: 이 사용자는 문서 훼손자입니다 other_label: 기타 note: + spam_label: 이 노트는 스팸입니다 + personal_label: 이 노트에 개인 정보가 있습니다 + abusive_label: 이 주석은 부적절합니다 other_label: 기타 create: successful_report: 보고서가 성공적으로 등록되었습니다 provide_details: 필수 상세 정보를 지정해 주십시오 layouts: + project_name: + title: 오픈스트리트맵 logo: alt_text: OpenStreetMap 로고 home: 현재 위치로 가기 @@ -1349,9 +1371,9 @@ ko: contributors_nl_html: |- 네덜란드: © AND 데이터, 2007년 (www.and.com)을 포함합니다. - contributors_nz_html: |- - 뉴질랜드: Land Information New Zealand에서의 - 데이터를 포함합니다. Crown이 저작권을 소유합니다. + contributors_nz_html: '뉴질랜드: LINZ + 데이터 서비스의 데이터를 포함하며, CC + BY 4.0에 따라 재사용될 수 있습니다.' contributors_si_html: |- 슬로베니아: Surveying and Mapping Authority와 Ministry of Agriculture, Forestry and Food @@ -2066,7 +2088,7 @@ ko: current email address: '현재 이메일 주소:' new email address: '새 이메일 주소:' email never displayed publicly: (절대 공개하지 않습니다) - external auth: '바깥 인증:' + external auth: '외부 인증:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: 이게 뭐죠? @@ -2407,6 +2429,8 @@ ko: new: intro: 실수했거나 없는 무언가를 발견했나요? 다른 매퍼에게 알려주어 ê³ ì¹  수 있게 해주세요. 마커를 올바른 위치로 이동하고, 참고를 남겨 문제를 설명해주세요. + advice: 노트는 공개되어 지도 업데이트에 쓰일 수 있으므로 개인 정보 또는 저작권이 있는 지도나 디렉터리 리스팅의 정보를 입력하지 + 마십시오. add: 참고 추가 show: anonymous_warning: 익명 사용자의 참고도 있으므로 별도로 확인해야 합니다. @@ -2435,8 +2459,21 @@ ko: instructions: continue_without_exit: '%{name}(으)로 계속 가세요' slight_right_without_exit: '%{name}을(를) 따라 오른쪽으로 완만하게 도세요' + offramp_right: 우측 램프로 이동 + offramp_right_with_exit: 우측 %{exit} 출구로 이동 + offramp_right_with_exit_name: '%{name} 쪽으로 우측 %{exit} 출구로 이동' + offramp_right_with_exit_directions: '%{directions} 방향으로 우측 %{exit} 출구로 이동' + offramp_right_with_exit_name_directions: '%{directions} 방향으로 %{name} 쪽으로 우측 + %{exit} 출구로 이동' offramp_right_with_name: 오른쪽에서 %{name}(으)로 진입하세요 + offramp_right_with_directions: '%{directions} 방향으로 좌측 램프로 이동' + offramp_right_with_name_directions: '%{directions} 방향으로 %{name} 쪽으로 우측 램프로 + 이동' onramp_right_without_exit: 경사로에서 %{name}(으)로 우회전 + onramp_right_with_directions: '%{directions} 방향으로 램프로 우회전' + onramp_right_with_name_directions: '%{directions} 방향으로 %{name} 쪽으로 램프로 우회전' + onramp_right_without_directions: 램프로 우회전 + onramp_right: 램프로 우회전 endofroad_right_without_exit: 길 끝쪽에서 %{name}(으)로 우회전 merge_right_without_exit: '%{name}을(를) 따라 우회전' fork_right_without_exit: 분기점에서 %{name}(으)로 우회전 @@ -2445,8 +2482,20 @@ ko: uturn_without_exit: '%{name}을(를) 따라 유턴하세요' sharp_left_without_exit: '%{name}을(를) 따라 왼쪽으로 꺾으세요' turn_left_without_exit: '%{name}을(를) 따라 왼쪽으로 도세요' + offramp_left: 좌측 램프로 이동 + offramp_left_with_exit: 좌측 %{exit} 출구로 이동 + offramp_left_with_exit_name: '%{name} 쪽으로 좌측 %{exit} 출구로 이동' + offramp_left_with_exit_directions: '%{directions} 방향으로 좌측 %{exit} 출구로 이동' + offramp_left_with_exit_name_directions: '%{directions} 방향으로 %{name} 쪽으로 좌측 + %{exit} 출구로 이동' offramp_left_with_name: '%{name}을(를) 향해 램프로 좌회전' + offramp_left_with_directions: '%{directions} 방향으로 좌측 램프로 이동' + offramp_left_with_name_directions: '%{directions} 방향으로 %{name} 쪽으로 램프로 이동' onramp_left_without_exit: 경사로에서 %{name}(으)로 좌회전 + onramp_left_with_directions: '%{directions} 방향으로 램프로 좌회전' + onramp_left_with_name_directions: '%{directions} 방향으로 %{name} 쪽으로 램프로 좌회전' + onramp_left_without_directions: 램프로 좌회전 + onramp_left: 램프로 좌회전 endofroad_left_without_exit: 길 끝쪽에서 %{name}(으)로 좌회전 merge_left_without_exit: '%{name}을(를) 따라 좌회전' fork_left_without_exit: 분기점에서 %{name}(으)로 좌회전 diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 26cd1d151..cc5fd72e6 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -1002,6 +1002,7 @@ ku-Latn: reopened: Rewşa pirsgirêk wekî "Vekirî" hat eyarkirin comments: created_at: Di %{datetime} de + reassign_param: Bila pirsgirêk ji nû ve bê tayînkirin? reports: updated_at: Di %{datetime} de reported_by_html: Ji aliyê %{user} ve wekî %{category} hat raporkirin diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 82372ef0f..bc1ff60fb 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -4,6 +4,7 @@ # Author: Aurimas # Author: Cyklopas # Author: Eitvys200 +# Author: Empers # Author: Garas # Author: Macofe # Author: Mantak111 @@ -249,7 +250,7 @@ lt: list: title: Pakeitimai title_user: Naudotojo %{user} pakeitimai - title_friend: JÅ«sų draugų pakeitimai + title_friend: Mano draugų pakeitimai title_nearby: Netoliese esančių naudotojų pakeitimai empty: Nerasta pakeitimų. empty_area: Nėra Å¡ios vietos pakeitimų. @@ -317,10 +318,12 @@ lt: edit_link: Keisti šį įrašą hide_link: Slėpti šį įrašą confirm: Patvirtinti + report: PraneÅ¡ti apie šį įrašą diary_comment: comment_from: Naudotojo %{link_user} komentaras, paraÅ¡ytas %{comment_created_at} hide_link: Slėpti šį komentarą confirm: Patvirtinti + report: PraneÅ¡ti apie šį komentarą location: location: 'Vieta:' view: ŽiÅ«rėti @@ -366,6 +369,7 @@ lt: aerodrome: Aerodromas apron: Oro uosto aikÅ¡telė gate: Vartai + hangar: Angaras helipad: Sraigtasparnių aikÅ¡telė parking_position: Stovėjimo Pozicija runway: Pakilimo takas @@ -490,6 +494,7 @@ lt: defibrillator: Defibriliatorius landing_site: Avarinio nusileidimo aikÅ¡telė phone: Avarinis telefonas + "yes": Avarinis highway: abandoned: Apleistas kelias bridleway: Jodinėjimo takas @@ -502,6 +507,7 @@ lt: emergency_access_point: Skubios prieigos punktas footway: Pėsčiųjų takas ford: Brasta + give_way: Ženklas "Duoti kelią" living_street: Gyvenamosios zonos gatvė milestone: Riboženklis motorway: Automagistralė @@ -630,6 +636,8 @@ lt: chimney: Kaminas crane: Kranas lighthouse: Å vyturys + mine: Kasykla + mineshaft: Kasyklos Å¡achta monitoring_station: Stebėjimo Stotis pipeline: Vamzdynas surveillance: Stebėjimas @@ -637,6 +645,7 @@ lt: watermill: Vandens MalÅ«nas water_tower: Vandens BokÅ¡tas water_well: Å ulinys + windmill: Vėjo malÅ«nas works: Gamykla "yes": Žmogaus sukurta military: @@ -894,6 +903,13 @@ lt: results: no_results: Daugiau rezultatų nėra more_results: Daugiau rezultatų + issues: + index: + search: IeÅ¡koti + states: + open: Atidaryta + show: + ignore: Ignoruoti layouts: logo: alt_text: OpenStreetMap logotipas diff --git a/config/locales/lv.yml b/config/locales/lv.yml index dcd36a514..3a05a949f 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -345,12 +345,12 @@ lv: geocoder: search: title: - latlon: Rezultāti no Iekšējās meklēšanas - ca_postcode: Rezultāti no Geocoder.CA - osm_nominatim: Rezultāti no OpenStreetMap + latlon: Rezultāti no Iekšējās meklēšanas + ca_postcode: Rezultāti no Geocoder.CA + osm_nominatim: Rezultāti no OpenStreetMap Nominatim geonames: Rezultāti no GeoNames - osm_nominatim_reverse: Rezultāti no OpenStreetMap + osm_nominatim_reverse: Rezultāti no OpenStreetMap Nominatim geonames_reverse: Rezultāti no GeoNames search_osm_nominatim: @@ -620,10 +620,16 @@ lv: "yes": AtpÅ«tas vieta man_made: beehive: BiÅ¡u strops + bridge: Tilts + bunker_silo: Bunkurs chimney: Skurstenis lighthouse: Bāka pipeline: Cauruļvads tower: Tornis + watermill: Ūdens dzirnavas + water_tower: Ūdens tornis + water_well: Aka + windmill: Vēja dzirnavas works: RÅ«pnÄ«ca "yes": Cilvēku radÄ«ts military: @@ -782,6 +788,7 @@ lv: jewelry: Juvelierizstrādājumu veikals kiosk: Kiosks laundry: Veļas mazgātava + lottery: Loterija mall: TirdzniecÄ«bas centrs market: Tirgus mobile_phone: Mobilo telefonu veikals @@ -858,7 +865,7 @@ lv: level10: PriekÅ¡pilsētas robeža description: title: - osm_nominatim: AtraÅ¡anās vieta no OpenStreetMap + osm_nominatim: AtraÅ¡anās vieta no OpenStreetMap Nominatim geonames: AtraÅ¡anās vieta no GeoNames types: @@ -868,6 +875,15 @@ lv: results: no_results: Nav atrasts neviens rezultāts more_results: Vairāk rezultātu + issues: + index: + search: Meklēt + status: Statuss + states: + ignored: Ignorēts + open: Atvērt + show: + ignore: Ignorēt layouts: logo: alt_text: OpenStreetMap logo @@ -1274,9 +1290,9 @@ lv: user_page_link: dalÄ«bnieka lapa anon_edits_link_text: Uzzini, kāpēc tā notiek. flash_player_required: Jums nepiecieÅ¡ams Flash playeris lai izmantotu Potlatch - - OpenStreetMap Flash redaktoru. JÅ«s varat Lejupielādēt + - OpenStreetMap Flash redaktoru. JÅ«s varat Lejupielādēt Flash Player no Adobe.com. OpenStreetMap rediģēšanai ir pieejamas arÄ«vairākas citas iespējas + href="https://wiki.openstreetmap.org/wiki/Editing">vairākas citas iespējas . potlatch_unsaved_changes: Tev ir nesaglabātas izmaiņas. (Lai saglabātu iekÅ¡ Potlatch, tev ir jānoņem atlase no esošā ceļa vai punkta, ja labojiet tieÅ¡raides @@ -1473,7 +1489,7 @@ lv: edit: Labot preview: PriekÅ¡skatÄ«jums markdown_help: - title_html: Parsēts ar Markdown + title_html: Parsēts ar Markdown headings: Virsraksti heading: Virsraksts subheading: ApakÅ¡virsraksts @@ -1916,6 +1932,7 @@ lv: if set location: Ja Tu uzstādi savu atraÅ¡anās vietu, skaista karte un sÄ«kumi parādÄ«sies Å¡eit. Tu vari uzstādÄ«t savu mājvietu savā %{settings_link} lapā. settings_link_text: iestatÄ«jumi + my friends: Mani draugi no friends: Tu vēl neesi pievienojis draugus. km away: '%{count} km attālumā' m away: '%{count} m attālumā' @@ -1945,6 +1962,7 @@ lv: friends_diaries: SkatÄ«t visus draugu dienasgrāmatu ierakstus nearby_changesets: SkatÄ«t visas tuvējo lietotāju izmaiņu kopas nearby_diaries: SkatÄ«t visus tuvējo lietotāju dienasgrāmatu ierakstus + report: Ziņot par Å¡o lietotāju popup: your location: JÅ«su atraÅ¡anās vieta nearby mapper: Kartētājs tuvējā apkārtnē @@ -1957,12 +1975,12 @@ lv: email never displayed publicly: (nekad netiek rādÄ«ta publiski) external auth: 'Ārējā autentifikācija:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: Kas tas ir? public editing: heading: 'Publiska rediģēšana:' enabled: Ieslēgts. Nav anonÄ«ms, un var rediģēt datus. - enabled link: http://wiki.OpenStreetMap.org/wiki/Anonymous_edits + enabled link: https://wiki.OpenStreetMap.org/wiki/Anonymous_edits enabled link text: Kas tas ir? disabled: Atspējots un nevar labot datus, visi iepriekšējie labojumi ir anonÄ«mi. disabled link text: Kāpēc nevar rediģēt? @@ -1971,7 +1989,7 @@ lv: text: PaÅ¡laik tavi labojumi ir anonÄ«mi un cilvēki nevar nosÅ«tÄ«t tev ziņojumus vai redzēt tavu atraÅ¡anās vietu. Lai parādÄ«tu, ko tu esi labojis un ļautu cilvēkiem sazināties ar tevi caur mājaslapu, spied uz pogu zemāk. KopÅ¡ - 0.6 API nomaiņas, tikai publiski lietotāji var labot karti. (uzzini + 0.6 API nomaiņas, tikai publiski lietotāji var labot karti. (uzzini kāpēc).