From: Richard Fairhurst Date: Sat, 8 Mar 2014 17:47:23 +0000 (+0000) Subject: Merge pull request #14 from tomhughes/routing X-Git-Tag: live~4261^2~23 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6?hp=5c0e96e0e0e99b3469c286f4bf77d4d0abf47c79 Merge pull request #14 from tomhughes/routing Routing --- diff --git a/Gemfile b/Gemfile index 8e0663427..d98a2a1fc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '4.0.2' +gem 'rails', '4.0.3' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 @@ -43,7 +43,7 @@ gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' gem 'composite_primary_keys', '>= 6.0.1' gem 'http_accept_language', '~> 2.0.0' -gem 'paperclip', '~> 3.0' +gem 'paperclip', '~> 4.0' gem 'deadlock_retry', '>= 1.2.0' gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.3', :require => 'i18n-js' gem 'rack-cors' @@ -73,7 +73,7 @@ gem 'httpclient' gem 'soap4r-ruby1.9' # Load memcache client in case we are using it -gem 'dalli', '~> 2.6.4' +gem 'dalli' gem 'kgio' # Gems useful for development @@ -86,3 +86,9 @@ group :test do gem 'timecop' gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20] end + +# Needed in development as well so rake can see konacha tasks +group :development, :test do + gem 'konacha' + gem 'poltergeist' +end diff --git a/Gemfile.lock b/Gemfile.lock index dd565f1ad..d477fcfca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,45 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.0.2) - actionpack (= 4.0.2) + actionmailer (4.0.3) + actionpack (= 4.0.3) mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) + actionpack (4.0.3) + activesupport (= 4.0.3) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - activemodel (4.0.2) - activesupport (= 4.0.2) + activemodel (4.0.3) + activesupport (= 4.0.3) builder (~> 3.1.0) - activerecord (4.0.2) - activemodel (= 4.0.2) + activerecord (4.0.3) + activemodel (= 4.0.3) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.2) + activesupport (= 4.0.3) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.2) + activesupport (4.0.3) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - arel (4.0.1) - atomic (1.1.14) + arel (4.0.2) + atomic (1.1.15) bigdecimal (1.1.0) builder (3.1.4) + capybara (2.2.1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) climate_control (0.0.3) activesupport (>= 3.0) + cliver (0.3.2) cocaine (0.5.3) climate_control (>= 0.0.3, < 1.0) coffee-rails (4.0.1) @@ -42,10 +49,11 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.7.0) + colorize (0.6.0) composite_primary_keys (6.0.1) activerecord (>= 4.0.0) - dalli (2.6.4) + dalli (2.7.0) deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) @@ -54,11 +62,11 @@ GEM multipart-post (>= 1.2, < 3) hike (1.2.3) htmlentities (4.3.1) - http_accept_language (2.0.0) + http_accept_language (2.0.1) httpclient (2.3.4.1) i18n (0.6.9) iconv (0.1) - jquery-rails (3.0.4) + jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -69,7 +77,13 @@ GEM jsonify (< 0.4.0) jwt (0.1.11) multi_json (>= 1.5) - kgio (2.8.1) + kgio (2.9.2) + konacha (3.1.0) + actionpack (>= 3.1, < 5) + capybara + colorize + railties (>= 3.1, < 5) + sprockets libxml-ruby (2.7.0) mail (2.5.4) mime-types (~> 1.16) @@ -98,51 +112,56 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.3) i18n - paperclip (3.5.2) + paperclip (4.1.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types pg (0.17.1) - polyglot (0.3.3) - psych (2.0.2) + poltergeist (1.5.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.4) + psych (2.0.4) r2 (0.2.2) rack (1.5.2) rack-cors (0.2.9) - rack-openid (1.4.1) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) + rails (4.0.3) + actionmailer (= 4.0.3) + actionpack (= 4.0.3) + activerecord (= 4.0.3) + activesupport (= 4.0.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) + railties (= 4.0.3) sprockets-rails (~> 2.0.0) rails-i18n (4.0.1) i18n (~> 0.6) rails (~> 4.0) - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) + railties (4.0.3) + actionpack (= 4.0.3) + activesupport (= 4.0.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.1) - redcarpet (3.0.0) + redcarpet (3.1.1) rinku (1.7.3) - ruby-openid (2.3.0) + ruby-openid (2.5.0) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.13) + sass (3.2.14) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) soap4r-ruby1.9 (2.0.5) - sprockets (2.10.1) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -152,8 +171,8 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) thor (0.18.1) - thread_safe (0.1.3) - atomic + thread_safe (0.2.0) + atomic (>= 1.1.7, < 2) tilt (1.4.1) timecop (0.7.1) treetop (1.4.15) @@ -165,6 +184,9 @@ GEM json (>= 1.8.0) validates_email_format_of (1.5.3) vendorer (0.1.14) + websocket-driver (0.3.2) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby @@ -175,7 +197,7 @@ DEPENDENCIES bigdecimal (~> 1.1.0) coffee-rails (~> 4.0.0) composite_primary_keys (>= 6.0.1) - dalli (~> 2.6.4) + dalli deadlock_retry (>= 1.2.0) dynamic_form htmlentities @@ -186,17 +208,19 @@ DEPENDENCIES json jsonify-rails kgio + konacha libxml-ruby (>= 2.0.5) minitest (~> 4.7.0) oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) openstreetmap-i18n-js (>= 3.0.0.rc5.3) - paperclip (~> 3.0) + paperclip (~> 4.0) pg + poltergeist psych r2 rack-cors - rails (= 4.0.2) + rails (= 4.0.3) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) diff --git a/Vendorfile b/Vendorfile index 7d7e7a66a..0cca4055c 100644 --- a/Vendorfile +++ b/Vendorfile @@ -11,13 +11,13 @@ folder 'vendor/assets' do end folder 'leaflet' do - file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.1/leaflet-src.js' - file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.1/leaflet.css' + file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet-src.js' + file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css' [ 'layers.png', 'layers-2x.png', 'marker-icon.png', 'marker-icon-2x.png', 'marker-shadow.png' ].each do |image| - file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.1/images/#{image}" + file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.2/images/#{image}" end from 'git://github.com/kajic/leaflet-locationfilter.git' do diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7072b7c6b..6ac398fc5 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,10 +20,6 @@ var querystring = require('querystring-component'); -function zoomPrecision(zoom) { - return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); -} - function remoteEditHandler(bbox, object) { var loaded = false, query = { @@ -78,7 +74,7 @@ function updateLinks(loc, zoom, layers, object) { args = { lat: loc.lat, - lon: loc.lon || loc.lng, + lon: 'lon' in loc ? loc.lon : loc.lng, zoom: zoom }; @@ -101,12 +97,6 @@ function updateLinks(loc, zoom, layers, object) { I18n.t('javascripts.site.edit_disabled_tooltip') : ''); } -// generate a cookie-safe string of map state -function cookieContent(map) { - var center = map.getCenter().wrap(); - return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|'); -} - function escapeHTML(string) { var htmlEscapes = { '&': '&', diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index f07f4331d..e5f6fe478 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -154,7 +154,7 @@ $(document).ready(function () { map._object); $.removeCookie("_osm_location"); - $.cookie("_osm_location", cookieContent(map), { expires: expiry, path: "/" }); + $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); if ($.cookie('_osm_welcome') == 'hide') { @@ -342,7 +342,7 @@ $(document).ready(function () { $(".describe_location").on("click", function(e) { e.preventDefault(); - var precision = zoomPrecision(map.getZoom()); + var precision = OSM.zoomPrecision(map.getZoom()); OSM.router.route("/search?query=" + encodeURIComponent( map.getCenter().lat.toFixed(precision) + "," + map.getCenter().lng.toFixed(precision))); diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js index fd658c532..6e6867e5b 100644 --- a/app/assets/javascripts/index/export.js +++ b/app/assets/javascripts/index/export.js @@ -36,7 +36,7 @@ OSM.Export = function(map) { } function setBounds(bounds) { - var precision = zoomPrecision(map.getZoom()); + var precision = OSM.zoomPrecision(map.getZoom()); $("#minlon").val(bounds.getWest().toFixed(precision)); $("#minlat").val(bounds.getSouth().toFixed(precision)); $("#maxlon").val(bounds.getEast().toFixed(precision)); diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index bb00f716c..443e47e76 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -121,9 +121,7 @@ L.OSM.layers = function(options) { .appendTo(overlaySection); function addOverlay(layer, name, maxArea) { - var refName = name.split(' ').join('_').toLowerCase(); var item = $('
  • ') - .attr('class', refName) .tooltip({ placement: 'top' }) @@ -139,7 +137,7 @@ L.OSM.layers = function(options) { .prop('checked', checked) .appendTo(label); - label.append(name); + label.append(I18n.t('javascripts.map.layers.' + name)); input.on('change', function() { checked = input.is(':checked'); @@ -170,12 +168,12 @@ L.OSM.layers = function(options) { $(item).attr('class', disabled ? 'disabled' : ''); item.attr('data-original-title', disabled ? - I18n.t('javascripts.site.' + refName + '_zoom_in_tooltip') : ''); + I18n.t('javascripts.site.map_' + name + '_zoom_in_tooltip') : ''); }); } - addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'), OSM.MAX_NOTE_REQUEST_AREA); - addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'), OSM.MAX_REQUEST_AREA); + addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA); + addOverlay(map.dataLayer, 'data', OSM.MAX_REQUEST_AREA); } options.sidebar.addPane($ui); diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb index 6c84bef55..35370ae99 100644 --- a/app/assets/javascripts/leaflet.map.js.erb +++ b/app/assets/javascripts/leaflet.map.js.erb @@ -36,7 +36,7 @@ L.OSM.Map = L.Map.extend({ name: I18n.t("javascripts.map.base.transport_map") }), new L.OSM.MapQuestOpen({ - attribution: copyright + ". Tiles courtesy of MapQuest ", + attribution: copyright + ". Tiles courtesy of MapQuest ", code: "Q", keyid: "mapquest", name: I18n.t("javascripts.map.base.mapquest") @@ -91,7 +91,7 @@ L.OSM.Map = L.Map.extend({ }, getUrl: function(marker) { - var precision = zoomPrecision(this.getZoom()), + var precision = OSM.zoomPrecision(this.getZoom()), params = {}; if (marker && this.hasLayer(marker)) { @@ -148,6 +148,11 @@ L.OSM.Map = L.Map.extend({ } var params = {}; + var layers = this.getLayersCode().replace('M', ''); + + if (layers) { + params.layers = layers; + } if (marker && this.hasLayer(marker)) { params.m = ''; diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 922bd2639..033b2de81 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -153,7 +153,7 @@ OSM = { center = center.wrap(); layers = layers.replace('M', ''); - var precision = zoomPrecision(zoom), + var precision = OSM.zoomPrecision(zoom), hash = '#map=' + zoom + '/' + center.lat.toFixed(precision) + '/' + center.lng.toFixed(precision); @@ -163,5 +163,16 @@ OSM = { } return hash; + }, + + zoomPrecision: function(zoom) { + return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); + }, + + locationCookie: function(map) { + var center = map.getCenter().wrap(), + zoom = map.getZoom(), + precision = OSM.zoomPrecision(zoom); + return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join('|'); } }; diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index 6a0d38dd5..fb4aa0300 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -36,7 +36,7 @@ $(document).ready(function () { map.on("click", function (e) { if ($('#updatehome').is(':checked')) { var zoom = map.getZoom(), - precision = zoomPrecision(zoom), + precision = OSM.zoomPrecision(zoom), location = e.latlng.wrap(); $('#homerow').removeClass(); diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 4eefddbe7..51f3c7e93 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -104,10 +104,6 @@ body { height: 100%; } -body.slim { - background-color: #f0f0f0; -} - h1, h2, h3 { font-weight: 600; line-height: 1.2; @@ -1330,42 +1326,6 @@ tr.turn:hover { z-index: 2000; } -#slim_container { - width: 100%; -} - -#slim_container_content { - max-width: 50em; - background-color: #FFFFFF; - margin: $lineheight/2 auto; - padding: 3px; - border-radius: 25px; - -moz-border-radius: 25px; - border: 1px solid #e6e6e6; -} - -#slim_content { - margin: $lineheight/2; - margin-top: 95px; - max-width: 50em; - - .content-heading { - margin-bottom: 15px; - } -} - -#slim_header { - margin: 30px $lineheight/2; - position: absolute; - top: 0px; - margin-right: $lineheight/4; - img { - vertical-align: middle; - margin-bottom: $lineheight/4; - margin-right: $lineheight/4; - } -} - /* Rules for small maps in content areas */ .content_map { diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 692ae24dd..73422c2f0 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -16,7 +16,7 @@ class GeocoderController < ApplicationController if params[:lat] && params[:lon] @sources.push "latlon" @sources.push "osm_nominatim_reverse" - @sources.push "geonames_reverse" + @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME) elsif params[:query].match(/^\d{5}(-\d{4})?$/) @sources.push "us_postcode" @sources.push "osm_nominatim" @@ -194,11 +194,14 @@ class GeocoderController < ApplicationController # get query parameters query = params[:query] + # get preferred language + lang = I18n.locale.to_s.split("-").first + # create result array @results = Array.new # ask geonames.org - response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&maxRows=20&username=#{GEONAMES_USERNAME}") + response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{GEONAMES_USERNAME}") # parse the response response.elements.each("geonames/geoname") do |geoname| @@ -255,11 +258,14 @@ class GeocoderController < ApplicationController lat = params[:lat] lon = params[:lon] + # get preferred language + lang = I18n.locale.to_s.split("-").first + # create result array @results = Array.new # ask geonames.org - response = fetch_xml("http://ws.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}") + response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{GEONAMES_USERNAME}") # parse the response response.elements.each("geonames/countrySubdivision") do |geoname| diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 38c9b2f3d..fd638e4e7 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -29,6 +29,7 @@ class MessageController < ApplicationController end end else + @message = Message.new(:recipient => @this_user) @title = t 'message.new.title' end end @@ -40,9 +41,13 @@ class MessageController < ApplicationController if message.to_user_id == @user.id then message.update_attribute(:message_read, true) - @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" - @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}" - @this_user = User.find(message.from_user_id) + @message = Message.new( + :recipient => message.sender, + :title => "Re: #{message.title.sub(/^Re:\s*/, '')}", + :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}", + ) + + @title = @message.title render :action => 'new' else diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 7ae7938c3..c7251f0a7 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -3,7 +3,7 @@ require 'oauth/controllers/provider_controller' class OauthController < ApplicationController include OAuth::Controllers::ProviderController - layout 'slim' + layout 'site' def login_required authorize_web diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 779ea1a88..5597fd4ae 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -17,7 +17,7 @@ class SiteController < ApplicationController def permalink lon, lat, zoom = ShortLink::decode(params[:code]) - new_params = params.except(:code, :lon, :lat, :zoom) + new_params = params.except(:code, :lon, :lat, :zoom, :node, :way, :relation, :changeset) if new_params.has_key? :m new_params.delete :m @@ -25,8 +25,27 @@ class SiteController < ApplicationController new_params[:mlon] = lon end - new_params[:controller] = 'site' - new_params[:action] = 'index' + if params.has_key? :node + new_params[:controller] = 'browse' + new_params[:action] = 'node' + new_params[:id] = params[:node] + elsif params.has_key? :way + new_params[:controller] = 'browse' + new_params[:action] = 'way' + new_params[:id] = params[:way] + elsif params.has_key? :relation + new_params[:controller] = 'browse' + new_params[:action] = 'relation' + new_params[:id] = params[:relation] + elsif params.has_key? :changeset + new_params[:controller] = 'browse' + new_params[:action] = 'changeset' + new_params[:id] = params[:changeset] + else + new_params[:controller] = 'site' + new_params[:action] = 'index' + end + new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}" redirect_to new_params diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 99777ca2d..dbfc44a37 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,5 +1,5 @@ class UserController < ApplicationController - layout :choose_layout + layout 'site', :except => [:api_details] skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files] before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details] @@ -786,21 +786,6 @@ private redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user end - ## - # Choose the layout to use. See - # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts - def choose_layout - oauth_url = url_for(:controller => :oauth, :action => :authorize, :only_path => true) - - if [ 'api_details' ].include? action_name - nil - elsif params[:referer] and URI.parse(params[:referer]).path == oauth_url - 'slim' - else - 'site' - end - end - ## # def disable_terms_redirect diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5d61e8c63..5266bf633 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -20,13 +20,13 @@ module ApplicationHelper def style_rules css = "" - css << ".hidden { display: none !important }"; - css << ".hide_unless_logged_in { display: none !important }" unless @user; - css << ".hide_if_logged_in { display: none !important }" if @user; - css << ".hide_if_user_#{@user.id} { display: none !important }" if @user; - css << ".show_if_user_#{@user.id} { display: inline !important }" if @user; - css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?; - css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?; + css << ".hidden { display: none !important }" + css << ".hide_unless_logged_in { display: none !important }" unless @user + css << ".hide_if_logged_in { display: none !important }" if @user + css << ".hide_if_user_#{@user.id} { display: none !important }" if @user + css << ".show_if_user_#{@user.id} { display: inline !important }" if @user + css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator? + css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator? return content_tag(:style, css, :type => "text/css") end @@ -57,10 +57,6 @@ module ApplicationHelper content_tag(tag, capture(&block), :class => "hide_unless_administrator") end - def scale_to_zoom(scale) - Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0) - end - def richtext_area(object_name, method, options = {}) id = "#{object_name.to_s}_#{method.to_s}" format = options.delete(:format) || "markdown" diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index cf13c2795..b192a63d5 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -24,11 +24,16 @@ module BrowseHelper end def link_class(type, object) + classes = [ type ] + if object.redacted? - type + " deleted" + classes << "deleted" else - type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') + classes += icon_tags(object).flatten.map { |t| h(t) } + classes << "deleted" unless object.visible? end + + classes.join(" ") end def link_title(object) @@ -114,16 +119,25 @@ private lang = 'en' end elsif key =~ /^wikipedia:(\S+)$/ - # Language is in the key, so assume value is a simple title + # Language is in the key, so assume value is the title lang = $1 else # Not a wikipedia key! return nil end + if value =~ /^([^#]*)(#.*)/ then + # Contains a reference to a section of the wikipedia article + # Must break it up to correctly build the url + value = $1 + section = $2 + else + section = "" + end + return { - :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}", - :title => value + :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}", + :title => value + section } end end diff --git a/app/models/node.rb b/app/models/node.rb index 12ffa2091..09f494b7c 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -21,7 +21,7 @@ class Node < ActiveRecord::Base has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :timestamp,:version, :changeset_id diff --git a/app/models/relation.rb b/app/models/relation.rb index 4e4235049..008f365c4 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -15,7 +15,7 @@ class Relation < ActiveRecord::Base has_many :relation_tags has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :timestamp,:version, :changeset_id diff --git a/app/models/session.rb b/app/models/session.rb deleted file mode 100644 index 619a7a7df..000000000 --- a/app/models/session.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Session < ActiveRecord::Base - def [](key) - @data = Marshal.load(Base64.decode64(self.data)) unless @data - - return @data[key] - end -end diff --git a/app/models/user.rb b/app/models/user.rb index b52007602..b27e0cda5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -28,6 +28,10 @@ class User < ActiveRecord::Base scope :active, -> { where(:status => ["active", "confirmed"]) } scope :public, -> { where(:data_public => true) } + has_attached_file :image, + :default_url => "/assets/:class/:attachment/:style.png", + :styles => { :large => "100x100>", :small => "50x50>" } + validates_presence_of :email, :display_name validates_confirmation_of :email#, :message => ' addresses must match' validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password' @@ -45,15 +49,12 @@ class User < ActiveRecord::Base validates_numericality_of :home_lon, :allow_nil => true validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true + validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/ after_initialize :set_defaults before_save :encrypt_password after_save :spam_check - has_attached_file :image, - :default_url => "/assets/:class/:attachment/:style.png", - :styles => { :large => "100x100>", :small => "50x50>" } - def self.authenticate(options) if options[:username] and options[:password] user = where("email = ? OR display_name = ?", options[:username], options[:username]).first diff --git a/app/models/way.rb b/app/models/way.rb index a9fdd88ee..1da048c96 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -17,7 +17,7 @@ class Way < ActiveRecord::Base has_many :way_tags has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :changeset_id,:version, :timestamp diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb index 2c2cdd4c0..581c49b09 100644 --- a/app/views/browse/_node.html.erb +++ b/app/views/browse/_node.html.erb @@ -13,10 +13,10 @@ <% unless node.ways.empty? and node.containing_relation_members.empty? %>

    <%= t 'browse.part_of' %>

    <% end %> diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index 10046d0bb..1644228ae 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -17,7 +17,7 @@ <% unless relation.containing_relation_members.empty? %>

    <%= t'browse.part_of' %>

    - + <% end %> <% end %> diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index fd419586f..aff405dde 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -28,7 +28,7 @@ <% unless way.containing_relation_members.empty? %>

    <%= t'browse.part_of' %>

    <% end %> diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 5ab29e0d1..fa6f75ff9 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -6,7 +6,7 @@
    -

    <%= t('browse.note.mine.description') %>

    +

    <%= t('browse.note.description') %>

    <%= h(@note.comments.first.body.to_html) %>
    diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb index 839b3dcec..9ac3eae33 100644 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@ -1,9 +1,11 @@ -<%= form_tag search_path, :class => "search_form" do %> +
    +
    <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %> · <%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %>
    +
    <%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %>
    @@ -23,4 +25,4 @@ <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
    -<% end %> + diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb deleted file mode 100644 index 72cfcec31..000000000 --- a/app/views/layouts/slim.html.erb +++ /dev/null @@ -1,25 +0,0 @@ - - - <%= render :partial => "layouts/head" %> - -
    -
    -
    -

    <%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %>

    -
    - -
    - <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - - <% if content_for? :heading %> -
    - <%= yield :heading %> -
    - <% end %> - - <%= yield %> -
    -
    -
    - - diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb index b8af5aac9..35f5b4a04 100644 --- a/app/views/message/new.html.erb +++ b/app/views/message/new.html.erb @@ -1,18 +1,18 @@ <% content_for :heading do %> -

    <%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %>

    +

    <%= raw(t'message.new.send_message_to', :name => link_to(h(@message.recipient.display_name), {:controller => 'user', :action => 'view', :display_name => @message.recipient.display_name})) %>

    <% end %> <%= error_messages_for 'message' %> -<%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %> +<%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @message.recipient.display_name } do |f| %>
    - <%= f.text_field :title, :size => 60, :value => @subject, :class => "richtext_title" %> + <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
    - <%= richtext_area :message, :body, :cols => 80, :rows => 20, :value => @body %> + <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
    <%= submit_tag t('message.new.send_button') %> diff --git a/config/initializers/konacha.rb b/config/initializers/konacha.rb new file mode 100644 index 000000000..2924efab6 --- /dev/null +++ b/config/initializers/konacha.rb @@ -0,0 +1,5 @@ +Konacha.configure do |config| + require 'capybara/poltergeist' + config.spec_dir = "test/javascripts" + config.driver = :poltergeist +end if defined?(Konacha) diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 088c1cd69..9e6296ef3 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -23,7 +23,7 @@ ast: language: Llingua latitude: Llatitú longitude: Llonxitú - title: Títulu + title: Asuntu user: Usuariu friend: friend: Amigu @@ -32,7 +32,7 @@ ast: body: Cuerpu recipient: Destinatariu sender: Remitente - title: Títulu + title: Asuntu trace: description: Descripción latitude: Llatitú @@ -350,6 +350,18 @@ ast: title: Planeta OSM zoom: Zoom title: Esportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Namái faiga clic en o nel mesmu iconu na vista del mapa.\nEsto pondrá un marcador nel mapa, que puede mover\nabasnando. Escriba'l so mensaxe, faiga clic en guardar, y otros mapeadores investigarán." + join_the_community: + explanation_html: Si atopó un problema colos datos del nuesu mapa; por exemplu una carretera que falta, o la so direición, lo meyor que pue facer ye xunise a la comunidá d'OpenStreetMap y amestar o reparar los datos vusté mesmu. + title: Xunise a la comunidá + title: Cómo ayudar + other_concerns: + explanation_html: "Si tien dalguna preocupación tocante a cómo tan usándose los nuesos datos o tocante al conteníu, consulte la\npáxina de drechos d'autor pa más información llegal, o comuníquese col grupu de trabayu de la OSMF afayadizu." + title: Otres preocupaciones + title: Informar d'un problema / iguar el mapa geocoder: description: title: diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index b5fbc3da9..2a5ca65ab 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -92,6 +92,7 @@ be-Tarask: containing_relation: entry: Адносіны %{relation_name} entry_role: Адносіны %{relation_name} (як %{relation_role}) + created: Створана not_found: sorry: Прабачце, %{type} з ідэнтыфікатарам %{id} ня знойдзены. type: diff --git a/config/locales/br.yml b/config/locales/br.yml index ad57bc894..0ea04d470 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -26,7 +26,7 @@ br: language: Yezh latitude: Ledred longitude: Hedred - title: Titl + title: Danvez user: Implijer friend: friend: Mignon @@ -334,6 +334,7 @@ br: paste_html: Pegañ HTML evit bezañ enkorfet en ul lec'hienn web scale: Skeuliad too_large: + advice: "Ma c'hwit an ezporzhiadur amañ a-us, implijit unan eus an elfennoù amañ dindan :" body: Re vras eo an takad-mañ evit bezañ ezporzhiet evel roadennoù XML OpenStreetMap. Zoumit, mar plij, pe diuzit un takad bihanoc'h. geofabrik: description: Eztennadennoù hizivaet ingal a genvandirioù, a broioù , hag a gêrioù diuzet @@ -349,6 +350,14 @@ br: title: Planedenn OSM zoom: Zoum title: Ezporzhiañ + fixthemap: + how_to_help: + join_the_community: + explanation_html: M'ho peus merzet ez eus ur gudenn gant roadennoù hor c'hartennoù, da skouer un hent diank pe ho chomlec'h, an doare d'ober gwellañ eo mont d'ar gumuniezh OpenStreetMap hag ouzhpennañ pe dresañ ar roadennoù hoc'h-unan. + title: Mont er gumuniezh-mañ + title: Penaos sikour + other_concerns: + title: Prederioù all geocoder: description: title: diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 4c5f3e051..857f6e0d1 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -4,8 +4,11 @@ # Author: Alenmahovic # Author: CERminator # Author: DzWiki +# Author: Edinwiki # Author: Maxmus bs: + about_page: + next: Slijedeće activerecord: attributes: diary_comment: @@ -14,7 +17,7 @@ bs: language: Jezik latitude: Geografska Å¡irina (Latitude) longitude: Geografska dužina (Longitude) - title: Naslov + title: Predmet user: Korisnik friend: friend: Prijatelj @@ -23,7 +26,7 @@ bs: body: Tijelo recipient: Primalac sender: PoÅ¡iljalac - title: Naslov + title: Predmet trace: description: Opis latitude: Geografska Å¡irina (Latitude) @@ -83,23 +86,34 @@ bs: blocked: VaÅ¡ pristup API-u je blokiran. Prijavite se na web upravljačku ploču da saznate viÅ¡e. need_to_see_terms: VaÅ¡ pristup API-ju je privremeno suspendovan. Molimo da se prijavite na web upravljačku ploču da pogledate Uslove za doprinosioce. Ne morate se složiti, ali ih morate pogledati. browse: + anonymous: anonimno changeset: + belongs_to: Autor changesetxml: XML seta promjena feed: title: Set promjena %{id} title_comment: Set promjena %{id} - %{comment} osmchangexml: osmChange XML - title: Set promjena + title: "Skup promjena: %{id}" + closed: Zatvoreno containing_relation: entry: Relacija %{relation_name} entry_role: Relacija %{relation_name} (kao %{relation_role}) + created: Napravljeno + download_xml: Preuzmi XML + in_changeset: Skup promijena + location: "Lokacija:" + no_comment: (bez komentara) not_found: - sorry: Žao nam je, ali %{type} sa ID %{id}, se ne može naći. + sorry: "Žao nam je, ali %{type} #%{id} se ne može naći." type: changeset: Set promjena node: čvor relation: relacija way: putanja + note: + new_note: Nova biljeÅ¡ka + part_of: Dio od redacted: message_html: Verzija %{version} ovoga %{type} ne može biti prikazana s obzirom da je u procesu redakcije. Molimo pogledajte %{redaction_link} za detalje. redaction: Redakcija %{id} @@ -107,6 +121,8 @@ bs: node: čvor relation: relacija way: putanja + relation: + members: Članovi relation_member: entry_role: "%{type} %{name} kao %{role}" type: @@ -129,6 +145,11 @@ bs: node: čvor relation: relacija way: putanja + version: Verzija + view_details: Prikaži detalje + view_history: Prikaži historiju + way: + nodes: Tačke changeset: changeset: anonymous: Anonimno @@ -228,6 +249,9 @@ bs: user_title: Dnenvnik korisnika %{user} editor: default: Zadano (currently %{name}) + id: + description: iD (uređivač u pregledniku) + name: iD potlatch: description: Potlatch 1 (uređivač unutar web preglednika) name: Potlatch 1 @@ -265,6 +289,11 @@ bs: title: Drugi izvori zoom: Uvećanje title: Izvezi + fixthemap: + how_to_help: + join_the_community: + title: Pridružite se zajednici + title: Kako pomoći geocoder: description: title: @@ -780,6 +809,9 @@ bs: water_point: Tačka vodotoka waterfall: Vodopad weir: Brana + help_page: + welcome: + url: /dobrodoÅ¡lica javascripts: map: base: @@ -925,6 +957,7 @@ bs: title: Odlazna poÅ¡ta to: Za read: + back: Nazad date: Datum from: Od reply_button: Odgovoriti @@ -1101,6 +1134,7 @@ bs: potlatch_unsaved_changes: Imate nespremljene promjene. (Da bi ste spremili u Potlatch-u, morate odznačiti trenutnu putanju ili tačku, ako uređujete uživo; ili kliknite SPREMITI ako imate to dugme.) user_page_link: korisnička stranica index: + createnote: Dodaj biljeÅ¡ku js_1: Koristite internet preglednik koji ne podržava JavaScript, ili ste onemogućili JavaScript. js_2: OpenStreetMap koristi JavaScript za slippy kartu. license: @@ -1490,7 +1524,7 @@ bs: consider_pd: Osim gore navedenog ugovora, smatram da su moji doprinosi u javnom vlasniÅ¡tvu (Public Domain) consider_pd_why: Å ta je ovo? decline: Odbiti - guidance: "Informacija da bi se pomoglo u shvatanju ovih uslova: Čitljiv sažetak i neki neformalni prevodi" + guidance: "Informacija da bi se pomoglo u shvatanju ovih uslova: Čitljiv sažetak i neki neformalni prijevodi" heading: Uslovi za doprinosioce legale_names: france: Francuska diff --git a/config/locales/ca.yml b/config/locales/ca.yml index e0df180b4..a30707577 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -44,7 +44,7 @@ ca: language: Idioma latitude: Latitud longitude: Longitud - title: Títol + title: Tema user: Usuari friend: friend: Amic @@ -53,7 +53,7 @@ ca: body: Cos recipient: Destinatari sender: Remitent - title: Títol + title: Tema trace: description: Descripció latitude: Latitud @@ -368,6 +368,15 @@ ca: title: Planeta OSM zoom: Zoom title: Exportar + fixthemap: + how_to_help: + join_the_community: + explanation_html: Si heu trobat un problema amb les nostres dades del mapa, com per exemple l'omissió d'una carretera o bé de la vostra adreça, la millor forma d'arreglar-ho és unint-se a la comunitat d'OpenStreetMap i afegir o bé corregir les dades vós mateix. + title: Afegiu-vos a la comunitat + title: Com contribuir + other_concerns: + title: Altres aspectes + title: Informeu d'un problema / Corregiu el mapa geocoder: description: title: @@ -1208,7 +1217,7 @@ ca: greeting: Hola, hopefully_you: Algú (possiblement vostè) ha demanat que la contrasenya d'aquest compte d'openstreetmap.org li siga reiniciada a la vostra adreça de correu electrònic. message_notification: - footer_html: També podeu llegir el missatge a % {readurl} i podeu respondre'l a % {replyurl} + footer_html: També podeu llegir el missatge a %{readurl} i podeu respondre'l a %{replyurl} header: "%{from_user} ha enviat un missatge a través de OpenStreetMap amb el tema %{subject}:" hi: Hola %{to_user}, note_comment_notification: @@ -1226,10 +1235,10 @@ ca: details: Podeu trobar més detalls de la nota a %{url}. greeting: Hola, reopened: - commented_note: "% {comentarista} ha reactivat una nota de mapa en la qual hi heu comentat. La nota és a prop de % {lloc}." - subject_other: "% [OpenStreetMap] {comentarista} ha reactivat una nota en que vostè està interessat" - subject_own: "% [OpenStreetMap] {comentarista} ha reactivat una de les vostres notes" - your_note: "% {comentarista} ha reactivat una de les notes de mapa a prop % {Lloc}." + commented_note: "%{commenter} ha reactivat una nota de mapa en la qual hi heu comentat. La nota és a prop de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha reactivat una nota en que vostè està interessat" + subject_own: "[OpenStreetMap] %{commenter} ha reactivat una de les vostres notes" + your_note: "%{commenter} ha reactivat una de les notes de mapa a prop %{place}." signup_confirm: confirm: "Primer de tot hem de confirmar que aquesta petició ha estat feta per vostè, si ha estat així, si us plau, premeu sobre el següent enllaç per tal confirmar la vostra petició de creació del compte d'usuari:" created: Algú (suposem que vós mateix) acaba de crear un compte a %{site_url}. @@ -1713,7 +1722,7 @@ ca: already_a_friend: Que ja sou amics amb %{name}. button: Afegeix als amics failed: Ho sentim, no afegir %{name} com un amic. - heading: Voleu afegir % {user} com un amic? + heading: Voleu afegir %{user} com un amic? success: "%{name} és ara el vostre amic!" new: about: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index a6e390052..057f75f47 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -15,6 +15,7 @@ # Author: Mormegil # Author: Mr. Richard Bolla # Author: Nemo bis +# Author: Paxt # Author: Reaperman # Author: Tchoř # Author: Veritaslibero @@ -48,7 +49,7 @@ cs: body: Text recipient: Příjemce sender: Odesílatel - title: Název + title: Předmět trace: description: Popis latitude: Šířka @@ -367,6 +368,18 @@ cs: title: Planeta OSM zoom: Zoom title: Export + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Stačí kliknout na nebo na stejnou ikonku na zobrazené mapě.\nTím do mapy přidáte značku, kterou můžete přesunout tažením myší. Přidejte svou zprávu a klikněte na uložit a ostatní uživatelé se na to podívají." + join_the_community: + explanation_html: Pokud jste si vÅ¡imli nějakého nedostatku naÅ¡ich mapových dat, např. chybějící silnice nebo vaÅ¡e adresa, nejlepším řeÅ¡ením je připojit se ke komunitě OpenStreetMap a přidat nebo opravit data vlastnoručně. + title: Přidejte se ke komunitě + title: Jak pomoci + other_concerns: + explanation_html: "Pokud máte pochyby o používání naÅ¡ich dat nebo jejich obsahu, na naší\nstránce o autorských právech naleznete více právních informací, případně kontaktujte\npřísluÅ¡nou pracovní skupinu OSMF." + title: Jiné problémy + title: Nahlásit problém / opravit mapu geocoder: description: title: diff --git a/config/locales/da.yml b/config/locales/da.yml index af0241376..2162be194 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -19,14 +19,14 @@ # Author: Winbladh da: about_page: - community_driven_html: "OpenStreetMap fællesskabet er alsidigt, passioneret, og vokser hver dag.\nVores bidragydere omfatter entusiastiske kortlæggere, GIS fagfolk, ingeniører der\nkører OSM servere, humanister der kortlægger katastroferamte omrÃ¥der,\nog mange flere.\nFor at læs mere om fællesskabet, se bruger dagbøger,\nfællesskabsblogs, og\n OSM Foundation hjemmeside." + community_driven_html: "OpenStreetMap-fællesskabet er alsidigt, passioneret, og vokser hver dag.\nVores bidragsydere omfatter entusiastiske kortlæggere, GIS-fagfolk, ingeniører der\nkører OSM-servere, humanitære arbejdere der kortlægger katastroferamte omrÃ¥der,\nog mange flere.\nFor at læs mere om fællesskabet, se brugerdagbøger,\nfællesskabsblogs, og\n OSM Foundations hjemmeside." community_driven_title: Drevet af fællesskabet - copyright_html: ©OpenStreetMap
    bidragyderer + copyright_html: ©OpenStreetMap
    bidragsydere lede_text: OpenStreetMap er bygget af et fællesskab af kortlæggere, der bidrager og vedligeholder data om veje, stier, caféer, jernbanestationer og meget mere, over hele verden. - local_knowledge_html: OpenStreetMap lægger vægt pÃ¥ lokal viden. Bidragydere bruger luftfotografier, GPS-enheder, og lavteknologiske feltkort til at kontrollere, at OSM er præcis og ajourført. + local_knowledge_html: OpenStreetMap lægger vægt pÃ¥ lokal viden. Bidragsydere bruger luftfotografier, GPS-enheder og lavteknologiske feltkort til at kontrollere at OSM er præcis og ajourført. local_knowledge_title: Lokal viden next: Næste - open_data_html: "OpenStreetMap er Ã¥bne data: du er fri til at bruge dem til ethvert formÃ¥l,\nsÃ¥ længe du kreditere OpenStreetMap og dets bidragydere. Hvis du ændrer eller\nbygger oven pÃ¥ data pÃ¥ bestemte mÃ¥der, mÃ¥ du kun distribuere resultatet under\nden samme licens. Se siden om ophavsret og licens for detaljer." + open_data_html: "OpenStreetMap er Ã¥bne data: du mÃ¥ bruge dem til ethvert formÃ¥l,\nsÃ¥ længe du nævner OpenStreetMap og dets bidragsydere. Hvis du ændrer eller\nbygger oven pÃ¥ data pÃ¥ bestemte mÃ¥der, mÃ¥ du kun distribuere resultatet under\nden samme licens. Se siden om ophavsret og licens for detaljer." open_data_title: Åbne Data partners_title: Partnere used_by: "%{name} stiller kortdata til rÃ¥dighed for hundredvis af websteder, mobile apps og hardware-enheder" @@ -38,7 +38,7 @@ da: language: Sprog latitude: Breddegrad longitude: Længdegrad - title: Titel + title: Emne user: Bruger friend: friend: Ven @@ -47,7 +47,7 @@ da: body: Brødtekst recipient: Modtager sender: Afsender - title: Titel + title: Emne trace: description: Beskrivelse latitude: Breddegrad @@ -141,7 +141,7 @@ da: history_title: "Punkthistorik: %{name}" title: "Punkt: %{name}" not_found: - sorry: Beklager, %{type}'en med id %{id} kan ikke findes. + sorry: Beklager, %{type} med id %{id} blev ikke fundet. type: changeset: ændringssæt node: punkt @@ -164,7 +164,7 @@ da: title: "Bemærkning: %{id}" part_of: Del af redacted: - message_html: Version %{version} af denne %{type} kan ikke vises, da den er omarbejdet. Se venligst %{redaction_link} for detaljer. + message_html: Version %{version} af %{type} kan ikke vises, da den er omarbejdet. Se venligst %{redaction_link} for detaljer. redaction: Omarbejdelse %{id} type: node: punkt @@ -181,14 +181,14 @@ da: relation: Relation way: Vej start_rjs: - feature_warning: Henter %{num_features} funktioner, som kan gøre din browser langsom eller slet ikke reagerer. Er du sikker pÃ¥ du ønsker at fÃ¥ vist disse data? + feature_warning: Henter %{num_features} funktioner, som kan gøre din browser langsom eller fÃ¥ den til at ikke at svare. Er du sikker pÃ¥ du ønsker at fÃ¥ vist disse data? load_data: Indlæs data loading: Indlæser... tag_details: tags: Egenskaber wiki_link: - key: Wikisiden med beskrivelse af %{key} egenskaben - tag: Wikisiden med beskrivelse af %{key}=%{value} egenskaben + key: Wikisiden med beskrivelse af egenskaben %{key} + tag: Wikisiden med beskrivelse af egenskaben %{key}=%{value} wikipedia_link: Artiklen %{page} pÃ¥ Wikipedia timeout: sorry: Beklager, data for %{type} med id %{id} tog for lang tid at hente @@ -313,7 +313,7 @@ da: editor: default: Foretrukket (i øjeblikket %{name}) id: - description: iD (in-browser editor) + description: iD (redigér i browseren) name: iD potlatch: description: Potlatch 1 (redigér i browseren) @@ -365,6 +365,18 @@ da: title: Planet OSM zoom: Zoom title: Eksportér + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Bare klik pÃ¥ eller det samme ikon pÃ¥ kortvisningen.\nDette vil tilføje en markør til kort, som du kan flytte\nved at trække. Tilføj din besked, klik sÃ¥ pÃ¥ gem, og andre kortlæggere vil undersøge." + join_the_community: + explanation_html: Hvis du har opdaget et problem med vores kortdata, for eksempel en vej der mangler eller din adresse, er den bedste mÃ¥de at gøre noget ved det, at deltage i OpenStreetMap-fællesskabet, og tilføje eller reparere data selv. + title: Deltag i fællesskabet + title: Hvordan man kan hjælpe + other_concerns: + explanation_html: "Hvis du har bekymringer om, hvordan vores data bruges, eller om indholdet, kan du se vores\nside om ophavsret for flere juridiske oplysninger, eller kontakte den relevante\nOSMF arbejdsgruppe." + title: Andre bekymringer + title: Rapportér et problem / Ret kortet geocoder: description: title: @@ -922,7 +934,7 @@ da: hot: Humanitær standard: Standard transport_map: Transportkort - copyright: © OpenStreetMap-bidragyderer + copyright: © OpenStreetMap-bidragsydere donate_link_text: layers: data: Kortdata @@ -1029,24 +1041,24 @@ da: contributors_at_html: "Østrig: Indeholder data fra\nStadt Wien (under\nCC BY),\nDelstaten Vorarlberg og\nDelstaten Tyrol (under CC-BY AT med tilføjelser)." contributors_ca_html: "Canada: Indeholder data fra\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) og StatCan (Geography Division,\nStatistics Canada)." contributors_fi_html: "Finland: Indeholder data fra National Land Survey af Finlands topografiske database og andre datasæt under NLSFI licensen." - contributors_footer_1_html: "For yderligere oplysninger om disse og andre kilder, der er blevet brugt for at hjælpe med at forbedre OpenStreetMap, se venligst siden med bidragydere pÃ¥ OpenStreetMap Wiki." + contributors_footer_1_html: "For yderligere oplysninger om disse og andre kilder, der er blevet brugt for at hjælpe med at forbedre OpenStreetMap, se venligst siden med bidragsydere pÃ¥ OpenStreetMap Wiki." contributors_footer_2_html: "Optagelse af data i OpenStreetMap indebærer ikke at den oprindelige\ndataudbyder siger god for OpenStreetMap, giver nogen garanti eller\naccepterer nogen form for erstatningspligt." contributors_fr_html: "Frankrig: Indeholder data fra\nDirection Générale des Impôts." contributors_gb_html: "Storbritannien: indeholder Ordnance\nSurvey data © Crown copyright and database right\n2010-12." - contributors_intro_html: "Vores bidragydere er tusinder af individer. Vi medtager ogsÃ¥\n Ã¥bent licenseret data fra nationale kortlægningsagenturer\n og andre kilder, blandt dem:" + contributors_intro_html: "Vores bidragsydere er tusinder af individer. Vi medtager ogsÃ¥\nÃ¥bent licenseret data fra nationale kortlægningsagenturer\nog andre kilder, blandt dem:" contributors_nl_html: "Holland: Indeholder © AND data, 2007\n(www.and.com)" contributors_nz_html: "New Zealand: Indeholder data fra \nLand Information New Zealand. Crown Copyright reserveret." - contributors_title_html: Vores bidragydere + contributors_title_html: Vores bidragsydere contributors_za_html: "Syd Afrika: Indeholder data fra\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserveret." - credit_1_html: Vi kræver at din kildeangivelse mindst bestÃ¥r af “© OpenStreetMap-bidragyderer”.. + credit_1_html: Vi kræver at din kildeangivelse mindst bestÃ¥r af “© OpenStreetMap-bidragsydere”.. credit_2_html: "Du skal ogsÃ¥ gøre det klart, at dataene er tilgængelige under Open \nDatabase License, og hvis du bruger vores kort fliser, at kartografi er\n licenseret som CC-BY-SA. Du kan gøre dette ved at linke til\ndenne side om ophavsret. \nAlternativt, og som et krav, hvis du distribuerer OSM i en\n dataform, kan du navngive og oprette et hyperlink direkte til licenserne. I medier\n hvor hyperlinks ikke er mulig (f.eks. trykte værker), foreslÃ¥r vi, at du\n henviser dine læsere til openstreetmap.org (mÃ¥ske ved at udvide\n'OpenStreetMap' til denne fuld adresse), til opendatacommons.org, og\n hvis relevant, til creativecommons.org." credit_3_html: "For et navigerbart elektronisk kort, skal kildeangivelsen være i hjørnet af kortet.\nFor eksempel:" credit_title_html: Kildeangivelse og OpenStreetMap - infringement_1_html: "OSM-bidragydere bliver mindet om aldrig at tilføje data fra nogen\nophavsretligt beskyttede kilder (f.eks. Google Maps eller trykte kort) uden\neksplicit tilladelse fra ophavsret-indehaverne." + infringement_1_html: "OSM-bidragsydere bliver mindet om aldrig at tilføje data fra nogen\nophavsretligt beskyttede kilder (f.eks. Google Maps eller trykte kort) uden\neksplicit tilladelse fra ophavsret-indehaverne." infringement_2_html: "Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er\n føjet til OpenStreetMap databasen eller dette websted, bedes du følge\n vores procedure til fjernelse a materiale eller udfyld formular direkte pÃ¥ vores\non-line side." infringement_title_html: Krænkelse af ophavsretten intro_1_html: "OpenStreetMap er Ã¥bne data, licenseret under Open Data\nCommons Open Database License (ODbL)." - intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores data, \nsÃ¥ længe du angiver OpenStreetMap og dets\nbidragydere som kilde. Hvis du ændrer eller bygger pÃ¥ vores\ndata, mÃ¥ du kun distribuere resultatet under den samme licens. Den\nfulde juridiske tekst\nforklarer dine rettigheder og pligter." + intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores data, \nsÃ¥ længe du angiver OpenStreetMap og dets\nbidragsydere som kilde. Hvis du ændrer eller bygger pÃ¥ vores\ndata, mÃ¥ du kun distribuere resultatet under den samme licens. Den\nfulde juridiske tekst\nforklarer dine rettigheder og pligter." intro_3_html: Kartografi i vores kort, og vores dokumentation er licenseret under Creative Commons Navngivelse-DelPÃ¥SammeVilkÃ¥r 2.0 (CC BY-SA). more_1_html: "Læs mere om brug af vores data, og hvordan du kreditere os, pÃ¥ den juridiske\nFAQ." more_2_html: "Selvom OpenStreetMap er Ã¥bne data, kan vi ikke levere en\ngratis kort-API til tredjeparts-udviklere.\n\nSe vores politik for API-brug,\npolitik for brug af kortbilleder\nog politik for brug af Nominatim." @@ -1566,12 +1578,12 @@ da: user: account: contributor terms: - agreed: Du har accepteret de nye vilkÃ¥r for bidragydere. + agreed: Du har accepteret de nye vilkÃ¥r for bidragsydere. agreed_with_pd: Du har ogsÃ¥ erklæret at du anser dine ændringer for at være fælleseje/uden ophavsret. - heading: "VilkÃ¥r for bidragydere:" + heading: "VilkÃ¥r for bidragsydere:" link text: hvad er dette? - not yet agreed: Du har endnu ikke accepteret de nye vilkÃ¥r for bidragydere. - review link text: Følg dette link nÃ¥r det er bekvemt for dig for at gennemse og acceptere de nye vilkÃ¥r for bidragydere. + not yet agreed: Du har endnu ikke accepteret de nye vilkÃ¥r for bidragsydere. + review link text: Følg dette link nÃ¥r det er bekvemt for dig for at gennemse og acceptere de nye vilkÃ¥r for bidragsydere. current email address: "Nuværende e-mailadresse:" delete image: Fjern det nuværende billede email never displayed publicly: (vises aldrig offentligt) @@ -1717,15 +1729,15 @@ da: display name: "Vist navn:" display name description: Dit offentligt synlige brugernavn. Du kan ændre dette senere i indstillingerne. email address: "E-mailadresse:" - license_agreement: NÃ¥r du bekræfter din konto, skal du acceptere vilkÃ¥rene for bidragydere. + license_agreement: NÃ¥r du bekræfter din konto, skal du acceptere vilkÃ¥rene for bidragsydere. no_auto_account_create: Vi kan desværre ikke oprette en konto automatisk for dig pt. not displayed publicly: Vises ikke offentligt (se privatlivspolitik) openid: "%{logo} OpenID:" openid association: "

    Din OpenID er endnu ikke tilknyttet en OpenStreetMap konto.

    \n
      \n
    • Hvis du er ny pÃ¥ OpenStreetMap, skal du oprette en ny konto ved hjælp af formularen nedenfor.
      • \n
    • \n Hvis du allerede har en konto, kan du logge ind pÃ¥ din konto\n ved hjælp af dit brugernavn og adgangskode og derefter knytte kontoen\n med din OpenID i dine brugerindstillinger.\n
      • \n
    " openid no password: Med OpenID kræves ikke en adgangskode, men nogle ekstraværktøjer eller en server kan muligvis stadig have brug for en. password: "Adgangskode:" - terms accepted: Tak for at du accepterede de nye vilkÃ¥r for bidragydere! - terms declined: Vi er kede af, at du har besluttet at du ikke kan acceptere de nye vilkÃ¥r for bidragydere. Yderligere oplysninger, se venligst denne wiki side. + terms accepted: Tak for at du accepterede de nye vilkÃ¥r for bidragsydere! + terms declined: Vi er kede af at du har besluttet at du ikke kan acceptere de nye vilkÃ¥r for bidragsydere. For yderligere oplysninger, se venligst denne wikiside. title: Opret konto use openid: Alternativt kan du bruge %{logo} OpenID til at logge pÃ¥ no_such_user: @@ -1762,15 +1774,15 @@ da: consider_pd_why: hvad er dette? decline: AfslÃ¥ guidance: "Oplysninger til at hjælpe med at forstÃ¥ disse udtryk: et menneskeligt læsbart sammendrag og nogle uformelle oversættelser" - heading: VilkÃ¥r for bidragydere + heading: VilkÃ¥r for bidragsydere legale_names: france: Frankrig italy: Italien rest_of_world: Resten af verden legale_select: "Vælg dit bopælsland:" read and accept: Læs aftalen nedenfor og tryk pÃ¥ "Accepter" for at bekræfte at du accepterer betingelserne i denne aftale for dine eksisterende og fremtidige bidrag. - title: VilkÃ¥r for bidragydere - you need to accept or decline: Læs og godkend eller afvis de nye vilkÃ¥r for bidragydere for at fortsætte. + title: VilkÃ¥r for bidragsydere + you need to accept or decline: Læs og godkend eller afvis de nye vilkÃ¥r for bidragsydere for at fortsætte. view: activate_user: aktiver denne bruger add as friend: Tilføj som ven @@ -1785,7 +1797,7 @@ da: created from: "Oprettet fra:" ct accepted: Accepteret for %{ago} siden ct declined: AfslÃ¥et - ct status: VilkÃ¥r for bidragydere + ct status: "VilkÃ¥r for bidragsydere:" ct undecided: Uafklaret deactivate_user: deaktiver denne bruger delete_user: slet denne bruger @@ -1843,7 +1855,7 @@ da: title: Blokeringer af %{name} blocks_on: empty: "%{name} er endnu ikke blevet blokeret." - heading: Liste over blokeringer af % {name} + heading: Liste over blokeringer af %{name} title: Blokeringer af %{name} create: flash: Oprettet en blokering af brugeren %{name}. @@ -1854,7 +1866,7 @@ da: heading: Redigerer blokering af %{name} needs_view: Skal brugeren logge pÃ¥, før denne blokering vil blive fjernet? period: Hvor længe, fra og med nu, brugeren vil blive blokeret fra API. - reason: Årsagen hvorfor % {name} er blokeret. Vær venligst sÃ¥ rolig og sÃ¥ fornuftig som muligt, giv sÃ¥ mange detaljer, som kan du om situationen. Tænk pÃ¥, at ikke alle brugerer forstÃ¥r fællesskabsjargonen, sÃ¥ prøv at bruge hverdags udtryk. + reason: Årsagen hvorfor %{name} er blokeret. Vær venligst sÃ¥ rolig og sÃ¥ fornuftig som muligt, giv sÃ¥ mange detaljer, som kan du om situationen. Tænk pÃ¥, at ikke alle brugerer forstÃ¥r fællesskabsjargonen, sÃ¥ prøv at bruge hverdags udtryk. show: Vis denne blokering submit: Opdater blokering title: Redigerer blokering af %{name} @@ -1877,7 +1889,7 @@ da: heading: Opretter blokering af %{name} needs_view: Brugeren skal logge pÃ¥, før denne blokering vil blive fjernet period: Hvor længe, fra og med nu, brugeren vil blive blokeret fra API. - reason: Årsagen hvorfor % {name} er blokeret. Vær venligst sÃ¥ rolig og sÃ¥ fornuftig som muligt, giv sÃ¥ mange detaljer, som kan du om situationen. Husk pÃ¥, at meddelelsen bliver offentligt synlig. Tænk pÃ¥, at ikke alle brugerer forstÃ¥r fællesskabsjargonen, sÃ¥ prøv at bruge hverdags udtryk. + reason: Årsagen hvorfor %{name} er blokeret. Vær venligst sÃ¥ rolig og sÃ¥ fornuftig som muligt, giv sÃ¥ mange detaljer, som kan du om situationen. Husk pÃ¥, at meddelelsen bliver offentligt synlig. Tænk pÃ¥, at ikke alle brugerer forstÃ¥r fællesskabsjargonen, sÃ¥ prøv at bruge hverdags udtryk. submit: Opret blokering title: Opretter blokering af %{name} tried_contacting: Jeg har kontaktet brugeren og bedt dem stoppe. diff --git a/config/locales/de.yml b/config/locales/de.yml index 16bdfbe1a..d2d9e9349 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -55,7 +55,7 @@ de: language: Sprache latitude: Breitengrad longitude: Längengrad - title: Titel + title: Betreff user: Benutzer friend: friend: Freund @@ -64,7 +64,7 @@ de: body: Text recipient: Empfänger sender: Absender - title: Titel + title: Betreff trace: description: Beschreibung latitude: Breitengrad @@ -376,12 +376,24 @@ de: title: Andere Quellen overpass: description: Diese Bounding Box von einem Mirror der OpenStreetMap-Datenbank herunterladen - title: API überführen + title: Overpass API planet: description: Regelmäßig aktualisierte Kopien der kompletten OpenStreetMap-Datenbank title: Planet OSM zoom: Zoom title: Exportieren + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Klicke einfach auf oder auf das gleiche Symbol in der Kartenanzeige.\nDies fügt eine Markierung der Karte hinzu, die du durch Ziehen verschieben kannst.\nSchreibe deine Nachricht, klicke auf „Speichern“ und andere Mapper werden den Fehler untersuchen." + join_the_community: + explanation_html: "Falls du bei unseren Kartendaten ein Problem bemerkt hast wie das Fehlen einer Straße oder deiner Adresse,\nist der beste Weg zum Weitermachen der Beitritt zur OpenStreetMap-Gemeinschaft und das Beheben der Daten durch dich selbst." + title: Der Gemeinschaft beitreten + title: Wie man helfen kann + other_concerns: + explanation_html: "Falls du Bedenken über die Verwendung unserer Daten oder über die Inhalte hast, lies bitte unsere\nCopyright-Seite für mehr rechtliche Informationen oder kontaktiere die entsprechende\nOSMF-Arbeitsgruppe." + title: Andere Anliegen + title: Ein Problem melden / Die Karte korrigieren geocoder: description: title: @@ -608,7 +620,7 @@ de: citywalls: Stadtmauern fort: Fort house: Historisches Haus - icon: Ikone + icon: Symbol manor: Gutshaus memorial: Denkmal mine: Mine @@ -665,7 +677,7 @@ de: garden: Garten golf_course: Golfplatz ice_rink: Eislaufplatz - marina: Marina + marina: Sporthafen miniature_golf: Minigolf nature_reserve: Naturschutzgebiet park: Park @@ -701,7 +713,7 @@ de: geyser: Geysir glacier: Gletscher heath: Heide - hill: Berg + hill: Hügel island: Insel land: Land marsh: Marsch @@ -784,7 +796,7 @@ de: spur: Anschlussgleis station: Bahnhof stop: Haltepunkt - subway: U-Bahn + subway: U-Bahn-Station subway_entrance: U-Bahn-Eingang switch: Weiche tram: Straßenbahn @@ -810,7 +822,7 @@ de: clothes: Bekleidungsgeschäft computer: Computergeschäft confectionery: Konditorei - convenience: Lebensmittelgeschäft + convenience: Tante-Emma-Laden copyshop: Copyshop cosmetics: Parfümerie deli: Feinkostladen @@ -823,7 +835,7 @@ de: farm: Hofladen fashion: Modegeschäft fish: Fischereiladen - florist: Blumenladen + florist: Blumengeschäft food: Lebensmittelladen funeral_directors: Bestattungsunternehmen furniture: Möbelgeschäft diff --git a/config/locales/diq.yml b/config/locales/diq.yml index 96b7f15fe..c354ca888 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -143,7 +143,7 @@ diq: latitude: "Heralem:" location: Lokasyon longitude: "Lemen:" - save_button: Star ke + save_button: Qeyd ke subject: "Mersel:" location: edit: Timar ke @@ -151,7 +151,7 @@ diq: view: Bıvin view: login: Cıkewtış - save_button: Star ke + save_button: Qeyd ke editor: default: Hesıbyaye (%{name} yo ke karêno) potlatch: diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index aa08caef9..1fe2b3291 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -25,7 +25,7 @@ dsb: language: Rěc latitude: Å yrina longitude: Dlinina - title: Titel + title: Tema user: Wužywaŕ friend: friend: Pśijaśel @@ -34,7 +34,7 @@ dsb: body: Tekst recipient: Dostawaŕ sender: Wótpósłaŕ - title: Titel + title: Tema trace: description: Wopisanje latitude: Å yrina @@ -356,6 +356,14 @@ dsb: title: Planet OSM zoom: Skalěrowanje title: Eksportěrowaś + fixthemap: + how_to_help: + join_the_community: + title: Zgromaźeństwu pśistupiś + title: Kak móžoÅ¡ pomagaś + other_concerns: + title: Druge nastupnosći + title: Problem k wěsći daś / Kórtu pópÅ¡awiś geocoder: description: title: @@ -1033,7 +1041,7 @@ dsb: contributors_title_html: NaÅ¡e sobustatkujuce contributors_za_html: "Pódpołdnjowa Afrika: Wopśimujo daty z Chief Directorate: National Geo-Spatial Information, Statne awtorske pÅ¡awo wuměnjone." credit_1_html: Pominamy se, až pódawaÅ¡ sobustatkujucych “© OpenStreetMap”. - credit_2_html: MusyÅ¡ teke wujasniś, až daty stoje pód licencu Open Database, a, jolicnaÅ¡e kórtowe kachle se wužywaju, až kartografija licencěrujo se pód CC-BY-SA licencuje. MóžoÅ¡ to cyniś, z tym až wótkazujoÅ¡ do toś togo boka awtorskego pÅ¡awa. Alternatiwnje, a ako pótrěbnosć, jolic rozdźělujoÅ¡ OSM w datowem formje, móžoÅ¡ direktnje k licencam pomjenjowaś a wótkazaś. W medijach, źož wótkaze njejsu móžno (na pś. wuśišćane źěła), naraźujomy śi, twójich cytarjow na openstreetmap.org (snaź z tym až rozÅ¡yrjujoÅ¡ 'OpenStreetMap' k toś tej połnej adresy), na opendatacommons.org a, jeli to je relewantne, na creativecommons.org dopomnjeś. + credit_2_html: MusyÅ¡ teke wujasniś, až daty stoje pód licencu Open Database, a, jolic naÅ¡e kórtowe kachle se wužywaju, až kartografija licencěrujo se pód CC-BY-SA. MóžoÅ¡ to cyniś, z tym až wótkazujoÅ¡ do toś togo boka awtorskego pÅ¡awa. Alternatiwnje, a ako pótrěbnosć, jolic rozdźělujoÅ¡ OSM w datowem formje, móžoÅ¡ direktnje k licencam pomjenjowaś a wótkazaś. W medijach, źož wótkaze njejsu móžno (na pś. wuśišćane źěła), naraźujomy śi, twójich cytarjow na openstreetmap.org (snaź z tym až rozÅ¡yrjujoÅ¡ 'OpenStreetMap' k toś tej połnej adresy), na opendatacommons.org a, jolic to jo relewantne, na creativecommons.org dopomnjeś. credit_3_html: "Za pśepytujobnu elektronisku kórtu by měło se źěkowanje w rožku kórty pokazaś. Na pśikład:" credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap infringement_1_html: Sobustatkujucych OSM napominamy, až njedodawaju nigda daty ze žrědłow, kótarež su pśez awtorske pÅ¡awo šćitane (na pś. z Google Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow. @@ -1464,6 +1472,11 @@ dsb: delete: scheduled_for_deletion: Za wulaÅ¡owanje pśedwiźona cera description: + description_with_count: + few: GPX-dataja z %{count} dypkami wót %{user} + one: GPX-dataja z %{count} dypkom wót %{user} + other: GPX-dataja z %{count} dypkami wót %{user} + two: GPX-dataja z %{count} dypkoma wót %{user} description_without_count: GPX-dataja wót %{user} edit: description: "Wopisanje:" diff --git a/config/locales/el.yml b/config/locales/el.yml index 2582b1d88..fffbf043d 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -32,7 +32,7 @@ el: language: Γλώσσα latitude: Γεωγραφικό πλάτος longitude: Γεωγραφικό μήκος - title: Τίτλος + title: Θέμα user: Χρήστης friend: friend: Φίλος @@ -41,7 +41,7 @@ el: body: Σώμα recipient: Παραλήπτης sender: Αποστολέας - title: Τίτλος + title: Θέμα trace: description: Περιγραφή latitude: Γεωγραφικό πλάτος diff --git a/config/locales/en.yml b/config/locales/en.yml index bb3f542b7..4384fda86 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -184,6 +184,7 @@ en: note: title: "Note: %{id}" new_note: "New Note" + description: "Description" open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" @@ -2108,7 +2109,7 @@ en: map_data_zoom_in_tooltip: Zoom in to see map data notes: new: - intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below." + intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)" add: Add Note show: anonymous_warning: This note includes comments from anonymous users which should be independently verified. diff --git a/config/locales/es.yml b/config/locales/es.yml index fde70415f..eda489cb5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -48,7 +48,7 @@ es: language: Idioma latitude: Latitud longitude: Longitud - title: Título + title: Asunto user: Usuario friend: friend: Amigo @@ -57,7 +57,7 @@ es: body: Cuerpo recipient: Destinatario sender: Remitente - title: Título + title: Asunto trace: description: Descripción latitude: Latitud @@ -375,6 +375,18 @@ es: title: Planeta OSM zoom: Zoom title: Exportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Simplemente haz clic en o el mismo icono en la pantalla del mapa.\nEsto agregará un marcador para el mapa, que puedes mover\narrastrándolo. Agrega tu mensaje y luego haz clic en guardar y otros usuarios lo investigarán." + join_the_community: + explanation_html: Si has notado un problema con nuestros datos del mapa, por ejemplo un camino no encontrado o tu dirección, la mejor manera de proceder es unirse a la comunidad de OpenStreetMap y añadir o corrigir los datos por ti mismo. + title: Unirse a la comunidad + title: Cómo ayudar + other_concerns: + explanation_html: "Si tienes preocupaciones sobre cómo se están utilizando nuestros datos o sobre el contenido, consulta nuestra\npágina de derechos de autor para obtener más información legal, o contacta con el grupo de trabajo OSMF apropiado." + title: Otras preocupaciones + title: Reportar un problema / corregir el mapa geocoder: description: title: diff --git a/config/locales/et.yml b/config/locales/et.yml index c3d26ad5a..2d09b5fc6 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -354,6 +354,18 @@ et: title: Planet OSM zoom: Suurendus title: Eksportimine + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Kliki või samale ikoonile kaardivaates.\nSee lisab kaardile markeri, mida sa saad liigutada seda hiirega lohistades. Lisa oma sõnum, seejärel kliki \"Salvesta\" ja teised kaardistajad näevad seda." + join_the_community: + explanation_html: Kui oled märganud probleemi meie kaardi andmetes, näiteks puuduvat teed või enda aadressi, siis parim viis selle lahendamiseks on liituda OpenStreetMapi kogukonnaga ja muuta või parandada andmed ise. + title: Liitu kogukonnaga + title: Kuidas aidata + other_concerns: + explanation_html: "Kui sul on küsimusi meie andmete kasutamise või sisu kohta, siis palun pöördu juriidilise info\nsaamiseks meie autoriõiguste lehele või võta ühendust sobiva OSMF töögrupiga." + title: Muud probleemid + title: Probleemist teatamine / kaardi parandamine geocoder: description: title: @@ -868,6 +880,7 @@ et: title: Tunnustamise näide contributors_at_html: "Austria: Sisaldab andmeid\nViini linnast \n(CC BY tingimustel),\nVorarlbergi liidumaast ja\nTirooli liidumaast (CC BY AT tingimustel koos õiendustega)." contributors_ca_html: "Kanada: Sisaldab\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) ja StatCan (Geography Division,\nStatistics Canada) kaardiandmeid." + contributors_fi_html: "Soome: Sisaldab kaardiandmeid, mis on pärit Maanmittauslaitos\nja teistest andmekogumitest \nMaanmittauslaitos litsentsi tingimustel." contributors_footer_1_html: "Täpsemat teavet nendest ja teistest allikatest, mida on kasutatud\nOpenStreetMapi täiustamiseks võib näha Kaastööliste lehel OpenStreetMapi vikis." contributors_footer_2_html: "Andmete kaasamisest OpenStreetMapi ei järeldu, et\nalgne andmete pakkuja toetab OpenStreetMapi, pakub mingit garantiid või\nvõtab endale mingeid kohustusi." contributors_fr_html: "Prantsusmaa: Sisaldab kaardiandmeid, mis on pärit\nDirection Générale des Impôts." diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 6caf085fe..21736ca69 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -6,6 +6,7 @@ # Author: Asieriko # Author: MikelEH # Author: PerroVerd +# Author: Subi # Author: Theklan # Author: Xabier Armendaritz eu: @@ -17,15 +18,16 @@ eu: language: Hizkuntza latitude: Latitude longitude: Longitude - title: Izenburua + title: Gaia user: Erabiltzailea friend: friend: Lagun user: Erabiltzailea message: body: Testua + recipient: Hartzailea sender: Igorlea - title: Izenburua + title: Gaia trace: description: Deskribapen latitude: Latitude @@ -50,6 +52,7 @@ eu: old_relation: Erlazio zaharra old_way: Bide zaharra relation: Erlazioa + session: Saioa trace: Trazoa tracepoint: Trazo puntua tracetag: Trazo etiketa @@ -57,13 +60,20 @@ eu: way: Bidea way_tag: Bidearen etiketa browse: + changeset: + belongs_to: Egilea containing_relation: entry: "%{relation_name} erlazioa" + location: "Kokapena:" not_found: type: node: nodo relation: erlazio way: bide + note: + title: "Oharra: %{id}" + relation: + members: Kideak relation_member: type: node: Nodo @@ -72,10 +82,11 @@ eu: start_rjs: loading: Kargatzen... tag_details: - tags: "Etiketak:" + tags: Etiketak timeout: type: relation: erlazio + version: Bertsioa changeset: changeset: anonymous: Anonimoa @@ -164,6 +175,7 @@ eu: runway: Lurreratze pista terminal: Terminala amenity: + WLAN: WiFi Sarbidea airport: Aireportu arts_centre: Arte Zentroa atm: Kutxazain automatikoa @@ -252,6 +264,7 @@ eu: national_park: Parke Nazionala protected_area: Babestutako Eremua bridge: + aqueduct: Akueduktua "yes": Zubia building: "yes": Eraikina @@ -295,6 +308,7 @@ eu: construction: Eraikuntza farm: Baserria forest: Baso + garages: Garajeak meadow: Larre military: Eremu Militarra mine: Meategi @@ -317,6 +331,7 @@ eu: park: Parkea pitch: Kirolgunea playground: Jolastoki + sauna: Sauna sports_centre: Kiroldegi stadium: Estadio swimming_pool: Igerilekua @@ -328,6 +343,7 @@ eu: channel: Kanal crater: Crater fjord: Fiordo + forest: Basoa geyser: Geiser glacier: Glaziar hill: Muinoa @@ -347,6 +363,7 @@ eu: water: Ura wood: Baso office: + architect: Arkitektoa employment_agency: Enplegu agentzia estate_agent: Inmobiliaria government: Gobernuko bulegoa @@ -420,6 +437,7 @@ eu: newsagent: Kioskoa optician: Optika pet: Animalia-denda + pharmacy: Farmazia photo: Argazki-denda shoes: Zapatadenda shopping_centre: Merkatal Gunea @@ -455,17 +473,20 @@ eu: waterfall: Ur-jauzi weir: Uharka layouts: + about: Honi buruz edit: Aldatu export: Esportatu help: Laguntza history: Historia home: hasiera + learn_more: Gehiago ikasi log_in: Saioa hasi logo: alt_text: OpenStreetMap logoa logout: saioa itxi make_a_donation: text: Dohaintza egin + more: Gehiago sign_up: izena eman license_page: foreign: @@ -510,6 +531,10 @@ eu: unread_button: Markatu irakurri gabekotzat sent_message_summary: delete_button: Ezabatu + note: + mine: + creator: Sortzailea + description: Deskribapena notifier: diary_comment_notification: hi: Kaixo %{to_user}, @@ -527,6 +552,8 @@ eu: greeting: Kaixo, message_notification: hi: Kaixo %{to_user}, + note_comment_notification: + greeting: Kaixo, oauth: oauthorize: allow_write_api: mapa aldatu. @@ -537,6 +564,11 @@ eu: name: Izena show: allow_write_api: mapa aldatu. + confirm: Ziur zaude? + redaction: + show: + description: "Deskribapena:" + user: "Sortzailea:" site: edit: user_page_link: Lankide orria @@ -726,21 +758,22 @@ eu: deactivate_user: erabiltzaile hau ezgaitu delete_user: lankide hau ezabatu description: Deskribapen - diary: egunerokoa - edits: aldaketak + diary: Egunerokoa + edits: Aldaketak email address: "Eposta helbidea:" hide_user: Erabiltzaile hau ezkutatu km away: "%{count} km-tara" m away: "%{count} m-tara" mapper since: "Noiztik mapatzaile:" + my comments: Nire Iruzkinak my diary: nire egunerokoa my edits: nire aldaketak - my settings: nire aukerak + my settings: Nire Hobespenak remove as friend: lagun bezala kendu role: administrator: Lankide hau administratzailea da moderator: Lankide hau moderatzailea da - send message: mezua bidali + send message: Mezua bidali settings_link_text: hobespenak status: "Egoera:" user location: Lankidearen kokapena @@ -749,6 +782,8 @@ eu: partial: creator_name: Egilea edit: Aldatu + next: Hurrengoa » + previous: « Aurrekoa show: Erakutsi status: Egoera period: @@ -764,3 +799,5 @@ eu: confirm: Berretsi revoke: confirm: Berretsi + welcome_page: + title: Ongi etorri! diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 915e88963..5b8a25a3f 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -365,6 +365,15 @@ fa: title: سیاره ی OSM zoom: بزگ‌نمایی title: خارج سازی + fixthemap: + how_to_help: + join_the_community: + explanation_html: اگر مشکلی با داده های نقشهٔ ما دارید به عنوان مثال جاده‌ای یا نشانی‌ای گم شده‌است، بهترین راه برای اقدام به عضویت جامعهٔ اپن‌استریت‌مپ بپیوندید و داده‌ها را خودتان اضافه یا تعمیر کنید. + title: به جمع ما بپیوندید + title: چگونه کمک کنید + other_concerns: + title: نگرانی‌های دیگر + title: گزارش مشکل / تعمیر نقشه geocoder: description: title: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index d5484ad1e..2de822f81 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -119,7 +119,9 @@ fi: osmchangexml: osmChange XML relation: Relaatiot (%{count}) title: "Muutoskokoelma: %{id}" + closed: Ratkaistu closed_by_html: Suljettu %{time} sitten käyttäjän %{user} toimesta + closed_html: Ratkaistu %{time} sitten containing_relation: entry: Relaatio %{relation_name} entry_role: Relaatio %{relation_name} (rooli %{relation_role}) @@ -128,9 +130,13 @@ fi: created_html: Lähettänyt käyttäjä %{time} sitten deleted_by_html: Poistettu %{time} sitten käyttäjän %{user} toimesta download_xml: Lataa XML-tiedostona + edited_by_html: Muokannut viimeksi käyttäjä %{user} %{time} sitten in_changeset: Muutoskokoelma location: "Sijainti:" no_comment: (ei kommenttia) + node: + history_title: Pisteen %{name} historia + title: "Piste: %{name}" not_found: sorry: "%{type} %{id} ei ole olemassa." type: @@ -140,14 +146,18 @@ fi: way: Polkua note: closed_by: Ratkaissut käyttäjä %{user} %{when} sitten + closed_by_anonymous: Ratkaissut tuntematon käyttäjä %{when} sitten closed_title: "Ratkaistu karttailmoitus #%{note_name}" commented_by: Kommentti käyttäjältä %{user} %{when} sitten + commented_by_anonymous: Kommentti tuntemattomalta käyttäjältä %{when} sitten hidden_by: Piilottanut käyttäjä %{user} %{when} sitten hidden_title: "Piilotettu karttailmoitus #%{note_name}" new_note: Uusi karttailmoitus open_by: Lähettänyt käyttäjä %{user} %{when} sitten + open_by_anonymous: Luonut tuntematon käyttäjä %{when} sitten open_title: "Ratkaisematon karttailmoitus #%{note_name}" reopened_by: Avannut uudelleen käyttäjä %{user} %{when} sitten + reopened_by_anonymous: Avannut uudelleen tuntematon käyttäjä %{when} sitten title: "Karttailmoitus: %{id}" part_of: Osana seuraavia redacted: @@ -160,6 +170,7 @@ fi: relation: history_title: Relaation %{name} historia members: Jäsenet + title: "Relaatio: %{name}" relation_member: entry_role: "%{type} %{name} roolissa %{role}" type: @@ -167,6 +178,7 @@ fi: relation: Relaatio way: Polku start_rjs: + feature_warning: Ladataan %{num_features} ominaisuutta, mikä saatta hidastaa tai kaataa verkkoselaimen. Haluatko varmasti näyttää nämä tiedot? load_data: Lataa tiedot loading: Ladataan tietoja... tag_details: @@ -185,6 +197,13 @@ fi: version: Versio view_details: Näytä tiedot view_history: Näytä historia + way: + also_part_of: + one: osa viivaa %{related_ways} + other: osa viivoja %{related_ways} + history_title: Viivan %{name} historia + nodes: Pisteet + title: "Viiva: %{name}" changeset: changeset: anonymous: Tuntematon @@ -201,6 +220,7 @@ fi: saved_at: Tallennettu user: Käyttäjä list: + load_more: Lataa lisää title: Muutoskokoelmat title_friend: Kaverien muutoskokoelmat title_nearby: Lähellä olevien käyttäjien muutoskokoelmat @@ -863,6 +883,8 @@ fi: help_page: help: description: Etsi vastauksia tai esitä oma kysymyksesi OSM:n kysy- ja vastaa -sivustolla. Englanninkielinen. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ introduction: Ohjeita ja vinkkejä OpenStreetMapin käyttöön on saatavilla useista eri lähteistä. title: Ohjekeskus welcome: @@ -871,6 +893,7 @@ fi: url: /welcome wiki: description: Tutustu syvällisemmin OpenStreetMapiin wikikirjastossa. Osittain englanninkielinen. + title: wiki.openstreetmap.org url: http://wiki.openstreetmap.org/wiki/Fi:Main_Page javascripts: close: Sulje @@ -886,6 +909,7 @@ fi: standard: Perinteinen transport_map: Joukkoliikenne copyright: © OpenStreetMapin tekijät + donate_link_text: layers: data: Kartta-aineisto header: Karttanäkymä @@ -932,12 +956,14 @@ fi: createnote_tooltip: Ilmoita karttavirheestä edit_disabled_tooltip: Aloita kartan muokkaaminen suurentamalla karttaa edit_tooltip: Muokkaa karttaa + map_data_zoom_in_tooltip: Näytä kartta-aineisto lähentämällä karttaa + map_notes_zoom_in_tooltip: Näytä karttailmoitukset lähentämällä karttaa layouts: about: Tietoja community: Yhteisö community_blogs: Yhteisöblogit community_blogs_title: OpenStreetMap-yhteisön jäsenten blogit - copyright: Tekijänoikeudet ja lisenssit + copyright: Tekijänoikeudet data: Tiedot donate: Tue OpenStreetMapia %{link} laitteistopäivitysrahastoon. edit: Muokkaa @@ -963,6 +989,7 @@ fi: make_a_donation: text: Lahjoita title: Tue OpenStreetMapia rahallisella lahjoituksella. + more: Lisää osm_offline: OpenStreetMapin tietokanta ei toistaiseksi ole käytettävissä välttämättömien ylläpitotöiden takia. osm_read_only: OpenStreetMapin tietokantaa ei toistaiseksi voi muokata välttämättömien ylläpitotöiden takia. partners_bytemark: Bytemark Hosting @@ -1199,6 +1226,8 @@ fi: allow_write_notes: Muokkaa muistiinpanoja. allow_write_prefs: muokata käyttäjäsi asetuksia request_access: Sovellus %{app_name} pyytää pääsyä käyttäjätiliisi %{user}. Tarkasta oikeudet, jotka tahdot antaa sovellukselle. Voit valita mielestäsi sopivat oikeudet. + oauthorize_success: + verification: Vahvistuskoodi on %{code}. revoke: flash: Olet poistanut sovelluksen %{application} avaimen oauth_clients: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 12008ad08..0940cd8da 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -56,7 +56,7 @@ fr: language: Langue latitude: Latitude longitude: Longitude - title: Titre + title: Sujet user: Utilisateur friend: friend: Ami @@ -65,7 +65,7 @@ fr: body: Corps recipient: Destinataire sender: Expéditeur - title: Titre + title: Sujet trace: description: Description latitude: Latitude @@ -383,6 +383,18 @@ fr: title: Planète OSM zoom: Zoom title: Exporter + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Cliquez simplement sur ou cette même icône sur l’affichage de la carte.\nCela ajoutera un marqueur à la carte, que vous pourrez déplacer en le tirant. Ajoutez votre message, puis cliquez sur enregistrer, et d’autres cartographes l’investigueront." + join_the_community: + explanation_html: "Si vous avez remarqué un problème avec nos données de carte, par exemple une route manquante ou votre adresse, le meilleur moyen de\nfaire est de rejoindre la communauté OpenStreetMap et d’ajouter ou réparer les données vous-même." + title: Rejoindre la communauté + title: Comment aider + other_concerns: + explanation_html: "Si vous êtes préoccupé par la manière dont nos données sont utilisées ou sur leur contenu, veuillez consulter notre\npage d e droit d’auteur pour des informations plus légales, ou contacter le \ngroupe de travail OSMF approprié." + title: Autres préoccupations + title: Signaler un problème / Corriger la carte geocoder: description: title: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index c3fba0c5b..47e7861a5 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -7,6 +7,12 @@ # Author: Toliño # Author: Vivaelcelta gl: + about_page: + copyright_html: ©Colaboradores do
    OpenStreetMap + local_knowledge_title: Coñecemento local + next: Seguinte + open_data_title: Datos libres + partners_title: Socios activerecord: attributes: diary_comment: @@ -15,7 +21,7 @@ gl: language: Lingua latitude: Latitude longitude: Lonxitude - title: Título + title: Asunto user: Usuario friend: friend: Amigo @@ -24,7 +30,7 @@ gl: body: Corpo recipient: Destinatario sender: Remitente - title: Título + title: Asunto trace: description: Descrición latitude: Latitude @@ -86,26 +92,31 @@ gl: browse: anonymous: anónimo changeset: - belongs_to: Autor/a + belongs_to: Autor changesetxml: Conxunto de cambios XML feed: title: Conxunto de cambios %{id} title_comment: Conxunto de cambios %{id} - %{comment} node: Nodos (%{count}) + node_paginated: Nodos (%{x}-%{y} de %{count}) osmchangexml: osmChange XML + relation: Relacións (%{count}) + relation_paginated: Relacións (%{x}-%{y} de %{count}) title: "Conxunto de cambios: %{id}" + way: Camiños (%{count}) + way_paginated: Camiños (%{x}-%{y} de %{count}) closed: Pechado - closed_by_html: Cerrado fai %{time} por %{user} - closed_html: Cerrado fai %{time} + closed_by_html: Pechado hai %{time} por %{user} + closed_html: Pechado hai %{time} containing_relation: entry: Relación %{relation_name} entry_role: Relación %{relation_name} (como %{relation_role}) created: Creado - created_by_html: Creado fai %{time} por %{user} - created_html: Creado fai %{time} - deleted_by_html: Eliminado fai %{time} por %{user} + created_by_html: Creado hai %{time} por %{user} + created_html: Creado hai %{time} + deleted_by_html: Borrado hai %{time} por %{user} download_xml: Descargar en XML - edited_by_html: Editado fai %{time} por %{user} + edited_by_html: Editado hai %{time} por %{user} in_changeset: Conxunto de cambios location: "Localización:" no_comment: (sen comentarios) @@ -113,19 +124,26 @@ gl: history_title: "Historial do nodo: %{name}" title: "Nodo: %{name}" not_found: - sorry: Sentímolo, non se puido atopar o %{type} co id %{id}. + sorry: Sentímolo, non se puido atopar o %{type} co nº%{id}. type: changeset: conxunto de cambios node: nodo relation: relación way: camiño note: - closed_title: "Nota resolta #%{note_name}" - hidden_title: "Nota oculta #%{note_name}" + closed_by: Resolto por %{user} hai %{when} + closed_by_anonymous: Resolto por un anónimo hai %{when} + closed_title: Nota resolta nº%{note_name} + commented_by: Comentado por %{user} hai %{when} + commented_by_anonymous: Comentado por un anónimo hai %{when} + hidden_by: Agochado por %{user} hai %{when} + hidden_title: Nota agochada nº%{note_name} new_note: Nova nota - open_by: Creado por %{user} fai %{when} - open_by_anonymous: Creado por un anónimo fai %{when} - open_title: "Nota sen resolver #%{note_name}" + open_by: Creado por %{user} hai %{when} + open_by_anonymous: Creado por un anónimo hai %{when} + open_title: Nota sen resolver nº%{note_name} + reopened_by: Reactivado por %{user} hai %{when} + reopened_by_anonymous: Reactivado por un anónimo hai %{when} title: "Nota: %{id}" part_of: Parte de redacted: @@ -136,7 +154,7 @@ gl: relation: relación way: camiño relation: - history_title: "Historial de relación: %{name}" + history_title: "Historial da relación: %{name}" members: Membros title: "Relación: %{name}" relation_member: @@ -146,6 +164,7 @@ gl: relation: Relación way: Camiño start_rjs: + feature_warning: A carga de %{num_features} características pode facer que o seu navegador vaia lento ou que non responda. Está seguro de querer mostrar eses datos? load_data: Cargar os datos loading: Cargando... tag_details: @@ -165,7 +184,10 @@ gl: view_details: Ver os detalles view_history: Ver o historial way: - history_title: "Historial co camiño: %{name}" + also_part_of: + one: parte do camiño %{related_ways} + other: parte dos camiños %{related_ways} + history_title: "Historial do camiño: %{name}" nodes: Nodos title: "Camiño: %{name}" changeset: @@ -184,13 +206,13 @@ gl: saved_at: Gardado o user: Usuario list: - empty: Non hai conxuntos de cambios atopados. - empty_area: Non hai conxuntos de cambios nesta área. - empty_user: Non hai conxuntos de cambios por este usuario/a. + empty: Non se atopou ningún conxunto de cambios. + empty_area: Non hai conxuntos de cambios nesta zona. + empty_user: Este usuario non ten ningún conxunto de cambios. load_more: Cargar máis - no_more: Non hai máis conxuntos de cambios atopados. - no_more_area: Non hai máis conxuntos de cambios nesta área. - no_more_user: Non hai máis conxuntos de cambios por este usuario/a. + no_more: Non se atopou ningún outro conxunto de cambios. + no_more_area: Non hai máis conxuntos de cambios nesta zona. + no_more_user: Este usuario non ten ningún outro conxunto de cambios. title: Conxuntos de cambios title_friend: Conxuntos de cambios dos seus amigos title_nearby: Conxuntos de cambios dos usuarios de lugares próximos @@ -307,6 +329,7 @@ gl: paste_html: Pegue o código HTML para incluílo na páxina web scale: Escala too_large: + advice: "Se a exportación anterior falla, considere utilizar unha das fontes listadas a continuación:" body: "Esta zona é grande de máis para ser exportada como datos XML do OpenStreetMap. Amplíe a zona ou escolla unha menor, ou utilice unha das seguintes fontes para as descargas masivas de datos:" geofabrik: description: Extraccións actualizadas regularmente dalgúns continentes, países e cidades seleccionados @@ -317,11 +340,25 @@ gl: other: description: Fontes adicionais listadas no wiki do OpenStreetMap title: Outras fontes + overpass: + description: Descargar esta caixa desde un espello da base de datos do OpenStreetMap + title: Pasarela da API planet: description: Copias actualizadas regularmente da base de datos do OpenStreetMap ao completo title: Planeta OSM zoom: Zoom title: Exportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Simplemente, prema en ou na mesma icona na visualización do mapa.\nIsto ha engadir un marcador ao mapa que pode mover\narrastrándoo. Engada a súa mensaxe, prema en \"Gardar\" e outras persoas investigarán iso." + join_the_community: + explanation_html: "Se atopa algún problema cos datos dos nosos mapas (por exemplo, se falta algunha estrada), o mellor é\nunirse á comunidade do OpenStreetMap e engadir ou corrixir os datos directamente." + title: Únase á comunidade + title: Como axudar + other_concerns: + title: Outras preocupacións + title: Informar dun problema/Corrixir o mapa geocoder: description: title: @@ -853,7 +890,18 @@ gl: weir: Vaira help_page: help: + description: Formule unha pregunta ou busque respostas no sitio de preguntas e respostas do OSM. title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: "O OpenStreetMap ten varios recursos para aprender sobre o proxecto, para formular e responder preguntas,\nasí como para debater e documentar colaborativamente sobre temas de cartografía." + title: Obter axuda + welcome: + description: Comece con esta guía rápida cos principios básicos do OpenStreetMap. + title: Dámoslle a benvida ao OSM + url: /welcome + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: close: Pechar edit_help: Desplace o mapa e amplíeo na localización que queira editar; logo, prema aquí. @@ -869,7 +917,7 @@ gl: standard: Estándar transport_map: Mapa de transporte copyright: © Colaboradores do OpenStreetMap - donate_link_text: + donate_link_text: layers: data: Datos do mapa header: Capas do mapa @@ -916,8 +964,8 @@ gl: createnote_tooltip: Engadir unha nota ao mapa edit_disabled_tooltip: Achegue para editar o mapa edit_tooltip: Editar o mapa - map_data_zoom_in_tooltip: Aumenta o zoom para ver os datos do mapa - map_notes_zoom_in_tooltip: Aumenta o zoom para ver as notas do mapa + map_data_zoom_in_tooltip: Achegar para ver os datos do mapa + map_notes_zoom_in_tooltip: Achegar para ver as notas do mapa layouts: about: Acerca de community: Comunidade @@ -938,13 +986,14 @@ gl: history: Historial home: Ir á localización inicial intro_2_create_account: Cree unha conta de usuario - intro_header: Benvido/a a OpenStreetMap! + intro_header: Dámoslle a benvida ao OpenStreetMap! + intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma vostede e de libre uso baixo unha licenza aberta. learn_more: Máis información - log_in: Iniciar sesión + log_in: Rexistro log_in_tooltip: Acceder ao sistema cunha conta existente logo: alt_text: Logo do OpenStreetMap - logout: Pechar sesión + logout: Saír make_a_donation: text: Facer unha doazón title: Apoie o OpenStreetMap cunha doazón @@ -958,7 +1007,7 @@ gl: partners_ucl: centro de realidade virtual do UCL sign_up: Rexistrarse sign_up_tooltip: Crear unha conta para editar - start_mapping: Comenzar a mapear + start_mapping: Comezar a cartografiar tag_line: O mapa mundial libre user_diaries: Diarios de usuario user_diaries_tooltip: Ollar os diarios do usuario @@ -973,6 +1022,7 @@ gl: title: Exemplo de recoñecemento contributors_at_html: "Austria: Contén datos de\nStadt Wien (baixo a licenza\nCC BY),\nLand Vorarlberg e\nLand Tirol (baixo a licenza CC-BY AT con emendas)." contributors_ca_html: "Canadá: Contén datos de\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) e StatCan (Geography Division,\nStatistics Canada)." + contributors_fi_html: "Finlandia: Contén datos da\nNational Land Survey of Finland's Topographic Database\ne outros conxuntos de datos, baixo a\nlicenza NLSFI." contributors_footer_1_html: "Para obter máis información sobre estas e outras fontes usadas\npara axudar na mellora do OpenStreetMap, bote unha ollada á páxina dos\ncolaboradores no wiki do OpenStreetMap." contributors_footer_2_html: "A inclusión de datos no OpenStreetMap non implica que o que\norixinalmente proporcionou os datos apoie o OpenStreetMap,\ndea calquera garantía ou acepte calquera responsabilidade." contributors_fr_html: "Francia: Contén datos con orixe na\nDirection Générale des Impôts." @@ -995,7 +1045,7 @@ gl: more_1_html: "Descubra máis sobre como empregar os nosos datos e como acreditarnos nas preguntas máis frecuentes\nsobre asuntos legais." more_2_html: "Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un\nmapa API gratuíto aos desenvolvedores.\nVexa a política de uso da API,\na política de uso de cuadrantes\ne a política de uso do Nominatim." more_title_html: Máis información - title_html: Dereitos de autor e licenza + title_html: Dereitos de autoría e licenza native: mapping_link: comezar a contribuír native_link: versión en galego @@ -1184,6 +1234,10 @@ gl: allow_write_notes: modificar as notas. allow_write_prefs: modificar as súas preferencias de usuario. request_access: A aplicación %{app_name} solicita acceso á súa conta, %{user}. Comprobe que desexa que a aplicación teña as seguintes capacidades. Pode elixir cantas queira. + oauthorize_failure: + invalid: O pase de autorización non é válido. + oauthorize_success: + verification: O código de verificación é %{code}. revoke: flash: Revogou o pase de %{application} oauth_clients: @@ -1894,7 +1948,7 @@ gl: way_html: Un camiño é unha liña ou área, como unha estrada, un arroio, un lago ou un edificio. introduction_html: Dámoslle a benvida ao OpenStreetMap, o mapa do mundo libre e editable. Agora que está rexistrado, xa pode empezar a cartografiar. Velaquí hai unha guía rápida das cousas máis importantes que necesita saber. questions: - paragraph_1_html: Necesita axuda para cartografiar ou non ten claro como usar o OpenStreetMap? Atope resposta ás súas preguntas no sitio web de axuda. + paragraph_1_html: "O OpenStreetMap ten varios recursos para aprender sobre o proxecto, para formular e responder\npreguntas, así como para debater e documentar colaborativamente sobre temas de cartografía.\nObteña axuda aquí." title: Ten algunha pregunta? start_mapping: Comezar a cartografiar title: Reciba a nosa benvida! diff --git a/config/locales/he.yml b/config/locales/he.yml index 4ba85bcd5..35a9290ab 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -14,8 +14,13 @@ # Author: Nemo bis # Author: Orsa # Author: YaronSh +# Author: Yona b # Author: תומר ט he: + about_page: + local_knowledge_title: ידע מקומי + next: הבא + partners_title: שותפים activerecord: attributes: diary_comment: @@ -24,7 +29,7 @@ he: language: שפה latitude: קו רוחב longitude: קו אורך - title: כותרת + title: נושא user: משתמש friend: friend: חבר @@ -33,7 +38,7 @@ he: body: גוף recipient: נמען sender: שולח - title: כותרת + title: נושא trace: description: תיאור latitude: קו רוחב @@ -108,10 +113,18 @@ he: title: "ערכת שינויים: %{id}" way: דרכים (%{count}) way_paginated: דרכים (%{x}–%{y} מתוך %{count}) + closed: נסגר + closed_by_html: נסגר לפני %{time} על ידי %{user} + closed_html: נסגר לפני %{time} containing_relation: entry: יחס %{relation_name} entry_role: יחס %{relation_name} (בתור %{relation_role}) + created: נוצר + created_by_html: נוצר לפני %{time} על ידי %{user} + created_html: נוצר לפני %{time} + deleted_by_html: נמחק לפני %{time} על ידי %{user} download_xml: הורדת XML + edited_by_html: נערך לפני %{time} על ידי %{user} in_changeset: ערכת שינויים no_comment: (אין הערות) node: @@ -185,6 +198,8 @@ he: saved_at: "נשמרו ב:" user: משתמש list: + empty: לא נמצאה סדרת שינויים + load_more: טען עוד title: ערכות שינויים title_friend: ערכות שינויים של החברים שלך title_nearby: ערכות שינויים של משתמשים בסביבה @@ -315,6 +330,15 @@ he: description: עותקים מעודכנים באופן קבוע של כל מסד הנתונים של OpenStreetMap title: פלאנט OSM zoom: מרחק מתצוגה + title: ייצוא + fixthemap: + how_to_help: + join_the_community: + title: להצטרף לקהילה + title: איך ניתן לעזור + other_concerns: + title: דאגות אחרות + title: דווח על בעיה / תקן את המפה geocoder: description: title: @@ -844,14 +868,23 @@ he: water_point: נקודת מים waterfall: מפל מים weir: סכר + help_page: + help: + title: help.openstreetmap.org + title: קבלת עזרה + welcome: + title: ברוכים הבאים ל-OSM + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ html: dir: rtl javascripts: close: סגירה edit_help: עליך להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן. key: - title: מפתח במפה - tooltip: מפתח במפה + title: מפת מפתח + tooltip: מפת מפתח tooltip_disabled: מפתח מפה זמין רק לשכבה התקנית map: base: @@ -860,6 +893,7 @@ he: standard: תקני transport_map: מפת תחבורה copyright: © מתנדבי OpenStreetMap + donate_link_text: layers: data: נתוני המפה header: שכבות במפה @@ -906,7 +940,9 @@ he: createnote_tooltip: הוספת הערה למפה edit_disabled_tooltip: להתקרב כדי לערוך את המפה edit_tooltip: עריכת המפה + map_data_zoom_in_tooltip: יש לקרב את המפה כדי לראות נתוני מפה layouts: + about: אודות community: קהילה community_blogs: בלוגים של הקהילה community_blogs_title: בלוגים של חברי קהילת OpenStreetMap @@ -925,6 +961,8 @@ he: history: היסטוריה home: מעבר למיקום הבית intro_2_create_account: נא ליצור חשבון משתמש + intro_header: ברוכים הבאים ל-OpenStreetMap! + intro_text: OpenStreetMap הוא מפה של העולם, נוצר על ידי אנשים כמוך, וחופשי לשימוש תחת רשיון פתוח. learn_more: מידע נוסף log_in: כניסה לחשבון log_in_tooltip: כניסה עם חשבון קיים @@ -934,6 +972,7 @@ he: make_a_donation: text: תרומה title: תִמכו במיזם OpenStreetMap על־ידי מתן תרומה כספית + more: עוד osm_offline: מסד הנתונים של אתר OpenStreetMap אינו מקוון כעת בשל עבודות תחזוקה המבוצעות בו. osm_read_only: מסד הנתונים של אתר OpenStreetMap נתון כעת במצב קריאה בלבד בשל עבודות תחזוקה המבוצעות בו. partners_bytemark: בייטמארק @@ -944,6 +983,7 @@ he: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: הרשמה sign_up_tooltip: יצירת חשבון לעריכה + start_mapping: להתחיל למפות tag_line: מפת עולם חופשית בשיטת הוויקי user_diaries: יומני משתמשים user_diaries_tooltip: צפייה ביומני המשתמש @@ -958,6 +998,7 @@ he: title: דוגמה לייחוס contributors_at_html: "אוסטריה: מכיל נתונים\nמעיריית וינה לפי תנאי\nCC BY,\nממדינת פורארלברג\nוממדינת טירול (לפי CC-BY AT עם תיקונים)." contributors_ca_html: "קנדה: מכיל נתונים\nמ־GeoBase®‏, GeoGratis‏ (©‏ Department of Natural\nResources Canada)‏, CanVec‏ (©‏ Department of Natural\nResources Canada), ו־StatCan‏ (Geography Division,\nStatistics Canada)." + contributors_fi_html: "פינלנד: מכיל מידע ממסד נתונים טופוגרפיים של פינדלנד וממקורות מידע אחרים, תחת\nרישיון NLSFI." contributors_footer_1_html: "למידע נוסף על מקורות אלה ואחרים ששימשו\nלשיפור OpenStreetMap, נא לראות את דף\nהתורמים בוויקי של OpenStreetMap." contributors_footer_2_html: "הכללה של נתונים ב־OpenStreetMap אינה אומרת שהספק המקורי\nשל הנתוהים תומך ב־OpenStreetMap, לוקח על עצמו אחריות כלשהי, או\nמקבל חבות כלשהי." contributors_fr_html: "צרפת: מכיל נתונים שהגיעו במקור\nממנהלת המסים הכללית (Direction Générale des Impôts)." @@ -1169,6 +1210,12 @@ he: allow_write_notes: לשנות הערות allow_write_prefs: לשנות את העדפות המשתמש שלך. request_access: היישום %{app_name} דורש גישה לחשבונך, %{user}. נא לבדוק האם מתאים לך שהיישום יקבל את היכולות האלו. אפשר לבחור או לא לבחור את כל מה שמתאים לך. + oauthorize_failure: + invalid: האסימון האישור אינו תקף. + title: בקשת אישור נכשלה + oauthorize_success: + title: בקשת אישור אושרה + verification: קוד האימות הוא %{code}. revoke: flash: שללת את האסימון מהיישום %{application}. oauth_clients: @@ -1724,6 +1771,7 @@ he: my comments: ההערות שלי my diary: היומן שלי my edits: העריכות שלי + my messages: ההודעות שלי my notes: הערות המפה שלי my profile: הפרופיל שלי my settings: ההגדרות שלי @@ -1877,7 +1925,7 @@ he: way_html: נתיב הוא קו או אזור כמו דרך, זרם, אגם או מבנה. introduction_html: ברוך בואך ל־OpenStreetMap, מפה חופשית של העולם, שאפשר לערוך. עכשיו שנרשמת, הכול מוכן ואפשר להתחיל לצייר מפות. הנה מדריך קצת שייתן לך את הדברים החשובים שכדאי לך לדעת. questions: - paragraph_1_html: דרושה לך עזרה במיפוי או שלא ברור לך איך להשתמש ב־OpenStreetMap? אפשר לקבל תשובות לשאלות באתר העזרה. + paragraph_1_html: "ל-OpenStreetMap מספר מקורות ללמידה על הפרויקט, לשאול ולענות על שאלות, דיונם לשיתוף פעולה ותיעוד נושאי המיפוי. \n\nלקבל עזרה." title: יש שאלות? start_mapping: להתחיל למפות title: ברוך בואך! diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index aecef1d5e..0fbd75c70 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -1,6 +1,7 @@ # Messages for Upper Sorbian (hornjoserbsce) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: J budissin # Author: Michawiki hsb: about_page: @@ -23,7 +24,7 @@ hsb: language: Rěč latitude: Šěrokostnik longitude: Dołhostnik - title: Titul + title: Tema user: Wužiwar friend: friend: Přećel @@ -32,7 +33,7 @@ hsb: body: Tekst recipient: Přijimowar sender: Wotpósłar - title: Titul + title: Tema trace: description: Wopisanje latitude: Šěrokostnik @@ -188,7 +189,7 @@ hsb: way: also_part_of: few: dźěl pućow %{related_ways} - one: cźěl puća %{related_ways} + one: dźěl puća %{related_ways} other: dźěl pućow %{related_ways} two: dźěl pućow %{related_ways} history_title: "Historija puća: %{name}" @@ -354,6 +355,14 @@ hsb: title: Planet OSM zoom: Skalowanje title: Eksportować + fixthemap: + how_to_help: + join_the_community: + title: Do zhromadźenstwa zastupić + title: Kak móžeÅ¡ pomhać + other_concerns: + title: Druhe naležnosće + title: Problem zdźělić / Kartu poprawić geocoder: description: title: @@ -694,7 +703,7 @@ hsb: tree: Å tom valley: Doł volcano: Wulkan - water: Wodźizny + water: wodźizna wetland: Łučina wetlands: Łučiny wood: Lěs @@ -878,7 +887,7 @@ hsb: rapids: Rěčne prohi river: Rěka riverbank: Rěčny brjóh - stream: Wulkorěka + stream: rěčka wadi: Wadi water_point: Wódne městno waterfall: Wodopad @@ -1461,6 +1470,11 @@ hsb: delete: scheduled_for_deletion: Čara předwidźana za zničenje description: + description_with_count: + few: GPX-dataja z %{count} dypkami wot %{user} + one: GPX-dataja z %{count} dypkom wot %{user} + other: GPX-dataja z %{count} dypkami wot %{user} + two: GPX-dataja z %{count} dypkomaj wot %{user} description_without_count: GPX-dataja wot %{user} edit: description: "Wopisanje:" diff --git a/config/locales/id.yml b/config/locales/id.yml index b844b9260..f14d122f3 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -106,11 +106,11 @@ id: relation: relasi way: way/garis note: - closed_title: "Catatan diselesaikan: % {note_name}" + closed_title: "Catatan diselesaikan: %{note_name}" open_title: "Catatan belum terselesaikan: %{note_name}" title: Catatan redacted: - message_html: Versi % {version} {type} % ini tidak dapat ditampilkan karena telah diedit. Silahkan lihat % {redaction_link} untuk rincian. + message_html: Versi %{version} %{type} ini tidak dapat ditampilkan karena telah diedit. Silahkan lihat %{redaction_link} untuk rincian. redaction: Redaksi %{id} type: node: node/titik @@ -128,7 +128,7 @@ id: tag_details: tags: "Tag:" wiki_link: - key: Deskripsi halaman wiki untuk tag % {key} + key: Deskripsi halaman wiki untuk tag %{key} tag: Deskripsi halaman wiki untuk %{key}=%{value} tag wikipedia_link: Artikel %{page} di Wikipedia timeout: @@ -224,8 +224,8 @@ id: new: title: Entri Baru Catatan Harian no_such_entry: - body: Maaf, tidak ada catatan harian atau komentar dengan id % {id}. Harap memeriksa ejaan, atau mungkin Anda mengklik link yang salah. - heading: "Tidak ada entri dengan id: % {id}" + body: Maaf, tidak ada catatan harian atau komentar dengan id %{id}. Harap memeriksa ejaan, atau mungkin Anda mengklik link yang salah. + heading: "Tidak ada entri dengan id: %{id}" title: Tidak ada entri catatan harian tersebut view: leave_a_comment: Tinggalkan komentar @@ -904,7 +904,7 @@ id: new_messages: one: "%{count} pesan baru" other: "%{count} pesan baru" - no_messages_yet: Anda belum memiliki pesan. Mengapa tidak berhubungan dengan beberapa % {people_mapping_nearby_link}? + no_messages_yet: Anda belum memiliki pesan. Mengapa tidak berhubungan dengan beberapa %{people_mapping_nearby_link}? old_messages: one: "%{count} pesan lama" other: "%{count} pesan lama" @@ -940,7 +940,7 @@ id: one: Anda memiliki %{count} pesan terkirim other: Anda memiliki %{count} pesan terkirim my_inbox: "%{inbox_link} saya" - no_sent_messages: Anda belum memiliki pesan. Mengapa tidak berhubungan dengan beberapa % {people_mapping_nearby_link}? + no_sent_messages: Anda belum memiliki pesan. Mengapa tidak berhubungan dengan beberapa %{people_mapping_nearby_link}? outbox: kotak keluar people_mapping_nearby: orang-orang disekitar Anda yang melakukan pemetaan subject: Subjek @@ -954,9 +954,9 @@ id: title: Baca pesan to: Kepada unread_button: Tandai belum dibaca - wrong_user: Anda login sebagai '% {user}' tetapi pesan yang anda balas tidak dikirim oleh atau untuk pengguna tersebut. Silahkan login sebagai pengguna yang benar untuk membacanya. + wrong_user: Anda login sebagai '%{user}' tetapi pesan yang anda balas tidak dikirim oleh atau untuk pengguna tersebut. Silahkan login sebagai pengguna yang benar untuk membacanya. reply: - wrong_user: Anda login sebagai '% {user}' tapi pesan yang Anda balas tidak terkirim ke pengguna. Silahkan login sebagai pengguna yang benar untuk membalas. + wrong_user: Anda login sebagai '%{user}' tapi pesan yang Anda balas tidak terkirim ke pengguna. Silahkan login sebagai pengguna yang benar untuk membalas. sent_message_summary: delete_button: Hapus note: @@ -985,7 +985,7 @@ id: rss: closed: catatan ditutup (near %{place}) commented: komentar baru (near %{place}) - description_area: Daftar catatan, laporan, komentar atau ditutup di daerah Anda [( %{min_lat}|% {min_lon})--( %{max_lat}|% {max_lon})] + description_area: Daftar catatan, laporan, komentar atau ditutup di daerah Anda [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})] description_item: Sebuah rss feed untuk catatan %{id} opened: catatan baru (near %{place}) reopened: catatan yang diaktifkan kembali (near %{place}) @@ -1041,22 +1041,22 @@ id: note_comment_notification: anonymous: Seorang pengguna anonim closed: - commented_note: "% {commenter} telah meninggalkan komentar pada peta catatan yang Anda komentari. Catatan ini dekat % {place}." - subject_other: "[OpenStreetMap] % {commenter} telah menyelesaikan sebuah catatan yang Anda minati" - subject_own: "[OpenStreetMap] % {commenter} telah menyelesaikan salah satu catatan Anda" - your_note: "% {commenter} telah menyelesaikan salah satu catatan peta Anda dekat % {tempat}." + commented_note: "%{commenter} telah meninggalkan komentar pada peta catatan yang Anda komentari. Catatan ini dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah menyelesaikan sebuah catatan yang Anda minati" + subject_own: "[OpenStreetMap] %{commenter} telah menyelesaikan salah satu catatan Anda" + your_note: "%{commenter} telah menyelesaikan salah satu catatan peta Anda dekat %{place}." commented: - commented_note: "%{commenter} memberi komentar pada catatan peta yang Anda komentari. Catatan ini dekat % {tempat}." - subject_other: "[OpenStreetMap] % {commenter} telah berkomentar pada catatan yang Anda minati" + commented_note: "%{commenter} memberi komentar pada catatan peta yang Anda komentari. Catatan ini dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah berkomentar pada catatan yang Anda minati" subject_own: "[OpenStreetMap] %{commenter} memberikan komentar di salah satu catatan Anda" - your_note: "% {commenter} telah meninggalkan komentar pada salah satu catatan peta Anda dekat % {tempat}." + your_note: "%{commenter} telah meninggalkan komentar pada salah satu catatan peta Anda dekat %{place}." details: Rincian lebih lanjut mengenai catatan dapat ditemukan di %{url}. greeting: Halo, reopened: - commented_note: "% {commenter} telah meninggalkan komentar pada catatan peta yang Anda komentari. Catatan ini dekat % {place}." - subject_other: "[OpenStreetMap] % {commenter} telah mengaktifkan kembali catatan yang Anda minati" - subject_own: "[OpenStreetMap] % {commenter} telah mengaktifkan kembali salah satu catatan Anda" - your_note: "% {commenter} telah mengaktifkan kembali salah satu catatan peta Anda dekat % {place}." + commented_note: "%{commenter} telah meninggalkan komentar pada catatan peta yang Anda komentari. Catatan ini dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah mengaktifkan kembali catatan yang Anda minati" + subject_own: "[OpenStreetMap] %{commenter} telah mengaktifkan kembali salah satu catatan Anda" + your_note: "%{commenter} telah mengaktifkan kembali salah satu catatan peta Anda dekat %{place}." signup_confirm: confirm: "Sebelum kita melakukan hal lainnya, kita perlu melakukan konfirmasi bahwa permintaan ini datang dari Anda, jadi bila benar silahkan Anda klik link di bawah ini untuk melakukan konfirmasi akun Anda:" created: Seseorang (mudah-mudahan Anda) baru saja membuat sebuah akun pada %{site_url}. @@ -1073,7 +1073,7 @@ id: allow_write_gpx: Upload trek GPS allow_write_notes: memodifikasi catatan. allow_write_prefs: modifikasi pengaturan pengguna anda. - request_access: Aplikasi % {app_name} akan meminta akses ke akun, % {pengguna}. Periksa apakah Anda ingin aplikasi untuk memiliki kemampuan berikut. Anda dapat memilih sebanyak atau sesedikit yang Anda inginkan. + request_access: Aplikasi %{app_name} akan meminta akses ke akun, %{user}. Periksa apakah Anda ingin aplikasi untuk memiliki kemampuan berikut. Anda dapat memilih sebanyak atau sesedikit yang Anda inginkan. revoke: flash: Anda telah menolak token untuk %(application} oauth_clients: @@ -1104,7 +1104,7 @@ id: list_tokens: "Token berikut telah dikeluarkan untuk aplikasi untuk nama Anda:" my_apps: Aplikasi klien saya my_tokens: Aplikasi yang telah saya setujui - no_apps: Apakah anda memiliki aplikasi yang ingin didaftarkan untuk digunakan dengan menggunakan standar % {oauth}? Anda harus mendaftar aplikasi web Anda sebelum dapat membuat permintaan OAuth untuk layanan ini. + no_apps: Apakah anda memiliki aplikasi yang ingin didaftarkan untuk digunakan dengan menggunakan standar %{oauth}? Anda harus mendaftar aplikasi web Anda sebelum dapat membuat permintaan OAuth untuk layanan ini. register_new: Daftarkan aplikasi anda registered_apps: "Anda memiliki aplikasi klien terdaftar berikut:" revoke: Batalkan! @@ -1161,7 +1161,7 @@ id: description: "Deskripsi:" destroy: Menghapus Redaksi ini edit: Mengedit Redaksi ini - heading: Menampilkan Redaksi "% {title}" + heading: Menampilkan Redaksi "%{title}" title: Menampilkan Redaksi user: "Pembuat:" update: @@ -1173,7 +1173,7 @@ id: id_not_configured: iD belum dikonfigurasikan no_iframe_support: Browser Anda tidak mendukung iframes HTML yang diperlukan untuk fitur ini. not_public: Anda belum mengatur hasil edit Anda menjadi publik. - not_public_description: Anda tidak dapat mengedit peta kecuali Anda melakukannya. Anda dapat mengatur editan Anda sebagai umum dari halaman % {user_page}. + not_public_description: Anda tidak dapat mengedit peta kecuali Anda melakukannya. Anda dapat mengatur editan Anda sebagai umum dari halaman %{user_page}. potlatch2_not_configured: Potlatch 2 belum dikonfigurasi - silakan lihat http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 untuk informasi lebih lanjut potlatch2_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk menyimpannya dengan Potlatch 2, Anda dapat klik simpan.) potlatch_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk menyimpan di Potlatch, Anda harus membatalkan pilihan garis atau titik saat ini, jika mengedit dalam modus live, atau klik Simpan jika Anda memiliki tombol simpan.) @@ -1293,7 +1293,7 @@ id: download: download edit: edit filename: "Nama File:" - heading: Mengedit dijitasi % {name} + heading: Mengedit dijitasi %{name} map: peta owner: "Pemilik:" points: "Poin/Titik:" @@ -1301,7 +1301,7 @@ id: start_coord: "Koordinat awal:" tags: "Tags:" tags_help: dipisahkan oleh koma - title: Mengedit jejak % {name} + title: Mengedit jejak %{name} uploaded_at: "Diupload:" visibility: Visibilitas visibility_help: apa artinya ini? @@ -1348,7 +1348,7 @@ id: see_all_traces: Lihat semua dijitasi see_your_traces: Melihat dijitasi Anda traces_waiting: - one: "Anda memiliki trek GPS % {count} yang menunggu untuk diupload. Harap pertimbangkan proses ini untuk diselesaikan sebelum meng-upload lagi, sehingga Anda tidak memblokir antrian untuk % {count} pengguna lain. " + one: "Anda memiliki trek GPS %{count} yang menunggu untuk diupload. Harap pertimbangkan proses ini untuk diselesaikan sebelum meng-upload lagi, sehingga Anda tidak memblokir antrian untuk %{count} pengguna lain. " other: Anda memiliki %{count} trek GPS yang menunggu untuk diupload. Harap pertimbangkan proses ini untuk diselesaikan sebelum meng-upload lagi, sehingga Anda tidak memblokir antrian untuk %{count} pengguna lain. upload_trace: Upload trek GPS trace_optionals: @@ -1364,7 +1364,7 @@ id: edit: edit edit_track: "Edit trek ini:" filename: "Nama File:" - heading: Melihat trek % {name} + heading: Melihat trek %{name} map: peta none: Tidak ada owner: "Pemilik:" @@ -1372,7 +1372,7 @@ id: points: "Poin/Titik:" start_coordinates: Koordinat Awal tags: "Tag:" - title: Melihat trek % {name} + title: Melihat trek %{name} trace_not_found: Trek tidak ditemukan! uploaded: "Diupload:" visibility: Visibilitas @@ -1607,10 +1607,10 @@ id: friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman hide_user: sembunyikan pengguna ini - if set location: Menyetel lokasi rumah % {settings_link} untuk melihat pengguna terdekat + if set location: Menyetel lokasi rumah %{settings_link} untuk melihat pengguna terdekat km away: sejauh %{count}km latest edit: "Hasil edit terakhir %{ago}:" - m away: sejauh % {count} meter + m away: sejauh %{count} meter mapper since: "Melakukan pemetaan sejak:" moderator_history: blok yang diberikan my comments: komentar saya @@ -1663,7 +1663,7 @@ id: heading: Mengedit blokir pada %{name} needs_view: Apakah pengguna harus login sebelum blokirnya dihapus? period: Berapa lama, mulai dari sekarang, pengguna akan diblokir dari API. - reason: Alasan mengapa % {name} diblokir. Harap tenang, berikan detail sebanyak mungkin dan masuk akal mengenai situasi Anda. Perlu diingat bahwa tidak semua pengguna memahami jargon masyarakat, jadi silakan coba untuk menggunakan istilah-istilah laymans. + reason: Alasan mengapa %{name} diblokir. Harap tenang, berikan detail sebanyak mungkin dan masuk akal mengenai situasi Anda. Perlu diingat bahwa tidak semua pengguna memahami jargon masyarakat, jadi silakan coba untuk menggunakan istilah-istilah laymans. show: Lihat blokir ini submit: Perbarui blokir title: Mengedit blokir pada %{name} @@ -1686,7 +1686,7 @@ id: heading: Membuat blokir pada %{name} needs_view: Pengguna perlu log in sebelum blokir ini dihapus period: Berapa lama, mulai dari sekarang, pengguna akan diblokir dari API. - reason: Alasan mengapa % {name} diblokir. Harap tenang, berikan detail sebanyak mungkin dan masuk akal mengenai situasi Anda, mengingat bahwa persan akan terlihat oleh umum. Perlu diingat bahwa tidak semua pengguna memahami jargon masyarakat, jadi silakan coba untuk menggunakan istilah-istilah laymans. + reason: Alasan mengapa %{name} diblokir. Harap tenang, berikan detail sebanyak mungkin dan masuk akal mengenai situasi Anda, mengingat bahwa persan akan terlihat oleh umum. Perlu diingat bahwa tidak semua pengguna memahami jargon masyarakat, jadi silakan coba untuk menggunakan istilah-istilah laymans. submit: Buat blokir title: Membuat blokir pada %{name} tried_contacting: Saya telah menghubungi pengguna tersebut dan memintanya untuk berhenti. diff --git a/config/locales/it.yml b/config/locales/it.yml index bb3d27888..e03be9eac 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -49,7 +49,7 @@ it: language: Lingua latitude: Latitudine longitude: Longitudine - title: Titolo + title: Soggetto user: Utente friend: friend: Amico @@ -58,7 +58,7 @@ it: body: Corpo del messaggio recipient: Recipiente sender: Mittente - title: Titolo + title: Soggetto trace: description: Descrizione latitude: Latitudine @@ -251,7 +251,7 @@ it: comments: ago: "%{ago} fa" comment: Commento - has_commented_on: "% {display_name} ha commentato le seguenti voci di diario" + has_commented_on: "%{display_name} ha commentato le seguenti voci di diario" newer_comments: Commenti più recenti older_comments: Commenti più vecchi post: Scrivi @@ -376,6 +376,12 @@ it: title: Pianeta OSM zoom: Ingrandimento title: Esporta + fixthemap: + how_to_help: + join_the_community: + title: Entra nella comunità + title: Come aiutare + title: Segnala un problema / Correggi la mappa geocoder: description: title: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 16a9cb71f..e4b118615 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -40,7 +40,7 @@ ja: language: 言語 latitude: 緯度 longitude: 経度 - title: タイトル + title: 件名 user: ユーザー friend: friend: 友達 @@ -49,7 +49,7 @@ ja: body: 本文 recipient: 受信者 sender: 送信者 - title: タイトル + title: 件名 trace: description: 説明 latitude: 緯度 @@ -366,6 +366,14 @@ ja: title: Planet OSM zoom: ズーム title: エクスポート + fixthemap: + how_to_help: + add_a_note: + instructions_html: " をクリックするか、または地図上の同じアイコンをクリックしてください。\n地図にマーカーが追加されます。マーカーはドラッグで移動できます。\nメッセージを追加して保存をクリックすると、他のマッパーたちが調査します。" + join_the_community: + title: コミュニティへの参加 + title: 支援する方法 + title: 問題点の報告 / 地図の修正 geocoder: description: title: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 5f5b08858..ff71c9f74 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -303,7 +303,7 @@ ko: title: "%{user}의 일기 | %{title}" user_title: "%{user}의 일기" editor: - default: 기본값 (현재 %{name}) + default: 기본 값 (현재 %{name}) id: description: iD (브라우저 내 편집기) name: iD @@ -357,6 +357,10 @@ ko: title: 플래닛 OSM zoom: 확대 title: 내보내기 + fixthemap: + how_to_help: + title: 돕는 방법 + title: 문제 ë³´ê³ /지도 수정 geocoder: description: title: diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 30c0724f8..a513362b8 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -16,14 +16,14 @@ lb: language: Sprooch latitude: Geografesch Breet longitude: Geografesch Längt - title: Titel + title: Sujet user: Benotzer friend: friend: Frënd user: Benotzer message: sender: Sender - title: Titel + title: Sujet trace: description: Beschreiwung latitude: Geografesch Breet @@ -141,14 +141,18 @@ lb: comment_count: one: "%{count} Bemierkung" other: "%{count} Bemierkungen" - zero: Keng Bemierkungrn + zero: Keng Bemierkungen confirm: Confirméieren edit: language: "Sprooch:" + latitude: "Breedegrad:" location: "Plaz:" + longitude: "Längtegrad:" save_button: Späicheren subject: "Sujet:" use_map_link: Kaart benotzen + list: + title: Blogge vun de Benotzer location: edit: Änneren location: "Plaz:" @@ -173,6 +177,12 @@ lb: description: Regelméisseg aktualiséiert Kopie vun der kompletter OpenStreetMap Datebank zoom: Zoom title: Exportéieren + fixthemap: + how_to_help: + title: Wéi Hëllefen + other_concerns: + title: Aner Uleies + title: E Problem mellen / D'Kaart verbesseren geocoder: description: types: @@ -273,8 +283,10 @@ lb: motorway: Autobunn path: Pad pedestrian: Fousswee + platform: Quai primary: Haaptstrooss primary_link: Haaptstrooss + proposed: Virgeschlo Strooss road: Strooss secondary_link: Niewestrooss steps: Trap @@ -296,12 +308,14 @@ lb: cemetery: Kierfecht farm: Bauerenhaff forest: Bësch + garages: Garagen military: Militairegebitt park: Park piste: Pist quarry: Steekaul railway: Eisebunn vineyard: Wéngert + wetland: Fiichtgebitt wood: Bësch leisure: garden: Gaart @@ -335,6 +349,8 @@ lb: valley: Dall volcano: Vulkan water: Waasser + wetland: Fiichtgebitt + wetlands: Fiichtgebitter wood: Bësch office: architect: Architekt @@ -381,6 +397,7 @@ lb: insurance: Versécherungsbüro jewelry: Bijouterie laundry: Botzerei + market: Maart optician: Optiker pharmacy: Apdikt photo: Fotosgeschäft diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 2a5a950a2..fbf30c46a 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -13,6 +13,18 @@ # Author: Raitisx # Author: Ttdnet lv: + about_page: + community_driven_html: "OpenStreetMap kopiena ir daudzveidÄ«ga, kaislÄ«ga un pieaug katru dienu.\nMÅ«su ieguldÄ«tāji ir entuziastiski kartogrāfi, GIS profesionāļi, inženieri, kuri darbina OSM serverus, humanitārieÅ¡i, kas kartē apgabalus, kurus skārusi dabas katastrofa un daudzi citi.\nLai uzzinātu vairāk par kopienu, apskati lietotāju dienasgrāmatas,\nkopienu blogus, un\nOSM Fonds mājaslapu." + community_driven_title: Kopienas virzÄ«ts + copyright_html: ©OpenStreetMap
    atbalstÄ«tāji + lede_text: OpenStreetMap bÅ«vē kartētāju kopiena, kuri iegulda un uztur datus par ceļiem, takām, kafejnÄ«cām, dzelzceļa stacijām un daudz ko vairāk visā pasaulē. + local_knowledge_html: OpenStreetMap liek uzsvaru uz vietējo zināšanām. Datu veidotāji lieto satelÄ«tbildes, GPS ierÄ«ces, un parastas papÄ«ra kartes, lai pārliecinātos ka OSM ir precÄ«zs un aktuāls. + local_knowledge_title: Vietējo zināšanas + next: Tālāk + open_data_html: "OpenStreetMap ir atvērti dati: tev ir brÄ«vas tiesÄ«bas to lietot jebkādam mērÄ·im, kamēr tu ievieto atsauci uz OpenStreetMap un tās veidotājiem. Ja tu maini vai bÅ«vē pa virtsu datiem dažādos veidos, tu vai tos izplatÄ«t tikai zem tās paÅ¡as licences. Apskati AutortiesÄ«bu un Licences lapu priekÅ¡ padziļinātas informācijas." + open_data_title: Atvērti dati + partners_title: Partneri + used_by: "%{name} darbina kartes datus simtiem mājaslapu, mobilajās aplikācijās un aparatÅ«ras ierÄ«cēs" activerecord: attributes: diary_comment: @@ -90,32 +102,61 @@ lv: blocked: Tev ir liegta piekļuve API. LÅ«dzu autorizējies mājaslapas interfeisā, lai uzzinātu vairāk. need_to_see_terms: Tava piekļuve API un laiku pārtraukta. LÅ«dzu autorizējies mājaslapas interfeisā, lai apskatÄ«tu Veidotāju Noteikumus. Tev nevajag piekrist, bet tev tie ir jāapskata. browse: + anonymous: anonÄ«ms changeset: belongs_to: Autors changesetxml: Izmaiņu kopas XML feed: title: Izmaiņu kopa %{id} title_comment: Izmaiņu kopa %{id} - %{comment} + node: Punkti (%{count}) + node_paginated: Punkti (%{x}-%{y} no %{count}) osmchangexml: osmChange XML - title: Izmaiņu kopa + relation: Relācijas (%{count}) + relation_paginated: Relācijas (%{x}-%{y} no %{count}) + title: "Izmaiņu kopa: %{id}" + way: Ceļi (%{count}) + way_paginated: Ceļi (%{x}-%{y} no %{count}) closed: Aizvērts + closed_by_html: Aizvērts %{time} atpakaļ pēc %{user} + closed_html: Aizvērts %{time} atpakaļ containing_relation: entry: Relācija %{relation_name} entry_role: Relācija %{relation_name} (kā %{relation_role}) created: Izveidots + created_by_html: Izveidots %{time} atpakaļ pēc %{user} + created_html: Izveidots %{time} atpakaļ + deleted_by_html: Dzēsts %{time} atpakaļ pēc %{user} download_xml: Lejupielādēt XML + edited_by_html: Labots %{time} atpakaļ pēc %{user} in_changeset: Izmaiņu kopa + location: "AtraÅ¡anās vieta:" + no_comment: (nav komentāru) + node: + history_title: "Punkta vēsture: %{name}" + title: "Punkts: %{name}" not_found: - sorry: Atvainojiet, %{type} ar id %{id} nevarēja atrast. + sorry: "Atvainojiet, %{type} ar id #%{id} nevarējām atrast." type: changeset: izmaiņu kopa node: punkts relation: relācija way: lÄ«nija note: - closed_title: "Atrisināta piezÄ«me: %{note_name}" - open_title: "Neatrisināta piezÄ«me: %{note_name}" - title: PiezÄ«me + closed_by: Atrisināja %{user} %{when} atpakaļ + closed_by_anonymous: Atrisināja anonÄ«ms %{when} atpakaļ + closed_title: "Atrisināta piezÄ«me: #%{note_name}" + commented_by: Komentārs no %{user} %{when} atpakaļ + commented_by_anonymous: Komentārs no anonÄ«ma %{when} atpakaļ + hidden_by: Paslēpa %{user} %{when} atpakaļ + hidden_title: "Paslēpta piezÄ«me #%{note_name}" + new_note: Jauna piezÄ«me + open_by: Izveidoja %{user} %{when} atpakaļ + open_by_anonymous: Izveidoja anonÄ«ms %{when} atpakaļ + open_title: "Neatrisināta piezÄ«me: #%{note_name}" + reopened_by: Atkal aktivizēja %{user} %{when} atpakaļ + reopened_by_anonymous: Atkal aktivizēja anonÄ«ms %{when} atpakaļ + title: "PiezÄ«me: %{id}" part_of: Daļa no redacted: message_html: Versija %{version} no Å¡Ä« %{type} nevar tikt parādÄ«ta, jo tika rediģēta. LÅ«dzu apskati %{redaction_link} priekÅ¡ papildus informācijas. @@ -125,7 +166,9 @@ lv: relation: relācija way: ceļš relation: + history_title: "Relācijas vēsture: %{name}" members: Lietotāji + title: "Relācija: %{name}" relation_member: entry_role: "%{type} %{name} kā %{role}" type: @@ -133,10 +176,11 @@ lv: relation: Relācija way: LÄ«nija start_rjs: + feature_warning: Ielādē %{num_features} objektus, kas var padarÄ«t tavu pārlÅ«ku lēnu vai nereaģējoÅ¡u. Vai esi droÅ¡s, ka vēlies parādÄ«t Å¡os datus? load_data: Ielādēt datus loading: Ielādē… tag_details: - tags: "Birkas:" + tags: Birkas wiki_link: key: Birkas %{key} viki lapa tag: Birkas %{key}=%{value} viki lapa @@ -149,9 +193,15 @@ lv: relation: relācija way: lÄ«nija version: Versija + view_details: SkatÄ«t detaļas view_history: SkatÄ«t vēsturi way: + also_part_of: + one: daļa no ceļa %{related_ways} + other: daļa no ceļiem %{related_ways} + history_title: "Ceļa Vēsture: %{name}" nodes: Punkts + title: "LÄ«nija: %{name}" changeset: changeset: anonymous: AnonÄ«ms @@ -168,6 +218,13 @@ lv: saved_at: Saglabāts user: Lietotājs list: + empty: Nav atrasta neviena izmaiņu kopa. + empty_area: Å ajā apgabalā nav izmaiņu kopu. + empty_user: Å im lietotājam nav izmaiņu kopu. + load_more: Ielādēt vairāk + no_more: Vairāk izmaiņu kopu neatrada. + no_more_area: Nav vairāk izmaiņu kopu Å¡ajā apgabalā. + no_more_user: Nav vairāk izmaiņu kopu no Å¡Ä« lietotāja. title: Izmaiņu kopas title_friend: Tavu draugu izmaiņu kopas title_nearby: Tuvējo lietotāju izmaiņu kopas @@ -284,6 +341,7 @@ lv: paste_html: IelÄ«mēt HTML mājas lapā scale: Mērogs too_large: + advice: "Ja augstāk esoÅ¡ais eksports neizdodas, lÅ«dzu apsver iespēj lietot kādu no zemāk minētajiem avotiem:" body: Å is apgabals ir pārāk liels, lai to eksportētu kā OpenStreetMap XML datus. LÅ«dzu tuvini vai izvēlies mazāku apgabalu. geofabrik: description: Regulāri atjaunoti izgriezumi no kontinentiem, valstÄ«m, un izvēlētām pilsētām @@ -294,6 +352,9 @@ lv: other: description: Papildus avoti, kas norādÄ«ti OpenStreetMap wiki title: Citi Avoti + overpass: + description: Lejupielādē Å¡o apgabalu no OpenStreetMap datubāzes spoguļa + title: Overpass API planet: description: Regulāri atjauninātas kopijas no pilnās OpenStreetMap datubāzes title: OSM Planēta @@ -830,9 +891,19 @@ lv: weir: Dambis help_page: help: + description: Uzdod jautājumu vai atrodi atbildes iekÅ¡ OSM jautājumu un atbilžu lapas. title: help.openstreetmap.org + url: http://forum.openstreetmap.org/viewforum.php?id=59 + introduction: OpenStreetMap ir vairāki resursi, lai uzzinātu par projektu, uzdotu un atbildētu uz jautājumiem, un diskutētu un dokumentētu kartēšanas tēmas. + title: PalÄ«dzÄ«bas saņemÅ¡ana welcome: + description: Sāc ar Å¡o Ä«so ceļvedi, kurÅ¡ aptver OpenStreetMap pamatus. title: Laipni lÅ«gti iekÅ¡ OSM + url: /sveicināts + wiki: + description: CaurlÅ«ko wiki priekÅ¡ padziļinātas OSM dokumentācijas. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: close: Aizvērt edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied Å¡eit. @@ -847,6 +918,7 @@ lv: standard: Standarta transport_map: Transporta karte copyright: © OpenStreetMap ieguldÄ«tāji + donate_link_text: layers: data: Kartes dati header: Kartes slāņi @@ -862,7 +934,7 @@ lv: notes: new: add: Pievienot PiezÄ«mi - intro: Lai uzlabotu karti, informācija, kuru tu ievadi tiek parādÄ«ta citiem kartētājiem, tādēļ, lÅ«dzu, cik vien iespējams izklāsti visu pēc iespējas precÄ«zāk un detalizētāk, kā arÄ« marÄ·ieri novieto pēc iespējas pareizākajā pozÄ«cijā. + intro: PiezÄ«mes domātas, lai norādÄ«tu uz kartes kļūdām. Ja vēlies pamēģināt pats ievietot informāciju, zÄ«mēt vai izlabot kļūdu, izmanto pogu "Labot" lapas augÅ¡pusē. PiezÄ«mes parādās citiem kartētājiem, tādēļ lÅ«dzu, cik vien iespējams precÄ«zāk un detalizētāk visu izklāsti, kā arÄ« marÄ·ieri novieto pēc iespējas pareizākajā pozÄ«cijā. show: anonymous_warning: Å Ä« piezÄ«me ietver komentārus no anonÄ«miem lietotājiem, kurus nepiecieÅ¡ams pārbaudÄ«t neatkarÄ«gi. comment: Komentēt @@ -893,6 +965,8 @@ lv: createnote_tooltip: Pievienot piezÄ«mi kartei edit_disabled_tooltip: Pietuvini, lai rediģētu karti edit_tooltip: Rediģēt karti + map_data_zoom_in_tooltip: Pietuvināt, lai redzētu kartes datus + map_notes_zoom_in_tooltip: Pietuvināt, lai redzētu piezÄ«mes layouts: about: Par community: Kopiena @@ -914,6 +988,7 @@ lv: home: Doties uz mājas atraÅ¡anās vietu intro_2_create_account: Izveidot lietotāja kontu intro_header: Laipni lÅ«dzam OpenStreetMap! + intro_text: OpenStreetMap ir pasaules karte, kuru veido cilvēki kā tu, un tā ir bezmaksas lietoÅ¡anai zem atvērtas licences. learn_more: Uzzināt Vairāk log_in: Ieiet log_in_tooltip: Ieiet ar esoÅ¡u kontu @@ -923,6 +998,7 @@ lv: make_a_donation: text: Ziedot attÄ«stÄ«bai title: Atbalstiet OpenStreetMap ar naudas ziedojumu + more: Vairāk osm_offline: OpenStreetMap datubāze Å¡obrÄ«d nav pieejama, tiek veikti svarÄ«gi datubāzes apkalpoÅ¡anas darbi. osm_read_only: OpenStreetMap datubāze Å¡obrÄ«d ir pieejama tikai-lasāmā režīmā, jo tiek veikti svarÄ«gi datubāzes apkalpes darbi. partners_bytemark: Bytemark Hosting @@ -948,6 +1024,7 @@ lv: title: Atsauces piemērs contributors_at_html: "Austrija: Ietver datus no\n Stadt Wien (zem\n CC BY)." contributors_ca_html: "Kanāda: Ietver datus no\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), un StatCan (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Somija: Satur datus no\nSomijas Topogrāfiskās Datubāzes Nacionālās Zemes Dienesta\nun citām datu kopām zem\nNLSFI Licence." contributors_footer_1_html: "SÄ«kāku informāciju par Å¡iem, un citiem avotiem, kas izmantoti,\nlai uzlabotu OpenStreetMap, lÅ«dzu apskati Veidotāju\nlapu iekÅ¡ OpenStreetMap Wiki." contributors_footer_2_html: " Datu ievietoÅ¡ana OpenStreetMap nenozÄ«mē ka oriÄ£inālais\n datu avots sniedz atbalstu OpenStreetMap, dod garantiju, vai\n pieņem jebkādu atbildÄ«bu." contributors_fr_html: "Francija: Ietver datus no\n Direction Générale des Impôts." @@ -1159,6 +1236,15 @@ lv: allow_write_notes: labot piezÄ«mes. allow_write_prefs: mainÄ«t jÅ«su lietotāja iestatÄ«jumus. request_access: Aplikācija %{app_name} pieprasa pieeju tavas lietotājam, %{user}. LÅ«dzu pārbaudi, vai tu vēlies, lai aplikācijai bÅ«tu sekojošās iespējas. Tu vari izvēlēties cik daudz vai maz tu vēlies. + title: Atļaut piekļuvi savam kontam + oauthorize_failure: + denied: Tu esi liedzis programmai %{app_name} piekļūt savam lietotājam. + invalid: Autorizācijas kods nav derÄ«gs. + title: Autorizācijas pieprasÄ«jums neizdevās + oauthorize_success: + allowed: Tu esi pieÅ¡Ä·Ä«ris tiesÄ«bas %{app_name} piekļūt tavam lietotājam. + title: Autorizācijas pieprasÄ«jums atļauts + verification: Pārbaudes kods ir %{code}. revoke: flash: Tu esi atsaucis pilnvaru priekÅ¡ %{application} oauth_clients: @@ -1714,6 +1800,7 @@ lv: my comments: Mani komentāri my diary: Mana Dienasgrāmata my edits: Mani Labojumi + my messages: Manas Ziņas my notes: Manas kartes PiezÄ«mes my profile: Mans Profils my settings: Mani IestatÄ«jumi @@ -1867,7 +1954,7 @@ lv: way_html: Ceļš ir lÄ«nija vai laukums, kā ceļš, strauts, ezers vai māja. introduction_html: Sveicināts OpenStreetMap, bezmaksas un rediģējamā pasaules karte. Tagad, kad esi piereÄ£istrējies, tu vari sākt kartēt. Å eit ir neliela pamācÄ«bā ar svarÄ«gākajām lietām, kuras tev jāzina. questions: - paragraph_1_html: NepiecieÅ¡ama palÄ«dzÄ«ba kartējot, vai nav skaidrs kā lietot OpenStreetMap? Atrodi atbildes uz saviem jautājumiem palÄ«dzÄ«bas lapā. + paragraph_1_html: NepiecieÅ¡ama palÄ«dzÄ«ba kartējot, vai nav skaidrs kā lietot OpenStreetMap? Atrodi atbildes uz saviem jautājumiem palÄ«dzÄ«bas lapā. title: Kādi jautājumi? start_mapping: Sākt Kartēt title: Laipni lÅ«dzam! diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 8bff3355b..d467a1b15 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -24,7 +24,7 @@ mk: language: Јазик latitude: Геог. ширина longitude: Геог. должина - title: Наслов + title: Тема user: Корисник friend: friend: Пријател @@ -33,7 +33,7 @@ mk: body: Содржина recipient: Примател sender: Испраќач - title: Наслов + title: Тема trace: description: Опис latitude: Геог. ширина @@ -351,6 +351,18 @@ mk: title: Планетата на OSM zoom: Приближи title: Извези + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Просто стиснете на или пак на истата икона од приказникот на картата.\nСо ова на неа ќе ставите бележник, кој можете да го преместувате со влечење. Ставете ја пораката, па стиснете да зачувате. Потоа другите картографи ќе го иследат проблемот." + join_the_community: + explanation_html: Ако имате забележано проблем со податоците на нашите карти (на пр. недостасува пат или адреса), најдобро е да се приклучите на заедницата на OpenStreetMap или пак самите да ги исправите податоците. + title: Приклучете се во заедницата + title: Како да помогнете + other_concerns: + explanation_html: "Ако сте загрижени за тоа како се користат нашите податоци или во врска со содржините, повеќе правни информации ќе добиете на\nстраницата за авторски права или обратете се кај соодветната \nработна група на OSMF." + title: Други проблеми + title: Пријава на проблем / Исправка на картата geocoder: description: title: diff --git a/config/locales/mr.yml b/config/locales/mr.yml index cbf7d57d5..af6e45984 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -7,7 +7,9 @@ mr: about_page: copyright_html: ©à¤“पनस्ट्रीटमॅप
    योगदाते + local_knowledge_title: स्थानिक ज्ञान next: पुढील + partners_title: भागीदार activerecord: attributes: diary_comment: @@ -16,7 +18,7 @@ mr: language: भाषा latitude: अक्षांश longitude: रेखांश - title: शीर्षक + title: विषय user: सदस्य friend: friend: मित्र @@ -25,7 +27,7 @@ mr: body: मायना recipient: प्राप्तकर्ता sender: प्रेषक - title: शीर्षक + title: विषय trace: description: वर्णन latitude: अक्षांश @@ -56,13 +58,13 @@ mr: node_tag: गाठीची खूणपताका notifier: अधिसूचक old_node: जुनी गाठ - old_node_tag: गाठीची जुनी खूणपताका + old_node_tag: जून्या गाठीची खूणपताका old_relation: जुना संबंध old_relation_member: संबंधाचा जुना सदस्य - old_relation_tag: संबंधाची जुनी खूणपताका + old_relation_tag: जून्या संबंधाची खूणपताका old_way: जुना मार्ग old_way_node: मार्गातील जुनी गाठ - old_way_tag: मार्गाची जुनी खूणपताका + old_way_tag: जून्या मार्गाची खूणपताका relation: संबंध relation_member: संबंधाचा सदस्य relation_tag: संबंधाची खूणपताका @@ -92,14 +94,18 @@ mr: title: "बदलसंच: %{id}" way: मार्ग (%{count}) way_paginated: मार्ग (%{x}-%{y}, %{count} पैकी) - closed: बंद केला + closed: बंद केले + closed_by_html: %{time} पूर्वी%{user} द्वारे बंद केले closed_html: %{time} पूर्वी बंद केला containing_relation: entry: संबंध %{relation_name} entry_role: संबंध %{relation_name} (%{relation_role} म्हणून) - created: तयार केला - created_html: %{time} पूर्वी तयार केला + created: बनविले + created_by_html: %{time} पूर्वी %{user} द्वारे तयार केले + created_html: %{time} पूर्वी बनविले + deleted_by_html: %{time} पूर्वी%{user} द्वारे गाळले download_xml: XML उतरवा + edited_by_html: %{time} पूर्वी %{user} द्वारे संपादन केले in_changeset: बदलसंच location: "ठिकाण:" no_comment: (वर्णन नाही) @@ -107,17 +113,22 @@ mr: history_title: "गाठीचा इतिहास: %{name}" title: "गाठ: %{name}" not_found: - sorry: क्षमा असावी, %{id} क्रमांका%{type} नाही. + sorry: "क्षमा असावी, %{type} #%{id} सापडले नाही." type: changeset: चा बदलसंच सापडला - node: ची गाठ सापडली - relation: चा संबंध सापडला - way: चा मार्ग सापडला + node: गाठ + relation: संबंध + way: मार्ग note: - closed_title: निराकरण झालेली टीप क्र. %{note_name} - hidden_title: लपविलेली टीप क्र. %{note_name} + closed_by: %{when} पूर्वी%{user} ने वियोजित केले + closed_title: "निराकरण झालेली टीप #%{note_name}" + commented_by: %{when} पूर्वी%{user} ची टिप्पणी + hidden_by: %{when} पूर्वी%{user} ने लपविले + hidden_title: "लपविलेली टीप #%{note_name}" new_note: नवी टीप - open_title: निराकरण न झालेली टीप क्र. %{note_name} + open_by: %{when} पूर्वी%{user} ने तयार केले + open_title: "निराकरण न झालेली टीप #%{note_name}" + reopened_by: %{when} पूर्वी%{user} ने सक्रिय केले title: "टीप: %{id}" part_of: चा भाग redacted: @@ -125,8 +136,8 @@ mr: redaction: लोपन %{id} type: node: गाठी - relation: संबंधा - way: मार्गा + relation: संबंध + way: मार्ग relation: history_title: "संबंधाचा इतिहास: %{name}" members: सदस्य @@ -138,7 +149,8 @@ mr: relation: संबंध way: मार्ग start_rjs: - load_data: माहितीचे भारण करा + feature_warning: "%{num_features} प्रारुपाचे प्रभारण करीत आहे ज्याने आपला न्याहाळक मंद अथवा प्रतिसादशून्य होईल.आपणास खात्री आहे काय की आपणास डाटा दर्शवायचा आहे." + load_data: डाटाचे भारण करा loading: प्रभारण करीत आहे tag_details: tags: खूणपताका @@ -147,12 +159,12 @@ mr: tag: "%{key}=%{value} खूणपताकेसाठी विकी वर्णन पान" wikipedia_link: विकिपिडियावरील %{page} हा लेख timeout: - sorry: क्षमा असावी, %{id} क्रमांकाच्या %{type}ची माहिती मिळविण्यास फार वेळ लागला. + sorry: क्षमा असावी, %{id}असलेला %{type}चा डाटा मिळविण्यास फार वेळ लागला. type: - changeset: बदलसंचा + changeset: बदलसंच node: गाठी - relation: संबंधा - way: मार्गा + relation: संबंध + way: मार्ग version: आवृत्ती view_details: तपशील पहा view_history: इतिहास पहा @@ -182,6 +194,7 @@ mr: empty: बदलसंच सापडले नाहीत. empty_area: ह्या भागात बदलसंच नाहीत. empty_user: ह्या सदस्याचे बदलसंच नाहीत. + load_more: अधिक प्रभारण करा no_more: अधिक बदलसंच सापडले नाहीत. no_more_area: ह्या भागात अधिक बदलसंच नाहीत. no_more_user: ह्या सदस्याचे अधिक बदलसंच नाहीत. @@ -259,9 +272,9 @@ mr: heading: "%{id} क्रमांकाची नोंद अस्तित्वात नाही" title: अनुदिनीत अशी नोंद नाही view: - leave_a_comment: अभिप्राय लिहा + leave_a_comment: टिप्पणी टाका login: सनोंद-प्रवेश करा - login_to_leave_a_comment: अभिप्राय लिहिण्यासाठी %{login_link} + login_to_leave_a_comment: टिप्प्णी लिहिण्यासाठी %{login_link} save_button: जतन करा title: "%{user}ची अनुदिनी | %{title}" user_title: "%{user}ची अनुदिनी" @@ -271,11 +284,11 @@ mr: description: iD (न्याहाळकात चालणारा संपादक) name: iD potlatch: - description: Potlatch 1 (न्याहाळकात चालणारा संपादक) - name: Potlatch 1 + description: पॉटलॅच १ (न्याहाळकात चालणारा संपादक) + name: पॉटलॅच १ potlatch2: - description: Potlatch 2 (न्याहाळकात चालणारा संपादक) - name: Potlatch 2 + description: पॉटलॅच २ (न्याहाळकात चालणारा संपादक) + name: पॉटलॅच २ remote: description: सुदूर नियंत्रण (JOSM अथवा Merkaartor) name: सुदूर नियंत्रण @@ -283,8 +296,9 @@ mr: start: add_marker: नकाशावर दर्शकचिन्ह जोडा area_to_export: निर्यात करावयाचे क्षेत्र - embeddable_html: अंतःस्थापनासाठी HTML + embeddable_html: अंतःस्थापन करण्याजोगी HTML export_button: निर्यात + export_details: ओपनस्ट्रीटमॅप डाटा हा परवान्यांतर्गत आहे.ओपन डाटा कॉमन्स ओपन डाटाबेस परवाना (ODbL). format: आराखडा format_to_export: निर्यातीचे प्रारुप image_size: चित्राचा आकार @@ -292,18 +306,19 @@ mr: licence: परवाना longitude: "रेखांश:" manually_select: वेगळे क्षेत्र निवडा - map_image: नकाशा (प्रमाण स्तर दाखविते) + map_image: नकाशा चित्र (प्रमाणित स्तर दाखविते) max: कमाल options: विकल्प + osm_xml_data: ओपनस्ट्रीटमॅप XML डाटा output: उत्पादन paste_html: संकेतस्थळावर अंतःस्थापनासाठी HTML चिकटवा scale: प्रमाण too_large: advice: "जर वरील निर्यात करण्यास अपयश आले, तर कृपया खालील स्रोत वापरण्याचा विचार करा :" - body: हे क्षेत्र OpenStreetMap XML Data म्हणून निर्यात करण्यास खूपच मोठे आहे.कृपया लहान करा किंवा लहान क्षेत्र निवडा. + body: हे क्षेत्र OpenStreetMap XML Data म्हणून निर्यात करण्यास खूपच मोठे आहे.कृपया लहान करा किंवा लहान क्षेत्र निवडा किंवा मोठ्या प्रमाणात डाटाचे अधिभारणासाठी खालील यादी केलेल्या स्रोतांपैकी एकाचा वापर करा. geofabrik: description: नियमितपणे अद्ययावत केले जाणारे खंड, देश, व निवडक शहरांचे उतारे - title: गियोफाब्रिक डाउनलोड्स् + title: जियोफेब्रिक अधिभारण metro: description: जगातील प्रमुख शहरे व त्यांच्या सभोवतालीच्या क्षेत्रांचे उतारे title: मेट्रो एक्स्ट्रॅक्ट्स् @@ -311,13 +326,22 @@ mr: description: ओपनस्ट्रीटमॅप विकीवर सूचीबद्ध अतिरिक्त स्रोत title: इतर स्रोत overpass: - title: ओव्हरपास API + description: ओपनस्ट्रीटमॅप प्रतिमा डाटाबेसमधून बंधनपेटीचे(बाउंडिंग बॉक्स) अधिभारण करा + title: API टाळा planet: + description: संपूर्ण ओपनस्ट्रीटमॅप डाटाबेसच्या नियमित अद्यतन केलेल्या प्रती title: प्लॅनेट OSM zoom: मोठे करा title: निर्यात + fixthemap: + how_to_help: + title: मदत कशी करावी + title: समस्या नोंदवा/नकाशा नीयत करा geocoder: description: + title: + geonames: स्थान जिओनेम्स मार्फत + osm_nominatim: स्थान ओपनस्ट्रीटमॅप नॉमिनॅटिम मार्फत types: cities: शहरे places: ठिकाणे @@ -338,6 +362,16 @@ mr: results: more_results: अधिक निकाल no_results: परिणाम सापडले नाही + search: + title: + ca_postcode: निकाल जिओकोडर.सीए + geonames: निकाल जिओनेम्स + geonames_reverse: निकाल जिओनेम्स + latlon: निकाल अंतर्गत + osm_nominatim: निकाल ओपनस्ट्रीटमॅप नॉमिनॅटिम + osm_nominatim_reverse: निकाल ओपनस्ट्रीटमॅप नॉमिनॅटिम + uk_postcode: निकालNPEMap / FreeThe Postcode + us_postcode: निकाल जिओकोडर.यूएस search_osm_nominatim: admin_levels: level10: उपनगर सिमा @@ -350,6 +384,7 @@ mr: prefix: aerialway: chair_lift: खुर्ची उद्वाहन + drag_lift: खेच उद्वाहन station: रज्जुमार्ग स्थानक aeroway: aerodrome: विमानतळ @@ -357,10 +392,10 @@ mr: gate: द्वार helipad: हेलिपॅड runway: धावपट्टी - taxiway: खेचमार्ग + taxiway: विमानखेचमार्ग terminal: अग्र amenity: - WLAN: वायफाय पोच + WLAN: वायफाय पोहोच airport: विमानतळ arts_centre: कलाकेंद्र artwork: कलाकृति @@ -415,8 +450,8 @@ mr: library: ग्रंथालय market: बाजार marketplace: बाजार - mountain_rescue: पर्वत बचाव - nightclub: निशा क्लब + mountain_rescue: पर्वत सुटकामार्ग + nightclub: रात्री क्लब nursery: बालवाडी nursing_home: शुश्रुषागृह office: कार्यालय @@ -435,13 +470,15 @@ mr: reception_area: स्वागत क्षेत्र recycling: पुनश्चक्रण केंद्र restaurant: उपाहारगृह - retirement_home: निवृत्तीगृह + retirement_home: आरामगृह sauna: सॉना school: शाळा shelter: आश्रयस्थान shop: दुकान + shopping: खरेदी shower: तुषारक social_centre: समाज केंद्र + social_club: समाज क्लब social_facility: सामाजिक सुविधा studio: कलागृह supermarket: सुपरमार्केट @@ -454,8 +491,9 @@ mr: university: विद्यापीठ vending_machine: विक्रययंत्र veterinary: पशू शल्यक्रिया + village_hall: गाव सभागृह waste_basket: कचरा टोपली - wifi: वायफाय पोच + wifi: वायफाय पोहोच youth_centre: युवक केंद्र boundary: administrative: प्रशासकीय सीमा @@ -464,8 +502,9 @@ mr: protected_area: संरक्षित क्षेत्र bridge: aqueduct: जलसेतू - suspension: लटकता पूल + suspension: टांगलेला पूल swing: झुलता पूल + viaduct: उंच पूल "yes": पूल building: "yes": इमारत @@ -474,18 +513,23 @@ mr: phone: संकटकालीन दूरध्वनी highway: bridleway: अश्वमार्ग + bus_guideway: गायडेड बस लेन bus_stop: बस थांबा byway: उपमार्ग - construction: निर्माणाधीन मार्ग + construction: निर्माणाधीन महामार्ग cycleway: सायकल मार्ग - emergency_access_point: आकस्मिक पोच बिंदू + emergency_access_point: आकस्मिक पोहोच बिंदू footway: पदपथ + ford: पाय-उतार + living_street: निवासी रस्ता milestone: मैलदगड minor: किरकोळ रस्ता - motorway: द्रुतगतीमार्ग + motorway: मोटारमार्ग + motorway_junction: मोटारमार्ग जंक्शन + motorway_link: मोटारमार्ग रस्ता path: पथ pedestrian: पादचारी मार्ग - platform: मंच + platform: ओटा primary: प्राथमिक रस्ता primary_link: प्राथमिक रस्ता proposed: प्रस्तावित रस्ता @@ -497,7 +541,7 @@ mr: secondary_link: माध्यमिक रस्ता service: सेवा मार्ग services: मोटरमार्ग सेवा - speed_camera: गती कॅमेरा + speed_camera: गतीनोंद कॅमेरा steps: पायऱ्या street_lamp: पथ दिवा track: वाट @@ -509,9 +553,9 @@ mr: historic: archaeological_site: पुरातत्त्व स्थळ battlefield: युद्धक्षेत्र - boundary_stone: सिमांकन + boundary_stone: सिमांकन दगड building: इमारत - castle: किल्ला + castle: गढी church: चर्च citywalls: शहराच्या भिंती fort: किल्ला @@ -525,7 +569,8 @@ mr: ruins: भग्नावशेष tomb: थडगे tower: मनोरा - wreck: नौभंग + wayside_shrine: मार्गालगतचे देवालय + wreck: भग्नावशेष landuse: allotments: वाटप basin: खोरे @@ -535,7 +580,9 @@ mr: construction: बांधकाम farm: मळा farmland: शेतजमीन + farmyard: शेतमैदान forest: वन + garages: गॅरेजेस grass: गवत industrial: औद्योगिक क्षेत्र landfill: भराव @@ -554,11 +601,15 @@ mr: residential: निवासी क्षेत्र retail: विक्री road: रस्त्याचे क्षेत्र + village_green: गावहिरवळ + vineyard: द्राक्षमळा + wetland: आर्द्र जमिन wood: जंगल leisure: bird_hide: पक्षी आश्रयस्थान common: सार्वजनिक जागा fishing: मासेमारी क्षेत्र + fitness_station: व्यायामस्थानक garden: बगीचा golf_course: गोल्फ कोर्स marina: नौकातळ @@ -567,6 +618,8 @@ mr: pitch: पटांगण playground: क्रीडांगण recreation_ground: करमणुक मैदान + sauna: सॉना + slipway: सरकमार्ग sports_centre: क्रीडाकेंद्र stadium: क्रीडागार swimming_pool: जलतरण तलाव @@ -575,13 +628,20 @@ mr: military: airfield: लष्करी विमानतळ barracks: बराकी + bunker: विवर + mountain_pass: + "yes": खिंड natural: + bay: खाडी beach: किनारा cape: भूशिर + cave_entrance: गुंफा प्रवेश + channel: जलमार्ग cliff: कडा crater: विवर dune: धन्व feature: रचना + fell: वृक्ष तोड forest: वन geyser: उष्ण झरा glacier: हिमनदी @@ -590,12 +650,17 @@ mr: island: बेट land: जमीन marsh: पाणथळ + moor: जीर्ण जमिन mud: चिखल peak: शिखर point: बिंदू reef: प्रवाली + ridge: पर्वतरांग river: नदी rock: खडक + scree: पायथा दगड + scrub: खुरटी झाडी + shoal: धक्का spring: झरा stone: दगड strait: सामुद्रधुनी @@ -603,12 +668,15 @@ mr: valley: दरी volcano: ज्वालामुखी water: पाणी + wetland: आर्द्र जमिन + wetlands: आर्द्र जमिनी wood: जंगल office: accountant: लेखापाल architect: वास्तुविशारद company: कंपनी employment_agency: सेवायोजन केंद्र + estate_agent: स्थावर अभिकर्ता government: शासकीय कार्यालय insurance: विमा कार्यालय lawyer: वकील @@ -627,7 +695,9 @@ mr: houses: घरे island: बेट islet: द्वीपक - locality: पेठ + isolated_dwelling: विलग रहिवास + locality: मोहल्ला + moor: जीर्ण जमिन municipality: नगरपालिका neighbourhood: परिसर postcode: पोस्टसंकेत @@ -636,6 +706,7 @@ mr: state: राज्य subdivision: उपविभाग suburb: उपनगर + town: गाव unincorporated_area: असमाविष्ट क्षेत्र village: खेडे railway: @@ -655,18 +726,21 @@ mr: platform: रेल्वे फलाट preserved: संरक्षित लोहमार्ग proposed: प्रस्तावित लोहमार्ग + spur: लोहमार्ग फाटा station: रेल्वे स्थानक stop: रेल्वे थांबा subway: मेट्रो स्थानक - subway_entrance: मेट्रो स्थानक प्रवेश + subway_entrance: भूयारी स्थानक प्रवेश switch: रेल्वे बिंदू tram: ट्राममार्ग tram_stop: ट्राम स्थानक yard: रेल्वे आवार shop: + alcohol: परवानाबाह्य antiques: पुरावस्तु art: कला दुकान bakery: बेकरी + beauty: प्रसाधन दुकान beverages: पेय दुकान bicycle: सायकल दुकान books: पुस्तकालय @@ -676,43 +750,72 @@ mr: car_parts: कार सुटेभाग car_repair: कार दुरुस्ती carpet: गालिचाचे दुकान + charity: धर्मदाय दुकान chemist: औषधविक्रेता clothes: कपडा दुकान computer: संगणक दुकान confectionery: मिठाई दुकान + convenience: सोईस्कर माल दुकान + copyshop: वही दुकान cosmetics: सौंदर्यप्रसाधनांचे दुकान + department_store: एकछत्री भांडार + discount: सवलतवस्तू दुकान + doityourself: स्वतः करा + dry_cleaning: ड्रायक्लिनींग electronics: ईलेक्ट्रॉनिक्स दुकान + estate_agent: स्थावर अभिकर्ता + farm: शेत दुकान + fashion: फॅशन दुकान fish: मत्स्य दुकान florist: फुलविक्रेता food: भोजन दुकान - furniture: लाकूडसामान + funeral_directors: मयत निर्देशक + furniture: उपस्कर gallery: दिर्घिका garden_centre: बगिचा केंद्र + general: फुटकळ दुकान gift: भेटवस्तु दुकान greengrocer: भाजीविक्रेता grocery: किराणा दुकान hairdresser: केशकर्तनालय + hardware: हार्डवेअर भांडार insurance: विमा jewelry: आभूषण दुकान kiosk: टपरी laundry: धुलाई केंद्र + mall: मॉल market: बाजार mobile_phone: भ्रमणध्वनी दुकान + motorcycle: मोटरसायकल दुकान music: संगीत दुकान + newsagent: बातमी अभिकर्ता optician: चश्मेवाला + organic: सेंद्रिय अन्नदुकान + outdoor: खुले दुकान pet: पाळीवप्राणी दुकान pharmacy: औषधालय photo: फोटो दुकान salon: केशकर्तनालय + second_hand: वापरलेल्या वस्तूंचे दुकान + shoes: जोडे दुकान + shopping_centre: खरेदी केंद्र + sports: क्रिडा दुकान stationery: लेखनसामग्री दुकान supermarket: सुपरमार्केट tailor: शिंपी toys: खेळणी दुकान travel_agency: प्रवास अभिकरण + video: व्हीडियो दुकान + wine: परवानाबाह्य "yes": दुकान tourism: + alpine_hut: पर्वतीय झोपडी artwork: कलाकृति attraction: आकर्षण + bed_and_breakfast: निद्रा व अल्पाहार + cabin: चौकी + camp_site: पडाव स्थळ + caravan_site: काफिला स्थळ guest_house: अतिथिभवन hostel: वसतीगृह hotel: हॉटेल @@ -720,7 +823,9 @@ mr: motel: मोटेल museum: वस्तुसंग्रहालय picnic_site: सहल स्थान + theme_park: सूत्र उद्यान valley: दरी + viewpoint: देखावाबिंदू zoo: प्राणीसंग्रहालय tunnel: culvert: छोटा पूल @@ -744,6 +849,7 @@ mr: riverbank: नदीकाठ stream: प्रवाह wadi: मरुघळ + water_point: जल केंद्र waterfall: धबधबा weir: बंधारा help_page: @@ -803,6 +909,7 @@ mr: community_blogs_title: ओपनस्ट्रीटमॅप समुदायाच्या सदस्यांच्या अनुदिनी copyright: प्रताधिकार data: माहिती + donate: हार्डवेअर अपग्रेड फंडमध्ये योगदानाने%{link} ओपनस्ट्रीटमॅपला साहाय्य करा. edit: संपादन करा edit_with: "%{editor} वापरून संपादन करा" export: निर्यात @@ -812,7 +919,7 @@ mr: gps_traces: GPS अनुरेख help: साहाय्य history: इतिहास - home: स्वगृही जा + home: स्वगृह स्थानावर जा intro_2_create_account: सदस्यखाते तयार करा intro_header: ओपनस्ट्रीटमॅपवर स्वागत आहे! intro_text: ओपनस्ट्रीटमॅप हा जगाचा नकाशा आहे, जो आपल्यासारख्या लोकांनी तयार केला आहे, व जो खुल्या परवान्यांतर्गत वापरास मुक्त आहे. @@ -824,19 +931,27 @@ mr: logout: सनोंद-निर्गम make_a_donation: text: देणगी द्या + title: आर्थिक देणगी देऊन करुन ओपनस्ट्रीटमॅपला साहाय्य करा. more: अधिक + osm_offline: डाटाबेसचे आवश्यक देखरेखीचे काम असल्यामुळे ओपनस्ट्रीटमॅप डाटाबेस ही जालावेगळी करण्यात आलेली आहे. + osm_read_only: डाटाबेसचे आवश्यक देखरेखीचे काम असल्यामुळे, ओपनस्ट्रीटमॅप डाटाबेस ही सध्या फक्त वाचू शकता येणार आहे. partners_bytemark: बाईटमार्क होस्टिंग partners_ic: इम्पिरियल कॉलेज लंडन + partners_partners: भागीदार partners_ucl: UCL VR सेंटर sign_up: नोंदणी करा sign_up_tooltip: संपादनासाठी खाते उघडा start_mapping: नकाशा आरेखन सुरु करा + tag_line: मुक्त विकि जागतिक नकाशा user_diaries: सदस्य अनुदिनी user_diaries_tooltip: सदस्य अनुदिनी पहा license_page: foreign: + english_link: मूळ इंग्लिश + text: या भाषांतरीत पानाच्या व %{english_original_link} यादरम्यान काही वादाचा प्रसंग उद्भवल्यास, मूळ इंग्लिश पानास प्राथमिकता राहील. title: ह्या भाषांतराबद्दल legal_babble: + contributors_intro_html: "आमचे योगदानकर्ते हे हजारोंच्या संख्येतील व्यक्ति आहेत.आम्ही मुक्त परवान्यांतर्गत असलेला डाटा हा राष्ट्रीय नकाशा संस्थेंकडून व त्यातील इतर स्रोतांतून घेऊन त्याचा अंतर्भाव करतो:" contributors_title_html: आमचे योगदाते credit_title_html: ओपनस्ट्रीटमॅपला श्रेय कसे द्यावे infringement_title_html: प्रताधिकार भंग @@ -1074,6 +1189,7 @@ mr: owner: "मालक:" points: "बिंदू:" save_button: जतन करा + tags: "खूणपताका:" tags_help: स्वल्पविरामाने परिसीमित title: अनुरेख %{name} संपादन uploaded_at: "चढविले:" @@ -1091,13 +1207,17 @@ mr: trace_form: description: "वर्णन:" help: साहाय्य + tags: "खूणपताका:" tags_help: स्वल्पविरामाने परिसीमित upload_button: चढवा + visibility: "दृश्यता:" visibility_help: ह्याचा अर्थ काय? trace_header: see_all_traces: सर्व अनुरेख पहा see_your_traces: स्वतःचे अनुरेख पहा upload_trace: अनुरेख चढवा + trace_optionals: + tags: खूणपताका trace_paging_nav: newer: नवे अनुरेख older: जुने अनुरेख @@ -1105,16 +1225,18 @@ mr: view: delete_track: हा अनुरेख वगळा description: "वर्णन:" - download: उतरवा + download: अधिभारण करा edit: संपादन edit_track: हा अनुरेख संपादा + filename: "संचिकानाम:" map: नकाशा none: काहीही नाही owner: "मालक:" pending: प्रलंबित points: "बिंदू:" + tags: "खूणपताका:" trace_not_found: अनुरेख आढळला नाही! - uploaded: "चढविले:" + uploaded: "अपभारण केले:" user: account: contributor terms: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 8b084aede..6fbd04028 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -24,7 +24,7 @@ ms: language: Bahasa latitude: Garis Lintang longitude: Garis Bujur - title: Tajuk + title: Subjek user: Pengguna friend: friend: Rakan @@ -33,7 +33,7 @@ ms: body: Isi recipient: Penerima sender: Pengirim - title: Tajuk + title: Subjek trace: description: Keterangan latitude: Garis Lintang @@ -342,11 +342,18 @@ ms: other: description: Sumber-sumber lanjutan yang tersenarai di wiki OpenStreetMap title: Sumber-sumber Lain + overpass: + description: Muat turun petak sempadan ini dari cermin pangkalan data OpenStreetMap + title: Overpass API planet: description: Salinan pangkalan data lengkap OpenStreetMap yang sentiasa dikemaskinikan title: Planet OSM zoom: Zum title: Eksport + fixthemap: + how_to_help: + title: Cara Menolong + title: Laporkan masalah / Baiki peta geocoder: description: title: @@ -895,8 +902,8 @@ ms: close: Tutup edit_help: Alihkan peta dan zum dekat pada lokasi yang ingin anda sunting, kemudian klik di sini. key: - title: Petunjuk - tooltip: Petunjuk + title: Petunjuk Peta + tooltip: Petunjuk Peta tooltip_disabled: Kunci Peta tersedia untuk lapisan Biasa sahaja map: base: @@ -1011,6 +1018,7 @@ ms: title: Contoh atribusi contributors_at_html: "Austria: Mengandungi data daripada Stadt Wien (di bawah CC BY) dan Land Vorarlberg, dan Land Tirol (under CC-BY AT dengan pindaan)." contributors_ca_html: "Kanada: Mengandungi data daripada GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada)." + contributors_fi_html: "Finland: Mengandungi data dari Pangkalan Data Topografi\nTinjauan Daratan Negara Finland dan lain-lain set data di bawah\nLesen NLSFI." contributors_footer_1_html: " Untuk keterangan lanjut tentang semua ini, serta sumber-sumber lain yang telah digunakan untuk membantu menambah baik OpenStreetMap, sila rujuk Halaman penyumbang di Wiki OpenStreetMap." contributors_footer_2_html: " Penyertaan data dalam OpenStreetMap tidak bermaksud bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang waranti, atau menerima sebarang tanggungan." contributors_fr_html: "Perancis: Mengandungi data yang disumberkan daripada Direction Générale des Impôts." diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 6c0d6ca3a..4d3d1eb81 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -23,7 +23,7 @@ nb: language: SprÃ¥k latitude: Breddegrad longitude: Lengdegrad - title: Tittel + title: Emne user: Bruker friend: friend: Venn @@ -32,7 +32,7 @@ nb: body: Brødtekst recipient: Mottaker sender: Avsender - title: Tittel + title: Emne trace: description: Beskrivelse latitude: Breddegrad @@ -92,18 +92,39 @@ nb: blocked: Din tilgang til API-et er blokkert. Logg inn pÃ¥ nettstedet for Ã¥ finne ut mer. need_to_see_terms: Din tilgang til API-et er midlertidig stoppet. Logg inn pÃ¥ nettsiden for Ã¥ lese bidragsytervilkÃ¥rene. Du trenger ikke godta vilkÃ¥rene, men du mÃ¥ lese dem. browse: + anonymous: anonym changeset: + belongs_to: Forfatter changesetxml: XML for endringssett feed: title: Endringssett %{id} title_comment: "Endringssett: %{id} - %{comment}" + node: Noder (%{count}) + node_paginated: Noder (%{x}-%{y} av %{count}) osmchangexml: osmChange XML + relation: Forbindelser (%{count}) + relation_paginated: Forbindelser (%{x}-%{y} av %{count}) title: "Endringssett: %{id}" + way: Strekninger (%{count}) + way_paginated: Strekninger (%{x}-%{y} av %{count}) closed: Lukket + closed_by_html: Lukket %{time} siden av %{user} + closed_html: Lukket %{time} siden containing_relation: entry: Relasjon %{relation_name} entry_role: Relasjon %{relation_name} (som %{relation_role}) created: Opprettet + created_by_html: Opprettet %{time} siden av %{user} + created_html: Opprettet %{time} siden + deleted_by_html: Slettet %{time} siden av %{user} + download_xml: Last ned XML + edited_by_html: Redigert %{time} siden av %{user} + in_changeset: Endringer + location: "Posisjon:" + no_comment: (ingen kommentar) + node: + history_title: "Node-historikk: %{name}" + title: "Node: %{name}" not_found: sorry: Beklager, klarte ikke finne %{type}-en med ID %{id}. type: @@ -112,9 +133,21 @@ nb: relation: relasjon way: vei note: + closed_by: Løst av %{user} %{when} siden + closed_by_anonymous: Løst av anonym bruker %{when} siden closed_title: "Avklart merknad: #%{note_name}" + commented_by: Kommentar fra %{user} %{when} siden + commented_by_anonymous: Kommentar fra anonym bruker %{when} siden + hidden_by: Skjult av %{user} %{when} siden + hidden_title: "Skjult notis #%{note_name}" + new_note: Ny notis + open_by: Opprettet av %{user} %{when} siden + open_by_anonymous: Opprettet av anonym bruker %{when} siden open_title: "Uavklart merknad #%{note_name}" + reopened_by: Gjenaktivisert av %{user} %{when} siden + reopened_by_anonymous: Gjenaktivisert av anonym bruker %{when} siden title: "Merknad: %{id}" + part_of: Del av redacted: message_html: Versjon %{version} av denne %{type} kan ikke vises fordi den er blitt maskert. Se %{redaction_link} for detaljer. redaction: Maskering %{id} @@ -122,6 +155,10 @@ nb: node: node relation: relasjon way: vei + relation: + history_title: "Forbindelseshistorikk: %{name}" + members: Medlemmer + title: "Forbindelse: %{name}" relation_member: entry_role: "%{type} %{name} som %{role}" type: @@ -129,6 +166,7 @@ nb: relation: Relasjon way: Vei start_rjs: + feature_warning: Laster %{num_features} funksjonalitetet som kan gjøre at nettleseren blir treg eller stopper helt. Vil du vise frem disse dataene? load_data: Last inn data loading: Laster... tag_details: @@ -144,6 +182,16 @@ nb: node: node relation: relasjon way: vei + version: Versjon + view_details: Vis detaljer + view_history: Vis historikk + way: + also_part_of: + one: delstrekning %{related_ways} + other: delstrekninger %{related_ways} + history_title: "Strekningshistorikk: %{name}" + nodes: Noder + title: "Strekning: %{name}" changeset: changeset: anonymous: Anonym @@ -160,6 +208,13 @@ nb: saved_at: Lagret user: Bruker list: + empty: Ingen endringssett funnet. + empty_area: Ingen endringssett i dette omrÃ¥det. + empty_user: Ingen endringssett fra denne brukeren. + load_more: Last inn mer + no_more: Ingen flere endringssett funnet. + no_more_area: Ingen flere endringssett i dette omrÃ¥det. + no_more_user: Ingen flere endringssett fra denne brukeren. title: Endringssett title_friend: Endringssett av dine venner title_nearby: Endringssett av brukere i nærheten @@ -276,8 +331,25 @@ nb: paste_html: Lim inn HTML som skal bygges inn i nettsted scale: Skala too_large: + advice: "Hvis eksporten over feiler, vær vennlig Ã¥ vurdere bruk av en av kildene i listen under:" body: Dette omrÃ¥det er for stort for Ã¥ bli eksportert som OpenStreetMap XML-data. Vennligst zoom inn eller velg et mindre omrÃ¥de. Eller du kan bruke en av kildene angitt under for nedlasting av bulkdata. + geofabrik: + description: Regelmessig oppdaterte utdrag av verdensdeler, land og utvalgte byer + title: Geofabrik-nedlastninger + metro: + description: Utdrag av verdens største byer med omgivelser + title: Metro-utdrag + other: + description: Ytterliger kilder listet pÃ¥ OpenStreetMap-wikien + title: Andre kilder + overpass: + description: Last ned denne avgrensingsrammen fra et speil av OpenStreetMap-databasen + title: Overførings-API + planet: + description: Regelmessig oppdaterte kopier av hele OpenStreetMap-databasen + title: Planet-OSM zoom: Zoom + title: Eksporter geocoder: description: title: @@ -307,8 +379,10 @@ nb: title: ca_postcode: Resultat fra Geocoder.CA geonames: Resultat fra GeoNames + geonames_reverse: Resultater fra GeoNames latlon: Resultat fra Internt osm_nominatim: Resultat fra OpenStreetMap Nominatim + osm_nominatim_reverse: Resultater fra OpenStreetMap Nominatim uk_postcode: Resultat fra NPEMap / FreeThe Postcode us_postcode: Resultat fra Geocoder.us search_osm_nominatim: @@ -321,6 +395,10 @@ nb: level8: Bygrense level9: Landsbygrense prefix: + aerialway: + chair_lift: Stolheis + drag_lift: Skitrekk + station: Fjellheisstasjon aeroway: aerodrome: Flyplass apron: Flyrampe @@ -414,6 +492,7 @@ nb: shower: Dusj social_centre: Samfunnshus social_club: Sosial klubb + social_facility: Sosialtjeneste studio: Studio supermarket: Supermarked swimming_pool: Svømmebasseng @@ -442,6 +521,9 @@ nb: "yes": Bru building: "yes": Bygning + emergency: + fire_hydrant: Brannhydrant + phone: Nødtelefon highway: bridleway: Ridevei bus_guideway: Ledet bussfelt @@ -463,6 +545,7 @@ nb: platform: Perrong primary: Primær vei primary_link: Primær vei + proposed: ForeslÃ¥tt vei raceway: Racerbane residential: Bolig rest_area: Rasteplass @@ -474,6 +557,7 @@ nb: speed_camera: Fotoboks steps: Trapper stile: Stige + street_lamp: Gatelys tertiary: Tertiær vei tertiary_link: Lokalvei track: Sti @@ -489,6 +573,7 @@ nb: building: Bygning castle: Slott church: Kirke + citywalls: Bymurer fort: Fort house: Hus icon: Ikon @@ -498,6 +583,7 @@ nb: monument: Monument museum: Museum ruins: Ruiner + tomb: Grav tower: TÃ¥rn wayside_cross: Veikant kors wayside_shrine: Veikant alter @@ -636,6 +722,7 @@ nb: locality: Plass moor: Myr municipality: Kommune + neighbourhood: Naboskap postcode: Postnummer region: OmrÃ¥de sea: Hav @@ -661,8 +748,10 @@ nb: narrow_gauge: Smalspor jernbane platform: Jernbaneperrong preserved: Bevart jernbane + proposed: ForeslÃ¥tt jernbane spur: Jernbaneforgrening station: Jernbanestasjon + stop: Jernbaneknutepunkt subway: T-banestasjon subway_entrance: T-baneinngang switch: Sporveksel @@ -678,6 +767,7 @@ nb: beverages: Drikkevarerbutikk bicycle: Sykkelbutikk books: Bokhandel + boutique: Luksusforretning butcher: Slakter car: Bilbutikk car_parts: Bildeler @@ -691,6 +781,7 @@ nb: convenience: Nærbutikk copyshop: Kopieringsbutikk cosmetics: Kosmetikkforretning + deli: Delikatessebutikk department_store: Varehus discount: Tilbudsbutikk doityourself: Gjør-det-selv @@ -727,17 +818,21 @@ nb: organic: Organisk matbutikk outdoor: Utendørs butikk pet: Dyrebutikk + pharmacy: Apotek photo: Fotobutikk salon: Salong + second_hand: Bruktbutikk shoes: Skobutikk shopping_centre: Kjøpesenter sports: Sportsbutikk stationery: Papirbutikk supermarket: Supermarked + tailor: Skredder toys: Lekebutikk travel_agency: ReisebyrÃ¥ video: Videobutikk wine: Utenfor lisens + "yes": Butikk tourism: alpine_hut: Fjellhytte artwork: Kunstverk @@ -760,6 +855,7 @@ nb: viewpoint: Utsiktspunkt zoo: Dyrepark tunnel: + culvert: Kulvert "yes": Tunnel waterway: artificial: Kunstig vassdrag @@ -826,14 +922,17 @@ nb: edit_disabled_tooltip: Zoom inn for Ã¥ redigere kartet edit_tooltip: Rediger kartet layouts: + about: Om community: Samfunnet community_blogs: Fellesskapsblogger community_blogs_title: Blogger fra medlemmene i OpenStreetMap-felleskapet copyright: Opphavsrett + data: Data donate: Støtt OpenStreetMap ved %{link} til Hardware Upgrade Fund (et fond for maskinvareoppgraderinger). edit: Rediger edit_with: Rediger med %{editor} export: Eksporter + export_data: Eksporter data foundation: Stiftelse foundation_title: OpenStreetMap-stiftelsen gps_traces: GPS-spor @@ -842,6 +941,9 @@ nb: history: Historikk home: GÃ¥ til din brukers hjemmeadresse intro_2_create_account: Opprett en brukerkonto + intro_header: Velkommen til OpenStreetMap! + intro_text: OpenStreetMap er et kart over verden, skapt av mennesker som deg, og gratis Ã¥ bruke under en Ã¥pen lisens. + learn_more: Lær mer log_in: Logg inn log_in_tooltip: Logg inn med en eksisterende konto logo: @@ -850,6 +952,7 @@ nb: make_a_donation: text: Doner title: Støtt OpenStreetMap med en donasjon + more: Mer osm_offline: OpenStreetMap databasen er for øyeblikket utilgjengelig mens essensielt vedlikeholdsarbeid utføres. osm_read_only: OpenStreetMap kan ikke redigeres akkurat nÃ¥, pÃ¥ grunn av nødvendig vedlikeholdsarbeid. partners_bytemark: Bytemark Hosting @@ -862,6 +965,7 @@ nb: title: OpenStreetMap sign_up: Registrer deg sign_up_tooltip: Opprett en konto for redigering + start_mapping: Start kartlegging tag_line: Fritt Wiki-verdenskart user_diaries: Brukerdagbok user_diaries_tooltip: Vis brukerens dagbok @@ -876,6 +980,7 @@ nb: title: Eksempel pÃ¥ kildehenvisning contributors_at_html: "Østerrike: Inneholder data fra\n Stadt Wien under\n CC BY,\nLand Vorarlberg og\nLand Tirol (under CC-BY AT med tilføyelser)." contributors_ca_html: "Canada: Inneholder data fra\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Finland: Inneholder data fra National Land Survey fra Finlands topografiske database og andre datasett under NLSFI-lisensen." contributors_footer_1_html: For detaljer om disse og andre kilder som har blitt brukt for Ã¥ forbedre OpenStreetMap, se siden med bidragsytere pÃ¥ OpenStreetMap-wikien. contributors_footer_2_html: " Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige\n dataleverandøren støtter OpenStreetMap, gir noen garanti eller\n godtar noe erstatningsansvar." contributors_fr_html: "Frankrike: Inneholder data hentet fra\n Direction Générale des Impôts." @@ -1768,3 +1873,24 @@ nb: fail: Kunne ikke fjerne rollen "%{role}" fra bruker "%{name}". Sjekk at bruker og rolle er gyldig. heading: Bekreft fjerning av rolle title: Bekreft fjerning av rolle + welcome_page: + add_a_note: + paragraph_1_html: Hvis du bare vil ha rettet en liten detalj, men ikke har tid til Ã¥ gjøre dette selv, kan du legge inn en kommentar. + title: Har du ikke tid til at kartlegge selv? Legg inn en kommentar! + basic_terms: + editor_html: En editor er et program eller en nettside som kan brukes til Ã¥ redigere kartet. + node_html: En node er et enkeltelement pÃ¥ kartet, f.eks. en restaurant eller et tre. + paragraph_1_html: OpenStreetMap har sin egen sjargong. Her er en ordliste som kan være nyttig. + tag_html: En tagg er et informasjonselement om en node eller strekning, f.eks. navnet pÃ¥ en restaurant eller fartsgrensen pÃ¥ en vei. + title: Grunnleggende termer + way_html: En strekning er en linje eller et areal, f.eks. en vei, elv, innsjø eller en bygning. + introduction_html: Velkommen til OpenStreetMap, det fri brukerredigerte verdenskartet. NÃ¥ som du er opprettet som bruker er du klar til Ã¥ legge til og endre kartinformasjon. Her er en guide med den viktigste informasjonen for Ã¥ komme hurtig i gang. + questions: + paragraph_1_html: "OpenStreetMap har diverse ressurser for Ã¥ undervise om prosjektet, som stiller spørsmÃ¥l og svarer pÃ¥ disse, samt legge til rette for dokumenter og diskusjoner om ulike kartleggingsemner.\nFÃ¥ hjelp her." + title: Noen spørsmÃ¥l? + start_mapping: Start kartlegging + title: Velkommen! + whats_on_the_map: + off_html: Kartet inneholder ikke subjektiv informasjon (f.eks. anmeldelser), objekter som er er fiktive eller ikke lenger eksisterer, samt opphavsrettslig beskyttede data fra andre kart. Kopier aldri noe som helst informasjon fra andre digitale eller papirbaserte kart, med mindre det foreligger en særlig tillatelse. + on_html: OpenStreetMap er et nettsted som lagrer og viser frem fysiske elementer med en fast geografisk plassering - f.eks. millionvis av bygninger, veier og andre stedlige detaljer. Du kan kartlegge alle slike ting fra den virkelige verden som du er interessert i. + title: Hva finnes pÃ¥ kartet diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 769ebc6c3..89853cb0d 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -38,7 +38,7 @@ nl: language: Taal latitude: Breedtegraad longitude: Lengtegraad - title: Titel + title: Onderwerp user: Gebruiker friend: friend: Vriend @@ -47,7 +47,7 @@ nl: body: Tekst recipient: Ontvanger sender: Afzender - title: Titel + title: Onderwerp trace: description: Beschrijving latitude: Breedtegraad @@ -365,6 +365,17 @@ nl: title: Planet OSM zoom: Zoom title: Exporteren + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Klik op of het hetzelfde pictogram op de kaartweergave.\nEr wordt dan een markering toegevoegd aan de kaart, die u kunt verplaatsen door te slepen.\nVoeg uw bericht toe, klik op opslaan, en andere kaartenmakers kijken dan naar uw melding." + join_the_community: + explanation_html: Als u een probleem met onze kaartgegevens hebt opgemerkt, er ontbreekt bijvoorbeeld een weg of uw adres, dan kunt u het beste lid worden van de OpenStreetMapgemeenschap en de gegevens zelf toevoegen of corrigeren. + title: Word lid van onze gemeenschap + title: Hoe u kunt helpen + other_concerns: + title: Andere punten van zorg + title: Een probleem melden / de kaart corrigeren geocoder: description: title: diff --git a/config/locales/oc.yml b/config/locales/oc.yml index d438057f9..fa9cf0477 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -3,6 +3,15 @@ # Export driver: syck-pecl # Author: Cedric31 oc: + about_page: + community_driven_html: "La comunautat d’OpenStreetMap es divèrsa, passionada e grossís cada jorn. Nòstres contributors incluisson de cartografes entosiastes, de professionals del GIS, d'ingenhiaires que menan los servidors OSM, d'umanitaris que cartografian las zònas devastadas per una catastròfa e plan mai encara.\nPer ne saber mai sus la comunautat, consultatz los annuaris d’utilizaires, los blogs comunautaris e lo site web de la Fondacion OSM." + community_driven_title: Menat per la comunautat + copyright_html: ©Contributors
    d’OpenStreetMap + lede_text: OpenStreetMap es bastit per una comunautat de cartografes benevòls que contribuisson e mantenon las donadas de las rotas, caminòls, cafès, estacions ferroviàrias e plan mai encara, pertot dins lo mond. + local_knowledge_title: Coneissença locala + next: Seguent + open_data_title: Donadas liuras + partners_title: Partenaris activerecord: attributes: diary_comment: @@ -11,7 +20,7 @@ oc: language: Lenga latitude: Latitud longitude: Longitud - title: Títol + title: Subjècte user: Utilizaire friend: friend: Amic @@ -20,7 +29,7 @@ oc: body: Còs recipient: Destinatari sender: Expeditor - title: Títol + title: Subjècte trace: description: Descripcion latitude: Latitud @@ -72,27 +81,62 @@ oc: way_node: Nosèl del camin way_tag: Balisa del camin browse: + anonymous: anonim changeset: + belongs_to: Autor changesetxml: Grop de modificacions XML feed: title: Grop de modificacions %{id} title_comment: Grop de modificacions %{id} – %{comment} + node: Nosèls (%{count}) + node_paginated: Nosèls (%{x} a %{y} sus %{count}) osmchangexml: osmChange XML - title: Grop de modificacions + relation: Relacions (%{count}) + relation_paginated: Relacions (%{x} a %{y} sus %{count}) + title: "Grop de modificacions : %{id}" + way: Camins (%{count}) + way_paginated: Camins (%{x} a %{y} sus %{count}) + closed: Tampat + closed_by_html: Tampat fa %{time} per %{user} + closed_html: Tampat fa %{time} containing_relation: entry: Relacion %{relation_name} entry_role: Relacion %{relation_name} (en tant que %{relation_role}) + created: Creat + created_by_html: Creat fa %{time} per %{user} + created_html: Creat fa %{time} + deleted_by_html: Suprimit fa %{time} per %{user} + download_xml: Telecargar lo XML + edited_by_html: Modificat fa %{time} per %{user} + in_changeset: Grop de modificacions + location: "Emplaçament :" + no_comment: (sens comentaris) + node: + history_title: "Istoric del nosèl : %{name}" + title: "Nosèl : %{name}" not_found: - sorry: O planhèm, l’objècte de tipe %{type} amb l’identificant %{id} es pas estat trobat. + sorry: "O planhèm, %{type} #%{id} a pas pogut èsser trobat." type: changeset: grop de modificacions node: nosèl relation: relacion way: camin note: - closed_title: "Nòta resolguda : %{note_name}" - open_title: "Nòta pas resolguda : %{note_name}" - title: Nòta + closed_by: Resolgut per %{user} fa %{when} + closed_by_anonymous: Resolgut per un utilizaire anonim fa %{when} + closed_title: Nòta resolguda nº %{note_name} + commented_by: Comentari de %{user} fa %{when} + commented_by_anonymous: Comentat per un utilizaire anonim fa %{when} + hidden_by: Amagat per %{user} fa %{when} + hidden_title: Nòta amagada nº %{note_name} + new_note: Nòta novèla + open_by: Creat per %{user} fa %{when} + open_by_anonymous: Creat per un utilizaire anonim fa %{when} + open_title: Nòta pas resolguda nº %{note_name} + reopened_by: Reactivat per %{user} fa %{when} + reopened_by_anonymous: Reactivat per un utilizaire anonim fa %{when} + title: "Nòta : %{id}" + part_of: Partida de redacted: message_html: La version %{version} d'aqueste(-a) %{type} pòt pas èsser afichada perque es estada amagada. Consultatz %{redaction_link} per mai d'informacions. redaction: Amagatge %{id} @@ -100,6 +144,10 @@ oc: node: nosèl relation: relacion way: camin + relation: + history_title: "Istoric de la relacion : %{name}" + members: Membres + title: "Relacion : %{name}" relation_member: entry_role: "%{type} %{name} amb lo ròtle %{role}" type: @@ -107,10 +155,11 @@ oc: relation: Relacion way: Camin start_rjs: + feature_warning: Lo cargament de %{num_features} caracteristicas poiriá rendre vòstre navigador lent o poiriá respondre pas mai. Sètz segur que volètz afichar aquelas donadas ? load_data: Cargar las donadas loading: Cargament... tag_details: - tags: "Balisas :" + tags: Atributs wiki_link: key: La descripcion de la balisa %{key} sul wiki tag: La descripcion de la balisa %{key}=%{value} sul wiki @@ -122,6 +171,16 @@ oc: node: nosèl relation: relacion way: camin + version: Version + view_details: Afichar los detalhs + view_history: Afichar l’istoric + way: + also_part_of: + one: partida del camin %{related_ways} + other: partida dels camins %{related_ways} + history_title: "Istoric del camin : %{name}" + nodes: Nosèls + title: "Camin : %{name}" changeset: changeset: anonymous: Anonim @@ -138,10 +197,19 @@ oc: saved_at: Salvat a user: Utilizaire list: + empty: Cap de grop de modificacions pas trobat. + empty_area: Pas cap de grop de modificacions dins aquesta zòna. + empty_user: Pas cap de grop de modificacions per aqueste utilizaire. + load_more: Cargar mai + no_more: Cap d'autre grop de modificacions pas trobat. + no_more_area: Pas cap d'autre grop de modificacions dins aquesta zòna. + no_more_user: Pas cap d'autre grop de modificacions per aqueste utilizaire. title: Gropes de modificacions title_friend: Gropes de modificacions per vòstres amics title_nearby: Gropes de modificacions dels utilizaires a proximitat title_user: Gropes de modificacions per %{user} + timeout: + sorry: O planhèm, la lista dels gropes de modificacions qu'avètz demandada met tròp de temps per èsser recuperada. diary_entry: comments: ago: i a %{ago} @@ -206,6 +274,7 @@ oc: new: title: Novèla entrada del jornal no_such_entry: + body: O planhèm, i a pas cap d'entrada dins lo jornal nimai cap de comentari amb l’id %{id}. Verificatz vòstra ortografia o la validitat del ligam qu'avètz clicat. heading: "Pas cap d'entrada amb l'id : %{id}" title: Cap d'entrada del jornal es pas estada trobada view: @@ -250,7 +319,30 @@ oc: output: Sortida paste_html: Pegatz lo còde HTML per incorporar dins un site web. scale: Escala + too_large: + advice: "Se l’expòrt çaisús fracassa, envisatjatz l’utilizacion d’una de las fonts listadas çaijòs :" + geofabrik: + title: Telecargaments de Geofabrik + metro: + title: Extraches de Metro + other: + description: Fonts suplementàrias listadas dins lo wiki d'OpenStreetMap + title: Autras fonts + overpass: + title: API palanca + planet: + title: Planeta OSM zoom: Zoom + title: Exportar + fixthemap: + how_to_help: + join_the_community: + title: Rejónher la comunautat + title: Cossí ajudar + other_concerns: + explanation_html: "Se sètz preocupat pel biais que nòstras donadas son utilizadas o sus lor contengut, consultatz nòstra\npagina de drech d’autor per d'informacions mai legalas, o contactar lo \ngrop de trabalh OSMF apropriat." + title: Autras preocupacions + title: Senhalar un problèma / Corregir la mapa geocoder: description: title: @@ -280,8 +372,10 @@ oc: title: ca_postcode: Resultats dempuèi Geocoder.CA geonames: Resultats dempuèi GeoNames + geonames_reverse: Resultats de GeoNames latlon: Resultats intèrnes osm_nominatim: Resultats de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultatts de OpenStreetMap Nominatim uk_postcode: Resultats dempuèi NPEMap / FreeThe Postcode us_postcode: Resultats dempuèi Geocoder.us search_osm_nominatim: @@ -482,6 +576,7 @@ oc: monument: Monument museum: Musèu ruins: Roïnas + tomb: Tombèl tower: Torre wayside_cross: Calvari wayside_shrine: Orador @@ -777,26 +872,81 @@ oc: water_point: Punt d'aiga waterfall: Cascada weir: Barratge + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap a mantuna ressorsas per aprene lo projècte, per pausar e respondre a de questions, e respondre a de questions, e per discutir en collaboracion amb d’autres e documentar los subjèctes de cartografia. + title: Obténer d’ajuda + welcome: + title: Benvenguda a OSM + url: /welcome + wiki: + description: Parcorrètz lo wiki per la documentacion aprigondida d’OSM + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Tampar + key: + title: Legenda + tooltip: Legenda + map: + base: + cycle_map: Mapa ciclista + hot: Umanitari + standard: Estandard + transport_map: Mapa de transpòrt + copyright: © Contributors d'OpenStreetMap + donate_link_text: + layers: + data: Donadas de mapa + header: Jaces de mapa + notes: Nòtas de la mapa + title: Jaces + locate: + title: Afichar mon emplaçament + zoom: + in: Zoom avant + out: Zoom arrièr + notes: + new: + add: Apondre una nòta + show: + comment: Comentari + comment_and_resolve: Comentar e resòlvre + hide: Amagar + reactivate: Reactivar + resolve: Resòlvre share: + cancel: Anullar + center_marker: Centrar la mapa sul marcador + custom_dimensions: Definir las dimensions personalizadas download: Telecargar embed: HTML format: "Format :" image: Imatge + image_size: L’imatge aficharà lo jaç estandard en + include_marker: Inclure lo marcador + link: Ligam o HTML long_link: Ligam scale: "Escala :" + short_link: Ligam cort short_url: URL corta + title: Partejar + view_larger_map: Afichar una mapa mai granda site: edit_tooltip: Modificar la mapa layouts: + about: A prepaus community: Comunautat community_blogs: Blogs de la comunautat community_blogs_title: Blogs de membres de la comunautat OpenStreetMap - copyright: Copyright & Licéncia + copyright: Dreches d’autor data: Donadas donate: Sostenètz OpenStreetMap, %{link} al fons per melhorar lo material. edit: Modificar edit_with: Modificar amb %{editor} + export: Exportar export_data: Exportar las donadas foundation: La Fondacion foundation_title: La Fondacion OpenStreetMap @@ -806,7 +956,9 @@ oc: history: Istoric home: Anar a l'emplaçament de mon domicili intro_2_create_account: Creatz un compte d'utilizaire - log_in: Connexion + intro_header: Benvenguda dins OpenStreetMap ! + learn_more: Ne saber mai + log_in: Se connectar log_in_tooltip: Se connectar amb un compte existent logo: alt_text: Lògo d'OpenStreetMap @@ -814,6 +966,7 @@ oc: make_a_donation: text: Far un don title: Sostenètz OpenStreetMap amb un don financièr + more: Mai osm_offline: La banca de donadas de OpenStreetMap es actualament fòra linha; una mantenença essenciala a son bon foncionament es en cors. osm_read_only: La banca de donadas d'OpenStreetMap es actualament en mòde lectura sola ; una mantenença essenciala a son bon foncionament es en cors. partners_bytemark: Albergament Bytemark @@ -821,8 +974,9 @@ oc: partners_ic: lo Collègi Imperial de Londres partners_partners: partenaris partners_ucl: lo VR Centre de l'UCL - sign_up: S'inscriure + sign_up: Crear un compte sign_up_tooltip: Crear un compte per la modificacion + start_mapping: Començar de cartografiar tag_line: La mapa cooperativa liura user_diaries: Jornals user_diaries_tooltip: Veire los jornals d'utilizaires @@ -833,12 +987,15 @@ oc: title: A prepaus d'aquesta traduccion legal_babble: attribution_example: + alt: Exemple d'atribucion OpenStreetMap sus una pagina internet title: Exemple d'atribucion + contributors_fr_html: "França : conten de donadas de la\n Direccion generala dels impòts." contributors_title_html: Nòstres contributors credit_title_html: Cossí creditar OpenStreetMap infringement_title_html: Violacion dels dreches d'autor intro_1_html: "OpenStreetMap es un ensemble de donadas dobèrtas, disponiblas jos la licéncia Open Data Commons Open Database License (ODbL)." intro_2_html: " Sètz liure de copiar, distribuir, transmetre e adaptar nòstras donadas,\n a condicion que creditiatz OpenStreetMap e sos\n contributors. Se modificatz o utilizatz nòstras donadas dins d’autras òbras derivadas,\n las podètz distribuir sonque jos la meteissa licéncia. Lo\n tèxte\n legal complet detalha vòstres dreches e responsabilitats." + more_1_html: "Se volètz obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la FAQ\n legala." more_title_html: Per trobar mai d’informacions title_html: Copyright e Licéncia native: @@ -908,21 +1065,61 @@ oc: unread_button: Marcar coma pas legit sent_message_summary: delete_button: Suprimir + note: + description: + closed_at_by_html: Resolgut fa %{when} per %{user} + closed_at_html: Resolgut fa %{when} + commented_at_by_html: Mesa a jorn fa %{when} per %{user} + commented_at_html: Mes a jorn fa %{when} + opened_at_by_html: Creat fa %{when} per %{user} + opened_at_html: Creat fa %{when} + reopened_at_by_html: Reactivat fa %{when} per %{user} + reopened_at_html: Reactivat fa %{when} + entry: + comment: Comentari + full: Nòta completa + mine: + ago_html: i a %{when} + created_at: Creat lo + creator: Creator + description: Descripcion + heading: Nòtas de %{user} + id: Id + last_changed: Darrièr cambiament + rss: + description_item: Un fial rss per la nòta %{id} + reopened: nòta reactivada (prèp de %{place}) + title: Nòtas d'OpenStreetMap notifier: diary_comment_notification: hi: Bonjorn %{to_user}, + subject: "[OpenStreetMap] %{user} a apondut un comentari sus vòstra entrada del jornal" + email_confirm: + subject: "[OpenStreetMap] Confirmacion de vòstra adreça de corrièr electronic" email_confirm_html: greeting: Bonjorn, email_confirm_plain: greeting: Bonjorn, + friend_notification: + befriend_them: "Tanben, lo podètz apondre coma amic aicí : %{befriendurl}." + had_added_you: "%{user} vos a apondut coma amic dins OpenStreetMap." + see_their_profile: "Podètz veire son perfil aicí : %{userurl}." + subject: "[OpenStreetMap] %{user} vos a apondut coma amic" gpx_notification: and_no_tags: e sens balisa. and_the_tags: "e las balisas seguentas :" failure: + failed_to_import: "a pas pogut èsser importat. Aquí l'error :" + more_info_1: Mai d'informacions sus las errors al moment de l'impòrt GPX e cossí las evitar + more_info_2: "pòdon èsser trobats sus :" subject: "[OpenStreetMap] Error al moment de l'impòrt GPX" greeting: Bonjorn, + success: + subject: "[OpenStreetMap] Impòrt GPX capitat" with_description: amb la descripcion your_gpx_file: Sembla que vòstre fichièr GPX + lost_password: + subject: "[OpenStreetMap] Demanda de reïnicializacion del senhal" lost_password_html: greeting: Bonjorn, lost_password_plain: @@ -934,36 +1131,96 @@ oc: commented: subject_other: "[OpenStreetMap] %{commenter} a comentat una nòta a la quala vos interessatz" subject_own: "[OpenStreetMap] %{commenter} a comentat una de vòstras nòtas" + details: Mai de detalh sus la nòta pòt èsser obtengut a %{url}. greeting: Bonjorn, signup_confirm: greeting: Bonjorn ! + subject: "[OpenStreetMap] Benvenguda dins OpenStreetMap" oauth: oauthorize: + allow_read_gpx: legir vòstras traças GPS privadas. + allow_read_prefs: legir vòstras preferéncias d'utilizaire. + allow_to: "Autorizar l'aplicacion client a :" allow_write_api: modificar la mapa. + allow_write_diary: creatz d'entradas dins lo jornal, de comentaris e fasètz-vos d'amics. + allow_write_gpx: mandar de traças GPS. allow_write_notes: modificar las nòtas. allow_write_prefs: modificar vòstras preferéncias d'utilizaire. + title: Autorizar l’accès a vòstre compte + oauthorize_failure: + invalid: Lo geton d’autorizacion es invalid. + title: La demanda d’autorizacion a fracassat + oauthorize_success: + title: La demanda d’autorizacion es estada acceptada + verification: Lo còde de verificacion es %{code}. + revoke: + flash: Avètz revocat lo geton per %{application} oauth_clients: + create: + flash: Informacions enregistradas amb succès + destroy: + flash: Enregistrament de l'aplicacion clienta suprimit + edit: + submit: Modificar + title: Modificar vòstra aplicacion form: + allow_read_gpx: legir sas traças GPS privadas. + allow_read_prefs: legir sas preferéncias d'utilizaire. allow_write_api: modificar la mapa. + allow_write_gpx: mandar de traças GPS. allow_write_notes: modificar las nòtas. allow_write_prefs: modificar sas preferéncias d'utilizaire. + callback_url: URL de rapèl + name: Nom + required: Requesit + support_url: URL de supòrt + url: URL principala de l'aplicacion index: application: Nom de l'aplicacion + issued_at: Emés lo my_apps: Mas aplicacions clientas my_tokens: Mas aplicacions enregistradas register_new: Enregistratz vòstra aplicacion revoke: Revocar ! title: Mos detalhs OAuth + new: + submit: Enregistrar + title: Enregistratz una novèla aplicacion + not_found: + sorry: O planhèm, aqueste %{type} a pas pogut èsser trobat. show: + access_url: "URL del geton d'accès :" + allow_read_gpx: legir lors traças GPS privadas. + allow_read_prefs: consultar sas preferéncias d'utilizaire. allow_write_api: modificar la mapa. + allow_write_gpx: mandar la traça GPS allow_write_notes: modificar las nòtas. allow_write_prefs: modificar sas preferéncias d'utilizaire. + authorize_url: "URL d'autorizacion :" + confirm: Sètz segur ? + delete: Suprimir lo client + edit: Modificar los detalhs + key: "Clau de l'utilizaire :" + secret: "Secret de l'utilizaire :" + title: Detalhs OAuth per %{app_name} + url: "URL del geton de requèsta :" + update: + flash: Informacions del client enregistradas amb succès redaction: edit: + description: Descripcion submit: Enregistrar l'amagatge + new: + description: Descripcion + show: + confirm: Sètz segur ? + description: "Descripcion :" + user: "Creator :" site: edit: anon_edits_link_text: Trobatz perqué aicí. + id_not_configured: iD es pas estat configurat + not_public: Avètz pas reglat vòstras modificacions per que sián publicas. user_page_link: pagina d'utilizaire index: createnote: Apondre una nòta @@ -1015,7 +1272,8 @@ oc: resident: Zòna residenciala retail: Zòna de comèrci runway: - 1: via de circulacion d'aeropòrt + - Pista d'aeropòrt + - via de circulacion d'aeropòrt school: - Escòla - universitat @@ -1056,6 +1314,7 @@ oc: search: Recèrca submit_text: Validar where_am_i: Ont soi ? + where_am_i_title: Descriu la posicion actuala en utilizant lo motor de recèrca sidebar: close: Tampar search_results: Resultats de la recèrca @@ -1065,6 +1324,13 @@ oc: trace: create: upload_trace: Mandar la traça GPS + delete: + scheduled_for_deletion: Pista prevista per la supression + description: + description_with_count: + one: Fichièr GPX file amb %{count} punt de %{user} + other: Fichièr GPX amb %{count} punts de %{user} + description_without_count: Fichièr GPX de %{user} edit: description: "Descripcion :" download: telecargar @@ -1082,11 +1348,21 @@ oc: uploaded_at: "Mandat lo :" visibility: "Visibilitat :" visibility_help: qué significa aquò ? + georss: + title: Traças GPS d'OpenStreetMap list: + description: Percórrer las darrièras traças GPS telecargadas + empty_html: Pas res a veire per aquí. Telecargar una traça novèla o per ne saber mai sul traçatge GPS, consultatz la pagina wiki. public_traces: Traças GPS publicas public_traces_from: Traças GPS publicas de %{user} tagged_with: " balisat amb %{tags}" your_traces: Vòstras traças GPS + make_public: + made_public: Pista renduda publica + offline: + heading: Emmagazinatge GPX fòra linha + offline_warning: + message: Lo sistèma de mandadís GPX es actualament indisponible trace: ago: i a %{time_in_words_ago} by: per @@ -1100,6 +1376,7 @@ oc: pending: EN ESPÈRA private: PRIVAT public: PUBLIC + trace_details: Veire los detalhs de la traça trackable: PISTABLE view_map: Veire la mapa trace_form: @@ -1136,8 +1413,12 @@ oc: points: "Punts :" start_coordinates: "Coordenadas de despart :" tags: "Balisas :" + title: Afichatge de la traça %{name} + trace_not_found: Traça pas trobada ! uploaded: "Mandat lo :" visibility: "Visibilitat :" + visibility: + private: Privat (partejat anonimament, punts pas ordenats) user: account: contributor terms: @@ -1174,21 +1455,36 @@ oc: heading: "Modificacion publica :" public editing note: heading: Modificacion publica + replace image: Remplaçar l'imatge actuala return to profile: Tornar al perfil save changes button: Enregistrar las modificacions title: Modificar lo compte update home location on click: Metre a jorn l'emplaçament de vòstre domicili quand clicatz sus la mapa ? confirm: button: Confirmar + heading: Verificatz vòstre corrièr electronic ! + confirm_email: + button: Confirmar + heading: Confirmar lo cambiament de vòstra adreça e-mail + confirm_resend: + failure: L’utilizaire %{name} es introbable. list: + confirm: Confirmar los utilizaires seleccionats + empty: Cap d'utilizaire correspondent es pas estat trobat + heading: Utilizaires + hide: Amagar los utilizaires seleccionats showing: one: Afichatge de la pagina %{page} (%{first_item} sus %{items}) other: Afichatge de la pagina %{page} (%{first_item}-%{last_item} sus %{items}) + title: Utilizaires login: + auth failure: O planhèm, mas las informacions provesidas an pas permés de vos identificar. + create account minute: Se crear un compte. Aquò pren pas qu'una minuta. email or username: "Adreça e-mail o nom d'utilizaire :" heading: Connexion login_button: Se connectar lost password link: Avètz perdut vòstre senhal ? + new to osm: Novèl sus OpenStreetMap ? no account: Avètz pas de compte ? openid: "%{logo} OpenID :" openid_logo_alt: Se connectar amb un OpenID @@ -1226,15 +1522,22 @@ oc: new password button: Mandar un senhal novèl title: Senhal perdut make_friend: + button: Apondre en tant qu'amic + heading: Apondre %{user} en tant qu'amic ? success: d'ara enlà, %{name} es vòstre amic. new: + about: + header: Liure e modificable + confirm email address: "Confirmar l'adreça de corrièr electronic :" confirm password: "Confirmatz lo senhal :" continue: S’inscriure display name: "Nom afichat :" email address: "Adreça de corrièr electronic :" openid: "%{logo} OpenID :" password: "Senhal :" + terms accepted: Mercé d’aver acceptat los novèls tèrmes del contributor ! title: S’inscriure + use openid: Tanben podètz utilizar %{logo} OpenID per vos identificar no_such_user: heading: L'utilizaire %{user} existís pas title: Utilizaire inexistent @@ -1244,12 +1547,18 @@ oc: your location: Vòstre emplaçament remove_friend: button: Suprimir en tant qu'amic + heading: Suprimir %{user} en tant qu’amic ? reset_password: confirm password: "Confirmatz lo senhal :" + flash changed: Vòstre senhal es estat modificat. heading: Reïnicializar lo senhal de %{user} password: "Senhal :" reset: Reïnicializar lo senhal title: Reïnicializar lo senhal + suspended: + heading: Compte suspendut + title: Compte suspendut + webmaster: webmèstre terms: agree: Accèpti consider_pd_why: qu’es aquò ? @@ -1259,11 +1568,13 @@ oc: france: França italy: Itàlia rest_of_world: Rèsta del mond + legale_select: "País de residéncia :" title: Tèrmes del contributor view: activate_user: activar aqueste utilizaire add as friend: Apondre en tant qu'amic ago: (i a %{time_in_words_ago}) + block_history: blòts recebuts blocks by me: Mos blocatges blocks on me: Mos blocatges comments: Comentaris @@ -1271,7 +1582,10 @@ oc: confirm_user: confirmar aqueste utilizaire create_block: blocar aqueste utilizaire created from: "Creat dempuèi :" + ct accepted: Acceptat fa %{ago} + ct declined: Refusat ct status: "Condicions del contributor :" + ct undecided: Pas decidit deactivate_user: desactivar aqueste utilizaire delete_user: suprimir aqueste utilizaire description: Descripcion @@ -1282,21 +1596,35 @@ oc: friends_diaries: Entradas de jornal dels amics hide_user: amagar aqueste utilizaire km away: "%{count} km" + latest edit: "Darrièra modificacion %{ago} :" m away: distant de %{count} m mapper since: "Mapaire dempuèi :" + moderator_history: blòts provesits my comments: Mos comentaris my diary: Mon jornal my edits: Mas modificacions + my messages: Mos messatges my notes: Mas nòtas de mapa my profile: Mon perfil my settings: Mas opcions my traces: Mas traças nearby users: Autres utilizaires a proximitat nearby_changesets: Percórrer totes los gropes de modificacions dels utilizaires a proximitat + nearby_diaries: Entradas de jornal dels utilizaires a proximitat new diary entry: novèla entrada dins lo jornal + no friends: Avètz pas encara apondut cap d'amic notes: Nòtas de mapa oauth settings: paramètres OAuth remove as friend: Suprimir en tant qu'amic + role: + administrator: Aqueste utilizaire es un administrator + grant: + administrator: Autrejar l'accès administrator + moderator: Autrejar l'accès moderator + moderator: Aqueste utilizaire es un moderator + revoke: + administrator: Revocar l'accès administrator + moderator: Revocar l'accès moderador send message: Mandar un messatge settings_link_text: opcions spam score: "Nòta pel spam :" @@ -1306,21 +1634,103 @@ oc: user location: Emplaçament de l'utilizaire your friends: Vòstres amics user_block: + blocks_by: + heading: Lista dels blocatges per %{name} + title: Blocatges per %{name} + blocks_on: + empty: "%{name} es pas encara estat blocat." + heading: Lista dels blocatges sus %{name} + title: Blocatges de %{name} + create: + flash: Blocatge creat sus l'utilizaire %{name}. + edit: + back: Veire totes los blocatges + heading: Modifica un blocatge sus %{name} + reason: Rason per la quala %{name} es blocat. Mercé d'èsser tant suau e rasonable com possible, e de balhar tant de detalhs coma possible sus la situacion. Sapiatz que tot lo monde compren pas lo girgon de la comunautat, alara utilizatz de tèrmes simples e precises. + show: Afichar aqueste blocatge + submit: Modificar lo blocatge + title: Modifica un blocatge sus %{name} + helper: + time_future: Acaba a %{time}. + time_past: Acabat fa %{time}. + until_login: Actiu fins al moment que l'utilizaire se connectarà. + index: + empty: Cap de blocatge es pas encara estat efectuat. + heading: Lista dels blocatges + title: Blocatges utilizaire + model: + non_moderator_revoke: Vos cal èsser moderator per revocar un blocatge. + new: + back: Veire totes los blocatges + heading: Creat un blocatge sus %{name} + reason: Rason per la quala %{name} es blocat. Mercé d'èsser tant suau e rasonable com possible, e de balhar tant de detalhs coma possible sus la situacion. Doblidetz pas qu'aqueste messatge serà visible per totes. Sapiatz que tot lo monde compren pas lo girgon de la comunautat, alara utilizatz de tèrmes simples e precises. + submit: Crear un blòt + title: Creat un blocatge sus %{name} + not_found: + back: Retorn a l'indèx partial: + confirm: Sètz segur ? + creator_name: Creator + display_name: Utilizaire blocat + edit: Modificar + next: Seguent » + not_revoked: (pas revocat) + previous: « Precedent + reason: Motiu del blocatge revoke: Revocar ! + revoker_name: Revocat per + show: Afichar + showing_page: Pagina %{page} + status: Estatut + period: + one: 1 ora + other: "%{count} oras" revoke: + flash: Aqueste blocatge es estat revocat. + heading: Revòca un blocatge sus %{block_on} per %{block_by} revoke: Revocar ! + time_future: Aqueste blocatge s'acabarà dins %{time}. + title: Revòca un blocatge sus %{block_on} show: + back: Afichar totes los blocatges + confirm: Sètz segur ? + edit: Modificar + heading: "%{block_on} blocat per %{block_by}" + reason: "Motiu del blocatge :" revoke: Revocar ! + revoker: "Revocador :" + show: Afichar + status: Estatut + time_future: S'acaba dins %{time} + time_past: S'es acabat fa %{time} + title: "%{block_on} blocat per %{block_by}" + update: + success: Blocatge mes a jorn. + user_role: + filter: + already_has_role: L'utilizaire possedís ja lo ròtle %{role}. + doesnt_have_role: L'utilizaire a pas lo ròtle %{role}. + not_a_role: La cadena « %{role} » es un ròtle valid. + grant: + confirm: Confirmar + heading: Confirmar l'autrejament del ròtle + title: Confirmar l'autrejament del ròtle + revoke: + confirm: Confirmar + heading: Confirmar la revocacion del ròtle + title: Confirmar la revocacion del ròtle welcome_page: add_a_note: title: Pas lo temps d'editar ? Apodètz una nòta ! basic_terms: editor_html: Un editor es un programa o site web que vos permet d'editar la mapa. + tag_html: "Un tag es una informacion a prepaus d'un nosèl o d'un camin, coma\nlo nom d'un restaurant o la velocitat limita d'una carrièra." title: Vocabulari de basa de cartografia questions: + paragraph_1_html: "OpenStreetMap a mantuna ressorsas per aprene lo projècte, per pausar e respondre a de questions, e per discutir en collaboracion amb d’autres e documentar los subjèctes de cartografia.\nTrobatz d’ajuda aicí." title: De questions ? start_mapping: Començar de cartografiar title: Benvenguda ! whats_on_the_map: + on_html: "OpenStreetMap servís a cartografiar de causas a l'encòp vertadièras e actualas\n- inclutz de milions de bastiments, de rotas, e d'autres detalhs de luòcs. Podètz cartografiar quin element vertadièr del mond que que vos interèsse." title: Çò qu'i a sus la mapa diff --git a/config/locales/pl.yml b/config/locales/pl.yml index c549b0d56..e502e0385 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -45,7 +45,7 @@ pl: language: Język latitude: Szerokość geograficzna longitude: Długość geograficzna - title: Tytuł + title: Temat user: Użytkownik friend: friend: Znajomy @@ -54,7 +54,7 @@ pl: body: Treść recipient: Odbiorca sender: Nadawca - title: Tytuł + title: Temat trace: description: Opis latitude: Szerokość geograficzna @@ -1865,7 +1865,7 @@ pl: block_expired: Blokada zakończyła się i nie można jej edytować. block_period: Długość blokady należy wybrać z listy rozwijanej. helper: - time_future: Blokada wygasa %{time}. + time_future: Blokada wygasa za %{time}. time_past: Zakończono %{time} temu. until_login: Aktywne do momentu zalogowania użytkownika. index: @@ -1924,7 +1924,7 @@ pl: revoker: Cofający uprawnienia show: Pokaż status: Status - time_future: Blokada wygasa %{time} + time_future: Blokada wygasa za %{time} time_past: Zakończona %{time} temu title: "%{block_on} zablokowany przez użytkownika %{block_by}" update: @@ -1967,5 +1967,6 @@ pl: start_mapping: Rozpocznij mapowanie title: Witaj! whats_on_the_map: + off_html: Nie wprowadzamy obiektów nieistniejących, hipotetycznych oraz danych ze źródeł objętych prawami autorskimi. Jeśli nie masz zgody, nie kopiuj z innych map (zarówno map papierowych, jak i online). on_html: OpeenStreetMap jest miejscem mapowania rzeczy, które są zarówno prawdziwe jak i aktualne - zawiera miliony budynków, dróg i innych szczegółów dotyczących miejsc. Można mapować wszystkie elementy rzeczywistego świata, które Cię interesują title: Co jest na mapie diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index cb4af5c83..2f4105088 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -8,6 +8,7 @@ # Author: Giro720 # Author: Gmare # Author: Gusta +# Author: Jgpacker # Author: Leosls # Author: Luckas # Author: Luckas Blade @@ -19,6 +20,12 @@ # Author: Vgeorge # Author: 555 pt-BR: + about_page: + community_driven_title: Dirigido pela comunidade + copyright_html: ©Colaboradores
    do OpenStreetMap + local_knowledge_title: Conhecimento local + next: Próximo + partners_title: Parceiros activerecord: attributes: diary_comment: @@ -27,7 +34,7 @@ pt-BR: language: Idioma latitude: Latitude longitude: Longitude - title: Título + title: Assunto user: Usuário friend: friend: Amigo @@ -36,7 +43,7 @@ pt-BR: body: Corpo recipient: Destinatário sender: Remetente - title: Título + title: Assunto trace: description: Descrição latitude: Latitude @@ -130,16 +137,27 @@ pt-BR: history_title: "Histórico do nó: %{name}" title: "Nó: %{name}" not_found: - sorry: Desculpe, o %{type} com o ID %{id}, não pôde ser encontrado. + sorry: Desculpe, não foi possível encontrar %{type} com id %{id}. type: changeset: conjunto de mudanças node: nó relation: relação way: caminho note: - closed_title: "Nota resolvida: %{note_name}" - open_title: "Nota não resolvida: %{note_name}" - title: Nota + closed_by: Resolvido por %{user} há %{when} atrás + closed_by_anonymous: Resolvido por um usuário anônimo há %{when} atrás + closed_title: "Nota resolvida #%{note_name}" + commented_by: Comentado por %{user} há %{when} atrás + commented_by_anonymous: Comentado por um usuário anônimo há %{when} atrás + hidden_by: Ocultado por %{user} há %{when} atrás + hidden_title: "Nota oculta #%{note_name}" + new_note: Nova nota + open_by: Criado por %{user} há %{when} atrás + open_by_anonymous: Criado por um usuário anônimo há %{when} atrás + open_title: "Nota não resolvida #%{note_name}" + reopened_by: Reaberto por %{user} há %{when} atrás + reopened_by_anonymous: Reaberto por um usuário anônimo há %{when} atrás + title: "Nota: %{id}" part_of: Parte de redacted: message_html: A versão %{version} deste %{type} não pode ser exibida tal como foi redigida. Consulte %{redaction_link} para obter mais informações. @@ -148,6 +166,10 @@ pt-BR: node: nó relation: relação way: caminho + relation: + history_title: "Histórico da Relação: %{name}" + members: Membros + title: "Relação: %{name}" relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} como %{role}" @@ -156,10 +178,11 @@ pt-BR: relation: Relação way: Caminho start_rjs: + feature_warning: Carregando %{num_features} feições, o que pode deixar seu navegador lento ou sem resposta. Tem certeza que quer exibir estes dados? load_data: Carregar dados loading: Carregando... tag_details: - tags: "Etiquetas:" + tags: Etiquetas wiki_link: key: A página no wiki com a descrição da etiqueta %{key} tag: A página no wiki com a descrição da etiqueta %{key}=%{value} @@ -175,7 +198,11 @@ pt-BR: view_details: Ver Detalhes view_history: Ver Histórico way: + also_part_of: + one: parte da linha %{related_ways} + other: parte das linhas %{related_ways} history_title: "Histórico da linha: %{name}" + nodes: Nós title: "Linha: %{name}" changeset: changeset: @@ -185,7 +212,7 @@ pt-BR: changeset_paging_nav: next: Seguinte » previous: « Anterior - showing_page: Página % {page} + showing_page: Página %{page} changesets: area: Área comment: Comentário @@ -193,6 +220,10 @@ pt-BR: saved_at: Salvo em user: Usuário list: + empty: Nenhum conjunto de alterações foi encontrado. + empty_area: Nenhum conjunto de alterações nesta área. + empty_user: Nenhum conjunto de alterações por este usuário. + load_more: Carregar mais title: Conjuntos de alterações title_friend: Conjuntos de alterações dos seus amigos title_nearby: Conjuntos de alterações de usuários próximos @@ -320,6 +351,11 @@ pt-BR: description: Cópias regularmente atualizadas da base de dados completa do OpenStreetMap title: Planeta OSM zoom: Zoom + fixthemap: + how_to_help: + join_the_community: + title: Junte-se à comunidade + title: Como ajudar geocoder: description: title: @@ -847,15 +883,20 @@ pt-BR: waterfall: Queda de água weir: Açude prefix_format: "%{name}" + help_page: + welcome: + title: Bem vindo ao OSM + wiki: + description: Navegue na wiki para ver a documentação do OSM com mais detalhes. html: dir: ltr javascripts: close: Fechar edit_help: Mover o mapa e ampliar uma localização que pretende editar e clique aqui. key: - title: Tecla de atalho do mapa - tooltip: Tecla de atalho do mapa - tooltip_disabled: Tecla de atalho do mapa disponível só para a camada padrão + title: Legenda do mapa + tooltip: Legenda do mapa + tooltip_disabled: Legenda do mapa disponível só para a camada padrão map: base: cycle_map: Cycle Map @@ -863,6 +904,7 @@ pt-BR: standard: Padrão transport_map: Mapa de transporte público copyright: © Contribuidores OpenStreetMap + donate_link_text: layers: data: Dados do Mapa header: Camadas do Mapa @@ -870,7 +912,7 @@ pt-BR: overlays: Ativar sobreposições para solucionar problemas do mapa locate: popup: Você está dentro de {distance} {unit} deste ponto - title: Mostrar Minha Localização + title: Mostrar minha localização zoom: in: Aumentar o Zoom out: Diminuir o Zoom @@ -912,7 +954,7 @@ pt-BR: community: Comunidade community_blogs: Blogs da Comunidade community_blogs_title: Blogs de membros da comunidade OpenStreetMap - copyright: Direitos Autorais & Licença + copyright: Direitos Autorais data: Dados donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: %{link}." edit: Editar @@ -927,7 +969,8 @@ pt-BR: history: Histórico home: Ir para o seu local intro_2_create_account: Criar uma conta de usuário - log_in: entrar + learn_more: Saiba mais + log_in: Entrar log_in_tooltip: Entrar com uma conta existente logo: alt_text: Logotipo do OpenStreetMap @@ -945,7 +988,7 @@ pt-BR: project_name: h1: OpenStreetMap title: OpenStreetMap - sign_up: registrar + sign_up: Criar conta sign_up_tooltip: Criar uma conta para editar tag_line: O Wiki de Mapas Livres user_diaries: Diários de Usuário @@ -1174,6 +1217,11 @@ pt-BR: allow_write_notes: alterar notas. allow_write_prefs: modificar suas preferências de usuário. request_access: A aplicação %{app_name} está pedindo acesso à sua conta, %{user}. Por favor verifique se você deseja que a aplicação tenha as capacidades a seguir. Você pode escolher quaisquer que quiser. + title: Autorizar acesso à sua conta + oauthorize_failure: + title: O pedido de autorização falhou + oauthorize_success: + verification: O código de verificação é %{code}. revoke: flash: Você cancelou o token para %{application} oauth_clients: @@ -1263,7 +1311,7 @@ pt-BR: description: "Descrição:" destroy: Remover esta edição edit: Reformar esta edição - heading: Mostrando a edição "% {title}" + heading: Mostrando a edição "%{title}" title: Mostrando edição user: "Criador:" update: @@ -1391,6 +1439,8 @@ pt-BR: upload_trace: Envie as trilhas de GPS delete: scheduled_for_deletion: Trilha marcada para ser apagada + description: + description_without_count: Arquivo GPX de %{user} edit: description: "Descrição:" download: baixar @@ -1409,6 +1459,8 @@ pt-BR: visibility: "Visibilidade:" visibility_help: o que isso significa? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=pt-br + georss: + title: Trilhas de GPS do OpenStreetMap list: description: Consultar últimos carregamentos de trilhas de GPS empty_html: Nada aqui por enquanto. Carregue uma nova trilha ou aprenda mais sobre trilhas de GPS na página wiki (em inglês). @@ -1728,6 +1780,7 @@ pt-BR: my comments: Meus comentários my diary: Meu diário my edits: Minhas edições + my messages: Minhas mensagens my notes: Minhas notas de mapa my profile: Meu Perfil my settings: Minhas configurações diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 74000a1cf..f4f2c20f0 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -6,8 +6,10 @@ # Author: Giro720 # Author: Gmare # Author: Hamilton Abreu +# Author: Imperadeiro98 # Author: Indech # Author: JasonZe +# Author: Jgpacker # Author: Jgrocha # Author: Luckas # Author: Luckas Blade @@ -20,7 +22,7 @@ # Author: Waldir pt: about_page: - community_driven_html: "OpenStreetMap's community is diverse, passionate, and growing every day. Our\n\nA comunidade do OpenStreetMap é diversa, apaixonada, e aumenta diariamente.\nEntre os nossos colaboradores encontra-se mapeadores entusiastas,\nprofissionais das áreas de sistemas geográficos, engenheiros que utilizam\nos servidores do OpenStreetMap, voluntários a mapear áreas afetadas\npor grandes desastres, e muitos mais.\nPara saber mais sobre a nossa comunidade, veja os diários dos editores,\nblogues da comunidade, e o sítio da OSM Foundation." + community_driven_html: "A comunidade do OpenStreetMap é diversa, apaixonada, e aumenta diariamente.\nEntre os nossos colaboradores encontra-se mapeadores entusiastas,\nprofissionais das áreas de sistemas geográficos, engenheiros que utilizam\nos servidores do OpenStreetMap, voluntários a mapear áreas afetadas\npor grandes desastres, e muitos mais.\nPara saber mais sobre a nossa comunidade, veja os diários dos editores,\nblogues da comunidade, e o sítio da OSM Foundation." community_driven_title: Dirigido pela Comunidade copyright_html: ©Colaboradores
    do OpenStreetMap lede_text: O OpenStreetMap é desenvolvido por uma comunidade voluntária de mapeadores que contribuem e mantêm atualizados os dados sobre estradas, trilhos, cafés, estações ferroviárias e muito mais por todo o mundo. @@ -39,7 +41,7 @@ pt: language: Língua latitude: Latitude longitude: Longitude - title: Título + title: Assunto user: Utilizador friend: friend: Amigo @@ -48,7 +50,7 @@ pt: body: Conteúdo recipient: Destinatário sender: Remetente - title: Título + title: Assunto trace: description: Descrição latitude: Latitude @@ -66,7 +68,7 @@ pt: languages: Línguas pass_crypt: Palavra-passe models: - acl: Lista de Controlo do Acesso + acl: Aceder à Lista de Controlo changeset: Conjunto de alterações changeset_tag: Etiqueta do conjunto de alterações country: País @@ -136,6 +138,7 @@ pt: download_xml: Descarregar XML edited_by_html: Editado há %{time} atrás por %{user} in_changeset: Conjunto de alterações + location: "Localização:" no_comment: (sem comentário) node: history_title: "Histórico do Nó: %{name}" @@ -346,6 +349,7 @@ pt: paste_html: Copie e cole o código num site para mostrar o mapa interativo nesse site scale: Escala too_large: + advice: "Se a exportação acima falhar, por favor, considere o uso de uma das fontes listadas abaixo:" body: Esta área é demasiado grande para exportar em XML do OpenStreetMap. Por favor aproxime a vista ou selecione uma área mais pequena. Para exportar esta área grande utilize uma das seguintes fontes. geofabrik: description: Extratos atualizados regularmente de continentes, países e cidades selecionadas @@ -356,11 +360,25 @@ pt: other: description: Fontes adicionais listadas no wiki do OpenStreetMap title: Outras Fontes + overpass: + description: Fazer o download desta caixa delimitadora através de um espelho do banco de dados do OpenStreetMap planet: description: Cópias atualizadas regularmente da base de dados completa do OpenStreetMap title: Planeta OSM zoom: Zoom title: Exportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Apenas clique em ou no mesmo ícone na interface do mapa.\nIsto irá adicionar um marcador ao mapa, o qual pode mover arrastando. Adicione a sua mensagem, clique em salvar, e outros utilizadores como você irão investigar." + join_the_community: + explanation_html: Se você reparou num problema com os dados do nosso mapa, como por exemplo uma estrada ou o seu adereço em falta, a melhor maneira de proceder é juntando-se à comunidade do OpenStreetMap e adicionando ou reparando os dados por si mesmo. + title: Junte-se à comunidade + title: Como Ajudar + other_concerns: + explanation_html: Se você tem preocupações sobre o modo como os nossos dados estão a ser usados ou sobre os conteúdos, por favor consulte a nossa página de direitos de autor para mais informações legais, ou contacte o grupo de trabalho OSMF apropriado. + title: Outras preocupações + title: Reportar um problema / Corrigir o mapa geocoder: description: title: @@ -872,6 +890,7 @@ pt: artificial: Curso de água artificial boatyard: Estaleiro Naval canal: Canal + connector: Conector Aquático dam: Barragem derelict_canal: Canal abandonado ditch: Vala @@ -998,6 +1017,7 @@ pt: make_a_donation: text: Fazer um Donativo title: Suporte o OpenStreetMap com um donativo monetário + more: Mais osm_offline: A base de dados do OpenStreetMap não está disponível neste momento enquanto decorrerem trabalhos de manutenção. osm_read_only: A base de dados do OpenStreetMap encontra-se neste momento no modo de leitura, enquanto decorrerem trabalhos de manutenção. partners_bytemark: Bytemark Hosting @@ -1797,6 +1817,7 @@ pt: my comments: Meus comentários my diary: Meu diário my edits: As minhas edições + my messages: As Minhas Mensagens my notes: Erros reportados por mim my profile: Meu Perfil my settings: As minhas configurações diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 352b1a652..0d41c89f1 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -216,7 +216,7 @@ ro: title: Jurnalul utilizatorului %{user} | %{title} user_title: Jurnalul utilizatorului %{user} editor: - default: Implicit (în prezent % {name}) + default: Implicit (în prezent %{name}) potlatch: description: Potlatch 1 (editor înglobat în navigator) name: Potlatch 1 diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 76f25c838..cfa267482 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -37,11 +37,14 @@ # Author: Сrower ru: about_page: + community_driven_html: "Сообщество OpenStreetMap — разнообразное, неравнодущное и растущее с каждым днём.\nНаши участники — это энтузиасты-картографы, ГИС-профессионалы, инженеры, содержащие серверы OSM, люди, отмечающие районы, пострадавшие от бедствий, и многие другие.\nЧтобы узнать больше о сообществе, читайте дневники участников,\nблоги сообщества и сайт Фонда OSM." community_driven_title: Силами сообщества copyright_html: ©Ð£Ñ‡Ð°ÑÑ‚ники
    OpenStreetMap lede_text: OpenStreetMap создан сообществом картографов, которые добавляют и поддерживают данные о дорогах, тропах, кафе, вокзалах и многих других объектах по всему миру. + local_knowledge_html: OpenStreetMap придаёт особое значение локальным знаниям. Участники используют аэрофотоснимки, GPS-устройства и низкотехнологичных карты земель для проверки того, что данные OSM являются точными и актуальными. local_knowledge_title: Знание местности next: Далее + open_data_html: "OpenStreetMap являются открытыми данными: вы можете использовать их для любых целей до тех пор, пока вы указываете авторские права OpenStreetMap и его участников. Если вы изменяете данные или определенным образом основываетесь на них, вы можете распространять свой результат только под той же лицензии. Смотрите Авторские права и Страница лицензии для более подробной информации." open_data_title: Открытые данные partners_title: Партнёры used_by: "%{name} предоставляет данные для сотен сайтов, мобильных приложений и устройств" @@ -53,7 +56,7 @@ ru: language: Язык latitude: Широта longitude: Долгота - title: Заголовок + title: Тема user: Пользователь friend: friend: Друг @@ -62,7 +65,7 @@ ru: body: Текст recipient: Получатель sender: Отправитель - title: Заголовок + title: Тема trace: description: Описание latitude: Широта @@ -362,6 +365,7 @@ ru: paste_html: HTML-код для встраивания на сайт scale: Масштаб too_large: + advice: "Если этот экспорт пройдёт неудачно, пожалуйста, попробуйте использовать один из перечисленных ниже источников:" body: "Эта область слишком велика для экспорта в качестве данных в формате OpenStreetMap XML. Пожалуйста, увеличьте масштаб, выберите меньшую область или используйте один из следующих источников для массовой загрузки данных:" geofabrik: description: Регулярно обновляемые выгрузки континентов, стран и отдельных городов @@ -373,12 +377,25 @@ ru: description: Дополнительные источники, перечисленные в вики OpenStreetMap title: Другие источники overpass: + description: Скачать ограниченную этим прямоугольником область с зеркала базы данных OpenStreetMap title: Overpass API planet: description: Регулярно обновляемые копии полной базы данных OpenStreetMap title: Планета OSM zoom: Приблизить title: Экспортировать + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Просто нажмите или на тот же значок на карте.\nЭто добавит на карту маркер, который можно передвигать перетаскиванием. Добавьте сообщение, а затем нажмите кнопку сохранения, и другие картографы увидят его." + join_the_community: + explanation_html: Если вы заметили проблему в данных нашей карты, например, отсутствие дорога или вашего адреса, лучший способ для дальнейших действий — вступить в сообщество OpenStreetMap и добавить или восстановить данные самостоятельно. + title: Присоединиться к сообществу + title: Как помочь + other_concerns: + explanation_html: "Если у вас есть вопросы о том, как используются наши данные, или о содержимом сайта, обратитесь к нашей\nстранице авторских прав для получения дополнительной правовой информации или свяжитесь с соответствующий\nрабочей группой OSMF." + title: Другие проблемы + title: Сообщить о проблеме / исправить карту geocoder: description: title: @@ -920,6 +937,7 @@ ru: title: Добро пожаловать на OSM url: /welcome wiki: + description: Посмотреть вики с подробной документацией по OSM title: wiki.openstreetmap.org url: http://wiki.openstreetmap.org/wiki/RU:Main_Page javascripts: @@ -1042,6 +1060,7 @@ ru: title: Пример указания авторства contributors_at_html: "Австрия. Данные города Вена (на условиях CC BY), а также земель Форарльберга и\n Тироля (на условиях CC-BY AT с дополнениями)." contributors_ca_html: Канада. Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады). + contributors_fi_html: "Финляндия: Содержит данные из топографической базы национальной земельной службы Финляндии\n и других наборов данных, под\nлицензией NLSFI." contributors_footer_1_html: Более подробную информацию об этих и других источниках, использованных для наполнения OpenStreetMap, смотрите на странице Contributors вики-сервера OpenStreetMap. contributors_footer_2_html: Включение данных в OpenStreetMap не означает, что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap, предоставляет гарантии или принимает на себя какую-любую ответственность. contributors_fr_html: "Франция: Данные от Главного налогового управления." diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 81e983abc..7da675f1a 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -12,6 +12,9 @@ # Author: Teslaton # Author: Vladolc sk: + about_page: + next: Ďalej + partners_title: Partneri activerecord: attributes: diary_comment: @@ -89,18 +92,41 @@ sk: blocked: Váš prístup do API bol zablokovaný. Prosím prihláste sa na webové rozhranie pre zistenie viac informácií. need_to_see_terms: Váš prístup k API je dočasne pozastavený. Prosím prihláste do webového rozhrania a prečítajte si Podmienky prispievania. Nie je nutné ich odsúhlasiÅ¥, musíte si ich ale zobraziÅ¥. browse: + anonymous: anonym changeset: + belongs_to: Autor changesetxml: XML sady zmien feed: title: Sada zmien %{id} title_comment: Sada zmien %{id} - %{comment} + node: Uzly (%{count}) + node_paginated: Uzly (%{x}–%{y} z %{count}) osmchangexml: osmChange XML + relation: Relácie (%{count}) + relation_paginated: Relácie (%{x}–%{y} z %{count}) title: Sada zmien + way: Cesty (%{count}) + way_paginated: Cesty (%{x}–%{y} z %{count}) + closed: Uzavreté + closed_by_html: Uzavrel pred %{time} %{user} + closed_html: Uzavreté pred %{time} containing_relation: entry: Relácia %{relation_name} entry_role: Relácia %{relation_name} (ako %{relation_role}) + created: Vytvorené + created_by_html: Vytvoril pred %{time} %{user} + created_html: Vytvorené pred %{time} + deleted_by_html: Odstránil pred %{time} %{user} + download_xml: StiahnuÅ¥ XML + edited_by_html: Upravil pred %{time} %{user} + in_changeset: Sada zmien + location: "Poloha:" + no_comment: (bez komentára) + node: + history_title: "História uzlu: %{name}" + title: "Uzol: %{name}" not_found: - sorry: Ľutujeme, %{type} s id %{id} nebolo možné nájsÅ¥. + sorry: "Ľutujeme, %{type} #%{id} nebolo možné nájsÅ¥." type: changeset: počet zmien node: bod @@ -108,8 +134,10 @@ sk: way: cesta note: closed_title: "VyrieÅ¡ená chyba: %{note_name}" + new_note: Nová poznámka open_title: "NevyrieÅ¡ená chyba: %{note_name}" title: Chyba + part_of: SúčasÅ¥ redacted: message_html: Verzia %{version} tohto objektu %{type} nemôže byÅ¥ zobrazené, pretože bola skrytá. Viac informácií nájdete na %{redaction_link}. redaction: Revízia %{id} @@ -117,6 +145,10 @@ sk: node: bod relation: vzÅ¥ah way: cesta + relation: + history_title: "História relácie: %{name}" + members: Prvky + title: "Relácia: %{name}" relation_member: entry_role: "%{type} %{name} ako %{role}" type: @@ -127,7 +159,7 @@ sk: load_data: NačítaÅ¥ údaje loading: Nahrávanie... tag_details: - tags: "Tagy:" + tags: Tagy wiki_link: key: Stránka s popisom značky %{key} na wiki tag: Stránka s popisom značky %{key}=%{value} na wiki @@ -139,6 +171,16 @@ sk: node: bod relation: relácia way: cesta + version: Verzia + view_details: ZobraziÅ¥ detaily + view_history: ZobraziÅ¥ históriu + way: + also_part_of: + one: súčasÅ¥ou cesty %{related_ways} + other: súčasÅ¥ou ciest %{related_ways} + history_title: "História cesty: %{name}" + nodes: Uzly + title: "Cesta: %{name}" changeset: changeset: anonymous: Anonym @@ -155,6 +197,13 @@ sk: saved_at: Uložené user: Používateľ list: + empty: Neboli nájdené žiadne sady zmien. + empty_area: V tejto oblasti neexistujú žiadne sady zmien. + empty_user: Tento používateľ nemá žiadne sady zmien. + load_more: NačítaÅ¥ ďalÅ¡ie + no_more: Nie sú ďalÅ¡ie sady zmien. + no_more_area: Nie sú ďalÅ¡ie sady zmien v tejto oblasti. + no_more_user: Nie sú ďalÅ¡ie sady zmien tohoto používateľa. title: Sady zmien title_friend: Sady zmien vaÅ¡ich priateľov title_nearby: Sady zmien používateľov v okolí @@ -272,6 +321,7 @@ sk: paste_html: Pre vloženie do stránky použite toto HTML scale: Mierka too_large: + advice: "Ak tento export zlyhá, zvážte použitie niektorého z nasledovných zdrojov:" body: Táto oblasÅ¥ je príliÅ¡ veľká pre export OpenStreetMap XML dát. Priblížte prosím mapu, alebo vyberte menÅ¡iu oblasÅ¥. geofabrik: description: Pravidelne aktualizované extrakty svetadielov, krajín a vybraných miest @@ -282,10 +332,18 @@ sk: other: description: ĎalÅ¡ie zdroje sú uvedené na OpenStreetMap wiki title: Iné zdroje + overpass: + description: StiahnuÅ¥ túto oblasÅ¥ z repliky databázy OpenStreetMap + title: Overpass API planet: description: Pravidelne aktualizované kópie kompletnej databázy OpenStreetMap title: Planéta OSM zoom: Zväčšenie + title: Export + fixthemap: + how_to_help: + title: Ako pomôcÅ¥ + title: NahlásiÅ¥ problém / OpraviÅ¥ mapu geocoder: description: title: @@ -315,8 +373,10 @@ sk: title: ca_postcode: Výsledky z Geocoder.CA geonames: Výsledky z GeoNames + geonames_reverse: Výsledky z GeoNames latlon: Výsledky z internej databázy osm_nominatim: Výsledky z OpenStreetMap Nominatim + osm_nominatim_reverse: Výsledky z OpenStreetMap Nominatim uk_postcode: Výsledky z NPEMap / FreeThe Postcode us_postcode: Výsledky z Geocoder.us search_osm_nominatim: @@ -789,6 +849,7 @@ sk: viewpoint: Rozhľadňa, výhliadka zoo: Zoo tunnel: + culvert: Priepust "yes": Tunel waterway: artificial: Vodný kanál, prieplav @@ -812,41 +873,73 @@ sk: water_point: Vodný bod waterfall: Vodopád weir: Splav + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + welcome: + title: Vitajte na OSM javascripts: close: ZavrieÅ¥ key: title: Legenda tooltip: Legenda + tooltip_disabled: Legenda je dostupná len pre Å tandardnú vrstvu map: base: cycle_map: Cyklomapa + hot: Humanitárna standard: Å tandardná transport_map: Dopravná mapa + copyright: © prispievatelia OpenStreetMap + donate_link_text: layers: data: Mapové podklady header: Mapové vrstvy notes: Poznámky k mape overlays: Zapnúť vrstvy pre ladenie mapy + title: Vrstvy + locate: + popup: Nachádzate sa do {distance} {unit} od tohoto bodu + title: ZobraziÅ¥ moju polohu zoom: in: PriblížiÅ¥ out: OddialiÅ¥ notes: + new: + add: PridaÅ¥ poznámku + intro: Aby sme mohli mapu spresniÅ¥, zobrazí sa vami zadaná informácia ostatným tvorcom. Pri umiestňovaní značky a formulovaní poznámky sa preto snažte byÅ¥ čo najpodrobnejší a najpresnejší. show: hide: SkryÅ¥ share: cancel: ZruÅ¡iÅ¥ + center_marker: CentrovaÅ¥ mapu na značku + custom_dimensions: NastaviÅ¥ vlastné rozmery + download: StiahnuÅ¥ + embed: HTML + format: "Formát:" + image: Obrázok + image_size: Na obrázku bude Å¡tandardná vrstva v + include_marker: Vrátane značky link: Odkaz alebo HTML long_link: Odkaz + paste_html: HTML pre vloženie na webovú stránku + scale: "Mierka:" short_link: Krátky odkaz + short_url: Krátke URL title: ZdieľaÅ¥ + view_larger_map: ZobraziÅ¥ väčšiu mapu site: + createnote_disabled_tooltip: Pre vloženie poznámky priblížte mapu + createnote_tooltip: PridaÅ¥ do mapy poznámku edit_disabled_tooltip: Pre editáciu priblížte mapu edit_tooltip: UpraviÅ¥ mapu layouts: + about: O projekte community: Komunita community_blogs: Komunitné blogy community_blogs_title: Blogy členov komunity OpenStreetMap - copyright: Autorské práva a licencia + copyright: Copyright data: Údaje donate: Podporte OpenStreetMap %{link} Fondu na obnovu hardwaru edit: UpraviÅ¥ @@ -861,7 +954,10 @@ sk: history: História home: Domov intro_2_create_account: Založte si konto - log_in: prihlásiÅ¥ sa + intro_header: Vitajte v OpenStreetMap! + intro_text: OpenStreetMap je mapa sveta, vytvorené ľuďmi ako vy, voľne využiteľná pod slobodnou licenciou. + learn_more: Viac info + log_in: PrihlásiÅ¥ sa log_in_tooltip: PrihlásiÅ¥ sa k existujúcemu kontu logo: alt_text: Logo OpenStreetMap @@ -869,6 +965,7 @@ sk: make_a_donation: text: Darovanie title: Podporte OpenStreetMap finančným príspevkom + more: ĎalÅ¡ie osm_offline: OpenStreetMap databáza je teraz offline, zatiaľ čo potrebná údržba databázy naďalej prebieha. osm_read_only: OpenStreetMap databáza je teraz len v móde čítania (bez možnosti zapisovania), zatiaľ čo potrebná údržba databázy naďalej prebieha. partners_bytemark: Bytemark Hosting @@ -877,8 +974,9 @@ sk: partners_partners: partneri partners_ucl: VR centrum UCL partners_url: http://wiki.openstreetmap.org/wiki/Partners - sign_up: zaregistrovaÅ¥ sa + sign_up: ZaregistrovaÅ¥ sa sign_up_tooltip: VytvoriÅ¥ si používateľské konto pre úpravy + start_mapping: ZačaÅ¥ mapovaÅ¥ tag_line: Slobodná wiki-mapa sveta user_diaries: Denníky používateľov user_diaries_tooltip: ZobraziÅ¥ denníky používateľov @@ -915,7 +1013,7 @@ sk: more_1_html: O používaní naÅ¡ich dát a spôsobe citovania, sa môžete dočítaÅ¥ viac v naÅ¡ich Často kladených právnych otázkach. more_2_html: "Hoci OpenStreetMap tvorí slobodné dáta, nemôžeme zadarmo poskytovaÅ¥ tretím stranám mapové API.\nPozrite naÅ¡e Pravidlá použitia API, Pravidlá použitia mapových dlaždíc a Pravidlá použitia nástroja Nominatim." more_title_html: ĎalÅ¡ie informácie - title_html: Autorské práva a licencie + title_html: Autorské práva a licencia native: mapping_link: začaÅ¥ mapovaÅ¥ native_link: slovenskú verziu @@ -1043,7 +1141,8 @@ sk: header: "%{from_user} vám zaslal správu cez OpenStreetMap s predmetom %{subject}:" hi: Ahoj %{to_user}, note_comment_notification: - details: Viac podrobností o poznámke môžete nájsÅ¥ nájsÅ¥ na % {url}. + anonymous: Anonymný používateľ + details: Viac podrobností o poznámke môžete nájsÅ¥ nájsÅ¥ na %{url}. greeting: Ahoj, signup_confirm: confirm: "Predtým, než urobíme čokoľvek ďalÅ¡ie, potrebujeme potvrdiÅ¥, že táto žiadosÅ¥ priÅ¡la od vás. Ak je to tak, kliknutím na nasledovný odkaz potvrdíte svoje konto:" @@ -1061,6 +1160,8 @@ sk: allow_write_gpx: nahraÅ¥ GPS stopy. allow_write_prefs: upraviÅ¥ vaÅ¡e osobné nastavenia. request_access: Aplikácia %{app_name} požaduje prístup k vášmu kontu (%{user}). Vyberte si, či si želáte, aby mala aplikácia nasledujúce oprávnenie. Môžete zvoliÅ¥ ľubovoľný počet oprávnení. + oauthorize_success: + verification: Váš overovací kód je %{code}. revoke: flash: Prístup pre aplikáciu %{application} bol odvolaný. oauth_clients: @@ -1370,7 +1471,7 @@ sk: agreed: Súhlasili ste s novými Podmienkami prispievania. agreed_with_pd: Deklarovali ste tiež, že svoje úpravy považujete za slobodné dielo. heading: "Podmienky prispievania:" - link text: čo je toto? + link text: čo to znamená? not yet agreed: Zatiaľ ste neodsúhlasili nové Podmienky prispievania. review link text: Keď budete maÅ¥ čas, pomocou tohoto odkazu si prosím prečítajte a odsúhlaste nové Podmienky prispievania. current email address: "Aktuálna e-mailová adresa:" @@ -1395,7 +1496,7 @@ sk: no home location: Nezadali ste svoje domovské miesto. openid: link: http://wiki.openstreetmap.org/wiki/CS:OpenID - link text: čo je toto? + link text: čo to znamená? openid: "OpenID:" preferred editor: "Preferovaný editor:" preferred languages: "Preferované jazyky:" @@ -1403,9 +1504,9 @@ sk: public editing: disabled: Vypnutý a nemôže upravovaÅ¥ údaje, vÅ¡etky predchádzajúce úpravy sú anonymné. disabled link text: prečo nemôžem upravovaÅ¥? - enabled: Zapnutý. Nie je anonym a môže upravovaÅ¥ dáta. + enabled: Zapnuté. Nie je anonym a môže upravovaÅ¥ údaje. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: čo je toto? + enabled link text: čo to znamená? heading: "Verejné úpravy:" public editing note: heading: Úprava pre verejnosÅ¥ @@ -1419,7 +1520,10 @@ sk: already active: Toto používateľské konto už bolo potvrdené. button: PotvrdiÅ¥ heading: Skontrolujte vaÅ¡u emailovú adresu! + introduction_1: Poslali sme vám potvrdzovací e-mail. + introduction_2: Potvrďte svoje konto kliknutím na odkaz v e-maili a budete môcÅ¥ začaÅ¥ mapovaÅ¥. press confirm button: Stlačte tlačítko na potvrdenie dole, pre aktiváciu vášho účtu. + reconfirm_html: Ak potrebujete, aby sme vám potvrdzovací e-mail poslali znova, kliknite sem. unknown token: Zadaný potvrdzovací kód neexistuje. confirm_email: button: PotvrdiÅ¥ @@ -1506,9 +1610,9 @@ sk: success: "%{name} je teraz váš priateľ." new: confirm email address: "PotvrdiÅ¥ emailovú adresu:" - confirm password: "PotvrdiÅ¥ Heslo:" + confirm password: "PotvrdiÅ¥ heslo:" contact_webmaster: Kontaktujte prosím webmastera so žiadosÅ¥ou o založenie konta – budeme sa snažiÅ¥ vaÅ¡u požiadavku vybaviÅ¥ čo najrýchlejÅ¡ie. - continue: PokračovaÅ¥ + continue: ZaregistrovaÅ¥ sa display name: "Zobrazované meno:" display name description: VaÅ¡e verejne zobrazené meno užívateľa. Môžete ho potom zmeniÅ¥ v nastaveniach. email address: "Emailová adresa:" @@ -1521,7 +1625,7 @@ sk: password: "Heslo:" terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania! terms declined: Je nám ľúto, že ste sa rozhodli neprijaÅ¥ nové Podmienky prispievania. Bližšie informácie nájdete natejto wiki-stránke. - title: VytvoriÅ¥ účet + title: ZaregistrovaÅ¥ sa use openid: Prípadne sa môžete prihlásiÅ¥ pomocou %{logo} OpenID no_such_user: body: Ľutujeme, používateľ %{user} neexistuje. Prosím skontrolujte váš text, alebo ste možno klikli na nesprávny odkaz. @@ -1537,12 +1641,12 @@ sk: not_a_friend: "%{name} nie je nikto z vaÅ¡ich priateľov." success: "%{name} bol z vaÅ¡ich priateľov vymazaný." reset_password: - confirm password: "PotvrdiÅ¥ Heslo:" + confirm password: "PotvrdiÅ¥ heslo:" flash changed: VaÅ¡e heslo bolo zmenené. flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL. heading: Resetnúť heslo pre %{user} password: "Heslo:" - reset: ZmazaÅ¥ Heslo + reset: VynulovaÅ¥ heslo title: Resetnúť heslo set_home: flash success: Domáca poloha úspeÅ¡ne uložená @@ -1554,7 +1658,7 @@ sk: terms: agree: Súhlasím consider_pd: NavyÅ¡e k uvedenej dohode vyhlasujem, že považujem svoje príspevky za slobodné dielo (Public Domain). - consider_pd_why: čo je toto? + consider_pd_why: čo to znamená? decline: Nesúhlasím guidance: "Informácie, ktoré Vám môžu pomôcÅ¥ porozumieÅ¥ týmto podmienkam: zhrnutie a nejaké neoficiálne preklady" heading: Podmienky prispievania @@ -1568,11 +1672,11 @@ sk: you need to accept or decline: Pre pokračovanie si prosím prečítajte a príjmite, alebo odmietnite nové Podmienky prispievania. view: activate_user: aktivovaÅ¥ tohoto používateľa - add as friend: pridaÅ¥ priateľa + add as friend: PridaÅ¥ priateľa ago: (pred %{time_in_words_ago}) block_history: prijaté bloky - blocks by me: blokovaÅ¥ pre mňa - blocks on me: moje zablokovania + blocks by me: Mnou udelené bloky + blocks on me: Moje zablokovania comments: komentáre confirm: PotvrdiÅ¥ confirm_user: potvrdiÅ¥ tohoto používateľa @@ -1585,8 +1689,8 @@ sk: deactivate_user: deaktivovaÅ¥ tohoto používateľa delete_user: vymazaÅ¥ tohoto používateľa description: Popis - diary: denník - edits: úpravy + diary: Denník + edits: Úpravy email address: "Emailová adresa:" friends_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien priateľov friends_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy priateľov @@ -1597,17 +1701,21 @@ sk: m away: vzdialený %{count}m mapper since: "Mapuje od:" moderator_history: odovzdané bloky - my comments: moje komentáre - my diary: môj denník - my edits: moje úpravy - my settings: moje nastavenia - my traces: moje stopy + my comments: Moje komentáre + my diary: Môj denník + my edits: Moje úpravy + my messages: Moje správy + my notes: Moje poznámky k mape + my profile: Môj profil + my settings: Moje nastavenia + my traces: Moje stopy nearby users: Ďalší používatelia v okolí nearby_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien používateľov v okolí nearby_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy používateľov v okolí new diary entry: nový záznam denníka no friends: EÅ¡te nemáte pridaných žiadnych priateľov. no nearby users: Nie je tu iný používateľ, ktorý priznáva mapovanie v okolí. + notes: Poznámky k mape oauth settings: oauth nastavenia remove as friend: OdstrániÅ¥ z priateľov role: @@ -1619,11 +1727,11 @@ sk: revoke: administrator: ZruÅ¡iÅ¥ prístup administrátora moderator: ZruÅ¡iÅ¥ prístup moderátora - send message: poslaÅ¥ správu + send message: PoslaÅ¥ správu settings_link_text: nastavenia spam score: "Spam skóre:" status: "Stav:" - traces: stopy + traces: Stopy unhide_user: zobraziÅ¥ tohoto používateľa user location: Poloha používateľa your friends: VaÅ¡i priatelia @@ -1688,7 +1796,7 @@ sk: revoke: ZruÅ¡iÅ¥! revoker_name: ZruÅ¡il show: ZobraziÅ¥ - showing_page: Zobrazená strana %{page} + showing_page: Strana %{page} status: Stav period: few: "%{count} hodiny" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 174848370..de9b6224f 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -18,7 +18,7 @@ sl: language: Jezik latitude: Zemljepisna Å¡irina longitude: Zemljepisna dolžina - title: Naslov + title: Zadeva user: Uporabnik friend: friend: Prijatelj @@ -27,7 +27,7 @@ sl: body: Besedilo recipient: Prejemnik sender: PoÅ¡iljatelj - title: Naslov + title: Zadeva trace: description: Opis latitude: Zemljepisna Å¡irina @@ -115,6 +115,7 @@ sl: download_xml: Prenesi XML edited_by_html: Uredil %{user} %{time} nazaj in_changeset: Paket sprememb + location: "Lokacija:" no_comment: (brez komentarja) node: history_title: "Zgodovina vozlišča: %{name}" diff --git a/config/locales/sv.yml b/config/locales/sv.yml index a135cad0d..82a1a87fc 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -51,7 +51,7 @@ sv: language: SprÃ¥k latitude: Latitud longitude: Longitud - title: Rubrik + title: Ämne user: Användare friend: friend: Vän @@ -60,7 +60,7 @@ sv: body: Brödtext recipient: Mottagare sender: Avsändare - title: Rubrik + title: Ämne trace: description: Beskrivning latitude: Latitud @@ -148,6 +148,7 @@ sv: download_xml: Ladda ner XML edited_by_html: Redigerade %{time} sedan av %{user} in_changeset: Ändringsset + location: "Plats:" no_comment: (inga kommentarer) node: history_title: "Nodhistorik: %{name}" @@ -358,6 +359,7 @@ sv: paste_html: Klistra in HTML för att bädda in pÃ¥ webbplats scale: Skala too_large: + advice: "Om ovanstÃ¥ende export misslyckas, vänligen överväg att använda en av de källor som anges nedan:" body: "Detta omrÃ¥de är för stort för att exporteras som OpenStreetMap XML-data. Vänligen zooma in eller välj ett mindre omrÃ¥de, eller använd en av följande källor för nedladdningar av bulkdata:" geofabrik: description: Regelbundet uppdaterat utdrag av kontinenter, länder och utvalda städer @@ -368,11 +370,26 @@ sv: other: description: Ytterligare källor anges pÃ¥ OpenStreetMaps wiki title: Andra källor + overpass: + description: Hämta denna avgränsningsram frÃ¥n en spegel av OpenStreetMap-databasen + title: Overpass API planet: description: Regelbundet uppdaterade kopior av den kompletta OpenStreetMap-databasen title: Planet OSM zoom: Zooma title: Exportera + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Klicka bara pÃ¥ eller samma ikon i kartrutan.\nDetta lägger till en markör pÃ¥ kartan som du kan flytta\n genom att dra. Skriv ditt meddelande och klicka sedan pÃ¥ spara, sÃ¥ kommer andra kartritare att undersöka." + join_the_community: + explanation_html: Om du har hittat ett problem med vÃ¥r kartdata, till exempel att en väg saknas eller din adress, är den bästa lösningen är att gÃ¥ med i OpenStreetMap-gemenskapen och lägga till eller reparera datan själv. + title: GÃ¥ med i gemenskapen + title: Hur man kan hjälpa till + other_concerns: + explanation_html: "Om du har frÃ¥gor om hur vÃ¥r data används eller om innehÃ¥llet, se\nsidan om upphovsrätt för mer juridisk information eller kontakta lämplig\nOSMF-arbetsgrupp." + title: Övriga frÃ¥gor + title: Rapportera ett problem / Fixa kartan geocoder: description: title: @@ -1039,6 +1056,7 @@ sv: title: Exempel pÃ¥ källhänvisning. contributors_at_html: "Österrike: InnehÃ¥ller data frÃ¥n\nStadt Wien (under licensen\nCC BY),\nLand Vorarlberg och\nLand Tirol (under licensen CC-BY AT med ändringar)." contributors_ca_html: "Kanada: InnehÃ¥ller data frÃ¥n\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), och StatCan (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Finland: InnehÃ¥ller data frÃ¥n Lantmäteriverket i Finlands topografiska databas och andra dataset, under licensen NLSFI." contributors_footer_1_html: "För ytterligare detaljer om dessa och andra källor som använts\nför att förbättra OpenStreetMap, se sidan om bidragsgivare\npÃ¥ OpenStreetMaps wiki." contributors_footer_2_html: " Införandet av uppgifter i OpenStreetMap innebär inte att den ursprungliga \n datagivaren stödjer OpenStreetMap, ger nÃ¥gon som helst garanti eller\n tar pÃ¥ sig nÃ¥got ansvar." contributors_fr_html: "Frankrike: InnehÃ¥ller data\n frÃ¥n Direction Générale des Impôts." @@ -1059,7 +1077,7 @@ sv: intro_2_html: "Du är fri att kopiera, distribuera, överföra och anpassa vÃ¥r data,\nsÃ¥ länge du anger OpenStreetMap och dess bidragsgivare som källa.\nOm du ändrar eller bygger vidare pÃ¥ vÃ¥r data kan du\nendast distribuera resultatet under samma licens. Den\nfullständiga juridiska\ntexten förklarar dina rättigheter och skyldigheter." intro_3_html: "Kartografin i vÃ¥ra kartrutor, och vÃ¥r dokumentation, är\ntillgängliga under licensen Creative\nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." more_1_html: "Läs mer om användning av vÃ¥r data, och hur du anger oss som källa, pÃ¥ vÃ¥r juridiska\nFAQ." - more_2_html: "Även om OpenStreetMap är öppen data, kan vi inte tillhandahÃ¥lla nÃ¥got\ngratis kart-API för tredjepartsutvecklare.\nSe vÃ¥ran användningspolicy för API,\nanvändningspolicy för kartrutor\noch användningspolicy för Nominatim." + more_2_html: "Även om OpenStreetMap är öppen data, kan vi inte tillhandahÃ¥lla nÃ¥got gratis kart-API för tredjepartsutvecklare.\nSe vÃ¥r användningspolicy för API,\nanvändningspolicy för kartrutor\noch användningspolicy för Nominatim." more_title_html: Mer information title_html: Upphovsrätt och licens native: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index b1db18fe1..c28fa4963 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -3,6 +3,7 @@ # Export driver: syck-pecl # Author: AnakngAraw # Author: Ianlopez1115 +# Author: Jewel457 # Author: 아라 tl: activerecord: @@ -259,6 +260,10 @@ tl: too_large: body: Masyadong malaki ang lugar na ito upang mailuwas bilang Dato ng XML ng OpenStreetMap. Mangyaring lumapit o pumili ng isang mas maliit na pook. zoom: Lapitan + fixthemap: + how_to_help: + title: Papaano tumulong + title: Mag-ulat ng problema/ Ayusin ang mapa geocoder: description: title: @@ -756,7 +761,7 @@ tl: weir: Pilapil prefix_format: "%{name}" html: - dir: mula kaliwa pakanan + dir: ltr javascripts: map: base: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 5df04a5a9..ccb9f509f 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -13,6 +13,7 @@ # Author: Szoszv # Author: Talha Samil Cakir # Author: Tarikozket +# Author: Trncmvsr # Author: Trockya # Author: 아라 tr: @@ -304,6 +305,12 @@ tr: title: OSM Gezegeni zoom: Yakınlaştır title: Dışa aktar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Sadece ikonuna tıklayın veya harita görünümü üzerinde aynı ikona tıklayın.\nBu haritaya daha sonra sürükleyerek taşıyabileceğiniz bir işaretleyici ekleyecek. Mesajınızı ekleyin ve kaydedin, diğer haritacılar bunu araştıracaklar." + title: Nasıl yardım edebilirim? + title: Sorun bildir / Haritayı onar geocoder: description: title: @@ -1026,7 +1033,7 @@ tr: description: "Açıklama:" destroy: Bu redaksiyonu kaldır edit: Bu redaksiyonu düzenle - heading: Redaksiyon "% {başlık}" göster + heading: Redaksiyon "%{title}" göster title: Redaksiyon göster user: "Oluşturan:" update: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 947d80580..40a2a99bd 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -41,7 +41,7 @@ uk: language: Мова latitude: Широта longitude: Довгота - title: Заголовок + title: Тема user: Користувач friend: friend: Друг @@ -50,7 +50,7 @@ uk: body: Текст recipient: Одержувач sender: Відправник - title: Заголовок + title: Тема trace: description: Опис latitude: Широта @@ -369,6 +369,18 @@ uk: title: Планета OSM zoom: Збільшити title: Експорт + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Просто натисніть або подібну піктограму на мапі.\nЦе додасть маркер на мапу, який ви зможете переміщувати\n шляхом перетягування. Додайте ваше повідомлення, а потім натисніть кнопку Зберегти, а інші картографи будуть розбиратися." + join_the_community: + explanation_html: Якщо ви помітили, проблеми з нашими картографічними даними, наприклад відсутня дорога або ваша адреса, найкращий спосіб продовження - це приєднання до спільноти OpenStreetMap і додавання або відновлення даних самостійно. + title: Приєднатися до спільноти + title: Як допомогти + other_concerns: + explanation_html: "Якщо у вас є занепокоєння про те, як наші дані використовуються або вміст, то зверніться до нашої\nсторінки авторських прав для правової інформації або зв'яжіться з відповідною\nробочою групою OSMF." + title: Інші проблеми + title: Повідомити про проблему / Виправити мапу geocoder: description: title: @@ -1230,7 +1242,7 @@ uk: your_note: "%{commenter} поновив одну з ваших нотаток на мапі біля %{place}." signup_confirm: confirm: "Перш ніж ми щось зробимо, ми повинні впевнитись, що запит надійшов від Вас; тож якщо це були Ви, будь ласка, натисніть на посилання нижче, щоб підтвердити Ваш обліковий запис:" - created: Хтось (сподіваємось Ви) щойно створив обліковий запис на % {site_url}. + created: Хтось (сподіваємось Ви) щойно створив обліковий запис на %{site_url}. greeting: Привіт! subject: "[OpenStreetMap] Ласкаво просимо до OpenStreetMap" welcome: Після того, як ви підтвердите свій обліковий запис, ми надамо вам додаткову інформацію, щоб ви розпочали роботу. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 3bf8a2ba6..d9ff92f00 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -352,6 +352,18 @@ vi: title: Quả đất OSM zoom: Thu phóng title: Xuất + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Chỉ việc bấm hoặc hình tượng này trên bản đồ.\nNút này sẽ thả một ghim vào bản đồ để bạn kéo thả vào vị trí đúng. Miêu tả vấn đề và bấm LÆ°u. Những người khác sẽ điều tra." + join_the_community: + explanation_html: Nếu bạn nhận thấy một vấn đề trong dữ liệu bản đồ của chúng tôi, chẳng hạn thiếu con đường hoặc địa chỉ của bạn, cách xá»­ lý tốt nhất là tham gia cộng đồng OpenStreetMap để thêm hoặc sá»­a dữ liệu lấy. + title: Tham gia cộng đồng + title: Cách giúp đỡ + other_concerns: + explanation_html: Nếu bạn có thắc mắc về cách sá»­ dụng dữ liệu của chúng tôi hoặc về nội dung của bản đồ, xin vui lòng xem thông tin pháp lý tại trang bản quyền, hoặc liên lạc với nhóm làm việc thích hợp của Quỹ OpenStreetMap. + title: Vấn đề khác + title: Báo cáo lỗi / Sá»­a bản đồ geocoder: description: title: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index e334f430e..8f599a7e7 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -34,7 +34,7 @@ zh-CN: language: 语言 latitude: 纬度 longitude: 经度 - title: 标题 + title: 主题 user: 用户 friend: friend: 朋友 @@ -43,7 +43,7 @@ zh-CN: body: 正文 recipient: 收件人 sender: 发件人 - title: 标题 + title: 主题 trace: description: 说明 latitude: 纬度 @@ -355,6 +355,14 @@ zh-CN: title: OSM星球 zoom: 缩放 title: 导出 + fixthemap: + how_to_help: + join_the_community: + title: 加入社区 + title: 如何帮助 + other_concerns: + title: 其他问题 + title: 报告问题/修复地图 geocoder: description: title: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 84cfc93ff..f4656650c 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -15,11 +15,14 @@ zh-TW: about_page: community_driven_title: 社群參與 + copyright_html: ©OpenStreetMap
    貢獻者 + lede_text: OpenStreetMap 是由製圖者社群所建立的，維護的資料包含世界上的道路、步道、咖啡館、火車站等等。 local_knowledge_html: "OpenStreetMap 強調當地的知道。貢獻者使用\n航照圖、GPS 裝置與低科技的地區地圖來驗證 OSM\n是正確而即時的。" local_knowledge_title: 當地的知識 next: 下一頁 open_data_title: 開放資料 partners_title: 合作夥伴 + used_by: "%{name} 提供數以百計的網站、行動 app 與硬體設備地圖資料" activerecord: attributes: diary_comment: @@ -857,8 +860,11 @@ zh-TW: help_page: help: title: help.openstreetmap.org + url: https://help.openstreetmap.org/ welcome: + description: 這個快速指南涵蓋了 OpenStreetMap 基礎知識。 title: 歡迎來到 OSM + url: /welcome wiki: title: wiki.openstreetmap.org url: http://wiki.openstreetmap.org/ diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml index 8b6b774e7..3e0f48acd 100644 --- a/config/wiki_pages.yml +++ b/config/wiki_pages.yml @@ -2,147 +2,350 @@ # PROGRAM DO NOT MANUALLY EDIT IT --- -cz: +az: + tag: + craft=locksmith: Az:Tag:craft=locksmith + highway=speed_camera: Az:Tag:highway=speed camera +bg: key: - historic: Cz:Key:historic - railway: Cz:Key:railway - tracktype: Cz:Key:tracktype + lanes: Bg:Key:lanes + tag: + railway=crossing: Bg:Tag:railway=crossing + railway=level_crossing: Bg:Tag:railway=level crossing +ca: tag: - route=trolleybus: Cz:Tag:route=trolleybus + leisure=swimming_pool: Ca:Tag:leisure=swimming pool da: key: - access: Da:Key:access fee: Da:Key:fee lit: Da:Key:lit maxheight: Da:Key:maxheight + maxspeed: Da:Key:maxspeed tag: - highway=tertiary: Da:Tag:highway=tertiary - highway=track: Da:Tag:highway=track - route=ferry: Da:Tag:route=ferry + amenity=place_of_worship: Da:Tag:amenity=place of worship de: key: + AlpinRes_ID: DE:Key:AlpinRes ID abutters: DE:Key:abutters access: DE:Key:access addr: DE:Key:addr aerialway: DE:Key:aerialway aeroway: DE:Key:aeroway amenity: DE:Key:amenity + area: DE:Key:area + asb: DE:Key:asb barrier: DE:Key:barrier basin: DE:Key:basin - bridge: DE:Key:bridge - building: DE:Key:building + beds: DE:Key:beds + bicycle: DE:Key:bicycle + bicycle_parking: DE:Key:bicycle parking + bicycle_road: DE:Key:bicycle road + biosphärenwirt: DE:Key:biosphärenwirt + bollard: DE:Key:bollard + brewery: DE:Key:brewery + building:condition: DE:Key:building:condition + building:material: DE:Key:building:material + capacity: DE:Key:capacity + clothes: DE:Key:clothes comment: DE:Key:comment + construction: DE:Key:construction + contact: DE:Key:contact + content: DE:Key:content + country: DE:Key:country + covered: DE:Key:covered + created_by: DE:Key:created by crossing: DE:Key:crossing + cuisine: DE:Key:cuisine + currency: DE:Key:currency + cutting: DE:Key:cutting cycleway: DE:Key:cycleway + de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel + de:regionalschluessel: DE:Key:de:regionalschluessel denomination: DE:Key:denomination + denotation: DE:Key:denotation description: DE:Key:description + designation: DE:Key:designation destination: DE:Key:destination - disused: DE:Key:disused + diaper: DE:Key:diaper + direction: DE:Key:direction drink: DE:Key:drink + drive_through: DE:Key:drive through + ele: DE:Key:ele + electrified: DE:Key:electrified embankment: DE:Key:embankment emergency: DE:Key:emergency + entrance: DE:Key:entrance + fee: DE:Key:fee + fetish: DE:Key:fetish fixme: DE:Key:fixme + foot: DE:Key:foot + footway: DE:Key:footway + ford: DE:Key:ford + generator:method: DE:Key:generator:method + generator:output: DE:Key:generator:output + generator:source: DE:Key:generator:source geological: DE:Key:geological + hazard: DE:Key:hazard hazmat: DE:Key:hazmat + height: DE:Key:height highway: DE:Key:highway historic: DE:Key:historic + horse: DE:Key:horse + ice_road: DE:Key:ice road + importance: DE:Key:importance incline: DE:Key:incline + informal: DE:Key:informal + information: DE:Key:information + intermittent: DE:Key:intermittent + internet_access: DE:Key:internet access + junction: DE:Key:junction landuse: DE:Key:landuse lanes: DE:Key:lanes layer: DE:Key:layer leisure: DE:Key:leisure + level: DE:Key:level lit: DE:Key:lit + lock: DE:Key:lock man_made: DE:Key:man made + manhole: DE:Key:manhole maxheight: DE:Key:maxheight maxspeed: DE:Key:maxspeed + maxstay: DE:Key:maxstay maxweight: DE:Key:maxweight + maxwidth: DE:Key:maxwidth military: DE:Key:military + minspeed: DE:Key:minspeed + motorroad: DE:Key:motorroad mtb:scale: DE:Key:mtb:scale name: DE:Key:name natural: DE:Key:natural + network: DE:Key:network noexit: DE:Key:noexit note: DE:Key:note - oneway: DE:Key:oneway + office: DE:Key:office + onkz: DE:Key:onkz opening_hours: DE:Key:opening hours operator: DE:Key:operator + osmc:status: DE:Key:osmc:status osmc:symbol: DE:Key:osmc:symbol + overtaking: DE:Key:overtaking + parking:lane: DE:Key:parking:lane + phone: DE:Key:phone + piste:difficulty: DE:Key:piste:difficulty + piste:type: DE:Key:piste:type place: DE:Key:place + playground: DE:Key:playground + population: DE:Key:population power: DE:Key:power - power_rating: DE:Key:power rating + priority: DE:Key:priority + priority_road: DE:Key:priority road + proposed: DE:Key:proposed + public_transport: DE:Key:public transport railway: DE:Key:railway + recycling_type: DE:Key:recycling type + ref: DE:Key:ref + ref:bufa: DE:Key:ref:bufa + ref:mobil-parken.de: DE:Key:ref:mobil-parken.de + religion: DE:Key:religion + resource: DE:Key:resource + roof:material: DE:Key:roof:material + rooms: DE:Key:rooms route: DE:Key:route + ruins: DE:Key:ruins sac_scale: DE:Key:sac scale seamark: DE:Key:seamark + seamark:fixme: DE:Key:seamark:fixme + seamark:type: DE:Key:seamark:type + segregated: DE:Key:segregated service: DE:Key:service + shelter_type: DE:Key:shelter type shop: DE:Key:shop + sidewalk: DE:Key:sidewalk smoking: DE:Key:smoking smoothness: DE:Key:smoothness + social_facility: DE:Key:social facility + source: DE:Key:source + source:maxspeed: DE:Key:source:maxspeed + speisebezirk: DE:Key:speisebezirk sport: DE:Key:sport + start_date: DE:Key:start date step_count: DE:Key:step count surface: DE:Key:surface + symbol: DE:Key:symbol + tactile_paving: DE:Key:tactile paving + toll: DE:Key:toll tourism: DE:Key:tourism tracktype: DE:Key:tracktype + traffic_calming: DE:Key:traffic calming + traffic_sign: DE:Key:traffic sign trail_visibility: DE:Key:trail visibility - tunnel: DE:Key:tunnel + turn: DE:Key:turn + type: DE:Key:type + usage: DE:Key:usage + verbindung: DE:Key:verbindung voltage: DE:Key:voltage waterway: DE:Key:waterway wheelchair: DE:Key:wheelchair + width: DE:Key:width + wiki:symbol: DE:Key:wiki:symbol + wikipedia: DE:Key:wikipedia wires: DE:Key:wires wood: DE:Key:wood + zone:maxspeed: DE:Key:zone:maxspeed tag: + abandoned=village: DE:Tag:abandoned=village + abandoned=yes: DE:Tag:abandoned=yes + access=designated: DE:Tag:access=designated + access=private: DE:Tag:access=private + aerialway=cable_car: DE:Tag:aerialway=cable car + aeroway=helipad: DE:Tag:aeroway=helipad + amenity=administration: DE:Tag:amenity=administration + amenity=animal_boarding: DE:Tag:amenity=animal boarding + amenity=animal_shelter: DE:Tag:amenity=animal shelter + amenity=arts_centre: DE:Tag:amenity=arts centre amenity=atm: DE:Tag:amenity=atm amenity=baby_hatch: DE:Tag:amenity=baby hatch amenity=bank: DE:Tag:amenity=bank + amenity=bar: DE:Tag:amenity=bar + amenity=bbq: DE:Tag:amenity=bbq amenity=bench: DE:Tag:amenity=bench + amenity=bicycle_parking: DE:Tag:amenity=bicycle parking amenity=bicycle_rental: DE:Tag:amenity=bicycle rental amenity=biergarten: DE:Tag:amenity=biergarten + amenity=brothel: DE:Tag:amenity=brothel + amenity=bureau_de_change: DE:Tag:amenity=bureau de change amenity=bus_station: DE:Tag:amenity=bus station + amenity=cafe: DE:Tag:amenity=cafe + amenity=car_rental: DE:Tag:amenity=car rental + amenity=car_sharing: DE:Tag:amenity=car sharing + amenity=car_wash: DE:Tag:amenity=car wash + amenity=charging_station: DE:Tag:amenity=charging station + amenity=cinema: DE:Tag:amenity=cinema amenity=clock: DE:Tag:amenity=clock amenity=compressed_air: DE:Tag:amenity=compressed air + amenity=courthouse: DE:Tag:amenity=courthouse + amenity=crematorium: DE:Tag:amenity=crematorium + amenity=customs: DE:Tag:amenity=customs amenity=drinking_water: DE:Tag:amenity=drinking water + amenity=driving_school: DE:Tag:amenity=driving school + amenity=embassy: DE:Tag:amenity=embassy amenity=emergency_phone: DE:Tag:amenity=emergency phone + amenity=fast_food: DE:Tag:amenity=fast food + amenity=ferry_terminal: DE:Tag:amenity=ferry terminal + amenity=fire_station: DE:Tag:amenity=fire station + amenity=fountain: DE:Tag:amenity=fountain amenity=fuel: DE:Tag:amenity=fuel + amenity=grave_yard: DE:Tag:amenity=grave yard amenity=grit_bin: DE:Tag:amenity=grit bin amenity=hospital: DE:Tag:amenity=hospital amenity=hunting_stand: DE:Tag:amenity=hunting stand + amenity=ice_cream: DE:Tag:amenity=ice cream + amenity=kindergarten: DE:Tag:amenity=kindergarten + amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure + amenity=library: DE:Tag:amenity=library + amenity=marketplace: DE:Tag:amenity=marketplace + amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking amenity=nightclub: DE:Tag:amenity=nightclub amenity=nursing_home: DE:Tag:amenity=nursing home amenity=parking: DE:Tag:amenity=parking + amenity=parking_entrance: DE:Tag:amenity=parking entrance + amenity=parking_space: DE:Tag:amenity=parking space amenity=pharmacy: DE:Tag:amenity=pharmacy amenity=place_of_worship: DE:Tag:amenity=place of worship + amenity=police: DE:Tag:amenity=police amenity=post_box: DE:Tag:amenity=post box + amenity=post_office: DE:Tag:amenity=post office + amenity=prison: DE:Tag:amenity=prison amenity=pub: DE:Tag:amenity=pub amenity=recycling: DE:Tag:amenity=recycling amenity=register_office: DE:Tag:amenity=register office amenity=restaurant: DE:Tag:amenity=restaurant amenity=school: DE:Tag:amenity=school + amenity=shelter: DE:Tag:amenity=shelter + amenity=social_facility: DE:Tag:amenity=social facility + amenity=studio: DE:Tag:amenity=studio + amenity=taxi: DE:Tag:amenity=taxi amenity=telephone: DE:Tag:amenity=telephone + amenity=theatre: DE:Tag:amenity=theatre amenity=toilets: DE:Tag:amenity=toilets + amenity=townhall: DE:Tag:amenity=townhall + amenity=university: DE:Tag:amenity=university amenity=vending_machine: DE:Tag:amenity=vending machine + amenity=veterinary: DE:Tag:amenity=veterinary amenity=waste_basket: DE:Tag:amenity=waste basket + atm=yes: DE:Tag:atm=yes + barrier=bollard: DE:Tag:barrier=bollard + barrier=cattle_grid: DE:Tag:barrier=cattle grid barrier=cycle_barrier: DE:Tag:barrier=cycle barrier + barrier=fence: DE:Tag:barrier=fence + barrier=gate: DE:Tag:barrier=gate + barrier=hedge: DE:Tag:barrier=hedge + barrier=hedge_bank: DE:Tag:barrier=hedge bank + barrier=kissing_gate: DE:Tag:barrier=kissing gate barrier=lift_gate: DE:Tag:barrier=lift gate + barrier=retaining_wall: DE:Tag:barrier=retaining wall + barrier=sally_port: DE:Tag:barrier=sally port + barrier=toll_booth: DE:Tag:barrier=toll booth + barrier=wall: DE:Tag:barrier=wall + biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes + boundary=national_park: DE:Tag:boundary=national park + boundary=protected_area: DE:Tag:boundary=protected area boundary=water_protection_area: DE:Tag:boundary=water protection area - club-mate=yes: DE:Tag:club-mate=yes + building=barn: DE:Tag:building=barn + building=entrance: DE:Tag:building=entrance + building=garage: DE:Tag:building=garage + building=garages: DE:Tag:building=garages + building=industrial: DE:Tag:building=industrial + building=roof: DE:Tag:building=roof + building=school: DE:Tag:building=school + building=stable: DE:Tag:building=stable + craft=car_repair: DE:Tag:craft=car repair + craft=hvac: DE:Tag:craft=hvac + craft=information_electronics: DE:Tag:craft=information electronics + craft=optician: DE:Tag:craft=optician + craft=painter: DE:Tag:craft=painter + craft=paperhanger: DE:Tag:craft=paperhanger + craft=plumber: DE:Tag:craft=plumber + craft=scaffolder: DE:Tag:craft=scaffolder + craft=stonemason: DE:Tag:craft=stonemason + emergency=ambulance_station: DE:Tag:emergency=ambulance station + emergency=defibrillator: DE:Tag:emergency=defibrillator emergency=fire_hydrant: DE:Tag:emergency=fire hydrant + emergency=fire_water_pond: DE:Tag:emergency=fire water pond + emergency=life_ring: DE:Tag:emergency=life ring + emergency=phone: DE:Tag:emergency=phone + emergency=siren: DE:Tag:emergency=siren + emergency=suction_point: DE:Tag:emergency=suction point + footway=sidewalk: DE:Tag:footway=sidewalk + generator:source=solar: DE:Tag:generator:source=solar + generator:source=wind: DE:Tag:generator:source=wind + highway=bridleway: DE:Tag:highway=bridleway highway=bus_stop: DE:Tag:highway=bus stop highway=crossing: DE:Tag:highway=crossing highway=cycleway: DE:Tag:highway=cycleway + highway=elevator: DE:Tag:highway=elevator highway=emergency_access_point: DE:Tag:highway=emergency access point highway=footway: DE:Tag:highway=footway + highway=give_way: DE:Tag:highway=give way highway=living_street: DE:Tag:highway=living street highway=mini_roundabout: DE:Tag:highway=mini roundabout highway=motorway: DE:Tag:highway=motorway + highway=motorway_junction: DE:Tag:highway=motorway junction highway=motorway_link: DE:Tag:highway=motorway link highway=path: DE:Tag:highway=path highway=pedestrian: DE:Tag:highway=pedestrian + highway=platform: DE:Tag:highway=platform highway=primary: DE:Tag:highway=primary + highway=raceway: DE:Tag:highway=raceway highway=residential: DE:Tag:highway=residential + highway=rest_area: DE:Tag:highway=rest area highway=road: DE:Tag:highway=road highway=secondary: DE:Tag:highway=secondary highway=service: DE:Tag:highway=service highway=services: DE:Tag:highway=services + highway=speed_camera: DE:Tag:highway=speed camera highway=steps: DE:Tag:highway=steps + highway=street_lamp: DE:Tag:highway=street lamp highway=tertiary: DE:Tag:highway=tertiary highway=track: DE:Tag:highway=track highway=traffic_signals: DE:Tag:highway=traffic signals @@ -150,164 +353,513 @@ de: highway=trunk_link: DE:Tag:highway=trunk link highway=turning_circle: DE:Tag:highway=turning circle highway=unclassified: DE:Tag:highway=unclassified + historic=aircraft: DE:Tag:historic=aircraft historic=archaeological_site: DE:Tag:historic=archaeological site + historic=boundary_stone: DE:Tag:historic=boundary stone historic=castle: DE:Tag:historic=castle + historic=city_gate: DE:Tag:historic=city gate + historic=citywalls: DE:Tag:historic=citywalls + historic=fort: DE:Tag:historic=fort + historic=gallows: DE:Tag:historic=gallows historic=manor: DE:Tag:historic=manor + historic=memorial: DE:Tag:historic=memorial + historic=milestone: DE:Tag:historic=milestone + historic=mine: DE:Tag:historic=mine historic=monastery: DE:Tag:historic=monastery + historic=monument: DE:Tag:historic=monument + historic=pillory: DE:Tag:historic=pillory + historic=ship: DE:Tag:historic=ship + historic=stone: DE:Tag:historic=stone + historic=wayside_cross: DE:Tag:historic=wayside cross + historic=wayside_shrine: DE:Tag:historic=wayside shrine + historic=wreck: DE:Tag:historic=wreck junction=roundabout: DE:Tag:junction=roundabout landuse=allotments: DE:Tag:landuse=allotments + landuse=basin: DE:Tag:landuse=basin + landuse=brownfield: DE:Tag:landuse=brownfield landuse=cemetery: DE:Tag:landuse=cemetery + landuse=commercial: DE:Tag:landuse=commercial + landuse=farm: DE:Tag:landuse=farm landuse=farmland: DE:Tag:landuse=farmland landuse=farmyard: DE:Tag:landuse=farmyard landuse=forest: DE:Tag:landuse=forest + landuse=garages: DE:Tag:landuse=garages + landuse=grass: DE:Tag:landuse=grass + landuse=greenfield: DE:Tag:landuse=greenfield + landuse=industrial: DE:Tag:landuse=industrial + landuse=landfill: DE:Tag:landuse=landfill landuse=meadow: DE:Tag:landuse=meadow + landuse=military: DE:Tag:landuse=military landuse=orchard: DE:Tag:landuse=orchard + landuse=plant_nursery: DE:Tag:landuse=plant nursery landuse=quarry: DE:Tag:landuse=quarry + landuse=railway: DE:Tag:landuse=railway + landuse=recreation_ground: DE:Tag:landuse=recreation ground + landuse=reservoir: DE:Tag:landuse=reservoir landuse=residential: DE:Tag:landuse=residential + landuse=retail: DE:Tag:landuse=retail landuse=village_green: DE:Tag:landuse=village green + landuse=vineyard: DE:Tag:landuse=vineyard + leisure=beach_resort: DE:Tag:leisure=beach resort leisure=dog_park: DE:Tag:leisure=dog park leisure=garden: DE:Tag:leisure=garden + leisure=golf_course: DE:Tag:leisure=golf course + leisure=ice_rink: DE:Tag:leisure=ice rink + leisure=marina: DE:Tag:leisure=marina + leisure=miniature_golf: DE:Tag:leisure=miniature golf + leisure=nature_reserve: DE:Tag:leisure=nature reserve + leisure=park: DE:Tag:leisure=park + leisure=pitch: DE:Tag:leisure=pitch leisure=playground: DE:Tag:leisure=playground leisure=slipway: DE:Tag:leisure=slipway + leisure=sports_centre: DE:Tag:leisure=sports centre + leisure=stadium: DE:Tag:leisure=stadium + leisure=swimming_pool: DE:Tag:leisure=swimming pool + leisure=track: DE:Tag:leisure=track + leisure=water_park: DE:Tag:leisure=water park + level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled + man_made=adit: DE:Tag:man made=adit + man_made=bunker_silo: DE:Tag:man made=bunker silo + man_made=communications_tower: DE:Tag:man made=communications tower man_made=crane: DE:Tag:man made=crane + man_made=cutline: DE:Tag:man made=cutline + man_made=dyke: DE:Tag:man made=dyke + man_made=embankment: DE:Tag:man made=embankment + man_made=gasometer: DE:Tag:man made=gasometer + man_made=groyne: DE:Tag:man made=groyne + man_made=lighthouse: DE:Tag:man made=lighthouse + man_made=mast: DE:Tag:man made=mast man_made=mineshaft: DE:Tag:man made=mineshaft man_made=pier: DE:Tag:man made=pier man_made=pipeline: DE:Tag:man made=pipeline + man_made=reservoir_covered: DE:Tag:man made=reservoir covered + man_made=surveillance: DE:Tag:man made=surveillance man_made=survey_point: DE:Tag:man made=survey point + man_made=tower: DE:Tag:man made=tower man_made=wastewater_plant: DE:Tag:man made=wastewater plant + man_made=water_tower: DE:Tag:man made=water tower + man_made=water_works: DE:Tag:man made=water works + man_made=watermill: DE:Tag:man made=watermill + man_made=windmill: DE:Tag:man made=windmill microbrewery=yes: DE:Tag:microbrewery=yes military=bunker: DE:Tag:military=bunker + natural=arete: DE:Tag:natural=arete + natural=bare_rock: DE:Tag:natural=bare rock + natural=bay: DE:Tag:natural=bay + natural=beach: DE:Tag:natural=beach + natural=cliff: DE:Tag:natural=cliff + natural=glacier: DE:Tag:natural=glacier + natural=grassland: DE:Tag:natural=grassland + natural=heath: DE:Tag:natural=heath + natural=ridge: DE:Tag:natural=ridge + natural=scree: DE:Tag:natural=scree + natural=scrub: DE:Tag:natural=scrub + natural=sinkhole: DE:Tag:natural=sinkhole + natural=spring: DE:Tag:natural=spring natural=stone: DE:Tag:natural=stone natural=tree: DE:Tag:natural=tree + natural=tree_row: DE:Tag:natural=tree row + natural=volcano: DE:Tag:natural=volcano natural=water: DE:Tag:natural=water natural=wetland: DE:Tag:natural=wetland natural=wood: DE:Tag:natural=wood + office=lawyer: DE:Tag:office=lawyer + office=political_party: DE:Tag:office=political party pipeline=marker: DE:Tag:pipeline=marker + place=archipelago: DE:Tag:place=archipelago + place=city: DE:Tag:place=city + place=hamlet: DE:Tag:place=hamlet + place=island: DE:Tag:place=island + place=isolated_dwelling: DE:Tag:place=isolated dwelling + place=locality: DE:Tag:place=locality + place=neighbourhood: DE:Tag:place=neighbourhood + place=suburb: DE:Tag:place=suburb + place=town: DE:Tag:place=town + place=village: DE:Tag:place=village power=cable: DE:Tag:power=cable power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet power=generator: DE:Tag:power=generator power=line: DE:Tag:power=line power=minor_line: DE:Tag:power=minor line power=pole: DE:Tag:power=pole + power=station: DE:Tag:power=station power=sub_station: DE:Tag:power=sub station + power=substation: DE:Tag:power=substation power=tower: DE:Tag:power=tower + public_transport=platform: DE:Tag:public transport=platform + public_transport=stop_area: DE:Tag:public transport=stop area + public_transport=stop_position: DE:Tag:public transport=stop position + railway=abandoned: DE:Tag:railway=abandoned railway=crossing: DE:Tag:railway=crossing + railway=disused: DE:Tag:railway=disused railway=halt: DE:Tag:railway=halt + railway=level_crossing: DE:Tag:railway=level crossing railway=monorail: DE:Tag:railway=monorail railway=platform: DE:Tag:railway=platform + railway=rail: DE:Tag:railway=rail railway=station: DE:Tag:railway=station railway=tram: DE:Tag:railway=tram railway=tram_stop: DE:Tag:railway=tram stop railway=turntable: DE:Tag:railway=turntable route=ferry: DE:Tag:route=ferry + route=ski: DE:Tag:route=ski + service=driveway: DE:Tag:service=driveway service=parking_aisle: DE:Tag:service=parking aisle + shelter_type=lean_to: DE:Tag:shelter type=lean to + shop=baby_goods: DE:Tag:shop=baby goods + shop=bag: DE:Tag:shop=bag shop=bakery: DE:Tag:shop=bakery + shop=beverages: DE:Tag:shop=beverages + shop=bicycle: DE:Tag:shop=bicycle + shop=books: DE:Tag:shop=books + shop=butcher: DE:Tag:shop=butcher + shop=car: DE:Tag:shop=car + shop=car_parts: DE:Tag:shop=car parts + shop=car_repair: DE:Tag:shop=car repair + shop=charity: DE:Tag:shop=charity + shop=chemist: DE:Tag:shop=chemist + shop=clothes: DE:Tag:shop=clothes + shop=computer: DE:Tag:shop=computer + shop=convenience: DE:Tag:shop=convenience + shop=copyshop: DE:Tag:shop=copyshop + shop=deli: DE:Tag:shop=deli + shop=doityourself: DE:Tag:shop=doityourself + shop=dry_cleaning: DE:Tag:shop=dry cleaning + shop=electronics: DE:Tag:shop=electronics + shop=fabric: DE:Tag:shop=fabric + shop=florist: DE:Tag:shop=florist + shop=funeral_directors: DE:Tag:shop=funeral directors + shop=garden_centre: DE:Tag:shop=garden centre shop=general: DE:Tag:shop=general + shop=hairdresser: DE:Tag:shop=hairdresser + shop=hardware: DE:Tag:shop=hardware + shop=houseware: DE:Tag:shop=houseware + shop=kiosk: DE:Tag:shop=kiosk + shop=kitchen: DE:Tag:shop=kitchen + shop=laundry: DE:Tag:shop=laundry + shop=mall: DE:Tag:shop=mall + shop=medical_supply: DE:Tag:shop=medical supply + shop=newsagent: DE:Tag:shop=newsagent + shop=outdoor: DE:Tag:shop=outdoor + shop=photo: DE:Tag:shop=photo + shop=shoes: DE:Tag:shop=shoes + shop=spare_parts: DE:Tag:shop=spare parts + shop=stationery: DE:Tag:shop=stationery + shop=supermarket: DE:Tag:shop=supermarket + shop=toys: DE:Tag:shop=toys + shop=vacant: DE:Tag:shop=vacant + shop=variety_store: DE:Tag:shop=variety store + shop=window_blind: DE:Tag:shop=window blind + source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery + sport=9pin: DE:Tag:sport=9pin + sport=climbing: DE:Tag:sport=climbing + sport=free_flying: DE:Tag:sport=free flying + sport=golf: DE:Tag:sport=golf + sport=scuba_diving: DE:Tag:sport=scuba diving + sport=soccer: DE:Tag:sport=soccer + summit:cross=yes: DE:Tag:summit:cross=yes + tourism=alpine_hut: DE:Tag:tourism=alpine hut + tourism=aquarium: DE:Tag:tourism=aquarium + tourism=artwork: DE:Tag:tourism=artwork tourism=camp_site: DE:Tag:tourism=camp site tourism=caravan_site: DE:Tag:tourism=caravan site + tourism=chalet: DE:Tag:tourism=chalet + tourism=gallery: DE:Tag:tourism=gallery + tourism=guest_house: DE:Tag:tourism=guest house + tourism=hostel: DE:Tag:tourism=hostel + tourism=hotel: DE:Tag:tourism=hotel + tourism=information: DE:Tag:tourism=information + tourism=motel: DE:Tag:tourism=motel + tourism=museum: DE:Tag:tourism=museum tourism=picnic_site: DE:Tag:tourism=picnic site + tourism=viewpoint: DE:Tag:tourism=viewpoint + tourism=zoo: DE:Tag:tourism=zoo vending=bicycle_tube: DE:Tag:vending=bicycle tube + waterway=canal: DE:Tag:waterway=canal + waterway=dam: DE:Tag:waterway=dam + waterway=ditch: DE:Tag:waterway=ditch waterway=dock: DE:Tag:waterway=dock + waterway=drain: DE:Tag:waterway=drain + waterway=fish_pass: DE:Tag:waterway=fish pass waterway=lock_gate: DE:Tag:waterway=lock gate waterway=river: DE:Tag:waterway=river waterway=riverbank: DE:Tag:waterway=riverbank waterway=stream: DE:Tag:waterway=stream + waterway=weir: DE:Tag:waterway=weir en: key: - Demolished: Key:Demolished + 3dr:type: Key:3dr:type + AND_nosr_r: Key:AND nosr r + CEMT: Key:CEMT + DGPS_correction: Key:DGPS correction + IBGE:tipo: Key:IBGE:tipo + NHS: Key:NHS + RLIS:bicycle: Key:RLIS:bicycle + RLIS:reviewed: Key:RLIS:reviewed TMC:Direction: Key:TMC:Direction TMC:LocationCode: Key:TMC:LocationCode TMC:NextLocationCode: Key:TMC:NextLocationCode TMC:PrevLocationCode: Key:TMC:PrevLocationCode + abandoned: Key:abandoned abutters: Key:abutters access: Key:access + access:lhv: Key:access:lhv + access:roadtrain: Key:access:roadtrain + access:roadtrain:trailers: Key:access:roadtrain:trailers addr: Key:addr addr:conscriptionnumber: Key:addr:conscriptionnumber + addr:flats: Key:addr:flats + addr:place: Key:addr:place addr:provisionalnumber: Key:addr:provisionalnumber addr:streetnumber: Key:addr:streetnumber + addr:suburb: Key:addr:suburb + adr_les: Key:adr les aerialway: Key:aerialway aeroway: Key:aeroway + airmark: Key:airmark amenity: Key:amenity architect: Key:architect area: Key:area + artwork_type: Key:artwork type + ascent: Key:ascent + asset_ref: Key:asset ref atv: Key:atv + automatic_door: Key:automatic door + backrest: Key:backrest + bar: Key:bar barrier: Key:barrier + barrier:personnel: Key:barrier:personnel basin: Key:basin beacon: Key:beacon + beds: Key:beds + bench: Key:bench bicycle: Key:bicycle + bicycle_parking: Key:bicycle parking + bicycle_road: Key:bicycle road + bin: Key:bin + board_type: Key:board type boat: Key:boat + bollard: Key:bollard + books: Key:books border_type: Key:border type boundary: Key:boundary + brand: Key:brand + brewery: Key:brewery bridge: Key:bridge building: Key:building + building:condition: Key:building:condition + building:cullis:height: Key:building:cullis:height + building:fireproof: Key:building:fireproof + building:levels: Key:building:levels + building:levels:underground: Key:building:levels:underground + building:material: Key:building:material + building:min_level: Key:building:min level + building:obm: Key:building:obm + building:part: Key:building:part bunker_type: Key:bunker type buoy: Key:buoy + busway: Key:busway + button_operated: Key:button operated + cables: Key:cables capacity: Key:capacity + carriageway_ref: Key:carriageway ref + castle_type: Key:castle type + castle_type:de: Key:castle type:de + centralkey: Key:centralkey + centre_turn_lane: Key:centre turn lane cep: Key:cep + check_date: Key:check date + checkpoint: Key:checkpoint + circuits: Key:circuits + circumference: Key:circumference clothes: Key:clothes + club: Key:club + coastline:survey_quality: Key:coastline:survey quality collection_times: Key:collection times + colour: Key:colour comment: Key:comment + common_good_land: Key:common good land construction: Key:construction + construction_end_expected: Key:construction end expected contact: Key:contact + content: Key:content + conveying: Key:conveying + country: Key:country covered: Key:covered + craft: Key:craft created_by: Key:created by + crop: Key:crop crossing: Key:crossing cuisine: Key:cuisine + cultivation_method: Key:cultivation method + currency: Key:currency cutting: Key:cutting + cyclability: Key:cyclability + cyclestreets_id: Key:cyclestreets id cycleway: Key:cycleway + cycleway:buffer: Key:cycleway:buffer + de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel + de:regionalschluessel: Key:de:regionalschluessel + deanery: Key:deanery + delivery: Key:delivery denomination: Key:denomination + denotation: Key:denotation depth: Key:depth + descent: Key:descent description: Key:description + description:restrictions: Key:description:restrictions designation: Key:designation destination: Key:destination + diaper: Key:diaper + diet: Key:diet + diocese: Key:diocese direction: Key:direction + dirtbike:scale: Key:dirtbike:scale disabled: Key:disabled dispensing: Key:dispensing + distance: Key:distance disused: Key:disused + door: Key:door drink: Key:drink + drinking_water: Key:drinking water + drive_in: Key:drive in + drive_through: Key:drive through + driving_side: Key:driving side + duration: Key:duration easy_overtaking: Key:easy overtaking ele: Key:ele electrified: Key:electrified + email: Key:email embankment: Key:embankment emergency: Key:emergency end_date: Key:end date enforcement: Key:enforcement + entrance: Key:entrance + escalator: Key:escalator + esperanto: Key:esperanto + european_cultural_path: Key:european cultural path + exit: Key:exit + exit_to: Key:exit to + expressway: Key:expressway + fair_trade: Key:fair trade fee: Key:fee + female: Key:female fence_type: Key:fence type fenced: Key:fenced + ferry: Key:ferry + fetish: Key:fetish + fishing: Key:fishing fixme: Key:fixme flood_prone: Key:flood prone + floor:material: Key:floor:material fog_signal: Key:fog signal foot: Key:foot + footway: Key:footway ford: Key:ford + fork: Key:fork + format: Key:format + frequency: Key:frequency + fruit: Key:fruit + fuel: Key:fuel fuel:discount: Key:fuel:discount + furniture: Key:furniture + gambling: Key:gambling gauge: Key:gauge + generator:method: Key:generator:method + generator:output: Key:generator:output + generator:output:electricity: Key:generator:output:electricity + generator:output:hot_air: Key:generator:output:hot air + generator:output:hot_water: Key:generator:output:hot water + generator:output:steam: Key:generator:output:steam + generator:plant: Key:generator:plant + generator:source: Key:generator:source + generator:type: Key:generator:type + genus: Key:genus + geocodigo: Key:geocodigo geological: Key:geological + gnis:feature_id: Key:gnis:feature id + golf: Key:golf + group_only: Key:group only + guidepost: Key:guidepost + habitat: Key:habitat + handrail: Key:handrail + harbour: Key:harbour + harbour:access:swell: Key:harbour:access:swell + harbour:access:tide: Key:harbour:access:tide + harbour:category: Key:harbour:category + harbour:main: Key:harbour:main + hazard_intensity: Key:hazard intensity + hazard_occurrence: Key:hazard occurrence + hazard_prone: Key:hazard prone + hazard_return_period: Key:hazard return period + hazard_type: Key:hazard type hazmat: Key:hazmat healthcare: Key:healthcare height: Key:height highway: Key:highway + hiking: Key:hiking historic: Key:historic + historic:civilization: Key:historic:civilization + history: Key:history horse: Key:horse + hov: Key:hov + iata: Key:iata + ice_road: Key:ice road + image: Key:image + importance: Key:importance incline: Key:incline + informal: Key:informal information: Key:information + inline_skates: Key:inline skates + inscription: Key:inscription + intermittent: Key:intermittent internet_access: Key:internet access is_in: Key:is in + jel: Key:jel junction: Key:junction + junction_number: Key:junction number + kerb: Key:kerb + kms: Key:kms + kms:county_name: Key:kms:county name + kms:county_no: Key:kms:county no + kms:house_no: Key:kms:house no + kms:last_updated: Key:kms:last updated + kms:municipality_name: Key:kms:municipality name + kms:municipality_no: Key:kms:municipality no + kms:street_name: Key:kms:street name + kms:street_no: Key:kms:street no + kms:zip_code: Key:kms:zip code + kms:zip_name: Key:kms:zip name + kp: Key:kp + label: Key:label landmark: Key:landmark landuse: Key:landuse + lane_hint: Key:lane hint lanes: Key:lanes + lanes:psv: Key:lanes:psv layer: Key:layer lcn_ref: Key:lcn ref leisure: Key:leisure length: Key:length + level: Key:level light: Key:light + lines: Key:lines + listed_status: Key:listed status lit: Key:lit lit:perceived: Key:lit:perceived + local_ref: Key:local ref + location: Key:location lock: Key:lock + lock_name: Key:lock name + maintained: Key:maintained + maintenance: Key:maintenance + male: Key:male man_made: Key:man made managed: Key:managed manhole: Key:manhole + massage: Key:massage + material: Key:material + max_age: Key:max age maxage: Key:maxage maxairdraft: Key:maxairdraft maxaxleload: Key:maxaxleload @@ -318,18 +870,31 @@ en: maxheight:physical: Key:maxheight:physical maxlength: Key:maxlength maxspeed: Key:maxspeed + maxspeed:type: Key:maxspeed:type maxstay: Key:maxstay maxweight: Key:maxweight maxwidth: Key:maxwidth military: Key:military + min_age: Key:min age + min_height: Key:min height minage: Key:minage minspeed: Key:minspeed + mofa: Key:mofa + monitoring:air_quality: Key:monitoring:air quality + monitoring:galileo: Key:monitoring:galileo monitoring:glonass: Key:monitoring:glonass monitoring:gps: Key:monitoring:gps + monitoring:noise: Key:monitoring:noise + monitoring:seismic_activity: Key:monitoring:seismic activity + monitoring:tide_gauge: Key:monitoring:tide gauge + monitoring:water_level: Key:monitoring:water level + monitoring:weather: Key:monitoring:weather mooring: Key:mooring + motorboat: Key:motorboat motorcar: Key:motorcar motorcycle: Key:motorcycle motorroad: Key:motorroad + motorway: Key:motorway mountain_pass: Key:mountain pass mtb:description: Key:mtb:description mtb:scale: Key:mtb:scale @@ -337,104 +902,364 @@ en: name:cy: Key:name:cy narrow: Key:narrow natural: Key:natural + navibot:categorize: Key:navibot:categorize + navibot:connect: Key:navibot:connect + ncat: Key:ncat + ncn_milepost: Key:ncn milepost ncn_ref: Key:ncn ref + network: Key:network noexit: Key:noexit noname: Key:noname + not_served_by: Key:not served by note: Key:note + note:deplacer4mE: Key:note:deplacer4mE + notes: Key:notes office: Key:office + offshore: Key:offshore + ois:fixme: Key:ois:fixme + old_ref_legislative: Key:old ref legislative oneway: Key:oneway + opening_date: Key:opening date opening_hours: Key:opening hours + openplaques:id: Key:openplaques:id + openplaques_plaque: Key:openplaques plaque + opensource: Key:opensource operator: Key:operator + operator:type: Key:operator:type + organic: Key:organic + origin: Key:origin + osak:identifier: Key:osak:identifier + osak:municipality_no: Key:osak:municipality no + osak:revision: Key:osak:revision + osak:street_name: Key:osak:street name + osak:street_no: Key:osak:street no + osak:subdivision: Key:osak:subdivision osmarender:nameDirection: Key:osmarender:nameDirection osmarender:render: Key:osmarender:render osmarender:renderName: Key:osmarender:renderName osmarender:renderRef: Key:osmarender:renderRef osmc:symbol: Key:osmc:symbol overtaking: Key:overtaking + owner: Key:owner + ownership: Key:ownership parking: Key:parking + parking:lane: Key:parking:lane passing_places: Key:passing places paved:date: Key:paved:date + payment: Key:payment + phoenixbikeguide: Key:phoenixbikeguide phone: Key:phone + pilotage: Key:pilotage + pipeline: Key:pipeline + piste:difficulty: Key:piste:difficulty + piste:grooming: Key:piste:grooming + piste:type: Key:piste:type + pk: Key:pk place: Key:place + place:fr: Key:place:fr + place_name: Key:place name + placement: Key:placement + planned: Key:planned + plant:output: Key:plant:output + plant_community: Key:plant community + platforms: Key:platforms + playground: Key:playground + police: Key:police population: Key:population + post_office:type: Key:post office:type postal_code: Key:postal code power: Key:power - power_rating: Key:power rating - power_source: Key:power source + power_output: Key:power output + power_supply: Key:power supply + priority: Key:priority + priority_road: Key:priority road + produce: Key:produce + product: Key:product proposed: Key:proposed + protect_class: Key:protect class + protect_id: Key:protect id + protection_title: Key:protection title + prow_ref: Key:prow ref psv: Key:psv + public_transport: Key:public transport + pump: Key:pump + pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa + rack: Key:rack + radar_conspicious: Key:radar conspicious + radar_reflector: Key:radar reflector + radar_transponder: Key:radar transponder + radar_transponder:signal_group: Key:radar transponder:signal group + radio_transponder: Key:radio transponder + radio_transponder:AIS: Key:radio transponder:AIS + radio_transponder:signal_frequency: Key:radio transponder:signal frequency railway: Key:railway ramp: Key:ramp + ramsar: Key:ramsar rcn_ref: Key:rcn ref + real_ale: Key:real ale + real_cider: Key:real cider + recycling_type: Key:recycling type + reef: Key:reef ref: Key:ref + ref:ERDF:gdo: Key:ref:ERDF:gdo + ref:FR:42C: Key:ref:FR:42C + ref:FR:CEF: Key:ref:FR:CEF + ref:FR:FINESS: Key:ref:FR:FINESS + ref:FR:SIRET: Key:ref:FR:SIRET + ref:INSEE: Key:ref:INSEE + ref:ISTAT: Key:ref:ISTAT + ref:UAI: Key:ref:UAI + ref:at:gkz: Key:ref:at:gkz + ref:at:okz: Key:ref:at:okz + ref:bam.brno.cz: Key:ref:bam.brno.cz + ref:bufa: Key:ref:bufa + ref:colour: Key:ref:colour ref:isil: Key:ref:isil + ref:mhs: Key:ref:mhs + ref:mobil-parken.de: Key:ref:mobil-parken.de + ref:ortsnetz: Key:ref:ortsnetz + ref:sandre: Key:ref:sandre + ref:taskey: Key:ref:taskey + ref:vatin: Key:ref:vatin + ref:vorwahl: Key:ref:vorwahl + ref:wawa: Key:ref:wawa + reference_point: Key:reference point religion: Key:religion + removed: Key:removed + repair: Key:repair + reservation: Key:reservation resource: Key:resource + retreat: Key:retreat + retroreflecting: Key:retroreflecting + roof:material: Key:roof:material + room: Key:room + rooms: Key:rooms + roundtrip: Key:roundtrip route: Key:route + route_master: Key:route master + route_ref: Key:route ref + royal_cypher: Key:royal cypher + rtc_rate: Key:rtc rate + rugby: Key:rugby + ruins: Key:ruins + rwn_ref: Key:rwn ref sac_scale: Key:sac scale sagns_id: Key:sagns id + scenic: Key:scenic + school: Key:school seabed_surface: Key:seabed surface seamark: Key:seamark + seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape + seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour + seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour + pattern + seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape + seamark:bridge:category: Key:seamark:bridge:category + seamark:bridge:clearance_height: Key:seamark:bridge:clearance height + seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed + seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open + seamark:bridge:clearance_width: Key:seamark:bridge:clearance width + seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity + seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity + seamark:cable_overhead:category: Key:seamark:cable overhead:category + seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical + clearance safe + seamark:cable_submarine:category: Key:seamark:cable submarine:category + seamark:conspicuity: Key:seamark:conspicuity + seamark:distance_mark:category: Key:seamark:distance mark:category + seamark:distance_mark:distance: Key:seamark:distance mark:distance + seamark:distance_mark:units: Key:seamark:distance mark:units + seamark:fixme: Key:seamark:fixme + seamark:fog_signal: Key:seamark:fog signal + seamark:fog_signal:category: Key:seamark:fog signal:category + seamark:fog_signal:group: Key:seamark:fog signal:group + seamark:fog_signal:period: Key:seamark:fog signal:period + seamark:fog_signal:range: Key:seamark:fog signal:range + seamark:fog_signal:sequence: Key:seamark:fog signal:sequence + seamark:fog_signal:status: Key:seamark:fog signal:status + seamark:landmark:category: Key:seamark:landmark:category + seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity + seamark:landmark:function: Key:seamark:landmark:function + seamark:light:exhibition: Key:seamark:light:exhibition + seamark:light:status: Key:seamark:light:status + seamark:light:visibility: Key:seamark:light:visibility + seamark:light_vessel:colour: Key:seamark:light vessel:colour + seamark:obstruction:category: Key:seamark:obstruction:category + seamark:pilot_boarding:category: Key:seamark:pilot boarding:category + seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category + seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name + seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product + seamark:platform:category: Key:seamark:platform:category + seamark:radar_reflector: Key:seamark:radar reflector + seamark:radar_station:category: Key:seamark:radar station:category + seamark:radar_station:channel: Key:seamark:radar station:channel + seamark:radar_transponder:category: Key:seamark:radar transponder:category + seamark:radar_transponder:group: Key:seamark:radar transponder:group + seamark:radar_transponder:period: Key:seamark:radar transponder:period + seamark:radar_transponder:range: Key:seamark:radar transponder:range + seamark:radar_transponder:sector_end: Key:seamark:radar transponder:sector end + seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start + seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence + seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength + seamark:radio_station:group: Key:seamark:radio station:group + seamark:reflectivity: Key:seamark:reflectivity + seamark:restricted_area:category: Key:seamark:restricted area:category + seamark:restricted_area:name: Key:seamark:restricted area:name + seamark:restricted_area:restriction: Key:seamark:restricted area:restriction + seamark:sea_area:category: Key:seamark:sea area:category + seamark:seabed_area:surface: Key:seamark:seabed area:surface + seamark:shoreline_construction:category: Key:seamark:shoreline construction:category + seamark:small_craft_facility:category: Key:seamark:small craft facility:category + seamark:small_craft_facility:name: Key:seamark:small craft facility:name + seasonal: Key:seasonal seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime + second_hand: Key:second hand + segregated: Key:segregated service: Key:service + service_times: Key:service times + shade: Key:shade + shelter: Key:shelter + shelter_type: Key:shelter type shop: Key:shop + side_road: Key:side road + sidewalk: Key:sidewalk + sign: Key:sign + signal_station: Key:signal station + site_type: Key:site type ski: Key:ski + ski_tour_difficulty: Key:ski tour difficulty smoothness: Key:smoothness + snowmobile: Key:snowmobile snowplowing: Key:snowplowing snowplowing:category: Key:snowplowing:category + social_facility: Key:social facility + sorting_name: Key:sorting name source: Key:source + source:addr: Key:source:addr + source:date: Key:source:date + source:loc: Key:source:loc + source:maxspeed: Key:source:maxspeed + species: Key:species + speech_output: Key:speech output + speisebezirk: Key:speisebezirk sport: Key:sport stars: Key:stars start_date: Key:start date + station: Key:station + status: Key:status step_count: Key:step count stop: Key:stop + storage_area: Key:storage area + stranded: Key:stranded + stream: Key:stream sub_sea: Key:sub sea - sulky: Key:sulky surface: Key:surface + surveillance: Key:surveillance + surveillance:type: Key:surveillance:type + surveillance:zone: Key:surveillance:zone + sustrans_ref: Key:sustrans ref + symbol: Key:symbol tactile_paving: Key:tactile paving + takeaway: Key:takeaway + taxon: Key:taxon + technology: Key:technology + tidal: Key:tidal + tiger: Key:tiger timezone: Key:timezone + toilets:wheelchair: Key:toilets:wheelchair toll: Key:toll + topmark: Key:topmark + touring: Key:touring tourism: Key:tourism + tourist_bus: Key:tourist bus + tracks: Key:tracks tracktype: Key:tracktype traffic:hourly: Key:traffic:hourly traffic_calming: Key:traffic calming traffic_sign: Key:traffic sign + traffic_signals: Key:traffic signals + traffic_signals:arrow: Key:traffic signals:arrow + traffic_signals:direction: Key:traffic signals:direction + traffic_signals:floor_vibration: Key:traffic signals:floor vibration + traffic_signals:minimap: Key:traffic signals:minimap + traffic_signals:sound: Key:traffic signals:sound + traffic_signals:vibration: Key:traffic signals:vibration trail_visibility: Key:trail visibility + trees: Key:trees trolley_wire: Key:trolley wire tunnel: Key:tunnel + turn: Key:turn + turning_radius: Key:turning radius + twitter: Key:twitter type: Key:type + uic_name: Key:uic name + uic_ref: Key:uic ref + unisex: Key:unisex + url: Key:url + url:restrictions: Key:url:restrictions + usage: Key:usage + validate:no_name: Key:validate:no name + validate:no_ref: Key:validate:no ref voltage: Key:voltage + waste: Key:waste + water: Key:water waterway: Key:waterway website: Key:website wheelchair: Key:wheelchair + wholesale: Key:wholesale width: Key:width + wiki:symbol: Key:wiki:symbol wikipedia: Key:wikipedia + winter_road: Key:winter road wires: Key:wires woeid: Key:woeid wood: Key:wood + xmas:feature: Key:xmas:feature + zone:maxspeed: Key:zone:maxspeed + zone:traffic: Key:zone:traffic zoo: Key:zoo tag: 4wd_only=yes: Tag:4wd only=yes - abandoned=yes: Tag:abandoned=yes + FIXME=Position_estimated: Tag:FIXME=Position estimated access=designated: Tag:access=designated + access=exclusion_zone: Tag:access=exclusion zone + access=license: Tag:access=license access=official: Tag:access=official + access=private: Tag:access=private + admin_level=aboriginal_land: Tag:admin level=aboriginal land aerialway=cable_car: Tag:aerialway=cable car + aerialway=canopy: Tag:aerialway=canopy aerialway=chair_lift: Tag:aerialway=chair lift aerialway=drag_lift: Tag:aerialway=drag lift aerialway=gondola: Tag:aerialway=gondola + aerialway=goods: Tag:aerialway=goods + aerialway=j-bar: Tag:aerialway=j-bar + aerialway=magic_carpet: Tag:aerialway=magic carpet aerialway=mixed_lift: Tag:aerialway=mixed lift + aerialway=platter: Tag:aerialway=platter aerialway=pylon: Tag:aerialway=pylon + aerialway=rope_tow: Tag:aerialway=rope tow aerialway=station: Tag:aerialway=station + aerialway=t-bar: Tag:aerialway=t-bar aeroway=aerodrome: Tag:aeroway=aerodrome + aeroway=airport: Tag:aeroway=airport aeroway=apron: Tag:aeroway=apron - aeroway=control_tower: Tag:aeroway=control tower aeroway=gate: Tag:aeroway=gate + aeroway=hangar: Tag:aeroway=hangar aeroway=helipad: Tag:aeroway=helipad aeroway=navigationaid: Tag:aeroway=navigationaid + aeroway=parking_position: Tag:aeroway=parking position aeroway=runway: Tag:aeroway=runway aeroway=taxiway: Tag:aeroway=taxiway aeroway=terminal: Tag:aeroway=terminal aeroway=windsock: Tag:aeroway=windsock + airmark=beacon: Tag:airmark=beacon + ale_supply=limited: Tag:ale supply=limited + allotments=plot: Tag:allotments=plot + amenity=Kneippbecken: Tag:amenity=Kneippbecken + amenity=animal_boarding: Tag:amenity=animal boarding + amenity=animal_breeding: Tag:amenity=animal breeding + amenity=animal_shelter: Tag:amenity=animal shelter amenity=architect_office: Tag:amenity=architect office amenity=arts_centre: Tag:amenity=arts centre amenity=atm: Tag:amenity=atm @@ -446,7 +1271,9 @@ en: amenity=bench: Tag:amenity=bench amenity=bicycle_parking: Tag:amenity=bicycle parking amenity=bicycle_rental: Tag:amenity=bicycle rental + amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing amenity=biergarten: Tag:amenity=biergarten + amenity=bikeshed: Tag:amenity=bikeshed amenity=boat_storage: Tag:amenity=boat storage amenity=brothel: Tag:amenity=brothel amenity=bureau_de_change: Tag:amenity=bureau de change @@ -454,52 +1281,93 @@ en: amenity=cafe: Tag:amenity=cafe amenity=car_rental: Tag:amenity=car rental amenity=car_sharing: Tag:amenity=car sharing + amenity=car_wash: Tag:amenity=car wash amenity=casino: Tag:amenity=casino + amenity=charging_station: Tag:amenity=charging station amenity=cinema: Tag:amenity=cinema + amenity=clinic: Tag:amenity=clinic amenity=clock: Tag:amenity=clock amenity=coast_guard: Tag:amenity=coast guard + amenity=coast_radar_station: Tag:amenity=coast radar station amenity=college: Tag:amenity=college amenity=community_centre: Tag:amenity=community centre amenity=compressed_air: Tag:amenity=compressed air amenity=courthouse: Tag:amenity=courthouse + amenity=coworking_space: Tag:amenity=coworking space amenity=crematorium: Tag:amenity=crematorium + amenity=crucifix: Tag:amenity=crucifix + amenity=crypt: Tag:amenity=crypt + amenity=customs: Tag:amenity=customs + amenity=dead_pub: Tag:amenity=dead pub amenity=dentist: Tag:amenity=dentist amenity=doctors: Tag:amenity=doctors + amenity=dojo: Tag:amenity=dojo amenity=drinking_water: Tag:amenity=drinking water + amenity=driving_school: Tag:amenity=driving school amenity=embassy: Tag:amenity=embassy + amenity=ev_charging: Tag:amenity=ev charging amenity=fast_food: Tag:amenity=fast food amenity=ferry_terminal: Tag:amenity=ferry terminal + amenity=festival_grounds: Tag:amenity=festival grounds + amenity=fire_hydrant: Tag:amenity=fire hydrant amenity=fire_station: Tag:amenity=fire station amenity=food_court: Tag:amenity=food court amenity=fountain: Tag:amenity=fountain amenity=fuel: Tag:amenity=fuel + amenity=gambling: Tag:amenity=gambling + amenity=game_feeding: Tag:amenity=game feeding amenity=grave_yard: Tag:amenity=grave yard amenity=grit_bin: Tag:amenity=grit bin + amenity=harbourmaster: Tag:amenity=harbourmaster amenity=hospital: Tag:amenity=hospital amenity=hunting_stand: Tag:amenity=hunting stand + amenity=ice_cream: Tag:amenity=ice cream + amenity=jobcentre: Tag:amenity=jobcentre amenity=kindergarten: Tag:amenity=kindergarten + amenity=kneipp_water_cure: Tag:amenity=kneipp water cure amenity=library: Tag:amenity=library amenity=life_ring: Tag:amenity=life ring + amenity=lifeboat_station: Tag:amenity=lifeboat station + amenity=love_hotel: Tag:amenity=love hotel amenity=marketplace: Tag:amenity=marketplace amenity=milk_dispenser: Tag:amenity=milk dispenser + amenity=mobile_library: Tag:amenity=mobile library + amenity=motorcycle_parking: Tag:amenity=motorcycle parking + amenity=music_venue: Tag:amenity=music venue amenity=nightclub: Tag:amenity=nightclub amenity=nursing_home: Tag:amenity=nursing home amenity=parking: Tag:amenity=parking + amenity=parking_entrance: Tag:amenity=parking entrance + amenity=parking_space: Tag:amenity=parking space amenity=pharmacy: Tag:amenity=pharmacy + amenity=photo_booth: Tag:amenity=photo booth amenity=place_of_worship: Tag:amenity=place of worship + amenity=planetarium: Tag:amenity=planetarium amenity=police: Tag:amenity=police amenity=post_box: Tag:amenity=post box amenity=post_office: Tag:amenity=post office amenity=prison: Tag:amenity=prison amenity=pub: Tag:amenity=pub + amenity=public_bath: Tag:amenity=public bath amenity=public_building: Tag:amenity=public building + amenity=ranger_station: Tag:amenity=ranger station amenity=recycling: Tag:amenity=recycling amenity=register_office: Tag:amenity=register office + amenity=rescue_box: Tag:amenity=rescue box amenity=restaurant: Tag:amenity=restaurant + amenity=retirement_home: Tag:amenity=retirement home amenity=sauna: Tag:amenity=sauna amenity=school: Tag:amenity=school + amenity=security_booth: Tag:amenity=security booth + amenity=shelter: Tag:amenity=shelter + amenity=shower: Tag:amenity=shower + amenity=social_centre: Tag:amenity=social centre + amenity=social_facility: Tag:amenity=social facility + amenity=spa: Tag:amenity=spa amenity=stripclub: Tag:amenity=stripclub amenity=studio: Tag:amenity=studio + amenity=swimming_pool: Tag:amenity=swimming pool + amenity=swingerclub: Tag:amenity=swingerclub amenity=taxi: Tag:amenity=taxi amenity=telephone: Tag:amenity=telephone amenity=theatre: Tag:amenity=theatre @@ -511,68 +1379,278 @@ en: amenity=waste_basket: Tag:amenity=waste basket amenity=waste_disposal: Tag:amenity=waste disposal amenity=waste_transfer_station: Tag:amenity=waste transfer station + amenity=water_point: Tag:amenity=water point amenity=watering_place: Tag:amenity=watering place - atm=no: Tag:atm=no + amenity=weighbridge: Tag:amenity=weighbridge atm=yes: Tag:atm=yes barrier=block: Tag:barrier=block barrier=bollard: Tag:barrier=bollard + barrier=border_control: Tag:barrier=border control + barrier=bus_trap: Tag:barrier=bus trap barrier=cattle_grid: Tag:barrier=cattle grid + barrier=chain: Tag:barrier=chain barrier=city_wall: Tag:barrier=city wall barrier=cycle_barrier: Tag:barrier=cycle barrier barrier=ditch: Tag:barrier=ditch + barrier=entrance: Tag:barrier=entrance barrier=fence: Tag:barrier=fence barrier=gate: Tag:barrier=gate + barrier=guard_rail: Tag:barrier=guard rail barrier=hedge: Tag:barrier=hedge barrier=horse_stile: Tag:barrier=horse stile barrier=kent_carriage_gap: Tag:barrier=kent carriage gap + barrier=kent_carriage_gate: Tag:barrier=kent carriage gate + barrier=kerb: Tag:barrier=kerb barrier=kissing_gate: Tag:barrier=kissing gate barrier=lift_gate: Tag:barrier=lift gate + barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier + barrier=ohm:military:wireObstacle: Tag:barrier=ohm:military:wireObstacle barrier=retaining_wall: Tag:barrier=retaining wall barrier=sally_port: Tag:barrier=sally port barrier=stile: Tag:barrier=stile + barrier=sump_buster: Tag:barrier=sump buster + barrier=swing_gate: Tag:barrier=swing gate barrier=toll_booth: Tag:barrier=toll booth barrier=turnstile: Tag:barrier=turnstile barrier=wall: Tag:barrier=wall + border_type=fishery: Tag:border type=fishery + border_type=harbour_limits: Tag:border type=harbour limits + boundary=aboriginal_lands: Tag:boundary=aboriginal lands boundary=administrative: Tag:boundary=administrative boundary=civil: Tag:boundary=civil + boundary=historic: Tag:boundary=historic + boundary=local_authority: Tag:boundary=local authority boundary=maritime: Tag:boundary=maritime boundary=national: Tag:boundary=national boundary=national_park: Tag:boundary=national park boundary=political: Tag:boundary=political + boundary=postal_code: Tag:boundary=postal code boundary=protected_area: Tag:boundary=protected area + boundary=regional_park: Tag:boundary=regional park + boundary=vice_county: Tag:boundary=vice county + bridge=bascule: Tag:bridge=bascule + bridge=beam: Tag:bridge=beam + bridge=drawbridge: Tag:bridge=drawbridge + bridge=lift: Tag:bridge=lift + bridge=opening: Tag:bridge=opening + bridge=pontoon: Tag:bridge=pontoon + bridge=suspension: Tag:bridge=suspension + bridge=transporter: Tag:bridge=transporter + bridge=viaduct: Tag:bridge=viaduct + building=apartments: Tag:building=apartments + building=barn: Tag:building=barn + building=bridge: Tag:building=bridge + building=bunker: Tag:building=bunker + building=cabin: Tag:building=cabin + building=cathedral: Tag:building=cathedral + building=chapel: Tag:building=chapel + building=church: Tag:building=church + building=civic: Tag:building=civic + building=commercial: Tag:building=commercial + building=construction: Tag:building=construction + building=cowshed: Tag:building=cowshed + building=detached: Tag:building=detached building=dormitory: Tag:building=dormitory building=entrance: Tag:building=entrance - building=parliament: Tag:building=parliament + building=farm: Tag:building=farm + building=farm_auxiliary: Tag:building=farm auxiliary + building=garage: Tag:building=garage + building=garages: Tag:building=garages + building=greenhouse: Tag:building=greenhouse + building=ground_station: Tag:building=ground station + building=hangar: Tag:building=hangar + building=hospital: Tag:building=hospital + building=hotel: Tag:building=hotel + building=house: Tag:building=house + building=houseboat: Tag:building=houseboat + building=hut: Tag:building=hut + building=industrial: Tag:building=industrial + building=manufacture: Tag:building=manufacture + building=mosque: Tag:building=mosque + building=office: Tag:building=office + building=public: Tag:building=public + building=residential: Tag:building=residential + building=retail: Tag:building=retail + building=roof: Tag:building=roof + building=school: Tag:building=school + building=shed: Tag:building=shed + building=stable: Tag:building=stable + building=static_caravan: Tag:building=static caravan + building=sty: Tag:building=sty + building=supermarket: Tag:building=supermarket + building=terrace: Tag:building=terrace + building=train_station: Tag:building=train station + building=transformer_tower: Tag:building=transformer tower + building=transportation: Tag:building=transportation + building=university: Tag:building=university + building=warehouse: Tag:building=warehouse bunker_type=munitions: Tag:bunker type=munitions bunker_type=pillbox: Tag:bunker type=pillbox + busway=lane: Tag:busway=lane + busway=opposite_lane: Tag:busway=opposite lane + cafe=time-cafe: Tag:cafe=time-cafe clothes=sports: Tag:clothes=sports - club-mate=yes: Tag:club-mate=yes + coastline:survey_quality=complete: Tag:coastline:survey quality=complete + coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate + craft=agricultural_engines: Tag:craft=agricultural engines + craft=basket_maker: Tag:craft=basket maker + craft=beekeeper: Tag:craft=beekeeper + craft=blacksmith: Tag:craft=blacksmith + craft=boatbuilder: Tag:craft=boatbuilder + craft=bookbinder: Tag:craft=bookbinder + craft=brewery: Tag:craft=brewery + craft=car_repair: Tag:craft=car repair + craft=carpenter: Tag:craft=carpenter + craft=carpet_layer: Tag:craft=carpet layer + craft=caterer: Tag:craft=caterer + craft=clockmaker: Tag:craft=clockmaker + craft=confectionery: Tag:craft=confectionery + craft=dressmaker: Tag:craft=dressmaker + craft=electrician: Tag:craft=electrician + craft=falles: Tag:craft=falles + craft=gardener: Tag:craft=gardener + craft=glaziery: Tag:craft=glaziery + craft=handicraft: Tag:craft=handicraft + craft=hvac: Tag:craft=hvac + craft=information_electronics: Tag:craft=information electronics + craft=insulation: Tag:craft=insulation + craft=jeweller: Tag:craft=jeweller + craft=key_cutter: Tag:craft=key cutter + craft=locksmith: Tag:craft=locksmith + craft=metal_construction: Tag:craft=metal construction + craft=optician: Tag:craft=optician + craft=painter: Tag:craft=painter + craft=parquet_layer: Tag:craft=parquet layer + craft=photographer: Tag:craft=photographer + craft=photographic_laboratory: Tag:craft=photographic laboratory + craft=plasterer: Tag:craft=plasterer + craft=plumber: Tag:craft=plumber + craft=pottery: Tag:craft=pottery + craft=rigger: Tag:craft=rigger + craft=roofer: Tag:craft=roofer + craft=saddler: Tag:craft=saddler + craft=sailmaker: Tag:craft=sailmaker + craft=sawmill: Tag:craft=sawmill + craft=scaffolder: Tag:craft=scaffolder + craft=sculptor: Tag:craft=sculptor + craft=shoemaker: Tag:craft=shoemaker + craft=stand_builder: Tag:craft=stand builder + craft=stonemason: Tag:craft=stonemason + craft=sun_protection: Tag:craft=sun protection + craft=sweep: Tag:craft=sweep + craft=tailor: Tag:craft=tailor + craft=tiler: Tag:craft=tiler + craft=tinsmith: Tag:craft=tinsmith + craft=upholsterer: Tag:craft=upholsterer + craft=watchmaker: Tag:craft=watchmaker + craft=window_construction: Tag:craft=window construction + crop=asparagus: Tag:crop=asparagus + crop=bananas: Tag:crop=bananas + crop=barley: Tag:crop=barley + crop=coffee: Tag:crop=coffee + crop=corn: Tag:crop=corn + crop=flowers: Tag:crop=flowers + crop=grape: Tag:crop=grape + crop=grass: Tag:crop=grass + crop=hay: Tag:crop=hay + crop=maize: Tag:crop=maize + crop=oats: Tag:crop=oats + crop=rape: Tag:crop=rape + crop=rice: Tag:crop=rice + crop=rye: Tag:crop=rye + crop=strawberry: Tag:crop=strawberry + crop=sugar: Tag:crop=sugar + crop=tea: Tag:crop=tea + crop=wheat: Tag:crop=wheat + cuisine=brazilian: Tag:cuisine=brazilian + cuisine=coffee_shop: Tag:cuisine=coffee shop + cycleway=asl: Tag:cycleway=asl cycleway=bike_box: Tag:cycleway=bike box + cycleway=share_busway: Tag:cycleway=share busway denomination=mormon: Tag:denomination=mormon + denomination=reformed: Tag:denomination=reformed + denotation=landmark: Tag:denotation=landmark emergency=ambulance_station: Tag:emergency=ambulance station + emergency=coast_guard: Tag:emergency=coast guard + emergency=defibrillator: Tag:emergency=defibrillator + emergency=fire_detection_system: Tag:emergency=fire detection system emergency=fire_extinguisher: Tag:emergency=fire extinguisher emergency=fire_flapper: Tag:emergency=fire flapper emergency=fire_hose: Tag:emergency=fire hose emergency=fire_hydrant: Tag:emergency=fire hydrant + emergency=fire_water_pond: Tag:emergency=fire water pond + emergency=life_ring: Tag:emergency=life ring + emergency=lifeboat_station: Tag:emergency=lifeboat station + emergency=marine_refuge: Tag:emergency=marine refuge emergency=phone: Tag:emergency=phone emergency=ses_station: Tag:emergency=ses station emergency=siren: Tag:emergency=siren + emergency=suction_point: Tag:emergency=suction point + emergency=water_rescue_station: Tag:emergency=water rescue station + emergency=water_tank: Tag:emergency=water tank + emergency_service=technical: Tag:emergency service=technical + esperanto=esperanto: Tag:esperanto=esperanto + estuary=yes: Tag:estuary=yes + fast_food=cafeteria: Tag:fast food=cafeteria + footway=crossing: Tag:footway=crossing + footway=sidewalk: Tag:footway=sidewalk + generator:method=fission: Tag:generator:method=fission + generator:method=fusion: Tag:generator:method=fusion + generator:plant=intermediate: Tag:generator:plant=intermediate + generator:plant=output: Tag:generator:plant=output + generator:source=hydro: Tag:generator:source=hydro + generator:source=nuclear: Tag:generator:source=nuclear + generator:source=solar: Tag:generator:source=solar + generator:source=wind: Tag:generator:source=wind + geological=outcrop: Tag:geological=outcrop geological=palaeontological_site: Tag:geological=palaeontological site + harbour:category=RoRo: Tag:harbour:category=RoRo + harbour:category=bulk: Tag:harbour:category=bulk + harbour:category=container: Tag:harbour:category=container + harbour:category=ferry: Tag:harbour:category=ferry + harbour:category=fishing: Tag:harbour:category=fishing + harbour:category=general: Tag:harbour:category=general + harbour:category=industrial: Tag:harbour:category=industrial + harbour:category=marina: Tag:harbour:category=marina + harbour:category=military: Tag:harbour:category=military + harbour:category=oil_platform: Tag:harbour:category=oil platform + harbour:category=passenger: Tag:harbour:category=passenger + harbour:category=seaport: Tag:harbour:category=seaport + harbour:category=shipyard: Tag:harbour:category=shipyard + harbour:category=tanker: Tag:harbour:category=tanker + harbour:category=tourism: Tag:harbour:category=tourism + harbour:category=yacht: Tag:harbour:category=yacht + harbour=dolphin: Tag:harbour=dolphin + harbour=drinking_water: Tag:harbour=drinking water + harbour=harbour_master: Tag:harbour=harbour master + harbour=jetty: Tag:harbour=jetty + harbour=slipway: Tag:harbour=slipway + harbour=yes: Tag:harbour=yes + hazard_prone=yes: Tag:hazard prone=yes + hazard_type=avalanche: Tag:hazard type=avalanche + hazard_type=flood: Tag:hazard type=flood + hazard_type=landslide: Tag:hazard type=landslide highway=bridleway: Tag:highway=bridleway highway=bus_guideway: Tag:highway=bus guideway highway=bus_stop: Tag:highway=bus stop highway=byway: Tag:highway=byway highway=crossing: Tag:highway=crossing highway=cycleway: Tag:highway=cycleway + highway=elevator: Tag:highway=elevator highway=emergency_access_point: Tag:highway=emergency access point + highway=escape: Tag:highway=escape highway=footway: Tag:highway=footway highway=ford: Tag:highway=ford highway=give_way: Tag:highway=give way + highway=incline: Tag:highway=incline + highway=lane: Tag:highway=lane highway=living_street: Tag:highway=living street + highway=milestone: Tag:highway=milestone highway=mini_roundabout: Tag:highway=mini roundabout highway=motorway: Tag:highway=motorway highway=motorway_junction: Tag:highway=motorway junction highway=motorway_link: Tag:highway=motorway link + highway=ohm:military:Trench: Tag:highway=ohm:military:Trench highway=passing_place: Tag:highway=passing place highway=path: Tag:highway=path highway=pedestrian: Tag:highway=pedestrian @@ -592,35 +1670,87 @@ en: highway=street_lamp: Tag:highway=street lamp highway=tertiary: Tag:highway=tertiary highway=track: Tag:highway=track + highway=traffic_mirror: Tag:highway=traffic mirror highway=traffic_signals: Tag:highway=traffic signals highway=trail: Tag:highway=trail highway=trunk: Tag:highway=trunk highway=turning_circle: Tag:highway=turning circle + highway=turning_loop: Tag:highway=turning loop highway=unclassified: Tag:highway=unclassified + highway=unsurfaced: Tag:highway=unsurfaced + highway=via_ferrata: Tag:highway=via ferrata + historic=aircraft: Tag:historic=aircraft historic=archaeological_site: Tag:historic=archaeological site historic=battlefield: Tag:historic=battlefield + historic=boundary_stone: Tag:historic=boundary stone + historic=cannon: Tag:historic=cannon historic=castle: Tag:historic=castle + historic=city_gate: Tag:historic=city gate + historic=citywalls: Tag:historic=citywalls + historic=farm: Tag:historic=farm + historic=fort: Tag:historic=fort + historic=gallows: Tag:historic=gallows historic=manor: Tag:historic=manor historic=memorial: Tag:historic=memorial + historic=milestone: Tag:historic=milestone + historic=mine: Tag:historic=mine historic=monastery: Tag:historic=monastery historic=monument: Tag:historic=monument + historic=pa: Tag:historic=pa historic=paleontological_site: Tag:historic=paleontological site + historic=pillory: Tag:historic=pillory historic=ruins: Tag:historic=ruins + historic=rune_stone: Tag:historic=rune stone + historic=ship: Tag:historic=ship + historic=stone: Tag:historic=stone + historic=tree_shrine: Tag:historic=tree shrine historic=wayside_cross: Tag:historic=wayside cross historic=wayside_shrine: Tag:historic=wayside shrine historic=wreck: Tag:historic=wreck hunting=raised_hide: Tag:hunting=raised hide + industrial=auto_wrecker: Tag:industrial=auto wrecker + industrial=well_cluster: Tag:industrial=well cluster information=guidepost: Tag:information=guidepost + information=tactile_model: Tag:information=tactile model + junction=crossing: Tag:junction=crossing + junction=filter: Tag:junction=filter junction=roundabout: Tag:junction=roundabout + landform=esker: Tag:landform=esker + landform=raised_beach: Tag:landform=raised beach + landmark=beacon: Tag:landmark=beacon + landmark=cairn: Tag:landmark=cairn + landmark=cemetery: Tag:landmark=cemetery + landmark=chimney: Tag:landmark=chimney + landmark=cross: Tag:landmark=cross + landmark=dish_aerial: Tag:landmark=dish aerial + landmark=flare_stack: Tag:landmark=flare stack + landmark=large_rock: Tag:landmark=large rock + landmark=mast: Tag:landmark=mast + landmark=memorial_plaque: Tag:landmark=memorial plaque + landmark=monument: Tag:landmark=monument + landmark=obelisk: Tag:landmark=obelisk + landmark=pillar: Tag:landmark=pillar + landmark=radar_scanner: Tag:landmark=radar scanner + landmark=rock_pinnacle: Tag:landmark=rock pinnacle + landmark=spire: Tag:landmark=spire + landmark=tower: Tag:landmark=tower + landmark=windmill: Tag:landmark=windmill + landmark=windmotor: Tag:landmark=windmotor + landmark=windsock: Tag:landmark=windsock + landuse=agriculture: Tag:landuse=agriculture landuse=allotments: Tag:landuse=allotments + landuse=aquaculture: Tag:landuse=aquaculture landuse=basin: Tag:landuse=basin landuse=brownfield: Tag:landuse=brownfield landuse=cemetery: Tag:landuse=cemetery + landuse=churchyard: Tag:landuse=churchyard landuse=commercial: Tag:landuse=commercial landuse=construction: Tag:landuse=construction + landuse=depot: Tag:landuse=depot landuse=farm: Tag:landuse=farm - landuse=farmland: Tag:landuse=farmland landuse=farmyard: Tag:landuse=farmyard + landuse=field: Tag:landuse=field + landuse=fishfarm: Tag:landuse=fishfarm landuse=forest: Tag:landuse=forest landuse=garages: Tag:landuse=garages landuse=grass: Tag:landuse=grass @@ -630,9 +1760,13 @@ en: landuse=landfill: Tag:landuse=landfill landuse=meadow: Tag:landuse=meadow landuse=military: Tag:landuse=military + landuse=observatory: Tag:landuse=observatory landuse=orchard: Tag:landuse=orchard landuse=peat_cutting: Tag:landuse=peat cutting + landuse=plant_nursery: Tag:landuse=plant nursery + landuse=plantation: Tag:landuse=plantation landuse=pond: Tag:landuse=pond + landuse=prison: Tag:landuse=prison landuse=quarry: Tag:landuse=quarry landuse=railway: Tag:landuse=railway landuse=recreation_ground: Tag:landuse=recreation ground @@ -641,55 +1775,99 @@ en: landuse=retail: Tag:landuse=retail landuse=salt_pond: Tag:landuse=salt pond landuse=street: Tag:landuse=street + landuse=traffic_island: Tag:landuse=traffic island + landuse=utility: Tag:landuse=utility landuse=village_green: Tag:landuse=village green landuse=vineyard: Tag:landuse=vineyard + landuse=well: Tag:landuse=well + landuse=wellsite: Tag:landuse=wellsite + lane=buffered: Tag:lane=buffered + leisure=adult_gaming_centre: Tag:leisure=adult gaming centre + leisure=amusement_arcade: Tag:leisure=amusement arcade + leisure=bathing_place: Tag:leisure=bathing place + leisure=bbq: Tag:leisure=bbq leisure=beach_resort: Tag:leisure=beach resort + leisure=bird_hide: Tag:leisure=bird hide leisure=common: Tag:leisure=common leisure=dance: Tag:leisure=dance leisure=dog_park: Tag:leisure=dog park + leisure=firepit: Tag:leisure=firepit leisure=fishing: Tag:leisure=fishing + leisure=fitness_station: Tag:leisure=fitness station leisure=garden: Tag:leisure=garden leisure=golf_course: Tag:leisure=golf course leisure=hackerspace: Tag:leisure=hackerspace leisure=ice_rink: Tag:leisure=ice rink + leisure=landscape_reserve: Tag:leisure=landscape reserve leisure=marina: Tag:leisure=marina leisure=miniature_golf: Tag:leisure=miniature golf leisure=nature_reserve: Tag:leisure=nature reserve leisure=paddling_pool: Tag:leisure=paddling pool leisure=park: Tag:leisure=park + leisure=picnic: Tag:leisure=picnic + leisure=picnic_site: Tag:leisure=picnic site leisure=picnic_table: Tag:leisure=picnic table leisure=pitch: Tag:leisure=pitch leisure=playground: Tag:leisure=playground + leisure=red_light_district: Tag:leisure=red light district + leisure=sailing_club: Tag:leisure=sailing club leisure=ski_playground: Tag:leisure=ski playground leisure=slipway: Tag:leisure=slipway leisure=sports_centre: Tag:leisure=sports centre + leisure=stadium: Tag:leisure=stadium + leisure=swimming_pool: Tag:leisure=swimming pool leisure=track: Tag:leisure=track leisure=video_arcade: Tag:leisure=video arcade leisure=water_park: Tag:leisure=water park + leisure=wildlife_hide: Tag:leisure=wildlife hide + level_crossing=uncontrolled: Tag:level crossing=uncontrolled + lines=phone: Tag:lines=phone man_made=adit: Tag:man made=adit + man_made=antenna: Tag:man made=antenna man_made=archimedes_screw: Tag:man made=archimedes screw man_made=beacon: Tag:man made=beacon + man_made=breakwater: Tag:man made=breakwater + man_made=bridge: Tag:man made=bridge + man_made=bunker_silo: Tag:man made=bunker silo + man_made=cairn: Tag:man made=cairn man_made=chimney: Tag:man made=chimney + man_made=communications_tower: Tag:man made=communications tower man_made=compass_rose: Tag:man made=compass rose man_made=crane: Tag:man made=crane + man_made=cross: Tag:man made=cross man_made=cutline: Tag:man made=cutline man_made=dyke: Tag:man made=dyke - man_made=fish_passage: Tag:man made=fish passage + man_made=embankment: Tag:man made=embankment + man_made=flagpole: Tag:man made=flagpole man_made=flare: Tag:man made=flare + man_made=floating_storage: Tag:man made=floating storage + man_made=gasometer: Tag:man made=gasometer + man_made=goods_conveyor: Tag:man made=goods conveyor man_made=ground_station: Tag:man made=ground station man_made=groyne: Tag:man made=groyne man_made=jetty: Tag:man made=jetty + man_made=kiln: Tag:man made=kiln man_made=lighthouse: Tag:man made=lighthouse + man_made=mast: Tag:man made=mast man_made=mineshaft: Tag:man made=mineshaft man_made=monitoring_station: Tag:man made=monitoring station + man_made=offshore_platform: Tag:man made=offshore platform + man_made=oil_well: Tag:man made=oil well + man_made=petroleum_well: Tag:man made=petroleum well man_made=pier: Tag:man made=pier + man_made=pillar: Tag:man made=pillar man_made=pipeline: Tag:man made=pipeline man_made=pumping_rig: Tag:man made=pumping rig man_made=reservoir_covered: Tag:man made=reservoir covered + man_made=school_sentry: Tag:man made=school sentry + man_made=silo: Tag:man made=silo + man_made=snow_fence: Tag:man made=snow fence man_made=storage_tank: Tag:man made=storage tank + man_made=submarine_cable: Tag:man made=submarine cable man_made=surveillance: Tag:man made=surveillance man_made=survey_point: Tag:man made=survey point man_made=tower: Tag:man made=tower + man_made=utility_pole: Tag:man made=utility pole man_made=wastewater_plant: Tag:man made=wastewater plant man_made=water_tower: Tag:man made=water tower man_made=water_well: Tag:man made=water well @@ -697,51 +1875,107 @@ en: man_made=watermill: Tag:man made=watermill man_made=well: Tag:man made=well man_made=wildlife_crossing: Tag:man made=wildlife crossing + man_made=wildlife_opening: Tag:man made=wildlife opening man_made=windmill: Tag:man made=windmill man_made=windpump: Tag:man made=windpump man_made=works: Tag:man made=works + medical=witchdoctor: Tag:medical=witchdoctor microbrewery=yes: Tag:microbrewery=yes military=airfield: Tag:military=airfield + military=barracks: Tag:military=barracks military=bunker: Tag:military=bunker + military=checkpoint: Tag:military=checkpoint + military=danger_area: Tag:military=danger area + military=exclusion_zone: Tag:military=exclusion zone military=naval_base: Tag:military=naval base + military=obstacle_course: Tag:military=obstacle course + military=range: Tag:military=range + military=training_area: Tag:military=training area + mooring=commercial: Tag:mooring=commercial + mooring=cruise: Tag:mooring=cruise + mooring=declaration: Tag:mooring=declaration + mooring=ferry: Tag:mooring=ferry + mooring=guest: Tag:mooring=guest + mooring=monobuoy: Tag:mooring=monobuoy + mooring=ring: Tag:mooring=ring + mooring=sbm: Tag:mooring=sbm + mooring=spm: Tag:mooring=spm + mooring=visitor: Tag:mooring=visitor + mooring=yes: Tag:mooring=yes + natural=arete: Tag:natural=arete + natural=avalanche_dam: Tag:natural=avalanche dam + natural=bare_rock: Tag:natural=bare rock natural=bay: Tag:natural=bay natural=beach: Tag:natural=beach + natural=bedrock: Tag:natural=bedrock + natural=breaker: Tag:natural=breaker + natural=cape: Tag:natural=cape natural=cave_entrance: Tag:natural=cave entrance natural=cliff: Tag:natural=cliff natural=coastline: Tag:natural=coastline + natural=continental_shelf: Tag:natural=continental shelf + natural=desert: Tag:natural=desert natural=dune: Tag:natural=dune + natural=esker: Tag:natural=esker natural=fell: Tag:natural=fell natural=glacier: Tag:natural=glacier + natural=grassland: Tag:natural=grassland natural=heath: Tag:natural=heath natural=lake: Tag:natural=lake natural=land: Tag:natural=land + natural=landform: Tag:natural=landform + natural=lava: Tag:natural=lava + natural=moor: Tag:natural=moor + natural=moraine: Tag:natural=moraine + natural=mud: Tag:natural=mud natural=peak: Tag:natural=peak + natural=reef: Tag:natural=reef + natural=ridge: Tag:natural=ridge natural=rock: Tag:natural=rock + natural=saddle: Tag:natural=saddle + natural=sand: Tag:natural=sand natural=scree: Tag:natural=scree natural=scrub: Tag:natural=scrub + natural=shoal: Tag:natural=shoal + natural=sinkhole: Tag:natural=sinkhole natural=spring: Tag:natural=spring natural=stone: Tag:natural=stone + natural=tidal: Tag:natural=tidal natural=tree: Tag:natural=tree + natural=tree_row: Tag:natural=tree row + natural=tundra: Tag:natural=tundra natural=volcano: Tag:natural=volcano natural=water: Tag:natural=water natural=wetland: Tag:natural=wetland natural=wood: Tag:natural=wood + odbl=clean: Tag:odbl=clean office=accountant: Tag:office=accountant + office=administrative: Tag:office=administrative office=architect: Tag:office=architect + office=camping: Tag:office=camping office=company: Tag:office=company + office=educational_institution: Tag:office=educational institution office=employment_agency: Tag:office=employment agency office=estate_agent: Tag:office=estate agent + office=foundation: Tag:office=foundation office=government: Tag:office=government office=insurance: Tag:office=insurance + office=it: Tag:office=it office=lawyer: Tag:office=lawyer office=newspaper: Tag:office=newspaper office=ngo: Tag:office=ngo + office=political_party: Tag:office=political party office=quango: Tag:office=quango office=research: Tag:office=research + office=surveyor: Tag:office=surveyor office=telecommunication: Tag:office=telecommunication office=travel_agent: Tag:office=travel agent + pilotage=boarding_point: Tag:pilotage=boarding point + pilotage=office: Tag:pilotage=office pipeline=marker: Tag:pipeline=marker pipeline=valve: Tag:pipeline=valve + place=allotments: Tag:place=allotments + place=archipelago: Tag:place=archipelago place=city: Tag:place=city place=continent: Tag:place=continent place=country: Tag:place=country @@ -752,78 +1986,409 @@ en: place=islet: Tag:place=islet place=isolated_dwelling: Tag:place=isolated dwelling place=locality: Tag:place=locality + place=neighbourhood: Tag:place=neighbourhood + place=ocean: Tag:place=ocean place=region: Tag:place=region + place=sea: Tag:place=sea place=state: Tag:place=state place=suburb: Tag:place=suburb place=town: Tag:place=town place=village: Tag:place=village + placement=right_of:1: Tag:placement=right of:1 + placement=transition: Tag:placement=transition + power=cable: Tag:power=cable power=cable_distribution_cabinet: Tag:power=cable distribution cabinet power=generator: Tag:power=generator + power=heliostat: Tag:power=heliostat power=line: Tag:power=line power=minor_line: Tag:power=minor line + power=plant: Tag:power=plant power=pole: Tag:power=pole power=station: Tag:power=station power=sub_station: Tag:power=sub station + power=substation: Tag:power=substation power=tower: Tag:power=tower + power=transformer: Tag:power=transformer + power=underground_cable: Tag:power=underground cable public_transport=pay_scale_area: Tag:public transport=pay scale area + public_transport=platform: Tag:public transport=platform + public_transport=station: Tag:public transport=station + public_transport=stop_area: Tag:public transport=stop area + public_transport=stop_position: Tag:public transport=stop position + pump=manual: Tag:pump=manual + pump=no: Tag:pump=no + pump=powered: Tag:pump=powered + radar_transponder=ramark: Tag:radar transponder=ramark + radio_transponder:category=aeronautical: Tag:radio transponder:category=aeronautical + radio_transponder:category=circular: Tag:radio transponder:category=circular + radio_transponder:category=coast_radio: Tag:radio transponder:category=coast radio + radio_transponder:category=consol: Tag:radio transponder:category=consol + radio_transponder:category=direction_finding: Tag:radio transponder:category=direction + finding + radio_transponder:category=directional: Tag:radio transponder:category=directional + radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating + pattern railway=PRT: Tag:railway=PRT + railway=abandoned: Tag:railway=abandoned + railway=buffer_stop: Tag:railway=buffer stop railway=crossing: Tag:railway=crossing + railway=derail: Tag:railway=derail + railway=disused: Tag:railway=disused + railway=funicular: Tag:railway=funicular railway=halt: Tag:railway=halt railway=level_crossing: Tag:railway=level crossing + railway=light_rail: Tag:railway=light rail + railway=milestone: Tag:railway=milestone railway=miniature: Tag:railway=miniature railway=monorail: Tag:railway=monorail + railway=narrow_gauge: Tag:railway=narrow gauge railway=platform: Tag:railway=platform + railway=preserved: Tag:railway=preserved railway=rail: Tag:railway=rail + railway=roundhouse: Tag:railway=roundhouse railway=station: Tag:railway=station railway=stop: Tag:railway=stop railway=subway: Tag:railway=subway railway=subway_entrance: Tag:railway=subway entrance + railway=switch: Tag:railway=switch railway=tram: Tag:railway=tram railway=tram_stop: Tag:railway=tram stop railway=turntable: Tag:railway=turntable religion=pagan: Tag:religion=pagan + resource=aggregate: Tag:resource=aggregate + resource=gravel: Tag:resource=gravel + resource=sand: Tag:resource=sand route=bus: Tag:route=bus route=canal: Tag:route=canal route=detour: Tag:route=detour route=ferry: Tag:route=ferry + route=fitness_trail: Tag:route=fitness trail + route=monorail: Tag:route=monorail + route=pipeline: Tag:route=pipeline route=railway: Tag:route=railway route=road: Tag:route=road route=share_taxi: Tag:route=share taxi route=ski: Tag:route=ski + route=subway: Tag:route=subway route=train: Tag:route=train route=tram: Tag:route=tram route=trolleybus: Tag:route=trolleybus + sea_mark=day_beacon: Tag:sea mark=day beacon + seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour + pattern=horizontal + seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower + seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated + danger:colour=black;red;black + seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated + danger:colour pattern=horizontal + seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower + seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green + seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green + seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white + seamark:beacon_lateral:colour=red: Tag:seamark:beacon lateral:colour=red + seamark:beacon_lateral:colour=red;green;red: Tag:seamark:beacon lateral:colour=red;green;red + seamark:beacon_lateral:colour=red;white;red;white: Tag:seamark:beacon lateral:colour=red;white;red;white + seamark:beacon_lateral:colour_pattern=horizontal: Tag:seamark:beacon lateral:colour + pattern=horizontal + seamark:beacon_lateral:shape=perch: Tag:seamark:beacon lateral:shape=perch + seamark:beacon_lateral:shape=pole: Tag:seamark:beacon lateral:shape=pole + seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower + seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy + seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white + seamark:beacon_safe_water:colour_pattern=vertical: Tag:seamark:beacon safe water:colour + pattern=vertical + seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower + seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable + seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice + seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing + seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning + seamark:beacon_special_purpose:colour=black: Tag:seamark:beacon special purpose:colour=black + seamark:beacon_special_purpose:colour=blue: Tag:seamark:beacon special purpose:colour=blue + seamark:beacon_special_purpose:colour=green: Tag:seamark:beacon special purpose:colour=green + seamark:beacon_special_purpose:colour=grey: Tag:seamark:beacon special purpose:colour=grey + seamark:beacon_special_purpose:colour=orange: Tag:seamark:beacon special purpose:colour=orange + seamark:beacon_special_purpose:colour=red: Tag:seamark:beacon special purpose:colour=red + seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white + seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow + seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn + seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole + seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower + seamark:buoy_cardinal:colour_pattern=horizontal: Tag:seamark:buoy cardinal:colour + pattern=horizontal + seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can + seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical + seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar + seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar + seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical + seamark:buoy_isolated_danger:colour=black;red;black: Tag:seamark:buoy isolated + danger:colour=black;red;black + seamark:buoy_isolated_danger:colour_pattern=horizontal: Tag:seamark:buoy isolated + danger:colour pattern=horizontal + seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can + seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical + seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar + seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar + seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical + seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green + seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green + seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white + seamark:buoy_lateral:colour=red: Tag:seamark:buoy lateral:colour=red + seamark:buoy_lateral:colour=red;green;red: Tag:seamark:buoy lateral:colour=red;green;red + seamark:buoy_lateral:colour=red;white;red;white: Tag:seamark:buoy lateral:colour=red;white;red;white + seamark:buoy_lateral:colour_pattern=horizontal: Tag:seamark:buoy lateral:colour + pattern=horizontal + seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can + seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical + seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar + seamark:buoy_lateral:shape=spar: Tag:seamark:buoy lateral:shape=spar + seamark:buoy_lateral:shape=spherical: Tag:seamark:buoy lateral:shape=spherical + seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white + seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour + pattern=vertical + seamark:buoy_safe_water:shape=can: Tag:seamark:buoy safe water:shape=can + seamark:buoy_safe_water:shape=conical: Tag:seamark:buoy safe water:shape=conical + seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar + seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar + seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical + seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas + seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing + seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black + seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue + seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green + seamark:buoy_special_purpose:colour=orange: Tag:seamark:buoy special purpose:colour=orange + seamark:buoy_special_purpose:colour=red: Tag:seamark:buoy special purpose:colour=red + seamark:buoy_special_purpose:colour=white: Tag:seamark:buoy special purpose:colour=white + seamark:buoy_special_purpose:colour=yellow: Tag:seamark:buoy special purpose:colour=yellow + seamark:buoy_special_purpose:colour_pattern=diagonal: Tag:seamark:buoy special + purpose:colour pattern=diagonal + seamark:buoy_special_purpose:colour_pattern=horizontal: Tag:seamark:buoy special + purpose:colour pattern=horizontal + seamark:buoy_special_purpose:colour_pattern=vertical: Tag:seamark:buoy special + purpose:colour pattern=vertical + seamark:buoy_special_purpose:shape=barrel: Tag:seamark:buoy special purpose:shape=barrel + seamark:buoy_special_purpose:shape=can: Tag:seamark:buoy special purpose:shape=can + seamark:buoy_special_purpose:shape=conical: Tag:seamark:buoy special purpose:shape=conical + seamark:buoy_special_purpose:shape=pillar: Tag:seamark:buoy special purpose:shape=pillar + seamark:buoy_special_purpose:shape=spar: Tag:seamark:buoy special purpose:shape=spar + seamark:buoy_special_purpose:shape=spherical: Tag:seamark:buoy special purpose:shape=spherical + seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy + seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power + seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone + seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous + seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board + seamark:distance_mark:category=not_installed: Tag:seamark:distance mark:category=not + installed + seamark:fog_signal:category=bell: Tag:seamark:fog signal:category=bell + seamark:fog_signal:category=diaphone: Tag:seamark:fog signal:category=diaphone + seamark:fog_signal:category=explosive: Tag:seamark:fog signal:category=explosive + seamark:fog_signal:category=gong: Tag:seamark:fog signal:category=gong + seamark:fog_signal:category=gun: Tag:seamark:fog signal:category=gun + seamark:fog_signal:category=horn: Tag:seamark:fog signal:category=horn + seamark:fog_signal:category=nautophone: Tag:seamark:fog signal:category=nautophone + seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren + seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle + seamark:fog_signal:status=wave_activated: Tag:seamark:fog signal:status=wave activated + seamark:fog_signal=yes: Tag:seamark:fog signal=yes + seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn + seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery + seamark:landmark:category=chimney: Tag:seamark:landmark:category=chimney + seamark:landmark:category=column: Tag:seamark:landmark:category=column + seamark:landmark:category=cross: Tag:seamark:landmark:category=cross + seamark:landmark:category=dish_aerial: Tag:seamark:landmark:category=dish aerial + seamark:landmark:category=dome: Tag:seamark:landmark:category=dome + seamark:landmark:category=flagstaff: Tag:seamark:landmark:category=flagstaff + seamark:landmark:category=flare_stack: Tag:seamark:landmark:category=flare stack + seamark:landmark:category=mast: Tag:seamark:landmark:category=mast + seamark:landmark:category=memorial: Tag:seamark:landmark:category=memorial + seamark:landmark:category=minaret: Tag:seamark:landmark:category=minaret + seamark:landmark:category=monument: Tag:seamark:landmark:category=monument + seamark:landmark:category=obelisk: Tag:seamark:landmark:category=obelisk + seamark:landmark:category=radar_scanner: Tag:seamark:landmark:category=radar scanner + seamark:landmark:category=spire: Tag:seamark:landmark:category=spire + seamark:landmark:category=statue: Tag:seamark:landmark:category=statue + seamark:landmark:category=tower: Tag:seamark:landmark:category=tower + seamark:landmark:category=water_tower: Tag:seamark:landmark:category=water tower + seamark:landmark:category=windmill: Tag:seamark:landmark:category=windmill + seamark:landmark:category=windmotor: Tag:seamark:landmark:category=windmotor + seamark:landmark:category=windsock: Tag:seamark:landmark:category=windsock + seamark:landmark:conspicuity=conspicuous: Tag:seamark:landmark:conspicuity=conspicuous + seamark:landmark:function=buddhist_temple: Tag:seamark:landmark:function=buddhist + temple + seamark:landmark:function=chapel: Tag:seamark:landmark:function=chapel + seamark:landmark:function=church: Tag:seamark:landmark:function=church + seamark:landmark:function=marabout: Tag:seamark:landmark:function=marabout + seamark:landmark:function=mosque: Tag:seamark:landmark:function=mosque + seamark:landmark:function=pagoda: Tag:seamark:landmark:function=pagoda + seamark:landmark:function=shinto_shrine: Tag:seamark:landmark:function=shinto + shrine + seamark:landmark:function=temple: Tag:seamark:landmark:function=temple + seamark:light:category=aero: Tag:seamark:light:category=aero + seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction + seamark:light:category=directional: Tag:seamark:light:category=directional + seamark:light:category=floodlight: Tag:seamark:light:category=floodlight + seamark:light:category=fog_detector: Tag:seamark:light:category=fog detector + seamark:light:category=front: Tag:seamark:light:category=front + seamark:light:category=lower: Tag:seamark:light:category=lower + seamark:light:category=moire: Tag:seamark:light:category=moire + seamark:light:category=rear: Tag:seamark:light:category=rear + seamark:light:category=striplight: Tag:seamark:light:category=striplight + seamark:light:category=subsidiary: Tag:seamark:light:category=subsidiary + seamark:light:category=upper: Tag:seamark:light:category=upper + seamark:light:exhibition=day: Tag:seamark:light:exhibition=day + seamark:light:exhibition=fog: Tag:seamark:light:exhibition=fog + seamark:light:exhibition=on_demand: Tag:seamark:light:exhibition=on demand + seamark:light:status=extinguished: Tag:seamark:light:status=extinguished + seamark:light:status=private: Tag:seamark:light:status=private + seamark:light:status=temporary: Tag:seamark:light:status=temporary + seamark:light:status=unreliable: Tag:seamark:light:status=unreliable + seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified + seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured + seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified + seamark:mooring:category=wall: Tag:seamark:mooring:category=wall + seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom + seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon + seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark + seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka + seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial + broadcast + seamark:radio_station:category=public_communication: Tag:seamark:radio station:category=public + communication + seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time + signal + seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological + reserve + seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul + ground + seamark:restricted_area:category=military: Tag:seamark:restricted area:category=military + seamark:restricted_area:category=nature_reserve: Tag:seamark:restricted area:category=nature + reserve + seamark:restricted_area:category=no_wake: Tag:seamark:restricted area:category=no + wake + seamark:restricted_area:category=noise_limit: Tag:seamark:restricted area:category=noise + limit + seamark:restricted_area:restriction=berthing_prohibited: Tag:seamark:restricted + area:restriction=berthing prohibited + seamark:restricted_area:restriction=berthing_restricted: Tag:seamark:restricted + area:restriction=berthing restricted + seamark:restricted_area:restriction=entry_prohibited: Tag:seamark:restricted area:restriction=entry + prohibited + seamark:restricted_area:restriction=no_anchoring: Tag:seamark:restricted area:restriction=no + anchoring + seamark:restricted_area:restriction=no_boating: Tag:seamark:restricted area:restriction=no + boating + seamark:restricted_area:restriction=no_diving: Tag:seamark:restricted area:restriction=no + diving + seamark:restricted_area:restriction=no_entry: Tag:seamark:restricted area:restriction=no + entry + seamark:restricted_area:restriction=no_fishing: Tag:seamark:restricted area:restriction=no + fishing + seamark:restricted_area:restriction=no_wake: Tag:seamark:restricted area:restriction=no + wake + seamark:restricted_area:restriction=overtaking_prohibited: Tag:seamark:restricted + area:restriction=overtaking prohibited + seamark:restricted_area:restriction=passing_or_overtaking_prohibited: Tag:seamark:restricted + area:restriction=passing or overtaking prohibited + seamark:restricted_area:restriction=restricted_fairway_depth: Tag:seamark:restricted + area:restriction=restricted fairway depth + seamark:restricted_area:restriction=restricted_speed: Tag:seamark:restricted area:restriction=restricted + speed + seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted + area:restriction=turning prohibited + seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat + hoist + seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard + seamark:small_craft_facility:category=chandler: Tag:seamark:small craft facility:category=chandler + seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity + seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel + station + seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette + seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out + seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers + seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway + seamark:small_craft_facility:category=toilets: Tag:seamark:small craft facility:category=toilets + seamark:small_craft_facility:category=visitor_berth: Tag:seamark:small craft facility:category=visitor + berth + seamark:small_craft_facility:category=water: Tag:seamark:small craft facility:category=water + seamark:topmark:colour=black: Tag:seamark:topmark:colour=black + seamark:topmark:colour=green: Tag:seamark:topmark:colour=green + seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey + seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange + seamark:topmark:colour=red: Tag:seamark:topmark:colour=red + seamark:topmark:colour=white: Tag:seamark:topmark:colour=white + seamark:topmark:colour=yellow: Tag:seamark:topmark:colour=yellow + seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones + base together + seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down + seamark:topmark:shape=2_cones_point_together: Tag:seamark:topmark:shape=2 cones + point together + seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up + seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres + seamark:topmark:shape=board: Tag:seamark:topmark:shape=board + seamark:topmark:shape=cone: Tag:seamark:topmark:shape=cone + seamark:topmark:shape=cone,_point_down: Tag:seamark:topmark:shape=cone, point + down + seamark:topmark:shape=cone,_point_up: Tag:seamark:topmark:shape=cone, point up + seamark:topmark:shape=cylinder: Tag:seamark:topmark:shape=cylinder + seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond + seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag + seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle + seamark:topmark:shape=rhombus: Tag:seamark:topmark:shape=rhombus + seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere + seamark:topmark:shape=square: Tag:seamark:topmark:shape=square + seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross + seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape + seamark=anchorage: Tag:seamark=anchorage + seamark=beacon: Tag:seamark=beacon + seamark=buoy: Tag:seamark=buoy + seamark=lighthouse: Tag:seamark=lighthouse + segregated=no: Tag:segregated=no + segregated=yes: Tag:segregated=yes service=alley: Tag:service=alley service=drive-through: Tag:service=drive-through service=driveway: Tag:service=driveway service=emergency_access: Tag:service=emergency access service=parking_aisle: Tag:service=parking aisle + service=parts: Tag:service=parts service=siding: Tag:service=siding service=spur: Tag:service=spur service=yard: Tag:service=yard + shelter_type=basic_hut: Tag:shelter type=basic hut + shelter_type=lean_to: Tag:shelter type=lean to shop=SpotColor: Tag:shop=SpotColor shop=alcohol: Tag:shop=alcohol + shop=anime: Tag:shop=anime + shop=antiques: Tag:shop=antiques shop=art: Tag:shop=art + shop=auto_parts: Tag:shop=auto parts + shop=baby_goods: Tag:shop=baby goods shop=bakery: Tag:shop=bakery + shop=bathroom_furnishing: Tag:shop=bathroom furnishing shop=beauty: Tag:shop=beauty shop=bed: Tag:shop=bed + shop=betting: Tag:shop=betting shop=beverages: Tag:shop=beverages shop=bicycle: Tag:shop=bicycle + shop=bookmaker: Tag:shop=bookmaker shop=books: Tag:shop=books shop=boutique: Tag:shop=boutique shop=butcher: Tag:shop=butcher + shop=canoe_hire: Tag:shop=canoe hire shop=car: Tag:shop=car + shop=car_bodyshop: Tag:shop=car bodyshop + shop=car_parts: Tag:shop=car parts shop=car_repair: Tag:shop=car repair - shop=cell_phones: Tag:shop=cell phones + shop=carpet: Tag:shop=carpet + shop=chandler: Tag:shop=chandler shop=charity: Tag:shop=charity + shop=cheese: Tag:shop=cheese shop=chemist: Tag:shop=chemist shop=clothes: Tag:shop=clothes - shop=communication: Tag:shop=communication shop=computer: Tag:shop=computer shop=confectionery: Tag:shop=confectionery shop=convenience: Tag:shop=convenience shop=copyshop: Tag:shop=copyshop shop=curtain: Tag:shop=curtain + shop=dairy: Tag:shop=dairy shop=deli: Tag:shop=deli shop=department_store: Tag:shop=department store shop=dive: Tag:shop=dive @@ -831,86 +2396,162 @@ en: shop=dry_cleaning: Tag:shop=dry cleaning shop=electronics: Tag:shop=electronics shop=erotic: Tag:shop=erotic + shop=estate_agent: Tag:shop=estate agent shop=fabric: Tag:shop=fabric shop=farm: Tag:shop=farm + shop=fashion: Tag:shop=fashion + shop=fish: Tag:shop=fish + shop=fishmonger: Tag:shop=fishmonger shop=florist: Tag:shop=florist shop=food: Tag:shop=food shop=frame: Tag:shop=frame shop=funeral_directors: Tag:shop=funeral directors shop=furnace: Tag:shop=furnace shop=furniture: Tag:shop=furniture + shop=gambling: Tag:shop=gambling shop=garden_centre: Tag:shop=garden centre + shop=gas: Tag:shop=gas shop=general: Tag:shop=general shop=gift: Tag:shop=gift shop=glaziery: Tag:shop=glaziery shop=greengrocer: Tag:shop=greengrocer shop=hairdresser: Tag:shop=hairdresser + shop=hairdresser_supply: Tag:shop=hairdresser supply shop=hardware: Tag:shop=hardware shop=hearing_aids: Tag:shop=hearing aids + shop=herbalist: Tag:shop=herbalist shop=hifi: Tag:shop=hifi shop=houseware: Tag:shop=houseware + shop=hunting: Tag:shop=hunting shop=ice_cream: Tag:shop=ice cream + shop=insurance: Tag:shop=insurance + shop=interior_decoration: Tag:shop=interior decoration shop=jewelry: Tag:shop=jewelry shop=kiosk: Tag:shop=kiosk + shop=kitchen: Tag:shop=kitchen shop=laundry: Tag:shop=laundry + shop=leather: Tag:shop=leather shop=locksmith: Tag:shop=locksmith + shop=lottery: Tag:shop=lottery shop=mall: Tag:shop=mall shop=massage: Tag:shop=massage + shop=medical_supply: Tag:shop=medical supply + shop=military_surplus: Tag:shop=military surplus shop=mobile_phone: Tag:shop=mobile phone shop=money_lender: Tag:shop=money lender shop=motorcycle: Tag:shop=motorcycle shop=motorcycle_repair: Tag:shop=motorcycle repair + shop=music: Tag:shop=music shop=musical_instrument: Tag:shop=musical instrument shop=newsagent: Tag:shop=newsagent + shop=office_supplies: Tag:shop=office supplies shop=optician: Tag:shop=optician shop=organic: Tag:shop=organic shop=outdoor: Tag:shop=outdoor shop=paint: Tag:shop=paint + shop=pastry: Tag:shop=pastry shop=pawnbroker: Tag:shop=pawnbroker + shop=perfumery: Tag:shop=perfumery shop=pet: Tag:shop=pet + shop=photo: Tag:shop=photo + shop=printing: Tag:shop=printing + shop=radiotechnics: Tag:shop=radiotechnics + shop=salon: Tag:shop=salon + shop=scuba_diving: Tag:shop=scuba diving shop=seafood: Tag:shop=seafood shop=second_hand: Tag:shop=second hand + shop=ship_chandler: Tag:shop=ship chandler shop=shoes: Tag:shop=shoes + shop=shopping_centre: Tag:shop=shopping centre shop=sports: Tag:shop=sports shop=stationery: Tag:shop=stationery shop=supermarket: Tag:shop=supermarket shop=systembolaget: Tag:shop=systembolaget shop=tattoo: Tag:shop=tattoo + shop=tea: Tag:shop=tea + shop=ticket: Tag:shop=ticket + shop=tobacco: Tag:shop=tobacco shop=toys: Tag:shop=toys shop=trade: Tag:shop=trade + shop=travel_agency: Tag:shop=travel agency + shop=tyres: Tag:shop=tyres + shop=vacant: Tag:shop=vacant shop=vacuum_cleaner: Tag:shop=vacuum cleaner shop=variety_store: Tag:shop=variety store shop=video: Tag:shop=video + shop=video_games: Tag:shop=video games + shop=window_blind: Tag:shop=window blind + shop=windows: Tag:shop=windows + shop=wine: Tag:shop=wine + shop=winery: Tag:shop=winery + sign=no: Tag:sign=no + sign=yes: Tag:sign=yes + signal_station=bridge: Tag:signal station=bridge + signal_station=control: Tag:signal station=control + signal_station=danger: Tag:signal station=danger + signal_station=distress: Tag:signal station=distress + signal_station=firing: Tag:signal station=firing + signal_station=ice: Tag:signal station=ice + signal_station=international_port_traffic: Tag:signal station=international port + traffic + signal_station=lock: Tag:signal station=lock + signal_station=storm: Tag:signal station=storm + signal_station=stream: Tag:signal station=stream + signal_station=telegraph: Tag:signal station=telegraph + signal_station=tide: Tag:signal station=tide + signal_station=tide_gauge: Tag:signal station=tide gauge + signal_station=tide_scale: Tag:signal station=tide scale + signal_station=time: Tag:signal station=time + signal_station=traffic: Tag:signal station=traffic + signal_station=weather: Tag:signal station=weather + social_facility=assisted_living: Tag:social facility=assisted living + social_facility=food_bank: Tag:social facility=food bank + social_facility=group_home: Tag:social facility=group home + social_facility=outreach: Tag:social facility=outreach + social_facility=shelter: Tag:social facility=shelter source:ele=barometric: Tag:source:ele=barometric + source:maxspeed=implicit: Tag:source:maxspeed=implicit + source=Bymiljøetaten: Tag:source=Bymiljøetaten + source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn source=GURS: Tag:source=GURS - source=IBGE: Tag:source=IBGE + source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government 1:25000 map (2007) source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government aerial imagery (2001) + source=NAIP: Tag:source=NAIP sport=10pin: Tag:sport=10pin sport=9pin: Tag:sport=9pin + sport=aikido: Tag:sport=aikido sport=american_football: Tag:sport=american football sport=archery: Tag:sport=archery sport=athletics: Tag:sport=athletics sport=australian_football: Tag:sport=australian football sport=badminton: Tag:sport=badminton + sport=base: Tag:sport=base sport=baseball: Tag:sport=baseball sport=basketball: Tag:sport=basketball sport=beachvolleyball: Tag:sport=beachvolleyball + sport=billards: Tag:sport=billards + sport=bmx: Tag:sport=bmx sport=boules: Tag:sport=boules sport=bowls: Tag:sport=bowls sport=canadian_football: Tag:sport=canadian football sport=canoe: Tag:sport=canoe sport=chess: Tag:sport=chess + sport=cliff_diving: Tag:sport=cliff diving sport=climbing: Tag:sport=climbing + sport=climbing_adventure: Tag:sport=climbing adventure + sport=cockfighting: Tag:sport=cockfighting sport=cricket: Tag:sport=cricket sport=cricket_nets: Tag:sport=cricket nets sport=croquet: Tag:sport=croquet sport=cycling: Tag:sport=cycling + sport=darts: Tag:sport=darts sport=diving: Tag:sport=diving sport=dog_racing: Tag:sport=dog racing sport=equestrian: Tag:sport=equestrian + sport=free_flying: Tag:sport=free flying sport=gaelic_football: Tag:sport=gaelic football sport=gaelic_games: Tag:sport=gaelic games sport=golf: Tag:sport=golf @@ -919,17 +2560,22 @@ en: sport=horse_racing: Tag:sport=horse racing sport=horseshoes: Tag:sport=horseshoes sport=ice_stock: Tag:sport=ice stock + sport=kitesurfing: Tag:sport=kitesurfing sport=korfball: Tag:sport=korfball + sport=model_aerodrome: Tag:sport=model aerodrome sport=motor: Tag:sport=motor sport=multi: Tag:sport=multi + sport=obstacle_course: Tag:sport=obstacle course sport=orienteering: Tag:sport=orienteering sport=paddle_tennis: Tag:sport=paddle tennis sport=paragliding: Tag:sport=paragliding sport=pelota: Tag:sport=pelota sport=racquet: Tag:sport=racquet sport=rowing: Tag:sport=rowing + sport=rugby: Tag:sport=rugby sport=rugby_league: Tag:sport=rugby league sport=rugby_union: Tag:sport=rugby union + sport=scuba_diving: Tag:sport=scuba diving sport=shooting: Tag:sport=shooting sport=skateboard: Tag:sport=skateboard sport=skating: Tag:sport=skating @@ -937,6 +2583,7 @@ en: sport=soccer: Tag:sport=soccer sport=surfing: Tag:sport=surfing sport=swimming: Tag:sport=swimming + sport=table_soccer: Tag:sport=table soccer sport=table_tennis: Tag:sport=table tennis sport=team_handball: Tag:sport=team handball sport=tennis: Tag:sport=tennis @@ -944,6 +2591,12 @@ en: sport=volleyball: Tag:sport=volleyball sport=water_ski: Tag:sport=water ski sub_sea=reef: Tag:sub sea=reef + summit:cross=yes: Tag:summit:cross=yes + surface=pebbles: Tag:surface=pebbles + tidal=mud: Tag:tidal=mud + tidal=pebbles: Tag:tidal=pebbles + tidal=rocks: Tag:tidal=rocks + tidal=sand: Tag:tidal=sand tourism=alpine_hut: Tag:tourism=alpine hut tourism=aquarium: Tag:tourism=aquarium tourism=artwork: Tag:tourism=artwork @@ -951,6 +2604,7 @@ en: tourism=camp_site: Tag:tourism=camp site tourism=caravan_site: Tag:tourism=caravan site tourism=chalet: Tag:tourism=chalet + tourism=gallery: Tag:tourism=gallery tourism=guest_house: Tag:tourism=guest house tourism=hostel: Tag:tourism=hostel tourism=hotel: Tag:tourism=hotel @@ -960,38 +2614,130 @@ en: tourism=picnic_site: Tag:tourism=picnic site tourism=theme_park: Tag:tourism=theme park tourism=viewpoint: Tag:tourism=viewpoint + tourism=wilderness_hut: Tag:tourism=wilderness hut tourism=zoo: Tag:tourism=zoo + tower:construction=dish: Tag:tower:construction=dish + tower:construction=dome: Tag:tower:construction=dome + tower:construction=freestanding: Tag:tower:construction=freestanding + tower:construction=lattice: Tag:tower:construction=lattice + tower:type=lattice: Tag:tower:type=lattice + traffic=local: Tag:traffic=local + traffic=national: Tag:traffic=national + traffic=regional: Tag:traffic=regional + traffic=suburban: Tag:traffic=suburban + traffic=urban: Tag:traffic=urban + traffic_calming=island: Tag:traffic calming=island tunnel=culvert: Tag:tunnel=culvert - type=site: Tag:type=site + type=autopass: Tag:type=autopass + type=benchmark: Tag:type=benchmark + type=fixed_point: Tag:type=fixed point + type=leading_light: Tag:type=leading light + type=leading_line: Tag:type=leading line + type=observation_spot: Tag:type=observation spot + type=public_transport: Tag:type=public transport + type=street: Tag:type=street + type=triangulation: Tag:type=triangulation vending=bicycle_tube: Tag:vending=bicycle tube + wall=dry_stone: Tag:wall=dry stone + wall=no: Tag:wall=no + wall=seawall: Tag:wall=seawall + wall=training_wall: Tag:wall=training wall + water=intermittent: Tag:water=intermittent + water=tidal: Tag:water=tidal + waterway=boat_lift: Tag:waterway=boat lift waterway=boatyard: Tag:waterway=boatyard + waterway=brook: Tag:waterway=brook waterway=canal: Tag:waterway=canal waterway=dam: Tag:waterway=dam + waterway=deep_well: Tag:waterway=deep well waterway=derelict_canal: Tag:waterway=derelict canal + waterway=ditch: Tag:waterway=ditch waterway=dock: Tag:waterway=dock waterway=drain: Tag:waterway=drain + waterway=dredged_area: Tag:waterway=dredged area + waterway=fish_pass: Tag:waterway=fish pass waterway=lock_gate: Tag:waterway=lock gate + waterway=milestone: Tag:waterway=milestone + waterway=offshore_field: Tag:waterway=offshore field + waterway=rapids: Tag:waterway=rapids waterway=river: Tag:waterway=river waterway=riverbank: Tag:waterway=riverbank waterway=seaway: Tag:waterway=seaway waterway=stream: Tag:waterway=stream + waterway=swept_area: Tag:waterway=swept area waterway=turning_point: Tag:waterway=turning point + waterway=wadi: Tag:waterway=wadi waterway=water_point: Tag:waterway=water point waterway=waterfall: Tag:waterway=waterfall waterway=weir: Tag:waterway=weir + wood=casuarina: Tag:wood=casuarina + wood=coniferous: Tag:wood=coniferous + wood=deciduous: Tag:wood=deciduous + wood=eucalypt: Tag:wood=eucalypt + wood=evergreen: Tag:wood=evergreen + wood=filao: Tag:wood=filao + wood=mixed: Tag:wood=mixed + wood=nipa_palm: Tag:wood=nipa palm + wood=palm: Tag:wood=palm zoo=petting_zoo: Tag:zoo=petting zoo es: + key: + amenity: ES:Key:amenity + highway: ES:Key:highway + proposed: ES:Key:proposed + stars: ES:Key:stars + traffic_calming: ES:Key:traffic calming tag: + aerialway=cable_car: ES:Tag:aerialway=cable car + amenity=atm: ES:Tag:amenity=atm amenity=bar: ES:Tag:amenity=bar + amenity=bicycle_parking: ES:Tag:amenity=bicycle parking + amenity=bicycle_rental: ES:Tag:amenity=bicycle rental + amenity=fuel: ES:Tag:amenity=fuel amenity=recycling: ES:Tag:amenity=recycling + amenity=university: ES:Tag:amenity=university + emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher highway=bus_stop: ES:Tag:highway=bus stop + highway=escape: ES:Tag:highway=escape + highway=living_street: ES:Tag:highway=living street + highway=motorway_junction: ES:Tag:highway=motorway junction + highway=motorway_link: ES:Tag:highway=motorway link + highway=pedestrian: ES:Tag:highway=pedestrian + highway=residential: ES:Tag:highway=residential + highway=stop: ES:Tag:highway=stop + landuse=allotments: ES:Tag:landuse=allotments + landuse=industrial: ES:Tag:landuse=industrial + leisure=playground: ES:Tag:leisure=playground + leisure=water_park: ES:Tag:leisure=water park + natural=beach: ES:Tag:natural=beach + natural=glacier: ES:Tag:natural=glacier + natural=saddle: ES:Tag:natural=saddle + natural=tree: ES:Tag:natural=tree + natural=water: ES:Tag:natural=water + power=pole: ES:Tag:power=pole + power=tower: ES:Tag:power=tower railway=level_crossing: ES:Tag:railway=level crossing + shop=alcohol: ES:Tag:shop=alcohol + shop=computer: ES:Tag:shop=computer + shop=lottery: ES:Tag:shop=lottery + tourism=alpine_hut: ES:Tag:tourism=alpine hut + tourism=artwork: ES:Tag:tourism=artwork + tourism=camp_site: ES:Tag:tourism=camp site et: key: + addr: Et:Key:addr + backrest: Et:Key:backrest highway: Et:Key:highway + tag: + amenity=bench: Et:Tag:amenity=bench + amenity=cafe: Et:Tag:amenity=cafe + amenity=library: Et:Tag:amenity=library + amenity=taxi: Et:Tag:amenity=taxi + building=roof: Et:Tag:building=roof fi: key: amenity: Fi:Key:amenity + bicycle_parking: Fi:Key:bicycle parking bridge: Fi:Key:bridge crossing: Fi:Key:crossing description: Fi:Key:description @@ -1004,15 +2750,23 @@ fi: leisure: Fi:Key:leisure man_made: Fi:Key:man made manhole: Fi:Key:manhole + maxspeed: Fi:Key:maxspeed + mtb:scale: Fi:Key:mtb:scale + name: Fi:Key:name narrow: Fi:Key:narrow natural: Fi:Key:natural note: Fi:Key:note operator: Fi:Key:operator - parking:lane:both: Fi:Key:parking:lane:both + parking:lane: Fi:Key:parking:lane + priority_road: Fi:Key:priority road + pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa shop: Fi:Key:shop + snowmobile: Fi:Key:snowmobile + snowplowing: Fi:Key:snowplowing surface: Fi:Key:surface tracktype: Fi:Key:tracktype traffic_calming: Fi:Key:traffic calming + traffic_sign: Fi:Key:traffic sign tunnel: Fi:Key:tunnel waterway: Fi:Key:waterway wheelchair: Fi:Key:wheelchair @@ -1021,6 +2775,8 @@ fi: amenity=atm: Fi:Tag:amenity=atm amenity=baby_hatch: Fi:Tag:amenity=baby hatch amenity=bank: Fi:Tag:amenity=bank + amenity=bicycle_parking: Fi:Tag:amenity=bicycle parking + amenity=bicycle_rental: Fi:Tag:amenity=bicycle rental amenity=bureau_de_change: Fi:Tag:amenity=bureau de change amenity=car_rental: Fi:Tag:amenity=car rental amenity=car_sharing: Fi:Tag:amenity=car sharing @@ -1041,11 +2797,17 @@ fi: amenity=theatre: Fi:Tag:amenity=theatre amenity=townhall: Fi:Tag:amenity=townhall amenity=veterinary: Fi:Tag:amenity=veterinary + building=garage: Fi:Tag:building=garage + building=garages: Fi:Tag:building=garages + highway=crossing: Fi:Tag:highway=crossing + highway=footway: Fi:Tag:highway=footway highway=secondary: Fi:Tag:highway=secondary + highway=speed_camera: Fi:Tag:highway=speed camera highway=steps: Fi:Tag:highway=steps highway=tertiary: Fi:Tag:highway=tertiary highway=track: Fi:Tag:highway=track highway=unclassified: Fi:Tag:highway=unclassified + leisure=dance: Fi:Tag:leisure=dance leisure=dog_park: Fi:Tag:leisure=dog park leisure=slipway: Fi:Tag:leisure=slipway man_made=wastewater_plant: Fi:Tag:man made=wastewater plant @@ -1071,314 +2833,1297 @@ fi: waterway=stream: Fi:Tag:waterway=stream fr: key: + CEMT: FR:Key:CEMT + abutters: FR:Key:abutters + access: FR:Key:access addr: FR:Key:addr + advertising: FR:Key:advertising + aeroway: FR:Key:aeroway amenity: FR:Key:amenity + area: FR:Key:area barrier: FR:Key:barrier + basin: FR:Key:basin + bench: FR:Key:bench + bicycle: FR:Key:bicycle + bicycle_parking: FR:Key:bicycle parking + boat: FR:Key:boat + bollard: FR:Key:bollard + books: FR:Key:books boundary: FR:Key:boundary bridge: FR:Key:bridge building: FR:Key:building + capacity: FR:Key:capacity + clothes: FR:Key:clothes collection_times: FR:Key:collection times + colour: FR:Key:colour + comment: FR:Key:comment + construction: FR:Key:construction + contact: FR:Key:contact + covered: FR:Key:covered + craft: FR:Key:craft + crop: FR:Key:crop + crossing: FR:Key:crossing + cutting: FR:Key:cutting cycleway: FR:Key:cycleway + denomination: FR:Key:denomination + description: FR:Key:description + designation: FR:Key:designation + destination: FR:Key:destination + diet:*: FR:Key:diet:* + dispensing: FR:Key:dispensing + distance: FR:Key:distance + drink: FR:Key:drink + ele: FR:Key:ele + email: FR:Key:email + embankment: FR:Key:embankment enforcement: FR:Key:enforcement + entrance: FR:Key:entrance + fee: FR:Key:fee + fixme: FR:Key:fixme + flood_prone: FR:Key:flood prone + foot: FR:Key:foot + footway: FR:Key:footway + generator:method: FR:Key:generator:method + generator:output: FR:Key:generator:output + generator:output:electricity: FR:Key:generator:output:electricity + generator:output:hot_air: FR:Key:generator:output:hot air + generator:output:hot_water: FR:Key:generator:output:hot water + generator:output:steam: FR:Key:generator:output:steam + generator:source: FR:Key:generator:source + height: FR:Key:height highway: FR:Key:highway + historic: FR:Key:historic + incline: FR:Key:incline + information: FR:Key:information + intermittent: FR:Key:intermittent + junction: FR:Key:junction landuse: FR:Key:landuse lanes: FR:Key:lanes leisure: FR:Key:leisure + length: FR:Key:length + level: FR:Key:level + lit: FR:Key:lit + lock: FR:Key:lock man_made: FR:Key:man made + manufacturer: FR:Key:manufacturer + maxage: FR:Key:maxage + maxheight: FR:Key:maxheight + maxheight:physical: FR:Key:maxheight:physical + maxlength: FR:Key:maxlength + maxspeed: FR:Key:maxspeed + maxstay: FR:Key:maxstay maxweight: FR:Key:maxweight + maxwidth: FR:Key:maxwidth + military: FR:Key:military + minage: FR:Key:minage + mountain_pass: FR:Key:mountain pass + mtb:scale: FR:Key:mtb:scale name: FR:Key:name natural: FR:Key:natural + network: FR:Key:network noname: FR:Key:noname + note: FR:Key:note + office: FR:Key:office + oneway: FR:Key:oneway opening_hours: FR:Key:opening hours operator: FR:Key:operator parking: FR:Key:parking + parking:lane: FR:Key:parking:lane + paved:date: FR:Key:paved:date + phone: FR:Key:phone place: FR:Key:place + place:fr: FR:Key:place:fr + post_office:type: FR:Key:post office:type power: FR:Key:power + power_supply: FR:Key:power supply + priority: FR:Key:priority + proposed: FR:Key:proposed + psv: FR:Key:psv + public_transport: FR:Key:public transport + railway: FR:Key:railway + ref: FR:Key:ref + ref:CEF: FR:Key:ref:CEF + ref:ERDF:gdo: FR:Key:ref:ERDF:gdo + ref:FR:42C: FR:Key:ref:FR:42C + ref:FR:FINESS: FR:Key:ref:FR:FINESS + ref:INSEE: FR:Key:ref:INSEE + ref:UAI: FR:Key:ref:UAI + ref:mhs: FR:Key:ref:mhs + ref:sandre: FR:Key:ref:sandre + religion: FR:Key:religion + resource: FR:Key:resource sac_scale: FR:Key:sac scale + second_hand: FR:Key:second hand + segregated: FR:Key:segregated + service: FR:Key:service + shelter_type: FR:Key:shelter type shop: FR:Key:shop smoothness: FR:Key:smoothness + social_facility: FR:Key:social facility + source: FR:Key:source + source:maxspeed: FR:Key:source:maxspeed sport: FR:Key:sport surface: FR:Key:surface + surveillance: FR:Key:surveillance + tactile_paving: FR:Key:tactile paving + takeaway: FR:Key:takeaway + timezone: FR:Key:timezone + toll: FR:Key:toll + tourism: FR:Key:tourism tracktype: FR:Key:tracktype + traffic_calming: FR:Key:traffic calming + traffic_sign: FR:Key:traffic sign + trail_visibility: FR:Key:trail visibility + tunnel: FR:Key:tunnel + turn: FR:Key:turn + turning_radius: FR:Key:turning radius + type: FR:Key:type + url: FR:Key:url + voltage: FR:Key:voltage + waste: FR:Key:waste + water: FR:Key:water waterway: FR:Key:waterway + website: FR:Key:website + wheelchair: FR:Key:wheelchair + width: FR:Key:width + wikipedia: FR:Key:wikipedia tag: + FIXME=Position_estimated: FR:Tag:FIXME=Position estimated + abandoned=yes: FR:Tag:abandoned=yes + access=private: FR:Tag:access=private + aerialway=cable_car: FR:Tag:aerialway=cable car + aerialway=chair_lift: FR:Tag:aerialway=chair lift + aeroway=helipad: FR:Tag:aeroway=helipad aeroway=runway: FR:Tag:aeroway=runway + amenity=animal_boarding: FR:Tag:amenity=animal boarding + amenity=animal_breeding: FR:Tag:amenity=animal breeding + amenity=animal_shelter: FR:Tag:amenity=animal shelter + amenity=atm: FR:Tag:amenity=atm + amenity=bench: FR:Tag:amenity=bench amenity=bicycle_parking: FR:Tag:amenity=bicycle parking amenity=bicycle_rental: FR:Tag:amenity=bicycle rental + amenity=cafe: FR:Tag:amenity=cafe + amenity=car_rental: FR:Tag:amenity=car rental + amenity=car_sharing: FR:Tag:amenity=car sharing amenity=community_centre: FR:Tag:amenity=community centre + amenity=compressed_air: FR:Tag:amenity=compressed air + amenity=coworking_space: FR:Tag:amenity=coworking space + amenity=crematorium: FR:Tag:amenity=crematorium + amenity=crypt: FR:Tag:amenity=crypt + amenity=drinking_water: FR:Tag:amenity=drinking water amenity=fire_station: FR:Tag:amenity=fire station + amenity=fountain: FR:Tag:amenity=fountain + amenity=fuel: FR:Tag:amenity=fuel + amenity=grave_yard: FR:Tag:amenity=grave yard + amenity=hospital: FR:Tag:amenity=hospital + amenity=kindergarten: FR:Tag:amenity=kindergarten amenity=library: FR:Tag:amenity=library + amenity=marketplace: FR:Tag:amenity=marketplace + amenity=parking: FR:Tag:amenity=parking + amenity=parking_space: FR:Tag:amenity=parking space amenity=pharmacy: FR:Tag:amenity=pharmacy + amenity=photo_booth: FR:Tag:amenity=photo booth + amenity=place_of_worship: FR:Tag:amenity=place of worship + amenity=police: FR:Tag:amenity=police amenity=recycling: FR:Tag:amenity=recycling + amenity=restaurant: FR:Tag:amenity=restaurant + amenity=school: FR:Tag:amenity=school + amenity=shelter: FR:Tag:amenity=shelter + amenity=social_centre: FR:Tag:amenity=social centre + amenity=social_facility: FR:Tag:amenity=social facility + amenity=taxi: FR:Tag:amenity=taxi amenity=telephone: FR:Tag:amenity=telephone + amenity=toilets: FR:Tag:amenity=toilets amenity=townhall: FR:Tag:amenity=townhall + amenity=university: FR:Tag:amenity=university + amenity=veterinary: FR:Tag:amenity=veterinary + amenity=waste_basket: FR:Tag:amenity=waste basket barrier=bollard: FR:Tag:barrier=bollard + barrier=cycle_barrier: FR:Tag:barrier=cycle barrier barrier=gate: FR:Tag:barrier=gate + barrier=hedge: FR:Tag:barrier=hedge + barrier=retaining_wall: FR:Tag:barrier=retaining wall + barrier=wall: FR:Tag:barrier=wall + building=house: FR:Tag:building=house + building=roof: FR:Tag:building=roof + craft=beekeeper: FR:Tag:craft=beekeeper + craft=car_repair: FR:Tag:craft=car repair + cycleway=asl: FR:Tag:cycleway=asl cycleway=bike_box: FR:Tag:cycleway=bike box + disused=yes: FR:Tag:disused=yes + emergency=defibrillator: FR:Tag:emergency=defibrillator + emergency=fire_hydrant: FR:Tag:emergency=fire hydrant + emergency=phone: FR:Tag:emergency=phone + footway=sidewalk: FR:Tag:footway=sidewalk + generator:method=combustion: FR:Tag:generator:method=combustion + generator:method=fission: FR:Tag:generator:method=fission + generator:method=fusion: FR:Tag:generator:method=fusion + generator:method=gasification: FR:Tag:generator:method=gasification + generator:method=photovoltaic: FR:Tag:generator:method=photovoltaic + generator:method=thermal: FR:Tag:generator:method=thermal + generator:source=biofuel: FR:Tag:generator:source=biofuel + generator:source=biogas: FR:Tag:generator:source=biogas + generator:source=biomass: FR:Tag:generator:source=biomass + generator:source=coal: FR:Tag:generator:source=coal + generator:source=gas: FR:Tag:generator:source=gas + generator:source=hydro: FR:Tag:generator:source=hydro + generator:source=nuclear: FR:Tag:generator:source=nuclear + generator:source=oil: FR:Tag:generator:source=oil + generator:source=solar: FR:Tag:generator:source=solar + generator:source=tidal: FR:Tag:generator:source=tidal + generator:source=wind: FR:Tag:generator:source=wind highway=bus_guideway: FR:Tag:highway=bus guideway highway=bus_stop: FR:Tag:highway=bus stop highway=crossing: FR:Tag:highway=crossing highway=cycleway: FR:Tag:highway=cycleway + highway=elevator: FR:Tag:highway=elevator + highway=emergency_access_point: FR:Tag:highway=emergency access point + highway=footway: FR:Tag:highway=footway highway=give_way: FR:Tag:highway=give way + highway=living_street: FR:Tag:highway=living street + highway=mini_roundabout: FR:Tag:highway=mini roundabout highway=motorway: FR:Tag:highway=motorway highway=motorway_link: FR:Tag:highway=motorway link + highway=path: FR:Tag:highway=path + highway=pedestrian: FR:Tag:highway=pedestrian + highway=primary: FR:Tag:highway=primary + highway=raceway: FR:Tag:highway=raceway + highway=residential: FR:Tag:highway=residential + highway=rest_area: FR:Tag:highway=rest area + highway=road: FR:Tag:highway=road + highway=secondary: FR:Tag:highway=secondary + highway=service: FR:Tag:highway=service + highway=services: FR:Tag:highway=services + highway=steps: FR:Tag:highway=steps + highway=stop: FR:Tag:highway=stop + highway=tertiary: FR:Tag:highway=tertiary highway=track: FR:Tag:highway=track + highway=trunk: FR:Tag:highway=trunk + highway=turning_circle: FR:Tag:highway=turning circle + highway=unclassified: FR:Tag:highway=unclassified + historic=battlefield: FR:Tag:historic=battlefield + historic=memorial: FR:Tag:historic=memorial + junction=roundabout: FR:Tag:junction=roundabout + landuse=allotments: FR:Tag:landuse=allotments + landuse=basin: FR:Tag:landuse=basin + landuse=cemetery: FR:Tag:landuse=cemetery + landuse=farm: FR:Tag:landuse=farm + landuse=farmland: FR:Tag:landuse=farmland landuse=farmyard: FR:Tag:landuse=farmyard landuse=forest: FR:Tag:landuse=forest + landuse=grass: FR:Tag:landuse=grass + landuse=orchard: FR:Tag:landuse=orchard + landuse=plant_nursery: FR:Tag:landuse=plant nursery + landuse=pond: FR:Tag:landuse=pond + landuse=residential: FR:Tag:landuse=residential + landuse=salt_pond: FR:Tag:landuse=salt pond + landuse=village_green: FR:Tag:landuse=village green + leisure=dog_park: FR:Tag:leisure=dog park + leisure=golf_course: FR:Tag:leisure=golf course + leisure=park: FR:Tag:leisure=park + leisure=pitch: FR:Tag:leisure=pitch leisure=playground: FR:Tag:leisure=playground + leisure=stadium: FR:Tag:leisure=stadium + leisure=swimming_pool: FR:Tag:leisure=swimming pool + leisure=track: FR:Tag:leisure=track + man_made=adit: FR:Tag:man made=adit man_made=cutline: FR:Tag:man made=cutline + man_made=pier: FR:Tag:man made=pier man_made=surveillance: FR:Tag:man made=surveillance + man_made=survey_point: FR:Tag:man made=survey point + man_made=tower: FR:Tag:man made=tower + man_made=wastewater_plant: FR:Tag:man made=wastewater plant man_made=water_works: FR:Tag:man made=water works + man_made=watermill: FR:Tag:man made=watermill + man_made=windmill: FR:Tag:man made=windmill + man_made=windpump: FR:Tag:man made=windpump + natural=cliff: FR:Tag:natural=cliff + natural=spring: FR:Tag:natural=spring + natural=stone: FR:Tag:natural=stone natural=tree: FR:Tag:natural=tree + natural=tree_row: FR:Tag:natural=tree row natural=water: FR:Tag:natural=water + natural=wetland: FR:Tag:natural=wetland + office=estate_agent: FR:Tag:office=estate agent + office=ngo: FR:Tag:office=ngo place=city: FR:Tag:place=city place=hamlet: FR:Tag:place=hamlet + place=isolated_dwelling: FR:Tag:place=isolated dwelling place=locality: FR:Tag:place=locality + place=neighbourhood: FR:Tag:place=neighbourhood place=town: FR:Tag:place=town place=village: FR:Tag:place=village power=generator: FR:Tag:power=generator + power=heliostat: FR:Tag:power=heliostat power=line: FR:Tag:power=line + power=minor_line: FR:Tag:power=minor line + power=pole: FR:Tag:power=pole + power=station: FR:Tag:power=station + power=sub_station: FR:Tag:power=sub station power=tower: FR:Tag:power=tower + power=transformer: FR:Tag:power=transformer + public_transport=platform: FR:Tag:public transport=platform + public_transport=station: FR:Tag:public transport=station + railway=level_crossing: FR:Tag:railway=level crossing + railway=rail: FR:Tag:railway=rail railway=station: FR:Tag:railway=station railway=subway_entrance: FR:Tag:railway=subway entrance + route=piste: FR:Tag:route=piste + service=alley: FR:Tag:service=alley + service=parking_aisle: FR:Tag:service=parking aisle + shelter_type=basic_hut: FR:Tag:shelter type=basic hut + shop=alcohol: FR:Tag:shop=alcohol + shop=anime: FR:Tag:shop=anime + shop=baby_goods: FR:Tag:shop=baby goods shop=bakery: FR:Tag:shop=bakery + shop=bathroom_furnishing: FR:Tag:shop=bathroom furnishing + shop=beauty: FR:Tag:shop=beauty + shop=bed: FR:Tag:shop=bed + shop=beverages: FR:Tag:shop=beverages + shop=bicycle: FR:Tag:shop=bicycle + shop=books: FR:Tag:shop=books + shop=boutique: FR:Tag:shop=boutique + shop=butcher: FR:Tag:shop=butcher + shop=car: FR:Tag:shop=car + shop=car_repair: FR:Tag:shop=car repair + shop=carpet: FR:Tag:shop=carpet + shop=charity: FR:Tag:shop=charity + shop=clothes: FR:Tag:shop=clothes + shop=confectionery: FR:Tag:shop=confectionery + shop=convenience: FR:Tag:shop=convenience + shop=copyshop: FR:Tag:shop=copyshop + shop=deli: FR:Tag:shop=deli + shop=dive: FR:Tag:shop=dive + shop=doityourself: FR:Tag:shop=doityourself + shop=farm: FR:Tag:shop=farm + shop=frame: FR:Tag:shop=frame + shop=funeral_directors: FR:Tag:shop=funeral directors + shop=furnace: FR:Tag:shop=furnace + shop=garden_centre: FR:Tag:shop=garden centre + shop=gift: FR:Tag:shop=gift + shop=hairdresser: FR:Tag:shop=hairdresser + shop=hunting: FR:Tag:shop=hunting + shop=kitchen: FR:Tag:shop=kitchen + shop=military_surplus: FR:Tag:shop=military surplus + shop=newsagent: FR:Tag:shop=newsagent + shop=photo: FR:Tag:shop=photo + shop=second_hand: FR:Tag:shop=second hand shop=supermarket: FR:Tag:shop=supermarket + shop=toys: FR:Tag:shop=toys + shop=trade: FR:Tag:shop=trade + shop=video: FR:Tag:shop=video + sport=free_flying: FR:Tag:sport=free flying + sport=shooting: FR:Tag:sport=shooting + tourism=alpine_hut: FR:Tag:tourism=alpine hut + tourism=artwork: FR:Tag:tourism=artwork + tourism=camp_site: FR:Tag:tourism=camp site + tourism=hostel: FR:Tag:tourism=hostel + tourism=hotel: FR:Tag:tourism=hotel + tourism=information: FR:Tag:tourism=information + tourism=viewpoint: FR:Tag:tourism=viewpoint + tunnel=culvert: FR:Tag:tunnel=culvert + type=associatedStreet: FR:Tag:type=associatedStreet + wall=no: FR:Tag:wall=no + waterway=boatyard: FR:Tag:waterway=boatyard + waterway=canal: FR:Tag:waterway=canal + waterway=lock_gate: FR:Tag:waterway=lock gate waterway=river: FR:Tag:waterway=river waterway=riverbank: FR:Tag:waterway=riverbank waterway=stream: FR:Tag:waterway=stream - waterway=weir: FR:Tag:waterway=weir hr: key: + amenity: Hr:Key:amenity + historic: Hr:Key:historic + leisure: Hr:Key:leisure + man_made: Hr:Key:man made + military: Hr:Key:military + natural: Hr:Key:natural + railway: Hr:Key:railway + shop: Hr:Key:shop + tourism: Hr:Key:tourism tracktype: Hr:Key:tracktype tag: amenity=atm: Hr:Tag:amenity=atm + amenity=bank: Hr:Tag:amenity=bank +ht: + key: + intermittent: Ht:Key:intermittent + pump: Ht:Key:pump + tag: + landuse=residential: Ht:Tag:landuse=residential hu: key: - aeroway: HU:Key:aeroway - shop: HU:Key:shop - tourism: HU:Key:tourism + amenity: Hu:Key:amenity + building: Hu:Key:building + jel: Hu:Key:jel + office: Hu:Key:office + symbol: Hu:Key:symbol + wood: Hu:Key:wood + tag: + boundary=administrative: Hu:Tag:boundary=administrative it: key: + abutters: IT:Key:abutters + access: IT:Key:access + addr: IT:Key:addr aerialway: IT:Key:aerialway aeroway: IT:Key:aeroway amenity: IT:Key:amenity barrier: IT:Key:barrier basin: IT:Key:basin + bicycle_parking: IT:Key:bicycle parking boundary: IT:Key:boundary bridge: IT:Key:bridge building: IT:Key:building + cables: IT:Key:cables + circuits: IT:Key:circuits construction: IT:Key:construction + craft: IT:Key:craft cutting: IT:Key:cutting cycleway: IT:Key:cycleway denomination: IT:Key:denomination + ele: IT:Key:ele embankment: IT:Key:embankment enforcement: IT:Key:enforcement + ford: IT:Key:ford + generator:output: IT:Key:generator:output geological: IT:Key:geological highway: IT:Key:highway historic: IT:Key:historic incline: IT:Key:incline + internet_access: IT:Key:internet access junction: IT:Key:junction landuse: IT:Key:landuse + lanes:psv: IT:Key:lanes:psv leisure: IT:Key:leisure lock: IT:Key:lock man_made: IT:Key:man made + maxaxleload: IT:Key:maxaxleload maxheight: IT:Key:maxheight + maxlength: IT:Key:maxlength + maxweight: IT:Key:maxweight maxwidth: IT:Key:maxwidth military: IT:Key:military mooring: IT:Key:mooring + mountain_pass: IT:Key:mountain pass + mtb:scale: IT:Key:mtb:scale name: IT:Key:name natural: IT:Key:natural + noexit: IT:Key:noexit + note: IT:Key:note + operator: IT:Key:operator osmc:symbol: IT:Key:osmc:symbol + parking:lane:both: IT:Key:parking:lane:both passing_places: IT:Key:passing places place: IT:Key:place + playground: IT:Key:playground power: IT:Key:power proposed: IT:Key:proposed railway: IT:Key:railway ref: IT:Key:ref + ref:vatin: IT:Key:ref:vatin religion: IT:Key:religion route: IT:Key:route sac_scale: IT:Key:sac scale service: IT:Key:service - shop: IT:Key:shop + smoothness: IT:Key:smoothness sport: IT:Key:sport stop: IT:Key:stop + summit:cross: IT:Key:summit:cross + surveillance: IT:Key:surveillance tourism: IT:Key:tourism tracktype: IT:Key:tracktype traffic_calming: IT:Key:traffic calming trail_visibility: IT:Key:trail visibility tunnel: IT:Key:tunnel type: IT:Key:type + voltage: IT:Key:voltage waterway: IT:Key:waterway wheelchair: IT:Key:wheelchair width: IT:Key:width + wires: IT:Key:wires tag: + amenity=animal_boarding: IT:Tag:amenity=animal boarding + amenity=animal_breeding: IT:Tag:amenity=animal breeding + amenity=animal_shelter: IT:Tag:amenity=animal shelter + amenity=bar: IT:Tag:amenity=bar amenity=bicycle_rental: IT:Tag:amenity=bicycle rental + amenity=cinema: IT:Tag:amenity=cinema amenity=college: IT:Tag:amenity=college amenity=fountain: IT:Tag:amenity=fountain amenity=fuel: IT:Tag:amenity=fuel amenity=hospital: IT:Tag:amenity=hospital + amenity=hunting_stand: IT:Tag:amenity=hunting stand + amenity=ice_cream: IT:Tag:amenity=ice cream amenity=kindergarten: IT:Tag:amenity=kindergarten + amenity=milk_dispenser: IT:Tag:amenity=milk dispenser amenity=parking: IT:Tag:amenity=parking amenity=place_of_worship: IT:Tag:amenity=place of worship amenity=police: IT:Tag:amenity=police amenity=post_office: IT:Tag:amenity=post office + amenity=recycling: IT:Tag:amenity=recycling amenity=school: IT:Tag:amenity=school + amenity=spa: IT:Tag:amenity=spa amenity=university: IT:Tag:amenity=university amenity=waste_basket: IT:Tag:amenity=waste basket + barrier=ditch: IT:Tag:barrier=ditch + barrier=fence: IT:Tag:barrier=fence barrier=toll_booth: IT:Tag:barrier=toll booth + footway=crossing: IT:Tag:footway=crossing + footway=sidewalk: IT:Tag:footway=sidewalk geological=palaeontological_site: IT:Tag:geological=palaeontological site highway=cycleway: IT:Tag:highway=cycleway + highway=footway: IT:Tag:highway=footway highway=ford: IT:Tag:highway=ford highway=mini_roundabout: IT:Tag:highway=mini roundabout highway=motorway: IT:Tag:highway=motorway highway=motorway_link: IT:Tag:highway=motorway link + highway=path: IT:Tag:highway=path highway=pedestrian: IT:Tag:highway=pedestrian highway=primary: IT:Tag:highway=primary highway=primary_link: IT:Tag:highway=primary link + highway=residential: IT:Tag:highway=residential + highway=rest_area: IT:Tag:highway=rest area + highway=secondary: IT:Tag:highway=secondary + highway=services: IT:Tag:highway=services + highway=tertiary: IT:Tag:highway=tertiary + highway=track: IT:Tag:highway=track highway=trunk: IT:Tag:highway=trunk highway=trunk_link: IT:Tag:highway=trunk link historic=paleontological_site: IT:Tag:historic=paleontological site + historic=wayside_shrine: IT:Tag:historic=wayside shrine junction=roundabout: IT:Tag:junction=roundabout landuse=construction: IT:Tag:landuse=construction leisure=beach_resort: IT:Tag:leisure=beach resort leisure=dog_park: IT:Tag:leisure=dog park leisure=marina: IT:Tag:leisure=marina + leisure=playground: IT:Tag:leisure=playground + leisure=swimming_pool: IT:Tag:leisure=swimming pool + man_made=mast: IT:Tag:man made=mast + natural=grassland: IT:Tag:natural=grassland + natural=scree: IT:Tag:natural=scree + natural=spring: IT:Tag:natural=spring + natural=wetland: IT:Tag:natural=wetland + place=village: IT:Tag:place=village + power=cable: IT:Tag:power=cable + power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet + power=generator: IT:Tag:power=generator + power=line: IT:Tag:power=line + power=plant: IT:Tag:power=plant + power=pole: IT:Tag:power=pole + power=substation: IT:Tag:power=substation + power=tower: IT:Tag:power=tower + power=transformer: IT:Tag:power=transformer railway=level_crossing: IT:Tag:railway=level crossing + route=bus: IT:Tag:route=bus shop=butcher: IT:Tag:shop=butcher shop=car: IT:Tag:shop=car shop=clothes: IT:Tag:shop=clothes + shop=confectionery: IT:Tag:shop=confectionery shop=florist: IT:Tag:shop=florist + shop=greengrocer: IT:Tag:shop=greengrocer + shop=hifi: IT:Tag:shop=hifi + shop=kiosk: IT:Tag:shop=kiosk + shop=mall: IT:Tag:shop=mall shop=newsagent: IT:Tag:shop=newsagent + shop=tobacco: IT:Tag:shop=tobacco + sport=surfing: IT:Tag:sport=surfing tourism=artwork: IT:Tag:tourism=artwork + waterway=stream: IT:Tag:waterway=stream ja: key: - abutters: JA:Key:abutters access: JA:Key:access + addr: JA:Key:addr aerialway: JA:Key:aerialway - aeroway: JA:Key:aeroway - amenity: JA:Key:amenity - barrier: JA:Key:barrier - boundary: JA:Key:boundary + area: JA:Key:area + books: JA:Key:books + brand: JA:Key:brand bridge: JA:Key:bridge building: JA:Key:building + building:material: JA:Key:building:material + building:part: JA:Key:building:part + building:parts: JA:Key:building:parts + capacity: JA:Key:capacity + clothes: JA:Key:clothes + contact: JA:Key:contact crossing: JA:Key:crossing cuisine: JA:Key:cuisine cycleway: JA:Key:cycleway + denomination: JA:Key:denomination + description: JA:Key:description + diet:*: JA:Key:diet:* + disused: JA:Key:disused + drive_in: JA:Key:drive in + drive_through: JA:Key:drive through + easy_overtaking: JA:Key:easy overtaking electrified: JA:Key:electrified + emergency: JA:Key:emergency + end_date: JA:Key:end date + fee: JA:Key:fee fixme: JA:Key:fixme foot: JA:Key:foot - highway: JA:Key:highway - historic: JA:Key:historic + footway: JA:Key:footway + furniture: JA:Key:furniture + geological: JA:Key:geological + hazard_type: JA:Key:hazard type + height: JA:Key:height incline: JA:Key:incline - information: JA:Key:information - internet_access: JA:Key:internet access - landuse: JA:Key:landuse lanes: JA:Key:lanes - leisure: JA:Key:leisure - man_made: JA:Key:man made - military: JA:Key:military + level: JA:Key:level + lit: JA:Key:lit + mountain_pass: JA:Key:mountain pass name: JA:Key:name - natural: JA:Key:natural + note: JA:Key:note + oneway: JA:Key:oneway + opening_hours: JA:Key:opening hours operator: JA:Key:operator + overtaking: JA:Key:overtaking phone: JA:Key:phone power: JA:Key:power power_source: JA:Key:power source - railway: JA:Key:railway + public_transport: JA:Key:public transport ref: JA:Key:ref - route: JA:Key:route - shop: JA:Key:shop + religion: JA:Key:religion + roof:material: JA:Key:roof:material + room: JA:Key:room + seamark:fixme: JA:Key:seamark:fixme + segregated: JA:Key:segregated + social_facility: JA:Key:social facility + sport: JA:Key:sport + start_date: JA:Key:start date step_count: JA:Key:step count surface: JA:Key:surface tactile_paving: JA:Key:tactile paving - tourism: JA:Key:tourism + takeaway: JA:Key:takeaway tracktype: JA:Key:tracktype type: JA:Key:type - waterway: JA:Key:waterway + url: JA:Key:url + website: JA:Key:website wheelchair: JA:Key:wheelchair + width: JA:Key:width wikipedia: JA:Key:wikipedia + winter_road: JA:Key:winter road wood: JA:Key:wood tag: - amenity=arts_centre: JA:Tag:amenity=arts centre + abandoned=yes: JA:Tag:abandoned=yes + access=designated: JA:Tag:access=designated + aeroway=apron: JA:Tag:aeroway=apron + aeroway=helipad: JA:Tag:aeroway=helipad + aeroway=runway: JA:Tag:aeroway=runway + aeroway=taxiway: JA:Tag:aeroway=taxiway amenity=baby_hatch: JA:Tag:amenity=baby hatch + amenity=bank: JA:Tag:amenity=bank + amenity=bbq: JA:Tag:amenity=bbq + amenity=bench: JA:Tag:amenity=bench + amenity=bicycle_parking: JA:Tag:amenity=bicycle parking + amenity=bicycle_rental: JA:Tag:amenity=bicycle rental + amenity=biergarten: JA:Tag:amenity=biergarten + amenity=boat_storage: JA:Tag:amenity=boat storage + amenity=brothel: JA:Tag:amenity=brothel + amenity=bureau_de_change: JA:Tag:amenity=bureau de change amenity=bus_station: JA:Tag:amenity=bus station - amenity=cafe: JA:Tag:amenity=cafe - amenity=crematorium: JA:Tag:amenity=crematorium - amenity=drinking_water: JA:Tag:amenity=drinking water - amenity=fast_food: JA:Tag:amenity=fast food + amenity=car_rental: JA:Tag:amenity=car rental + amenity=car_wash: JA:Tag:amenity=car wash + amenity=clock: JA:Tag:amenity=clock + amenity=college: JA:Tag:amenity=college + amenity=courthouse: JA:Tag:amenity=courthouse + amenity=dentist: JA:Tag:amenity=dentist + amenity=embassy: JA:Tag:amenity=embassy + amenity=ferry_terminal: JA:Tag:amenity=ferry terminal amenity=fire_station: JA:Tag:amenity=fire station + amenity=food_court: JA:Tag:amenity=food court + amenity=fountain: JA:Tag:amenity=fountain + amenity=grave_yard: JA:Tag:amenity=grave yard + amenity=hunting_stand: JA:Tag:amenity=hunting stand + amenity=kindergarten: JA:Tag:amenity=kindergarten + amenity=library: JA:Tag:amenity=library + amenity=nightclub: JA:Tag:amenity=nightclub + amenity=nursing_home: JA:Tag:amenity=nursing home amenity=parking: JA:Tag:amenity=parking - amenity=place_of_worship: JA:Tag:amenity=place of worship - amenity=pub: JA:Tag:amenity=pub + amenity=parking_entrance: JA:Tag:amenity=parking entrance + amenity=parking_space: JA:Tag:amenity=parking space + amenity=pharmacy: JA:Tag:amenity=pharmacy + amenity=police: JA:Tag:amenity=police + amenity=post_box: JA:Tag:amenity=post box + amenity=post_office: JA:Tag:amenity=post office + amenity=recycling: JA:Tag:amenity=recycling amenity=restaurant: JA:Tag:amenity=restaurant - amenity=toilets: JA:Tag:amenity=toilets - amenity=vending_machine: JA:Tag:amenity=vending machine - amenity=veterinary: JA:Tag:amenity=veterinary + amenity=sauna: JA:Tag:amenity=sauna + amenity=shelter: JA:Tag:amenity=shelter + amenity=social_centre: JA:Tag:amenity=social centre + amenity=stripclub: JA:Tag:amenity=stripclub + amenity=studio: JA:Tag:amenity=studio + amenity=taxi: JA:Tag:amenity=taxi + amenity=university: JA:Tag:amenity=university + amenity=waste_basket: JA:Tag:amenity=waste basket + amenity=waste_disposal: JA:Tag:amenity=waste disposal + amenity=watering_place: JA:Tag:amenity=watering place + atm=yes: JA:Tag:atm=yes + barrier=bollard: JA:Tag:barrier=bollard + barrier=fence: JA:Tag:barrier=fence barrier=lift_gate: JA:Tag:barrier=lift gate + barrier=toll_booth: JA:Tag:barrier=toll booth + boundary=administrative: JA:Tag:boundary=administrative + boundary=national_park: JA:Tag:boundary=national park + boundary=protected_area: JA:Tag:boundary=protected area + bridge=viaduct: JA:Tag:bridge=viaduct + craft=brewery: JA:Tag:craft=brewery + emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher + emergency=fire_hydrant: JA:Tag:emergency=fire hydrant highway=crossing: JA:Tag:highway=crossing - highway=footway: JA:Tag:highway=footway - highway=pedestrian: JA:Tag:highway=pedestrian + highway=cycleway: JA:Tag:highway=cycleway + highway=motorway_link: JA:Tag:highway=motorway link + highway=path: JA:Tag:highway=path highway=residential: JA:Tag:highway=residential - highway=steps: JA:Tag:highway=steps + highway=rest_area: JA:Tag:highway=rest area + highway=road: JA:Tag:highway=road + highway=secondary: JA:Tag:highway=secondary + highway=services: JA:Tag:highway=services + highway=tertiary: JA:Tag:highway=tertiary highway=track: JA:Tag:highway=track highway=traffic_signals: JA:Tag:highway=traffic signals + highway=trunk: JA:Tag:highway=trunk + highway=unclassified: JA:Tag:highway=unclassified historic=archaeological_site: JA:Tag:historic=archaeological site + historic=battlefield: JA:Tag:historic=battlefield + historic=boundary_stone: JA:Tag:historic=boundary stone + historic=monument: JA:Tag:historic=monument + information=guidepost: JA:Tag:information=guidepost + landuse=allotments: JA:Tag:landuse=allotments + landuse=basin: JA:Tag:landuse=basin + landuse=brownfield: JA:Tag:landuse=brownfield + landuse=cemetery: JA:Tag:landuse=cemetery + landuse=commercial: JA:Tag:landuse=commercial + landuse=construction: JA:Tag:landuse=construction + landuse=farmyard: JA:Tag:landuse=farmyard landuse=forest: JA:Tag:landuse=forest landuse=garages: JA:Tag:landuse=garages + landuse=grass: JA:Tag:landuse=grass + landuse=greenfield: JA:Tag:landuse=greenfield + landuse=industrial: JA:Tag:landuse=industrial + landuse=landfill: JA:Tag:landuse=landfill + landuse=meadow: JA:Tag:landuse=meadow + landuse=military: JA:Tag:landuse=military + landuse=orchard: JA:Tag:landuse=orchard + landuse=plant_nursery: JA:Tag:landuse=plant nursery + landuse=quarry: JA:Tag:landuse=quarry + landuse=railway: JA:Tag:landuse=railway + landuse=recreation_ground: JA:Tag:landuse=recreation ground + landuse=reservoir: JA:Tag:landuse=reservoir + landuse=residential: JA:Tag:landuse=residential + landuse=retail: JA:Tag:landuse=retail + landuse=salt_pond: JA:Tag:landuse=salt pond + landuse=village_green: JA:Tag:landuse=village green landuse=wood: JA:Tag:landuse=wood + leisure=beach_resort: JA:Tag:leisure=beach resort + leisure=bird_hide: JA:Tag:leisure=bird hide + leisure=dance: JA:Tag:leisure=dance leisure=dog_park: JA:Tag:leisure=dog park - leisure=ice_rink: JA:Tag:leisure=ice rink + leisure=garden: JA:Tag:leisure=garden + leisure=golf_course: JA:Tag:leisure=golf course + leisure=marina: JA:Tag:leisure=marina + leisure=miniature_golf: JA:Tag:leisure=miniature golf + leisure=nature_reserve: JA:Tag:leisure=nature reserve + leisure=playground: JA:Tag:leisure=playground + leisure=slipway: JA:Tag:leisure=slipway + leisure=sports_centre: JA:Tag:leisure=sports centre + leisure=swimming_pool: JA:Tag:leisure=swimming pool + leisure=track: JA:Tag:leisure=track + man_made=adit: JA:Tag:man made=adit + man_made=breakwater: JA:Tag:man made=breakwater + man_made=crane: JA:Tag:man made=crane + man_made=cutline: JA:Tag:man made=cutline + man_made=flagpole: JA:Tag:man made=flagpole + man_made=groyne: JA:Tag:man made=groyne + man_made=kiln: JA:Tag:man made=kiln man_made=lighthouse: JA:Tag:man made=lighthouse - natural=coastline: JA:Tag:natural=coastline + man_made=mineshaft: JA:Tag:man made=mineshaft + man_made=pier: JA:Tag:man made=pier + man_made=tower: JA:Tag:man made=tower + man_made=water_well: JA:Tag:man made=water well + man_made=works: JA:Tag:man made=works + natural=heath: JA:Tag:natural=heath + natural=scree: JA:Tag:natural=scree + natural=tree_row: JA:Tag:natural=tree row natural=wood: JA:Tag:natural=wood + place=island: JA:Tag:place=island + place=islet: JA:Tag:place=islet + place=neighbourhood: JA:Tag:place=neighbourhood + place=suburb: JA:Tag:place=suburb power=generator: JA:Tag:power=generator + public_transport=platform: JA:Tag:public transport=platform railway=crossing: JA:Tag:railway=crossing railway=level_crossing: JA:Tag:railway=level crossing railway=rail: JA:Tag:railway=rail - railway=station: JA:Tag:railway=station + railway=tram: JA:Tag:railway=tram + route=road: JA:Tag:route=road + service=parking_aisle: JA:Tag:service=parking aisle + shop=alcohol: JA:Tag:shop=alcohol + shop=art: JA:Tag:shop=art + shop=bakery: JA:Tag:shop=bakery + shop=beauty: JA:Tag:shop=beauty + shop=bicycle: JA:Tag:shop=bicycle + shop=books: JA:Tag:shop=books + shop=boutique: JA:Tag:shop=boutique + shop=charity: JA:Tag:shop=charity + shop=chemist: JA:Tag:shop=chemist + shop=clothes: JA:Tag:shop=clothes + shop=confectionery: JA:Tag:shop=confectionery + shop=convenience: JA:Tag:shop=convenience + shop=deli: JA:Tag:shop=deli + shop=department_store: JA:Tag:shop=department store shop=doityourself: JA:Tag:shop=doityourself - shop=garden_centre: JA:Tag:shop=garden centre - shop=gift: JA:Tag:shop=gift + shop=florist: JA:Tag:shop=florist + shop=general: JA:Tag:shop=general + shop=hairdresser: JA:Tag:shop=hairdresser shop=motorcycle: JA:Tag:shop=motorcycle - shop=outdoor: JA:Tag:shop=outdoor - tourism=hostel: JA:Tag:tourism=hostel + shop=pet: JA:Tag:shop=pet + shop=second_hand: JA:Tag:shop=second hand + shop=supermarket: JA:Tag:shop=supermarket + shop=tobacco: JA:Tag:shop=tobacco tourism=hotel: JA:Tag:tourism=hotel - tourism=information: JA:Tag:tourism=information - tourism=viewpoint: JA:Tag:tourism=viewpoint - waterway=riverbank: JA:Tag:waterway=riverbank + tourism=museum: JA:Tag:tourism=museum + tourism=picnic_site: JA:Tag:tourism=picnic site + waterway=dam: JA:Tag:waterway=dam + waterway=ditch: JA:Tag:waterway=ditch + waterway=drain: JA:Tag:waterway=drain waterway=water_point: JA:Tag:waterway=water point + waterway=weir: JA:Tag:waterway=weir +ko: + key: + ele: Ko:Key:ele + wikipedia: Ko:Key:wikipedia + tag: + craft=tailor: Ko:Tag:craft=tailor + shop=garden_centre: Ko:Tag:shop=garden centre + shop=gift: Ko:Tag:shop=gift nl: key: - cycleway: NL:Key:cycleway + AND_nosr_r: NL:Key:AND nosr r + crossing: NL:Key:crossing + scenic: NL:Key:scenic + wheelchair: NL:Key:wheelchair tag: - highway=motorway: NL:Tag:highway=motorway - landuse=industrial: NL:Tag:landuse=industrial - shop=car: NL:Tag:shop=car - zoo=petting_zoo: NL:Tag:zoo=petting zoo + amenity=post_office: NL:Tag:amenity=post office + highway=footway: NL:Tag:highway=footway + highway=path: NL:Tag:highway=path + man_made=windmill: NL:Tag:man made=windmill no: key: amenity: No:Key:amenity boundary: No:Key:boundary + building: No:Key:building fenced: No:Key:fenced maxheight:legal: No:Key:maxheight:legal maxheight:marine: No:Key:maxheight:marine maxheight:physical: No:Key:maxheight:physical tag: amenity=bank: No:Tag:amenity=bank + amenity=fuel: No:Tag:amenity=fuel amenity=marketplace: No:Tag:amenity=marketplace amenity=pharmacy: No:Tag:amenity=pharmacy amenity=place_of_worship: No:Tag:amenity=place of worship boundary=maritime: No:Tag:boundary=maritime pl: key: + abutters: Pl:Key:abutters + access: Pl:Key:access + addr: Pl:Key:addr + addr:flats: Pl:Key:addr:flats + addr:place: Pl:Key:addr:place + addr:suburb: Pl:Key:addr:suburb + aerialway: Pl:Key:aerialway + aeroway: Pl:Key:aeroway + amenity: Pl:Key:amenity + area: Pl:Key:area + automatic_door: Pl:Key:automatic door + backrest: Pl:Key:backrest + bar: Pl:Key:bar + barrier: Pl:Key:barrier + bench: Pl:Key:bench + bicycle: Pl:Key:bicycle + bicycle_parking: Pl:Key:bicycle parking + bicycle_road: Pl:Key:bicycle road + bollard: Pl:Key:bollard + border_type: Pl:Key:border type + boundary: Pl:Key:boundary + brand: Pl:Key:brand + bridge: Pl:Key:bridge + building: Pl:Key:building + building:cullis:height: Pl:Key:building:cullis:height + building:levels: Pl:Key:building:levels + building:material: Pl:Key:building:material + building:min_level: Pl:Key:building:min level + building:part: Pl:Key:building:part + bunker_type: Pl:Key:bunker type + busway: Pl:Key:busway + capacity: Pl:Key:capacity + circumference: Pl:Key:circumference + colour: Pl:Key:colour + comment: Pl:Key:comment + construction: Pl:Key:construction + contact: Pl:Key:contact + covered: Pl:Key:covered + crop: Pl:Key:crop + crossing: Pl:Key:crossing + cutting: Pl:Key:cutting + deanery: Pl:Key:deanery + denomination: Pl:Key:denomination + denotation: Pl:Key:denotation + designation: Pl:Key:designation + destination: Pl:Key:destination + diocese: Pl:Key:diocese + ele: Pl:Key:ele + embankment: Pl:Key:embankment + emergency: Pl:Key:emergency + entrance: Pl:Key:entrance + fee: Pl:Key:fee + fixme: Pl:Key:fixme + foot: Pl:Key:foot + footway: Pl:Key:footway + generator:output: Pl:Key:generator:output height: Pl:Key:height + highway: Pl:Key:highway + historic: Pl:Key:historic + information: Pl:Key:information + inscription: Pl:Key:inscription + intermittent: Pl:Key:intermittent + is_in: Pl:Key:is in + junction: Pl:Key:junction + kerb: Pl:Key:kerb + landuse: Pl:Key:landuse + lanes: Pl:Key:lanes + lanes:psv: Pl:Key:lanes:psv + leisure: Pl:Key:leisure + lit: Pl:Key:lit + location: Pl:Key:location + lock: Pl:Key:lock + lock_name: Pl:Key:lock name + man_made: Pl:Key:man made + manhole: Pl:Key:manhole + maxheight: Pl:Key:maxheight + maxspeed: Pl:Key:maxspeed + maxstay: Pl:Key:maxstay + mooring: Pl:Key:mooring + name: Pl:Key:name + natural: Pl:Key:natural + noexit: Pl:Key:noexit + note: Pl:Key:note + office: Pl:Key:office oneway: Pl:Key:oneway + opening_hours: Pl:Key:opening hours + operator: Pl:Key:operator + overtaking: Pl:Key:overtaking + owner: Pl:Key:owner + ownership: Pl:Key:ownership + parking: Pl:Key:parking + parking:lane: Pl:Key:parking:lane + place: Pl:Key:place + place_name: Pl:Key:place name + power: Pl:Key:power + psv: Pl:Key:psv + public_transport: Pl:Key:public transport + railway: Pl:Key:railway + railway:area: Pl:Key:railway:area + ramp: Pl:Key:ramp + recycling_type: Pl:Key:recycling type + religion: Pl:Key:religion + roof:material: Pl:Key:roof:material + route: Pl:Key:route + route_master: Pl:Key:route master + sac_scale: Pl:Key:sac scale + seamark:fixme: Pl:Key:seamark:fixme + service: Pl:Key:service + service_times: Pl:Key:service times + shop: Pl:Key:shop + sidewalk: Pl:Key:sidewalk + step_count: Pl:Key:step count + surface: Pl:Key:surface + surveillance: Pl:Key:surveillance + surveillance:type: Pl:Key:surveillance:type + surveillance:zone: Pl:Key:surveillance:zone + tomb: Pl:Key:tomb + tourism: Pl:Key:tourism + tracktype: Pl:Key:tracktype + traffic_calming: Pl:Key:traffic calming + turn: Pl:Key:turn + type: Pl:Key:type + url: Pl:Key:url + usage: Pl:Key:usage + voltage: Pl:Key:voltage + waterway: Pl:Key:waterway + website: Pl:Key:website + wheelchair: Pl:Key:wheelchair + wikipedia: Pl:Key:wikipedia + wood: Pl:Key:wood + zoo: Pl:Key:zoo + tag: + access=designated: Pl:Tag:access=designated + access=official: Pl:Tag:access=official + access=private: Pl:Tag:access=private + aeroway=hangar: Pl:Tag:aeroway=hangar + amenity=atm: Pl:Tag:amenity=atm + amenity=baby_hatch: Pl:Tag:amenity=baby hatch + amenity=bank: Pl:Tag:amenity=bank + amenity=bench: Pl:Tag:amenity=bench + amenity=bicycle_parking: Pl:Tag:amenity=bicycle parking + amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental + amenity=brothel: Pl:Tag:amenity=brothel + amenity=compressed_air: Pl:Tag:amenity=compressed air + amenity=crypt: Pl:Tag:amenity=crypt + amenity=doctors: Pl:Tag:amenity=doctors + amenity=drinking_water: Pl:Tag:amenity=drinking water + amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal + amenity=fire_station: Pl:Tag:amenity=fire station + amenity=fuel: Pl:Tag:amenity=fuel + amenity=grave_yard: Pl:Tag:amenity=grave yard + amenity=parking: Pl:Tag:amenity=parking + amenity=parking_entrance: Pl:Tag:amenity=parking entrance + amenity=parking_space: Pl:Tag:amenity=parking space + amenity=pharmacy: Pl:Tag:amenity=pharmacy + amenity=place_of_worship: Pl:Tag:amenity=place of worship + amenity=post_box: Pl:Tag:amenity=post box + amenity=post_office: Pl:Tag:amenity=post office + amenity=recycling: Pl:Tag:amenity=recycling + amenity=school: Pl:Tag:amenity=school + amenity=taxi: Pl:Tag:amenity=taxi + amenity=vending_machine: Pl:Tag:amenity=vending machine + amenity=waste_disposal: Pl:Tag:amenity=waste disposal + atm=yes: Pl:Tag:atm=yes + barrier=block: Pl:Tag:barrier=block + barrier=bollard: Pl:Tag:barrier=bollard + barrier=bus_trap: Pl:Tag:barrier=bus trap + barrier=cattle_grid: Pl:Tag:barrier=cattle grid + barrier=chain: Pl:Tag:barrier=chain + barrier=city_wall: Pl:Tag:barrier=city wall + barrier=cycle_barrier: Pl:Tag:barrier=cycle barrier + barrier=ditch: Pl:Tag:barrier=ditch + barrier=entrance: Pl:Tag:barrier=entrance + barrier=fence: Pl:Tag:barrier=fence + barrier=gate: Pl:Tag:barrier=gate + barrier=guard_rail: Pl:Tag:barrier=guard rail + barrier=hedge: Pl:Tag:barrier=hedge + barrier=kerb: Pl:Tag:barrier=kerb + barrier=lift_gate: Pl:Tag:barrier=lift gate + barrier=retaining_wall: Pl:Tag:barrier=retaining wall + barrier=toll_booth: Pl:Tag:barrier=toll booth + barrier=turnstile: Pl:Tag:barrier=turnstile + barrier=wall: Pl:Tag:barrier=wall + boundary=administrative: Pl:Tag:boundary=administrative + boundary=religious_administration: Pl:Tag:boundary=religious administration + building=apartments: Pl:Tag:building=apartments + building=barn: Pl:Tag:building=barn + building=bridge: Pl:Tag:building=bridge + building=bunker: Pl:Tag:building=bunker + building=cabin: Pl:Tag:building=cabin + building=chapel: Pl:Tag:building=chapel + building=church: Pl:Tag:building=church + building=civic: Pl:Tag:building=civic + building=commercial: Pl:Tag:building=commercial + building=construction: Pl:Tag:building=construction + building=detached: Pl:Tag:building=detached + building=dormitory: Pl:Tag:building=dormitory + building=farm_auxiliary: Pl:Tag:building=farm auxiliary + building=garage: Pl:Tag:building=garage + building=garages: Pl:Tag:building=garages + building=greenhouse: Pl:Tag:building=greenhouse + building=hangar: Pl:Tag:building=hangar + building=hospital: Pl:Tag:building=hospital + building=hotel: Pl:Tag:building=hotel + building=house: Pl:Tag:building=house + building=hut: Pl:Tag:building=hut + building=industrial: Pl:Tag:building=industrial + building=manufacture: Pl:Tag:building=manufacture + building=office: Pl:Tag:building=office + building=public: Pl:Tag:building=public + building=residential: Pl:Tag:building=residential + building=retail: Pl:Tag:building=retail + building=roof: Pl:Tag:building=roof + building=school: Pl:Tag:building=school + building=shed: Pl:Tag:building=shed + building=supermarket: Pl:Tag:building=supermarket + building=terrace: Pl:Tag:building=terrace + building=train_station: Pl:Tag:building=train station + building=transportation: Pl:Tag:building=transportation + building=university: Pl:Tag:building=university + building=warehouse: Pl:Tag:building=warehouse + emergency=defibrillator: Pl:Tag:emergency=defibrillator + emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher + emergency=fire_flapper: Pl:Tag:emergency=fire flapper + emergency=fire_hose: Pl:Tag:emergency=fire hose + emergency=fire_hydrant: Pl:Tag:emergency=fire hydrant + emergency=fire_water_pond: Pl:Tag:emergency=fire water pond + emergency=suction_point: Pl:Tag:emergency=suction point + emergency=water_tank: Pl:Tag:emergency=water tank + footway=crossing: Pl:Tag:footway=crossing + footway=sidewalk: Pl:Tag:footway=sidewalk + highway=bridleway: Pl:Tag:highway=bridleway + highway=bus_stop: Pl:Tag:highway=bus stop + highway=crossing: Pl:Tag:highway=crossing + highway=cycleway: Pl:Tag:highway=cycleway + highway=footway: Pl:Tag:highway=footway + highway=give_way: Pl:Tag:highway=give way + highway=living_street: Pl:Tag:highway=living street + highway=milestone: Pl:Tag:highway=milestone + highway=motorway: Pl:Tag:highway=motorway + highway=path: Pl:Tag:highway=path + highway=pedestrian: Pl:Tag:highway=pedestrian + highway=primary: Pl:Tag:highway=primary + highway=proposed: Pl:Tag:highway=proposed + highway=raceway: Pl:Tag:highway=raceway + highway=residential: Pl:Tag:highway=residential + highway=road: Pl:Tag:highway=road + highway=secondary: Pl:Tag:highway=secondary + highway=service: Pl:Tag:highway=service + highway=speed_camera: Pl:Tag:highway=speed camera + highway=street_lamp: Pl:Tag:highway=street lamp + highway=tertiary: Pl:Tag:highway=tertiary + highway=track: Pl:Tag:highway=track + highway=trunk: Pl:Tag:highway=trunk + highway=unclassified: Pl:Tag:highway=unclassified + historic=battlefield: Pl:Tag:historic=battlefield + historic=city_gate: Pl:Tag:historic=city gate + historic=memorial: Pl:Tag:historic=memorial + historic=monument: Pl:Tag:historic=monument + historic=ruins: Pl:Tag:historic=ruins + historic=tomb: Pl:Tag:historic=tomb + historic=wayside_shrine: Pl:Tag:historic=wayside shrine + information=guidepost: Pl:Tag:information=guidepost + junction=roundabout: Pl:Tag:junction=roundabout + landuse=allotments: Pl:Tag:landuse=allotments + landuse=brownfield: Pl:Tag:landuse=brownfield + landuse=cemetery: Pl:Tag:landuse=cemetery + landuse=farm: Pl:Tag:landuse=farm + landuse=farmyard: Pl:Tag:landuse=farmyard + landuse=forest: Pl:Tag:landuse=forest + landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture + landuse=landfill: Pl:Tag:landuse=landfill + landuse=meadow: Pl:Tag:landuse=meadow + landuse=plant_nursery: Pl:Tag:landuse=plant nursery + landuse=quarry: Pl:Tag:landuse=quarry + landuse=railway: Pl:Tag:landuse=railway + landuse=religious: Pl:Tag:landuse=religious + leisure=firepit: Pl:Tag:leisure=firepit + leisure=fishing: Pl:Tag:leisure=fishing + man_made=cross: Pl:Tag:man made=cross + man_made=cutline: Pl:Tag:man made=cutline + man_made=dyke: Pl:Tag:man made=dyke + man_made=embankment: Pl:Tag:man made=embankment + man_made=surveillance: Pl:Tag:man made=surveillance + man_made=tower: Pl:Tag:man made=tower + man_made=watermill: Pl:Tag:man made=watermill + man_made=windmill: Pl:Tag:man made=windmill + mooring=ferry: Pl:Tag:mooring=ferry + natural=bay: Pl:Tag:natural=bay + natural=cave_entrance: Pl:Tag:natural=cave entrance + natural=grassland: Pl:Tag:natural=grassland + natural=heath: Pl:Tag:natural=heath + natural=scrub: Pl:Tag:natural=scrub + natural=sinkhole: Pl:Tag:natural=sinkhole + natural=tree: Pl:Tag:natural=tree + natural=tree_row: Pl:Tag:natural=tree row + natural=wetland: Pl:Tag:natural=wetland + natural=wood: Pl:Tag:natural=wood + place=city: Pl:Tag:place=city + place=farm: Pl:Tag:place=farm + place=hamlet: Pl:Tag:place=hamlet + place=isolated_dwelling: Pl:Tag:place=isolated dwelling + place=locality: Pl:Tag:place=locality + place=neighbourhood: Pl:Tag:place=neighbourhood + place=suburb: Pl:Tag:place=suburb + place=town: Pl:Tag:place=town + place=village: Pl:Tag:place=village + power=generator: Pl:Tag:power=generator + power=line: Pl:Tag:power=line + power=minor_line: Pl:Tag:power=minor line + power=pole: Pl:Tag:power=pole + power=sub_station: Pl:Tag:power=sub station + power=tower: Pl:Tag:power=tower + power=transformer: Pl:Tag:power=transformer + public_transport=platform: Pl:Tag:public transport=platform + public_transport=stop_area: Pl:Tag:public transport=stop area + public_transport=stop_position: Pl:Tag:public transport=stop position + railway=abandoned: Pl:Tag:railway=abandoned + railway=crossing: Pl:Tag:railway=crossing + railway=crossing_controller: Pl:Tag:railway=crossing controller + railway=level_crossing: Pl:Tag:railway=level crossing + service=alley: Pl:Tag:service=alley + service=drive-through: Pl:Tag:service=drive-through + service=driveway: Pl:Tag:service=driveway + service=emergency_access: Pl:Tag:service=emergency access + service=parking_aisle: Pl:Tag:service=parking aisle + service=parts: Pl:Tag:service=parts + service=siding: Pl:Tag:service=siding + service=spur: Pl:Tag:service=spur + service=yard: Pl:Tag:service=yard + shop=baby_goods: Pl:Tag:shop=baby goods + shop=bicycle: Pl:Tag:shop=bicycle + shop=funeral_directors: Pl:Tag:shop=funeral directors + sport=aikido: Pl:Tag:sport=aikido + tourism=artwork: Pl:Tag:tourism=artwork + tourism=camp_site: Pl:Tag:tourism=camp site + tourism=caravan_site: Pl:Tag:tourism=caravan site + tourism=chalet: Pl:Tag:tourism=chalet + tourism=guest_house: Pl:Tag:tourism=guest house + tourism=hostel: Pl:Tag:tourism=hostel + tourism=hotel: Pl:Tag:tourism=hotel + tourism=information: Pl:Tag:tourism=information + tourism=motel: Pl:Tag:tourism=motel + tourism=museum: Pl:Tag:tourism=museum + tourism=picnic_site: Pl:Tag:tourism=picnic site + tourism=theme_park: Pl:Tag:tourism=theme park + tourism=viewpoint: Pl:Tag:tourism=viewpoint + tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut + tourism=zoo: Pl:Tag:tourism=zoo + tunnel=culvert: Pl:Tag:tunnel=culvert + type=public_transport: Pl:Tag:type=public transport + waterway=boatyard: Pl:Tag:waterway=boatyard + waterway=canal: Pl:Tag:waterway=canal + waterway=dam: Pl:Tag:waterway=dam + waterway=ditch: Pl:Tag:waterway=ditch + waterway=drain: Pl:Tag:waterway=drain + waterway=fish_pass: Pl:Tag:waterway=fish pass + waterway=lock_gate: Pl:Tag:waterway=lock gate + waterway=river: Pl:Tag:waterway=river + waterway=riverbank: Pl:Tag:waterway=riverbank + waterway=stream: Pl:Tag:waterway=stream + waterway=weir: Pl:Tag:waterway=weir + wood=coniferous: Pl:Tag:wood=coniferous + wood=deciduous: Pl:Tag:wood=deciduous + wood=evergreen: Pl:Tag:wood=evergreen + wood=mixed: Pl:Tag:wood=mixed +pt: + key: + postal_code: Pt:Key:postal code + sport: Pt:Key:sport + tag: + amenity=hospital: Pt:Tag:amenity=hospital + highway=primary: Pt:Tag:highway=primary + leisure=fishing: Pt:Tag:leisure=fishing + leisure=garden: Pt:Tag:leisure=garden + leisure=golf_course: Pt:Tag:leisure=golf course + leisure=marina: Pt:Tag:leisure=marina + leisure=nature_reserve: Pt:Tag:leisure=nature reserve + leisure=park: Pt:Tag:leisure=park + leisure=pitch: Pt:Tag:leisure=pitch + leisure=playground: Pt:Tag:leisure=playground + leisure=slipway: Pt:Tag:leisure=slipway + leisure=sports_centre: Pt:Tag:leisure=sports centre + leisure=stadium: Pt:Tag:leisure=stadium + leisure=track: Pt:Tag:leisure=track + leisure=water_park: Pt:Tag:leisure=water park + sport=golf: Pt:Tag:sport=golf pt-br: key: + IBGE:tipo: Pt-br:Key:IBGE:tipo + TMC: Pt-br:Key:TMC abutters: Pt-br:Key:abutters access: Pt-br:Key:access addr: Pt-br:Key:addr + aerialway: Pt-br:Key:aerialway aeroway: Pt-br:Key:aeroway amenity: Pt-br:Key:amenity + area: Pt-br:Key:area barrier: Pt-br:Key:barrier bicycle: Pt-br:Key:bicycle boat: Pt-br:Key:boat @@ -1386,23 +4131,42 @@ pt-br: boundary: Pt-br:Key:boundary bridge: Pt-br:Key:bridge building: Pt-br:Key:building + cables: Pt-br:Key:cables cep: Pt-br:Key:cep construction: Pt-br:Key:construction + contact: Pt-br:Key:contact + craft: Pt-br:Key:craft + created_by: Pt-br:Key:created by + crossing: Pt-br:Key:crossing + cuisine: Pt-br:Key:cuisine + cutting: Pt-br:Key:cutting cycleway: Pt-br:Key:cycleway ele: Pt-br:Key:ele + electrified: Pt-br:Key:electrified + embankment: Pt-br:Key:embankment emergency: Pt-br:Key:emergency fenced: Pt-br:Key:fenced foot: Pt-br:Key:foot + frequency: Pt-br:Key:frequency geological: Pt-br:Key:geological hgv: Pt-br:Key:hgv highway: Pt-br:Key:highway historic: Pt-br:Key:historic horse: Pt-br:Key:horse + iata: Pt-br:Key:iata + icao: Pt-br:Key:icao + ice_road: Pt-br:Key:ice road + incline: Pt-br:Key:incline + intermittent: Pt-br:Key:intermittent internet_access: Pt-br:Key:internet access + is_in: Pt-br:Key:is in + junction: Pt-br:Key:junction landuse: Pt-br:Key:landuse lanes: Pt-br:Key:lanes leisure: Pt-br:Key:leisure + listed_status: Pt-br:Key:listed status lit: Pt-br:Key:lit + lock: Pt-br:Key:lock man_made: Pt-br:Key:man made maxdraught: Pt-br:Key:maxdraught maxheight: Pt-br:Key:maxheight @@ -1412,195 +4176,865 @@ pt-br: maxspeed: Pt-br:Key:maxspeed maxweight: Pt-br:Key:maxweight military: Pt-br:Key:military + mooring: Pt-br:Key:mooring motorcar: Pt-br:Key:motorcar motorcycle: Pt-br:Key:motorcycle + motorroad: Pt-br:Key:motorroad + mountain_pass: Pt-br:Key:mountain pass + mtb: Pt-br:Key:mtb name: Pt-br:Key:name natural: Pt-br:Key:natural noname: Pt-br:Key:noname office: Pt-br:Key:office oneway: Pt-br:Key:oneway operator: Pt-br:Key:operator + overtaking: Pt-br:Key:overtaking + passing_places: Pt-br:Key:passing places + place: Pt-br:Key:place + population: Pt-br:Key:population + postal_code: Pt-br:Key:postal code + power: Pt-br:Key:power psv: Pt-br:Key:psv + public_transport: Pt-br:Key:public transport railway: Pt-br:Key:railway + ref: Pt-br:Key:ref religion: Pt-br:Key:religion route: Pt-br:Key:route + sac_scale: Pt-br:Key:sac scale seamark: Pt-br:Key:seamark + seasonal: Pt-br:Key:seasonal service: Pt-br:Key:service shop: Pt-br:Key:shop ski: Pt-br:Key:ski + smoothness: Pt-br:Key:smoothness source: Pt-br:Key:source sport: Pt-br:Key:sport surface: Pt-br:Key:surface tourism: Pt-br:Key:tourism tracktype: Pt-br:Key:tracktype traffic_calming: Pt-br:Key:traffic calming + trail_visibility: Pt-br:Key:trail visibility + tunnel: Pt-br:Key:tunnel type: Pt-br:Key:type + usage: Pt-br:Key:usage + voltage: Pt-br:Key:voltage waterway: Pt-br:Key:waterway + winter_road: Pt-br:Key:winter road + wires: Pt-br:Key:wires tag: + aerialway=cable_car: Pt-br:Tag:aerialway=cable car + aerialway=station: Pt-br:Tag:aerialway=station + aeroway=aerodrome: Pt-br:Tag:aeroway=aerodrome + aeroway=apron: Pt-br:Tag:aeroway=apron + aeroway=gate: Pt-br:Tag:aeroway=gate + aeroway=helipad: Pt-br:Tag:aeroway=helipad + aeroway=runway: Pt-br:Tag:aeroway=runway + aeroway=taxiway: Pt-br:Tag:aeroway=taxiway + aeroway=terminal: Pt-br:Tag:aeroway=terminal + aeroway=windsock: Pt-br:Tag:aeroway=windsock + amenity=architect_office: Pt-br:Tag:amenity=architect office + amenity=arts_centre: Pt-br:Tag:amenity=arts centre + amenity=atm: Pt-br:Tag:amenity=atm + amenity=baby_hatch: Pt-br:Tag:amenity=baby hatch amenity=bank: Pt-br:Tag:amenity=bank + amenity=bar: Pt-br:Tag:amenity=bar + amenity=bbq: Pt-br:Tag:amenity=bbq + amenity=bench: Pt-br:Tag:amenity=bench + amenity=bicycke_parking: Pt-br:Tag:amenity=bicycke parking + amenity=bicycle_rental: Pt-br:Tag:amenity=bicycle rental + amenity=biergarten: Pt-br:Tag:amenity=biergarten amenity=brothel: Pt-br:Tag:amenity=brothel + amenity=bureau_de_change: Pt-br:Tag:amenity=bureau de change + amenity=bus_station: Pt-br:Tag:amenity=bus station + amenity=cafe: Pt-br:Tag:amenity=cafe + amenity=car_rental: Pt-br:Tag:amenity=car rental + amenity=car_sharing: Pt-br:Tag:amenity=car sharing + amenity=car_wash: Pt-br:Tag:amenity=car wash + amenity=cinema: Pt-br:Tag:amenity=cinema + amenity=clock: Pt-br:Tag:amenity=clock + amenity=college: Pt-br:Tag:amenity=college + amenity=community_centre: Pt-br:Tag:amenity=community centre + amenity=courthouse: Pt-br:Tag:amenity=courthouse + amenity=crematorium: Pt-br:Tag:amenity=crematorium + amenity=dentist: Pt-br:Tag:amenity=dentist + amenity=doctors: Pt-br:Tag:amenity=doctors + amenity=drinking_water: Pt-br:Tag:amenity=drinking water + amenity=embassy: Pt-br:Tag:amenity=embassy + amenity=ev_charging: Pt-br:Tag:amenity=ev charging + amenity=fast_food: Pt-br:Tag:amenity=fast food + amenity=ferry_terminal: Pt-br:Tag:amenity=ferry terminal + amenity=fire_hydrant: Pt-br:Tag:amenity=fire hydrant + amenity=fire_station: Pt-br:Tag:amenity=fire station + amenity=food_court: Pt-br:Tag:amenity=food court + amenity=fountain: Pt-br:Tag:amenity=fountain amenity=fuel: Pt-br:Tag:amenity=fuel + amenity=grave_yard: Pt-br:Tag:amenity=grave yard + amenity=grit_bin: Pt-br:Tag:amenity=grit bin + amenity=hospital: Pt-br:Tag:amenity=hospital + amenity=hunting_stand: Pt-br:Tag:amenity=hunting stand + amenity=ice_cream: Pt-br:Tag:amenity=ice cream + amenity=kindergarten: Pt-br:Tag:amenity=kindergarten + amenity=library: Pt-br:Tag:amenity=library + amenity=love_hotel: Pt-br:Tag:amenity=love hotel amenity=marketplace: Pt-br:Tag:amenity=marketplace amenity=nightclub: Pt-br:Tag:amenity=nightclub + amenity=nursing_home: Pt-br:Tag:amenity=nursing home + amenity=parking: Pt-br:Tag:amenity=parking + amenity=pharmacy: Pt-br:Tag:amenity=pharmacy amenity=place_of_worship: Pt-br:Tag:amenity=place of worship + amenity=police: Pt-br:Tag:amenity=police + amenity=post_box: Pt-br:Tag:amenity=post box + amenity=post_office: Pt-br:Tag:amenity=post office + amenity=prison: Pt-br:Tag:amenity=prison + amenity=pub: Pt-br:Tag:amenity=pub + amenity=public_building: Pt-br:Tag:amenity=public building + amenity=recycling: Pt-br:Tag:amenity=recycling + amenity=restaurant: Pt-br:Tag:amenity=restaurant + amenity=sauna: Pt-br:Tag:amenity=sauna + amenity=school: Pt-br:Tag:amenity=school + amenity=shelter: Pt-br:Tag:amenity=shelter + amenity=social_centre: Pt-br:Tag:amenity=social centre + amenity=social_facility: Pt-br:Tag:amenity=social facility amenity=stripclub: Pt-br:Tag:amenity=stripclub + amenity=studio: Pt-br:Tag:amenity=studio + amenity=taxi: Pt-br:Tag:amenity=taxi + amenity=telephone: Pt-br:Tag:amenity=telephone + amenity=theatre: Pt-br:Tag:amenity=theatre + amenity=toilets: Pt-br:Tag:amenity=toilets + amenity=townhall: Pt-br:Tag:amenity=townhall + amenity=university: Pt-br:Tag:amenity=university + amenity=vending_machine: Pt-br:Tag:amenity=vending machine + amenity=veterinary: Pt-br:Tag:amenity=veterinary + amenity=waste_basket: Pt-br:Tag:amenity=waste basket + amenity=waste_disposal: Pt-br:Tag:amenity=waste disposal + amenity=watering_place: Pt-br:Tag:amenity=watering place + barrier=city_wall: Pt-br:Tag:barrier=city wall + barrier=ditch: Pt-br:Tag:barrier=ditch + barrier=fence: Pt-br:Tag:barrier=fence + barrier=gate: Pt-br:Tag:barrier=gate + barrier=hedge: Pt-br:Tag:barrier=hedge + barrier=lift_gate: Pt-br:Tag:barrier=lift gate + barrier=retaining_wall: Pt-br:Tag:barrier=retaining wall + barrier=toll_booth: Pt-br:Tag:barrier=toll booth + barrier=wall: Pt-br:Tag:barrier=wall + boundary=administrative: Pt-br:Tag:boundary=administrative + boundary=civil: Pt-br:Tag:boundary=civil boundary=maritime: Pt-br:Tag:boundary=maritime + boundary=national_park: Pt-br:Tag:boundary=national park + boundary=political: Pt-br:Tag:boundary=political + boundary=protected_area: Pt-br:Tag:boundary=protected area + building=house: Pt-br:Tag:building=house + craft=agricultural_engines: Pt-br:Tag:craft=agricultural engines + craft=basket_maker: Pt-br:Tag:craft=basket maker + craft=beekeeper: Pt-br:Tag:craft=beekeeper + craft=blacksmith: Pt-br:Tag:craft=blacksmith + craft=boatbuilder: Pt-br:Tag:craft=boatbuilder + craft=bookbinder: Pt-br:Tag:craft=bookbinder + craft=brewery: Pt-br:Tag:craft=brewery + craft=carpenter: Pt-br:Tag:craft=carpenter + craft=carpet_layer: Pt-br:Tag:craft=carpet layer + craft=caterer: Pt-br:Tag:craft=caterer + craft=clockmaker: Pt-br:Tag:craft=clockmaker + craft=confectionery: Pt-br:Tag:craft=confectionery + craft=dressmaker: Pt-br:Tag:craft=dressmaker + craft=electrician: Pt-br:Tag:craft=electrician + craft=gardener: Pt-br:Tag:craft=gardener + craft=glaziery: Pt-br:Tag:craft=glaziery + craft=handicraft: Pt-br:Tag:craft=handicraft + craft=hvac: Pt-br:Tag:craft=hvac + craft=insulation: Pt-br:Tag:craft=insulation + craft=jeweller: Pt-br:Tag:craft=jeweller + craft=key_cutter: Pt-br:Tag:craft=key cutter + craft=locksmith: Pt-br:Tag:craft=locksmith + craft=metal_construction: Pt-br:Tag:craft=metal construction + craft=optician: Pt-br:Tag:craft=optician + craft=painter: Pt-br:Tag:craft=painter + craft=parquet_layer: Pt-br:Tag:craft=parquet layer + craft=photographer: Pt-br:Tag:craft=photographer + craft=photographic_laboratory: Pt-br:Tag:craft=photographic laboratory + craft=plasterer: Pt-br:Tag:craft=plasterer + craft=plumber: Pt-br:Tag:craft=plumber + craft=pottery: Pt-br:Tag:craft=pottery + craft=rigger: Pt-br:Tag:craft=rigger + craft=roofer: Pt-br:Tag:craft=roofer + craft=saddler: Pt-br:Tag:craft=saddler + craft=sailmaker: Pt-br:Tag:craft=sailmaker + craft=sawmill: Pt-br:Tag:craft=sawmill + craft=scaffolder: Pt-br:Tag:craft=scaffolder + craft=sculptor: Pt-br:Tag:craft=sculptor + craft=shoemaker: Pt-br:Tag:craft=shoemaker + craft=stand_builder: Pt-br:Tag:craft=stand builder + craft=stonemason: Pt-br:Tag:craft=stonemason + craft=sun_protection: Pt-br:Tag:craft=sun protection + craft=sweep: Pt-br:Tag:craft=sweep + craft=tailor: Pt-br:Tag:craft=tailor + craft=tiler: Pt-br:Tag:craft=tiler + craft=tinsmith: Pt-br:Tag:craft=tinsmith + craft=upholstrer: Pt-br:Tag:craft=upholstrer + craft=watchmaker: Pt-br:Tag:craft=watchmaker + emergency=ambulance_station: Pt-br:Tag:emergency=ambulance station + emergency=fire_hydrant: Pt-br:Tag:emergency=fire hydrant + emergency=phone: Pt-br:Tag:emergency=phone + emergency=siren: Pt-br:Tag:emergency=siren + geological=palaeontological_site: Pt-br:Tag:geological=palaeontological site + highway=bridleway: Pt-br:Tag:highway=bridleway + highway=bus_guideway: Pt-br:Tag:highway=bus guideway + highway=bus_stop: Pt-br:Tag:highway=bus stop + highway=byway: Pt-br:Tag:highway=byway + highway=crossing: Pt-br:Tag:highway=crossing + highway=cycleway: Pt-br:Tag:highway=cycleway + highway=emergency_access_point: Pt-br:Tag:highway=emergency access point + highway=footway: Pt-br:Tag:highway=footway + highway=ford: Pt-br:Tag:highway=ford + highway=give_way: Pt-br:Tag:highway=give way + highway=living_street: Pt-br:Tag:highway=living street + highway=mini_roundabout: Pt-br:Tag:highway=mini roundabout highway=motorway: Pt-br:Tag:highway=motorway highway=motorway_junction: Pt-br:Tag:highway=motorway junction highway=motorway_link: Pt-br:Tag:highway=motorway link + highway=passing_place: Pt-br:Tag:highway=passing place + highway=path: Pt-br:Tag:highway=path + highway=pedestrian: Pt-br:Tag:highway=pedestrian + highway=platform: Pt-br:Tag:highway=platform + highway=primary: Pt-br:Tag:highway=primary + highway=raceway: Pt-br:Tag:highway=raceway + highway=residential: Pt-br:Tag:highway=residential + highway=rest_area: Pt-br:Tag:highway=rest area highway=road: Pt-br:Tag:highway=road + highway=secondary: Pt-br:Tag:highway=secondary + highway=service: Pt-br:Tag:highway=service + highway=services: Pt-br:Tag:highway=services + highway=speed_camera: Pt-br:Tag:highway=speed camera + highway=steps: Pt-br:Tag:highway=steps highway=stop: Pt-br:Tag:highway=stop + highway=street_lamp: Pt-br:Tag:highway=street lamp + highway=tertiary: Pt-br:Tag:highway=tertiary + highway=track: Pt-br:Tag:highway=track + highway=traffic_signals: Pt-br:Tag:highway=traffic signals + highway=trunk: Pt-br:Tag:highway=trunk + highway=turning_circle: Pt-br:Tag:highway=turning circle highway=unclassified: Pt-br:Tag:highway=unclassified + historic=archaeological_site: Pt-br:Tag:historic=archaeological site + historic=battlefield: Pt-br:Tag:historic=battlefield + historic=boundary_stone: Pt-br:Tag:historic=boundary stone + historic=castle: Pt-br:Tag:historic=castle + historic=city_gate: Pt-br:Tag:historic=city gate + historic=memorial: Pt-br:Tag:historic=memorial + historic=monument: Pt-br:Tag:historic=monument + historic=ruins: Pt-br:Tag:historic=ruins + historic=wayside_cross: Pt-br:Tag:historic=wayside cross + historic=wayside_shrine: Pt-br:Tag:historic=wayside shrine + historic=wreck: Pt-br:Tag:historic=wreck + junction=roundabout: Pt-br:Tag:junction=roundabout + landuse=allotments: Pt-br:Tag:landuse=allotments + landuse=basin: Pt-br:Tag:landuse=basin + landuse=brownfield: Pt-br:Tag:landuse=brownfield landuse=cemetery: Pt-br:Tag:landuse=cemetery + landuse=commercial: Pt-br:Tag:landuse=commercial + landuse=farm: Pt-br:Tag:landuse=farm + landuse=farmyard: Pt-br:Tag:landuse=farmyard + landuse=forest: Pt-br:Tag:landuse=forest + landuse=garages: Pt-br:Tag:landuse=garages + landuse=grass: Pt-br:Tag:landuse=grass + landuse=greenfield: Pt-br:Tag:landuse=greenfield + landuse=greenhouse_horticulture: Pt-br:Tag:landuse=greenhouse horticulture + landuse=industrial: Pt-br:Tag:landuse=industrial + landuse=landfill: Pt-br:Tag:landuse=landfill landuse=meadow: Pt-br:Tag:landuse=meadow + landuse=military: Pt-br:Tag:landuse=military + landuse=orchard: Pt-br:Tag:landuse=orchard + landuse=quarry: Pt-br:Tag:landuse=quarry + landuse=railway: Pt-br:Tag:landuse=railway + landuse=recreation_ground: Pt-br:Tag:landuse=recreation ground + landuse=reservoir: Pt-br:Tag:landuse=reservoir + landuse=residential: Pt-br:Tag:landuse=residential + landuse=retail: Pt-br:Tag:landuse=retail + landuse=salt_pond: Pt-br:Tag:landuse=salt pond + landuse=village_green: Pt-br:Tag:landuse=village green + landuse=vineyard: Pt-br:Tag:landuse=vineyard + leisure=common: Pt-br:Tag:leisure=common + leisure=dance: Pt-br:Tag:leisure=dance + leisure=dog_park: Pt-br:Tag:leisure=dog park + leisure=garden: Pt-br:Tag:leisure=garden + leisure=golf_course: Pt-br:Tag:leisure=golf course + leisure=ice_rink: Pt-br:Tag:leisure=ice rink + leisure=marina: Pt-br:Tag:leisure=marina + leisure=miniature_golf: Pt-br:Tag:leisure=miniature golf + leisure=nature_reserve: Pt-br:Tag:leisure=nature reserve + leisure=park: Pt-br:Tag:leisure=park + leisure=pitch: Pt-br:Tag:leisure=pitch + leisure=playground: Pt-br:Tag:leisure=playground + leisure=slipway: Pt-br:Tag:leisure=slipway + leisure=sports_centre: Pt-br:Tag:leisure=sports centre + leisure=stadium: Pt-br:Tag:leisure=stadium + leisure=swimming_pool: Pt-br:Tag:leisure=swimming pool + leisure=track: Pt-br:Tag:leisure=track + leisure=water_park: Pt-br:Tag:leisure=water park + man_made=adit: Pt-br:Tag:man made=adit + man_made=antenna: Pt-br:Tag:man made=antenna + man_made=beacon: Pt-br:Tag:man made=beacon + man_made=breakwater: Pt-br:Tag:man made=breakwater + man_made=crane: Pt-br:Tag:man made=crane + man_made=cutline: Pt-br:Tag:man made=cutline + man_made=flagpole: Pt-br:Tag:man made=flagpole + man_made=groyne: Pt-br:Tag:man made=groyne + man_made=jetty: Pt-br:Tag:man made=jetty + man_made=lighthouse: Pt-br:Tag:man made=lighthouse + man_made=mineshaft: Pt-br:Tag:man made=mineshaft + man_made=monitoring_station: Pt-br:Tag:man made=monitoring station + man_made=petroleum_well: Pt-br:Tag:man made=petroleum well + man_made=pier: Pt-br:Tag:man made=pier + man_made=pipeline: Pt-br:Tag:man made=pipeline + man_made=reservoir_covered: Pt-br:Tag:man made=reservoir covered + man_made=surveillance: Pt-br:Tag:man made=surveillance man_made=survey_point: Pt-br:Tag:man made=survey point + man_made=tower: Pt-br:Tag:man made=tower + man_made=wastewater_plant: Pt-br:Tag:man made=wastewater plant + man_made=water_tower: Pt-br:Tag:man made=water tower + man_made=water_well: Pt-br:Tag:man made=water well + man_made=water_works: Pt-br:Tag:man made=water works + man_made=watermill: Pt-br:Tag:man made=watermill + man_made=windmill: Pt-br:Tag:man made=windmill + man_made=works: Pt-br:Tag:man made=works + military=airfield: Pt-br:Tag:military=airfield + military=barracks: Pt-br:Tag:military=barracks + military=bunker: Pt-br:Tag:military=bunker + military=danger_area: Pt-br:Tag:military=danger area + military=naval_base: Pt-br:Tag:military=naval base + military=range: Pt-br:Tag:military=range + natural=bay: Pt-br:Tag:natural=bay natural=beach: Pt-br:Tag:natural=beach + natural=cave_entrance: Pt-br:Tag:natural=cave entrance + natural=cliff: Pt-br:Tag:natural=cliff + natural=coastline: Pt-br:Tag:natural=coastline + natural=fell: Pt-br:Tag:natural=fell + natural=glacier: Pt-br:Tag:natural=glacier + natural=grassland: Pt-br:Tag:natural=grassland + natural=heath: Pt-br:Tag:natural=heath + natural=mud: Pt-br:Tag:natural=mud + natural=peak: Pt-br:Tag:natural=peak + natural=sand: Pt-br:Tag:natural=sand + natural=scree: Pt-br:Tag:natural=scree + natural=scrub: Pt-br:Tag:natural=scrub + natural=spring: Pt-br:Tag:natural=spring + natural=stone: Pt-br:Tag:natural=stone + natural=tree: Pt-br:Tag:natural=tree + natural=volcano: Pt-br:Tag:natural=volcano + natural=water: Pt-br:Tag:natural=water natural=wetland: Pt-br:Tag:natural=wetland + natural=wood: Pt-br:Tag:natural=wood + office=accountant: Pt-br:Tag:office=accountant + office=administrative: Pt-br:Tag:office=administrative + office=architect: Pt-br:Tag:office=architect + office=camping: Pt-br:Tag:office=camping + office=company: Pt-br:Tag:office=company + office=educational_institution: Pt-br:Tag:office=educational institution + office=employment_agency: Pt-br:Tag:office=employment agency + office=estate_agent: Pt-br:Tag:office=estate agent + office=government: Pt-br:Tag:office=government + office=insurance: Pt-br:Tag:office=insurance + office=it: Pt-br:Tag:office=it + office=lawyer: Pt-br:Tag:office=lawyer + office=newspaper: Pt-br:Tag:office=newspaper + office=ngo: Pt-br:Tag:office=ngo + office=quango: Pt-br:Tag:office=quango + office=research: Pt-br:Tag:office=research + office=telecommunication: Pt-br:Tag:office=telecommunication + office=travel_agent: Pt-br:Tag:office=travel agent + place=city: Pt-br:Tag:place=city + place=continent: Pt-br:Tag:place=continent + place=country: Pt-br:Tag:place=country + place=county: Pt-br:Tag:place=county + place=farm: Pt-br:Tag:place=farm + place=hamlet: Pt-br:Tag:place=hamlet + place=island: Pt-br:Tag:place=island + place=islet: Pt-br:Tag:place=islet + place=isolated_dwelling: Pt-br:Tag:place=isolated dwelling + place=locality: Pt-br:Tag:place=locality + place=region: Pt-br:Tag:place=region + place=state: Pt-br:Tag:place=state + place=suburb: Pt-br:Tag:place=suburb + place=town: Pt-br:Tag:place=town + place=village: Pt-br:Tag:place=village + power=cable_distribution_cabinet: Pt-br:Tag:power=cable distribution cabinet + power=generator: Pt-br:Tag:power=generator + power=line: Pt-br:Tag:power=line + power=minor_line: Pt-br:Tag:power=minor line + power=pole: Pt-br:Tag:power=pole + power=station: Pt-br:Tag:power=station + power=sub_station: Pt-br:Tag:power=sub station + power=tower: Pt-br:Tag:power=tower + railway=buffer_stop: Pt-br:Tag:railway=buffer stop + railway=crossing: Pt-br:Tag:railway=crossing + railway=derail: Pt-br:Tag:railway=derail + railway=funicular: Pt-br:Tag:railway=funicular + railway=halt: Pt-br:Tag:railway=halt + railway=level_crossing: Pt-br:Tag:railway=level crossing + railway=monorail: Pt-br:Tag:railway=monorail + railway=platform: Pt-br:Tag:railway=platform railway=rail: Pt-br:Tag:railway=rail + railway=station: Pt-br:Tag:railway=station + railway=subway: Pt-br:Tag:railway=subway + railway=subway_entrance: Pt-br:Tag:railway=subway entrance + railway=switch: Pt-br:Tag:railway=switch + railway=tram: Pt-br:Tag:railway=tram + railway=tram_stop: Pt-br:Tag:railway=tram stop + railway=turntable: Pt-br:Tag:railway=turntable + route=bus: Pt-br:Tag:route=bus + route=detour: Pt-br:Tag:route=detour + route=ferry: Pt-br:Tag:route=ferry + route=railway: Pt-br:Tag:route=railway + route=road: Pt-br:Tag:route=road + route=train: Pt-br:Tag:route=train + route=tram: Pt-br:Tag:route=tram + service=alley: Pt-br:Tag:service=alley + service=driveway: Pt-br:Tag:service=driveway + service=parking_aisle: Pt-br:Tag:service=parking aisle + service=siding: Pt-br:Tag:service=siding + service=spur: Pt-br:Tag:service=spur + service=yard: Pt-br:Tag:service=yard + shop=alcohol: Pt-br:Tag:shop=alcohol + shop=anime: Pt-br:Tag:shop=anime + shop=art: Pt-br:Tag:shop=art + shop=baby_goods: Pt-br:Tag:shop=baby goods + shop=bakery: Pt-br:Tag:shop=bakery + shop=bathroom_furnishing: Pt-br:Tag:shop=bathroom furnishing + shop=beauty: Pt-br:Tag:shop=beauty + shop=bed: Pt-br:Tag:shop=bed + shop=beverages: Pt-br:Tag:shop=beverages + shop=bicycle: Pt-br:Tag:shop=bicycle + shop=books: Pt-br:Tag:shop=books + shop=boutique: Pt-br:Tag:shop=boutique + shop=butcher: Pt-br:Tag:shop=butcher + shop=car: Pt-br:Tag:shop=car + shop=car_repair: Pt-br:Tag:shop=car repair + shop=charity: Pt-br:Tag:shop=charity + shop=chemist: Pt-br:Tag:shop=chemist + shop=clothes: Pt-br:Tag:shop=clothes + shop=computer: Pt-br:Tag:shop=computer + shop=confectionery: Pt-br:Tag:shop=confectionery + shop=convenience: Pt-br:Tag:shop=convenience + shop=copyshop: Pt-br:Tag:shop=copyshop + shop=curtain: Pt-br:Tag:shop=curtain + shop=deli: Pt-br:Tag:shop=deli + shop=department_store: Pt-br:Tag:shop=department store + shop=dive: Pt-br:Tag:shop=dive + shop=doityourself: Pt-br:Tag:shop=doityourself + shop=dry_cleaning: Pt-br:Tag:shop=dry cleaning + shop=electronics: Pt-br:Tag:shop=electronics + shop=erotic: Pt-br:Tag:shop=erotic + shop=fabric: Pt-br:Tag:shop=fabric + shop=farm: Pt-br:Tag:shop=farm + shop=florist: Pt-br:Tag:shop=florist + shop=frame: Pt-br:Tag:shop=frame + shop=funeral_directors: Pt-br:Tag:shop=funeral directors + shop=furnace: Pt-br:Tag:shop=furnace + shop=furniture: Pt-br:Tag:shop=furniture + shop=garden_centre: Pt-br:Tag:shop=garden centre + shop=gas: Pt-br:Tag:shop=gas + shop=general: Pt-br:Tag:shop=general + shop=gift: Pt-br:Tag:shop=gift + shop=glaziery: Pt-br:Tag:shop=glaziery + shop=greengrocer: Pt-br:Tag:shop=greengrocer + shop=hairdresser: Pt-br:Tag:shop=hairdresser + shop=hardware: Pt-br:Tag:shop=hardware + shop=hearing_aids: Pt-br:Tag:shop=hearing aids + shop=hifi: Pt-br:Tag:shop=hifi + shop=hunting: Pt-br:Tag:shop=hunting + shop=insurance: Pt-br:Tag:shop=insurance + shop=interior_decoration: Pt-br:Tag:shop=interior decoration + shop=jewelry: Pt-br:Tag:shop=jewelry + shop=kiosk: Pt-br:Tag:shop=kiosk + shop=kitchen: Pt-br:Tag:shop=kitchen + shop=laundry: Pt-br:Tag:shop=laundry shop=mall: Pt-br:Tag:shop=mall + shop=massage: Pt-br:Tag:shop=massage + shop=mobile_phone: Pt-br:Tag:shop=mobile phone + shop=money_lender: Pt-br:Tag:shop=money lender + shop=motorcycle: Pt-br:Tag:shop=motorcycle + shop=musical_instrument: Pt-br:Tag:shop=musical instrument + shop=newsagent: Pt-br:Tag:shop=newsagent + shop=optician: Pt-br:Tag:shop=optician + shop=organic: Pt-br:Tag:shop=organic + shop=outdoor: Pt-br:Tag:shop=outdoor + shop=paint: Pt-br:Tag:shop=paint + shop=pawnbroker: Pt-br:Tag:shop=pawnbroker + shop=pet: Pt-br:Tag:shop=pet + shop=radiotechnics: Pt-br:Tag:shop=radiotechnics + shop=seafood: Pt-br:Tag:shop=seafood + shop=second_hand: Pt-br:Tag:shop=second hand + shop=shoes: Pt-br:Tag:shop=shoes + shop=sports: Pt-br:Tag:shop=sports shop=stationery: Pt-br:Tag:shop=stationery + shop=supermarket: Pt-br:Tag:shop=supermarket + shop=tattoo: Pt-br:Tag:shop=tattoo + shop=tobacco: Pt-br:Tag:shop=tobacco + shop=toys: Pt-br:Tag:shop=toys + shop=trade: Pt-br:Tag:shop=trade + shop=vacant: Pt-br:Tag:shop=vacant + shop=vacuum_cleaner: Pt-br:Tag:shop=vacuum cleaner + shop=variety_store: Pt-br:Tag:shop=variety store + shop=video: Pt-br:Tag:shop=video source=IBGE: Pt-br:Tag:source=IBGE + sport=soccer: Pt-br:Tag:sport=soccer + tourism=alpine_hut: Pt-br:Tag:tourism=alpine hut + tourism=artwork: Pt-br:Tag:tourism=artwork + tourism=attraction: Pt-br:Tag:tourism=attraction + tourism=camp_site: Pt-br:Tag:tourism=camp site + tourism=caravan_site: Pt-br:Tag:tourism=caravan site + tourism=chalet: Pt-br:Tag:tourism=chalet + tourism=guest_house: Pt-br:Tag:tourism=guest house + tourism=hostel: Pt-br:Tag:tourism=hostel + tourism=hotel: Pt-br:Tag:tourism=hotel + tourism=information: Pt-br:Tag:tourism=information + tourism=motel: Pt-br:Tag:tourism=motel + tourism=museum: Pt-br:Tag:tourism=museum + tourism=picnic_site: Pt-br:Tag:tourism=picnic site + tourism=theme_park: Pt-br:Tag:tourism=theme park tourism=viewpoint: Pt-br:Tag:tourism=viewpoint + tourism=zoo: Pt-br:Tag:tourism=zoo + waterway=boatyard: Pt-br:Tag:waterway=boatyard + waterway=canal: Pt-br:Tag:waterway=canal + waterway=dam: Pt-br:Tag:waterway=dam + waterway=ditch: Pt-br:Tag:waterway=ditch + waterway=dock: Pt-br:Tag:waterway=dock + waterway=drain: Pt-br:Tag:waterway=drain + waterway=lock_gate: Pt-br:Tag:waterway=lock gate + waterway=river: Pt-br:Tag:waterway=river waterway=riverbank: Pt-br:Tag:waterway=riverbank + waterway=stream: Pt-br:Tag:waterway=stream + waterway=turning_point: Pt-br:Tag:waterway=turning point + waterway=weir: Pt-br:Tag:waterway=weir ro: + key: + leisure: Ro:Key:leisure + tracktype: Ro:Key:tracktype tag: + amenity=nightclub: Ro:Tag:amenity=nightclub junction=roundabout: Ro:Tag:junction=roundabout -ro-md: - tag: - amenity=nightclub: Ro-md:Tag:amenity=nightclub ru: key: abutters: RU:Key:abutters access: RU:Key:access addr: RU:Key:addr + addr:flats: RU:Key:addr:flats + addr:place: RU:Key:addr:place + addr:suburb: RU:Key:addr:suburb aerialway: RU:Key:aerialway aeroway: RU:Key:aeroway amenity: RU:Key:amenity area: RU:Key:area + area:highway: RU:Key:area:highway barrier: RU:Key:barrier + bench: RU:Key:bench bicycle: RU:Key:bicycle + bicycle_parking: RU:Key:bicycle parking + bin: RU:Key:bin boat: RU:Key:boat border_type: RU:Key:border type boundary: RU:Key:boundary + brand: RU:Key:brand bridge: RU:Key:bridge building: RU:Key:building + building:levels: RU:Key:building:levels + building:material: RU:Key:building:material + building:min_level: RU:Key:building:min level + building:part: RU:Key:building:part + building:parts: RU:Key:building:parts bunker_type: RU:Key:bunker type + cafe: RU:Key:cafe capacity: RU:Key:capacity + check_date: RU:Key:check date + clothes: RU:Key:clothes + club: RU:Key:club + colour: RU:Key:colour comment: RU:Key:comment construction: RU:Key:construction + contact: RU:Key:contact covered: RU:Key:covered + craft: RU:Key:craft created_by: RU:Key:created by + crop: RU:Key:crop crossing: RU:Key:crossing cuisine: RU:Key:cuisine cutting: RU:Key:cutting denomination: RU:Key:denomination description: RU:Key:description + designation: RU:Key:designation direction: RU:Key:direction + dispensing: RU:Key:dispensing disused: RU:Key:disused + drive_in: RU:Key:drive in ele: RU:Key:ele + electrified: RU:Key:electrified embankment: RU:Key:embankment + emergency: RU:Key:emergency + entrance: RU:Key:entrance + exit: RU:Key:exit + fast_food: RU:Key:fast food fee: RU:Key:fee + fence_type: RU:Key:fence type + ferry: RU:Key:ferry fixme: RU:Key:fixme foot: RU:Key:foot + footway: RU:Key:footway + ford: RU:Key:ford + fuel: RU:Key:fuel gauge: RU:Key:gauge + generator:output: RU:Key:generator:output + generator:source: RU:Key:generator:source + gvr:code: RU:Key:gvr:code + handrail: RU:Key:handrail height: RU:Key:height highway: RU:Key:highway historic: RU:Key:historic horse: RU:Key:horse + ice_road: RU:Key:ice road + incline: RU:Key:incline information: RU:Key:information + inscription: RU:Key:inscription + intermittent: RU:Key:intermittent internet_access: RU:Key:internet access junction: RU:Key:junction + kerb: RU:Key:kerb + landmark: RU:Key:landmark landuse: RU:Key:landuse lanes: RU:Key:lanes + layer: RU:Key:layer leisure: RU:Key:leisure + length: RU:Key:length + level: RU:Key:level man_made: RU:Key:man made + manhole: RU:Key:manhole + maxaxleload: RU:Key:maxaxleload maxheight: RU:Key:maxheight maxlength: RU:Key:maxlength maxspeed: RU:Key:maxspeed + maxspeed:practical: RU:Key:maxspeed:practical + maxstay: RU:Key:maxstay maxweight: RU:Key:maxweight maxwidth: RU:Key:maxwidth military: RU:Key:military + min_height: RU:Key:min height minspeed: RU:Key:minspeed + motorroad: RU:Key:motorroad name: RU:Key:name natural: RU:Key:natural noexit: RU:Key:noexit note: RU:Key:note + office: RU:Key:office oneway: RU:Key:oneway + opening_date: RU:Key:opening date opening_hours: RU:Key:opening hours operator: RU:Key:operator + overtaking: RU:Key:overtaking parking: RU:Key:parking + parking:lane: RU:Key:parking:lane passing_places: RU:Key:passing places paved:date: RU:Key:paved:date + payment: RU:Key:payment phone: RU:Key:phone + piste:type: RU:Key:piste:type place: RU:Key:place + playground: RU:Key:playground population: RU:Key:population power: RU:Key:power - power_source: RU:Key:power source + priority_road: RU:Key:priority road + psv: RU:Key:psv railway: RU:Key:railway + ramp: RU:Key:ramp ref: RU:Key:ref religion: RU:Key:religion + resource: RU:Key:resource + roof:material: RU:Key:roof:material route: RU:Key:route + ruins: RU:Key:ruins + seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime service: RU:Key:service + shelter: RU:Key:shelter + shelter_type: RU:Key:shelter type shop: RU:Key:shop + side_road: RU:Key:side road + sidewalk: RU:Key:sidewalk + smoking: RU:Key:smoking smoothness: RU:Key:smoothness + snowplowing: RU:Key:snowplowing + social_facility: RU:Key:social facility + sorting_name: RU:Key:sorting name source: RU:Key:source + source:maxspeed: RU:Key:source:maxspeed + species: RU:Key:species + sport: RU:Key:sport surface: RU:Key:surface + surveillance: RU:Key:surveillance + tactile_paving: RU:Key:tactile paving + toll: RU:Key:toll tourism: RU:Key:tourism tracktype: RU:Key:tracktype traffic_calming: RU:Key:traffic calming + traffic_sign: RU:Key:traffic sign + tunnel: RU:Key:tunnel + turn: RU:Key:turn type: RU:Key:type + voltage: RU:Key:voltage + water: RU:Key:water waterway: RU:Key:waterway website: RU:Key:website + wheelchair: RU:Key:wheelchair width: RU:Key:width wikipedia: RU:Key:wikipedia + winter_road: RU:Key:winter road wood: RU:Key:wood tag: + abandoned=yes: RU:Tag:abandoned=yes access=designated: RU:Tag:access=designated aeroway=aerodrome: RU:Tag:aeroway=aerodrome aeroway=apron: RU:Tag:aeroway=apron aeroway=gate: RU:Tag:aeroway=gate aeroway=helipad: RU:Tag:aeroway=helipad + aeroway=navigationaid: RU:Tag:aeroway=navigationaid aeroway=runway: RU:Tag:aeroway=runway aeroway=taxiway: RU:Tag:aeroway=taxiway aeroway=terminal: RU:Tag:aeroway=terminal + aeroway=windsock: RU:Tag:aeroway=windsock + amenity=animal_boarding: RU:Tag:amenity=animal boarding + amenity=animal_shelter: RU:Tag:amenity=animal shelter + amenity=arts_centre: RU:Tag:amenity=arts centre + amenity=atm: RU:Tag:amenity=atm amenity=bank: RU:Tag:amenity=bank + amenity=bar: RU:Tag:amenity=bar + amenity=bbq: RU:Tag:amenity=bbq + amenity=bench: RU:Tag:amenity=bench + amenity=bicycle_parking: RU:Tag:amenity=bicycle parking amenity=bicycle_rental: RU:Tag:amenity=bicycle rental + amenity=biergarten: RU:Tag:amenity=biergarten + amenity=boat_storage: RU:Tag:amenity=boat storage amenity=brothel: RU:Tag:amenity=brothel + amenity=bureau_de_change: RU:Tag:amenity=bureau de change amenity=bus_station: RU:Tag:amenity=bus station + amenity=cafe: RU:Tag:amenity=cafe amenity=car_rental: RU:Tag:amenity=car rental amenity=car_sharing: RU:Tag:amenity=car sharing + amenity=car_wash: RU:Tag:amenity=car wash + amenity=casino: RU:Tag:amenity=casino + amenity=cinema: RU:Tag:amenity=cinema + amenity=clinic: RU:Tag:amenity=clinic + amenity=clock: RU:Tag:amenity=clock + amenity=college: RU:Tag:amenity=college + amenity=community_centre: RU:Tag:amenity=community centre + amenity=compressed_air: RU:Tag:amenity=compressed air + amenity=courthouse: RU:Tag:amenity=courthouse amenity=crematorium: RU:Tag:amenity=crematorium + amenity=dentist: RU:Tag:amenity=dentist + amenity=doctors: RU:Tag:amenity=doctors + amenity=drinking_water: RU:Tag:amenity=drinking water + amenity=driving_school: RU:Tag:amenity=driving school + amenity=embassy: RU:Tag:amenity=embassy amenity=fast_food: RU:Tag:amenity=fast food + amenity=ferry_terminal: RU:Tag:amenity=ferry terminal amenity=fire_station: RU:Tag:amenity=fire station + amenity=food_court: RU:Tag:amenity=food court amenity=fountain: RU:Tag:amenity=fountain amenity=fuel: RU:Tag:amenity=fuel amenity=grave_yard: RU:Tag:amenity=grave yard + amenity=hospital: RU:Tag:amenity=hospital + amenity=kindergarten: RU:Tag:amenity=kindergarten + amenity=library: RU:Tag:amenity=library + amenity=love_hotel: RU:Tag:amenity=love hotel + amenity=marketplace: RU:Tag:amenity=marketplace + amenity=monastery: RU:Tag:amenity=monastery + amenity=mortuary: RU:Tag:amenity=mortuary amenity=nightclub: RU:Tag:amenity=nightclub + amenity=nursing_home: RU:Tag:amenity=nursing home amenity=parking: RU:Tag:amenity=parking + amenity=parking_entrance: RU:Tag:amenity=parking entrance + amenity=parking_space: RU:Tag:amenity=parking space + amenity=payment_terminal: RU:Tag:amenity=payment terminal amenity=pharmacy: RU:Tag:amenity=pharmacy amenity=place_of_worship: RU:Tag:amenity=place of worship + amenity=police: RU:Tag:amenity=police + amenity=post_box: RU:Tag:amenity=post box + amenity=post_office: RU:Tag:amenity=post office + amenity=prison: RU:Tag:amenity=prison + amenity=pub: RU:Tag:amenity=pub + amenity=public_building: RU:Tag:amenity=public building + amenity=recycling: RU:Tag:amenity=recycling + amenity=register_office: RU:Tag:amenity=register office amenity=restaurant: RU:Tag:amenity=restaurant + amenity=sauna: RU:Tag:amenity=sauna amenity=school: RU:Tag:amenity=school + amenity=shelter: RU:Tag:amenity=shelter + amenity=shower: RU:Tag:amenity=shower + amenity=social_facility: RU:Tag:amenity=social facility amenity=stripclub: RU:Tag:amenity=stripclub amenity=taxi: RU:Tag:amenity=taxi amenity=telephone: RU:Tag:amenity=telephone amenity=theatre: RU:Tag:amenity=theatre amenity=toilets: RU:Tag:amenity=toilets + amenity=townhall: RU:Tag:amenity=townhall + amenity=university: RU:Tag:amenity=university amenity=vending_machine: RU:Tag:amenity=vending machine + amenity=veterinary: RU:Tag:amenity=veterinary amenity=waste_basket: RU:Tag:amenity=waste basket amenity=waste_disposal: RU:Tag:amenity=waste disposal atm=yes: RU:Tag:atm=yes + barrier=block: RU:Tag:barrier=block + barrier=bollard: RU:Tag:barrier=bollard + barrier=city_wall: RU:Tag:barrier=city wall + barrier=ditch: RU:Tag:barrier=ditch + barrier=entrance: RU:Tag:barrier=entrance barrier=fence: RU:Tag:barrier=fence + barrier=gate: RU:Tag:barrier=gate + barrier=hedge: RU:Tag:barrier=hedge barrier=lift_gate: RU:Tag:barrier=lift gate + barrier=retaining_wall: RU:Tag:barrier=retaining wall + barrier=sally_port: RU:Tag:barrier=sally port barrier=toll_booth: RU:Tag:barrier=toll booth + barrier=turnstile: RU:Tag:barrier=turnstile + barrier=wall: RU:Tag:barrier=wall + building=detached: RU:Tag:building=detached + building=dormitory: RU:Tag:building=dormitory building=entrance: RU:Tag:building=entrance + building=roof: RU:Tag:building=roof + building=shed: RU:Tag:building=shed + building=stable: RU:Tag:building=stable + building=train_station: RU:Tag:building=train station + bunker_type=pillbox: RU:Tag:bunker type=pillbox + cafe=time-cafe: RU:Tag:cafe=time-cafe + craft=agricultural_engines: RU:Tag:craft=agricultural engines + craft=basket_maker: RU:Tag:craft=basket maker + craft=beekeeper: RU:Tag:craft=beekeeper + craft=blacksmith: RU:Tag:craft=blacksmith + craft=boatbuilder: RU:Tag:craft=boatbuilder + craft=bookbinder: RU:Tag:craft=bookbinder + craft=brewery: RU:Tag:craft=brewery + craft=carpenter: RU:Tag:craft=carpenter + craft=carpet_layer: RU:Tag:craft=carpet layer + craft=caterer: RU:Tag:craft=caterer + craft=clockmaker: RU:Tag:craft=clockmaker + craft=dressmaker: RU:Tag:craft=dressmaker + craft=electrician: RU:Tag:craft=electrician + craft=glaziery: RU:Tag:craft=glaziery + craft=handicraft: RU:Tag:craft=handicraft + craft=shoemaker: RU:Tag:craft=shoemaker + craft=tailor: RU:Tag:craft=tailor + emergency=ambulance_station: RU:Tag:emergency=ambulance station + emergency=fire_hydrant: RU:Tag:emergency=fire hydrant + emergency=fire_water_pond: RU:Tag:emergency=fire water pond + fast_food=cafeteria: RU:Tag:fast food=cafeteria + footway=crossing: RU:Tag:footway=crossing + footway=sidewalk: RU:Tag:footway=sidewalk + geological=palaeontological_site: RU:Tag:geological=palaeontological site highway=bridleway: RU:Tag:highway=bridleway highway=bus_stop: RU:Tag:highway=bus stop + highway=construction: RU:Tag:highway=construction highway=crossing: RU:Tag:highway=crossing highway=cycleway: RU:Tag:highway=cycleway + highway=elevator: RU:Tag:highway=elevator highway=emergency_access_point: RU:Tag:highway=emergency access point highway=footway: RU:Tag:highway=footway highway=ford: RU:Tag:highway=ford + highway=give_way: RU:Tag:highway=give way highway=living_street: RU:Tag:highway=living street highway=mini_roundabout: RU:Tag:highway=mini roundabout highway=motorway: RU:Tag:highway=motorway @@ -1613,6 +5047,7 @@ ru: highway=primary: RU:Tag:highway=primary highway=primary_link: RU:Tag:highway=primary link highway=residential: RU:Tag:highway=residential + highway=rest_area: RU:Tag:highway=rest area highway=road: RU:Tag:highway=road highway=secondary: RU:Tag:highway=secondary highway=secondary_link: RU:Tag:highway=secondary link @@ -1622,6 +5057,7 @@ ru: highway=steps: RU:Tag:highway=steps highway=stop: RU:Tag:highway=stop highway=tertiary: RU:Tag:highway=tertiary + highway=tertiary_link: RU:Tag:highway=tertiary link highway=track: RU:Tag:highway=track highway=traffic_signals: RU:Tag:highway=traffic signals highway=trunk: RU:Tag:highway=trunk @@ -1630,77 +5066,288 @@ ru: highway=unclassified: RU:Tag:highway=unclassified historic=archaeological_site: RU:Tag:historic=archaeological site historic=battlefield: RU:Tag:historic=battlefield + historic=boundary_stone: RU:Tag:historic=boundary stone + historic=castle: RU:Tag:historic=castle + historic=city_gate: RU:Tag:historic=city gate + historic=fort: RU:Tag:historic=fort + historic=memorial: RU:Tag:historic=memorial + historic=monument: RU:Tag:historic=monument + historic=ruins: RU:Tag:historic=ruins + historic=rune_stone: RU:Tag:historic=rune stone + historic=ship: RU:Tag:historic=ship + historic=tree_shrine: RU:Tag:historic=tree shrine + historic=wayside_cross: RU:Tag:historic=wayside cross + historic=wayside_shrine: RU:Tag:historic=wayside shrine + historic=wreck: RU:Tag:historic=wreck information=guidepost: RU:Tag:information=guidepost junction=roundabout: RU:Tag:junction=roundabout landuse=allotments: RU:Tag:landuse=allotments + landuse=basin: RU:Tag:landuse=basin landuse=cemetery: RU:Tag:landuse=cemetery + landuse=commercial: RU:Tag:landuse=commercial + landuse=construction: RU:Tag:landuse=construction + landuse=farm: RU:Tag:landuse=farm landuse=forest: RU:Tag:landuse=forest landuse=garages: RU:Tag:landuse=garages + landuse=grass: RU:Tag:landuse=grass + landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture landuse=industrial: RU:Tag:landuse=industrial + landuse=landfill: RU:Tag:landuse=landfill landuse=meadow: RU:Tag:landuse=meadow landuse=military: RU:Tag:landuse=military + landuse=orchard: RU:Tag:landuse=orchard landuse=peat_cutting: RU:Tag:landuse=peat cutting + landuse=plant_nursery: RU:Tag:landuse=plant nursery + landuse=pond: RU:Tag:landuse=pond + landuse=quarry: RU:Tag:landuse=quarry landuse=railway: RU:Tag:landuse=railway + landuse=recreation_ground: RU:Tag:landuse=recreation ground landuse=reservoir: RU:Tag:landuse=reservoir landuse=residential: RU:Tag:landuse=residential + landuse=retail: RU:Tag:landuse=retail + landuse=village_green: RU:Tag:landuse=village green + landuse=vineyard: RU:Tag:landuse=vineyard + leisure=beach_resort: RU:Tag:leisure=beach resort + leisure=dance: RU:Tag:leisure=dance + leisure=firepit: RU:Tag:leisure=firepit + leisure=ice_rink: RU:Tag:leisure=ice rink leisure=marina: RU:Tag:leisure=marina + leisure=park: RU:Tag:leisure=park + leisure=pitch: RU:Tag:leisure=pitch + leisure=playground: RU:Tag:leisure=playground + leisure=sports_centre: RU:Tag:leisure=sports centre + leisure=stadium: RU:Tag:leisure=stadium + leisure=swimming_pool: RU:Tag:leisure=swimming pool + leisure=track: RU:Tag:leisure=track leisure=water_park: RU:Tag:leisure=water park + man_made=adit: RU:Tag:man made=adit man_made=beacon: RU:Tag:man made=beacon + man_made=breakwater: RU:Tag:man made=breakwater man_made=cutline: RU:Tag:man made=cutline man_made=lighthouse: RU:Tag:man made=lighthouse + man_made=monitoring_station: RU:Tag:man made=monitoring station man_made=pier: RU:Tag:man made=pier + man_made=pillar: RU:Tag:man made=pillar + man_made=pipeline: RU:Tag:man made=pipeline + man_made=reservoir_covered: RU:Tag:man made=reservoir covered + man_made=surveillance: RU:Tag:man made=surveillance + man_made=tower: RU:Tag:man made=tower + man_made=wastewater_plant: RU:Tag:man made=wastewater plant + man_made=water_tower: RU:Tag:man made=water tower + man_made=water_works: RU:Tag:man made=water works + military=airfield: RU:Tag:military=airfield + natural=arete: RU:Tag:natural=arete natural=beach: RU:Tag:natural=beach + natural=cliff: RU:Tag:natural=cliff + natural=coastline: RU:Tag:natural=coastline + natural=desert: RU:Tag:natural=desert natural=fell: RU:Tag:natural=fell + natural=grassland: RU:Tag:natural=grassland + natural=heath: RU:Tag:natural=heath + natural=peak: RU:Tag:natural=peak + natural=ridge: RU:Tag:natural=ridge + natural=saddle: RU:Tag:natural=saddle + natural=sand: RU:Tag:natural=sand + natural=scrub: RU:Tag:natural=scrub natural=spring: RU:Tag:natural=spring natural=tree: RU:Tag:natural=tree + natural=tree_row: RU:Tag:natural=tree row + natural=volcano: RU:Tag:natural=volcano natural=water: RU:Tag:natural=water natural=wetland: RU:Tag:natural=wetland natural=wood: RU:Tag:natural=wood + office=accountant: RU:Tag:office=accountant + office=administrative: RU:Tag:office=administrative + office=architect: RU:Tag:office=architect + office=company: RU:Tag:office=company + office=educational_institution: RU:Tag:office=educational institution + office=employment_agency: RU:Tag:office=employment agency + office=estate_agent: RU:Tag:office=estate agent + office=government: RU:Tag:office=government + office=insurance: RU:Tag:office=insurance + office=it: RU:Tag:office=it office=lawyer: RU:Tag:office=lawyer + office=newspaper: RU:Tag:office=newspaper + office=ngo: RU:Tag:office=ngo + office=political_party: RU:Tag:office=political party + office=research: RU:Tag:office=research + office=telecommunication: RU:Tag:office=telecommunication + office=travel_agent: RU:Tag:office=travel agent opening_hours=24/7: RU:Tag:opening hours=24/7 + pipeline=marker: RU:Tag:pipeline=marker + place=allotments: RU:Tag:place=allotments + place=city: RU:Tag:place=city + place=hamlet: RU:Tag:place=hamlet place=island: RU:Tag:place=island + place=islet: RU:Tag:place=islet + place=isolated_dwelling: RU:Tag:place=isolated dwelling + place=locality: RU:Tag:place=locality + place=neighbourhood: RU:Tag:place=neighbourhood + place=suburb: RU:Tag:place=suburb place=town: RU:Tag:place=town place=village: RU:Tag:place=village power=generator: RU:Tag:power=generator power=line: RU:Tag:power=line + power=minor_line: RU:Tag:power=minor line + power=plant: RU:Tag:power=plant power=station: RU:Tag:power=station power=sub_station: RU:Tag:power=sub station + power=substation: RU:Tag:power=substation power=tower: RU:Tag:power=tower + public_transport=platform: RU:Tag:public transport=platform + public_transport=station: RU:Tag:public transport=station + public_transport=stop_position: RU:Tag:public transport=stop position railway=crossing: RU:Tag:railway=crossing + railway=level_crossing: RU:Tag:railway=level crossing + railway=miniature: RU:Tag:railway=miniature + railway=narrow_gauge: RU:Tag:railway=narrow gauge + railway=preserved: RU:Tag:railway=preserved + railway=rail: RU:Tag:railway=rail + railway=station: RU:Tag:railway=station + railway=subway: RU:Tag:railway=subway railway=subway_entrance: RU:Tag:railway=subway entrance + railway=tram: RU:Tag:railway=tram route=bus: RU:Tag:route=bus + route=ferry: RU:Tag:route=ferry route=railway: RU:Tag:route=railway route=train: RU:Tag:route=train route=tram: RU:Tag:route=tram service=alley: RU:Tag:service=alley service=driveway: RU:Tag:service=driveway service=parking_aisle: RU:Tag:service=parking aisle + shop=alcohol: RU:Tag:shop=alcohol + shop=anime: RU:Tag:shop=anime + shop=antiques: RU:Tag:shop=antiques + shop=art: RU:Tag:shop=art + shop=baby_goods: RU:Tag:shop=baby goods + shop=bag: RU:Tag:shop=bag shop=bakery: RU:Tag:shop=bakery + shop=bathroom_furnishing: RU:Tag:shop=bathroom furnishing + shop=beauty: RU:Tag:shop=beauty + shop=bed: RU:Tag:shop=bed + shop=beverages: RU:Tag:shop=beverages shop=bicycle: RU:Tag:shop=bicycle + shop=books: RU:Tag:shop=books + shop=boutique: RU:Tag:shop=boutique + shop=butcher: RU:Tag:shop=butcher shop=car: RU:Tag:shop=car + shop=car_parts: RU:Tag:shop=car parts + shop=car_repair: RU:Tag:shop=car repair + shop=carpet: RU:Tag:shop=carpet + shop=charity: RU:Tag:shop=charity + shop=chemist: RU:Tag:shop=chemist shop=clothes: RU:Tag:shop=clothes shop=computer: RU:Tag:shop=computer shop=confectionery: RU:Tag:shop=confectionery + shop=convenience: RU:Tag:shop=convenience + shop=copyshop: RU:Tag:shop=copyshop + shop=curtain: RU:Tag:shop=curtain + shop=dairy: RU:Tag:shop=dairy + shop=deli: RU:Tag:shop=deli shop=department_store: RU:Tag:shop=department store + shop=dive: RU:Tag:shop=dive + shop=doityourself: RU:Tag:shop=doityourself + shop=dry_cleaning: RU:Tag:shop=dry cleaning + shop=electronics: RU:Tag:shop=electronics + shop=erotic: RU:Tag:shop=erotic + shop=fabric: RU:Tag:shop=fabric shop=fabrics: RU:Tag:shop=fabrics + shop=farm: RU:Tag:shop=farm + shop=fishing: RU:Tag:shop=fishing shop=florist: RU:Tag:shop=florist + shop=frame: RU:Tag:shop=frame + shop=funeral_directors: RU:Tag:shop=funeral directors + shop=furnace: RU:Tag:shop=furnace + shop=furniture: RU:Tag:shop=furniture + shop=garden_centre: RU:Tag:shop=garden centre + shop=gas: RU:Tag:shop=gas + shop=gift: RU:Tag:shop=gift + shop=glaziery: RU:Tag:shop=glaziery + shop=greengrocer: RU:Tag:shop=greengrocer + shop=haberdashery: RU:Tag:shop=haberdashery shop=hairdresser: RU:Tag:shop=hairdresser + shop=hardware: RU:Tag:shop=hardware + shop=hearing_aids: RU:Tag:shop=hearing aids + shop=herbalist: RU:Tag:shop=herbalist + shop=hifi: RU:Tag:shop=hifi + shop=hunting: RU:Tag:shop=hunting + shop=interior_decoration: RU:Tag:shop=interior decoration + shop=jewelry: RU:Tag:shop=jewelry shop=kiosk: RU:Tag:shop=kiosk + shop=kitchen: RU:Tag:shop=kitchen + shop=laundry: RU:Tag:shop=laundry + shop=mall: RU:Tag:shop=mall + shop=massage: RU:Tag:shop=massage + shop=mobile_phone: RU:Tag:shop=mobile phone + shop=money_lender: RU:Tag:shop=money lender + shop=motorcycle: RU:Tag:shop=motorcycle + shop=musical_instrument: RU:Tag:shop=musical instrument + shop=newsagent: RU:Tag:shop=newsagent + shop=optician: RU:Tag:shop=optician + shop=organic: RU:Tag:shop=organic + shop=outdoor: RU:Tag:shop=outdoor + shop=paint: RU:Tag:shop=paint + shop=pawnbroker: RU:Tag:shop=pawnbroker + shop=pet: RU:Tag:shop=pet + shop=radiotechnics: RU:Tag:shop=radiotechnics + shop=religion: RU:Tag:shop=religion + shop=seafood: RU:Tag:shop=seafood + shop=second_hand: RU:Tag:shop=second hand + shop=ship_chandler: RU:Tag:shop=ship chandler + shop=shoes: RU:Tag:shop=shoes + shop=sports: RU:Tag:shop=sports + shop=stationery: RU:Tag:shop=stationery shop=supermarket: RU:Tag:shop=supermarket + shop=tattoo: RU:Tag:shop=tattoo + shop=ticket: RU:Tag:shop=ticket + shop=tobacco: RU:Tag:shop=tobacco + shop=toys: RU:Tag:shop=toys + shop=trade: RU:Tag:shop=trade shop=travel_agency: RU:Tag:shop=travel agency + shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner + shop=variety_store: RU:Tag:shop=variety store + shop=video: RU:Tag:shop=video + shop=window_blind: RU:Tag:shop=window blind + social_facility=group_home: RU:Tag:social facility=group home + sport=archery: RU:Tag:sport=archery + sport=scuba_diving: RU:Tag:sport=scuba diving + tourism=artwork: RU:Tag:tourism=artwork + tourism=attraction: RU:Tag:tourism=attraction + tourism=camp_site: RU:Tag:tourism=camp site + tourism=chalet: RU:Tag:tourism=chalet + tourism=hostel: RU:Tag:tourism=hostel tourism=hotel: RU:Tag:tourism=hotel tourism=information: RU:Tag:tourism=information + tourism=museum: RU:Tag:tourism=museum + tourism=picnic_site: RU:Tag:tourism=picnic site + tourism=theme_park: RU:Tag:tourism=theme park + tourism=viewpoint: RU:Tag:tourism=viewpoint + tunnel=culvert: RU:Tag:tunnel=culvert + type=site: RU:Tag:type=site + waterway=boatyard: RU:Tag:waterway=boatyard + waterway=canal: RU:Tag:waterway=canal waterway=dam: RU:Tag:waterway=dam + waterway=dock: RU:Tag:waterway=dock + waterway=drain: RU:Tag:waterway=drain waterway=rapids: RU:Tag:waterway=rapids waterway=river: RU:Tag:waterway=river waterway=riverbank: RU:Tag:waterway=riverbank waterway=stream: RU:Tag:waterway=stream waterway=weir: RU:Tag:waterway=weir + wood=mixed: RU:Tag:wood=mixed +sq: + key: + highway: Sq:Key:highway sv: key: access: Sv:Key:access tag: + aerialway=cable_car: Sv:Tag:aerialway=cable car amenity=place_of_worship: Sv:Tag:amenity=place of worship + highway=rest_area: Sv:Tag:highway=rest area + junction=roundabout: Sv:Tag:junction=roundabout + leisure=dog_park: Sv:Tag:leisure=dog park + railway=rail: Sv:Tag:railway=rail tr: key: amenity: Tr:Key:amenity @@ -1712,18 +5359,39 @@ tr: sport: Tr:Key:sport uk: key: - access: Uk:Key:access - highway: Uk:Key:highway - place: Uk:Key:place + bicycle_parking: Uk:Key:bicycle parking + tag: + amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking + amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental + shop=antiques: Uk:Tag:shop=antiques + shop=bicycle: Uk:Tag:shop=bicycle + shop=second_hand: Uk:Tag:shop=second hand + vending=bicycle_tube: Uk:Tag:vending=bicycle tube +zh-hans: + key: + cuisine: Zh-hans:Key:cuisine + name: Zh-hans:Key:name + tag: + amenity=cafe: Zh-hans:Tag:amenity=cafe +zh-hant: + key: + amenity: Zh-hant:Key:amenity + fixme: Zh-hant:Key:fixme + fuel: Zh-hant:Key:fuel + noexit: Zh-hant:Key:noexit + opening_hours: Zh-hant:Key:opening hours + tracktype: Zh-hant:Key:tracktype + trail_visibility: Zh-hant:Key:trail visibility tag: - highway=motorway: Uk:Tag:highway=motorway - highway=motorway_link: Uk:Tag:highway=motorway link - highway=primary: Uk:Tag:highway=primary - highway=primary_link: Uk:Tag:highway=primary link - highway=secondary: Uk:Tag:highway=secondary - highway=secondary_link: Uk:Tag:highway=secondary link - highway=tertiary: Uk:Tag:highway=tertiary - highway=trunk: Uk:Tag:highway=trunk - highway=trunk_link: Uk:Tag:highway=trunk link - highway=unclassified: Uk:Tag:highway=unclassified + amenity=bench: Zh-hant:Tag:amenity=bench + amenity=crematorium: Zh-hant:Tag:amenity=crematorium + amenity=fuel: Zh-hant:Tag:amenity=fuel + amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship + amenity=toilets: Zh-hant:Tag:amenity=toilets + highway=bus_stop: Zh-hant:Tag:highway=bus stop + landuse=cemetery: Zh-hant:Tag:landuse=cemetery + natural=peak: Zh-hant:Tag:natural=peak + shop=funeral_directors: Zh-hant:Tag:shop=funeral directors + shop=gas: Zh-hant:Tag:shop=gas + tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut diff --git a/db/migrate/20140210003018_add_user_image_content_type.rb b/db/migrate/20140210003018_add_user_image_content_type.rb new file mode 100644 index 000000000..d212931fc --- /dev/null +++ b/db/migrate/20140210003018_add_user_image_content_type.rb @@ -0,0 +1,5 @@ +class AddUserImageContentType < ActiveRecord::Migration + def change + add_column :users, :image_content_type, :string + end +end diff --git a/db/structure.sql b/db/structure.sql index 5c4fdf8c7..1d6170bc4 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1072,7 +1072,8 @@ CREATE TABLE users ( changesets_count integer DEFAULT 0 NOT NULL, traces_count integer DEFAULT 0 NOT NULL, diary_entries_count integer DEFAULT 0 NOT NULL, - image_use_gravatar boolean DEFAULT true NOT NULL + image_use_gravatar boolean DEFAULT true NOT NULL, + image_content_type character varying(255) ); @@ -2423,6 +2424,8 @@ INSERT INTO schema_migrations (version) VALUES ('20140115192822'); INSERT INTO schema_migrations (version) VALUES ('20140117185510'); +INSERT INTO schema_migrations (version) VALUES ('20140210003018'); + INSERT INTO schema_migrations (version) VALUES ('21'); INSERT INTO schema_migrations (version) VALUES ('22'); diff --git a/lib/object_finder.rb b/lib/object_finder.rb deleted file mode 100644 index 26608a7f9..000000000 --- a/lib/object_finder.rb +++ /dev/null @@ -1,5 +0,0 @@ -module ObjectFinder - def visible - find :all, :conditions => "#{proxy_reflection.table_name}.visible = 1" - end -end diff --git a/lib/osm.rb b/lib/osm.rb index a2432c1e6..9e8198299 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -399,7 +399,7 @@ module OSM begin lonradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2 / cos(@lat) ** 2)) - rescue Errno::EDOM + rescue Errno::EDOM, Math::DomainError lonradius = PI end diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake new file mode 100644 index 000000000..7a915c228 --- /dev/null +++ b/lib/tasks/testing.rake @@ -0,0 +1,5 @@ +namespace :test do + Rails::TestTask.new(lib: "test:prepare") do |t| + t.pattern = 'test/lib/**/*_test.rb' + end +end diff --git a/test/functional/amf_controller_test.rb b/test/controllers/amf_controller_test.rb similarity index 99% rename from test/functional/amf_controller_test.rb rename to test/controllers/amf_controller_test.rb index f3a4e7cd1..36b76c329 100644 --- a/test/functional/amf_controller_test.rb +++ b/test/controllers/amf_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'stringio' include Potlatch diff --git a/test/functional/api_controller_test.rb b/test/controllers/api_controller_test.rb similarity index 99% rename from test/functional/api_controller_test.rb rename to test/controllers/api_controller_test.rb index c92e1132e..6426184fc 100644 --- a/test/functional/api_controller_test.rb +++ b/test/controllers/api_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'api_controller' class ApiControllerTest < ActionController::TestCase diff --git a/test/functional/browse_controller_test.rb b/test/controllers/browse_controller_test.rb similarity index 99% rename from test/functional/browse_controller_test.rb rename to test/controllers/browse_controller_test.rb index 82a039242..2ab9106f1 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'browse_controller' class BrowseControllerTest < ActionController::TestCase diff --git a/test/functional/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb similarity index 99% rename from test/functional/changeset_controller_test.rb rename to test/controllers/changeset_controller_test.rb index ef5e1541a..25bb936d9 100644 --- a/test/functional/changeset_controller_test.rb +++ b/test/controllers/changeset_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'changeset_controller' class ChangesetControllerTest < ActionController::TestCase diff --git a/test/functional/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb similarity index 99% rename from test/functional/diary_entry_controller_test.rb rename to test/controllers/diary_entry_controller_test.rb index 92d9bcffd..ad3d6787b 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/controllers/diary_entry_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class DiaryEntryControllerTest < ActionController::TestCase fixtures :users, :diary_entries, :diary_comments, :languages diff --git a/test/functional/export_controller_test.rb b/test/controllers/export_controller_test.rb similarity index 96% rename from test/functional/export_controller_test.rb rename to test/controllers/export_controller_test.rb index d36f0cfd8..8d61b9911 100644 --- a/test/functional/export_controller_test.rb +++ b/test/controllers/export_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ExportControllerTest < ActionController::TestCase diff --git a/test/functional/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb similarity index 93% rename from test/functional/geocoder_controller_test.rb rename to test/controllers/geocoder_controller_test.rb index f1b12f21d..94cf7cf46 100644 --- a/test/functional/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -1,6 +1,6 @@ # coding: utf-8 -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'geocoder_controller' class GeocoderControllerTest < ActionController::TestCase @@ -170,12 +170,7 @@ class GeocoderControllerTest < ActionController::TestCase 'S50 4.064 W14 22.645', "50° 04.064' S, 014° 22.645' W" ].each do |code| - post :search, :query => code - assert_response :success - assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) - assert_nil @controller.params[:query] - assert_in_delta -50.06773, @controller.params[:lat] - assert_in_delta -14.37742, @controller.params[:lon] + latlon_check code, -50.06773, -14.37742 end end @@ -286,7 +281,7 @@ private assert_response :success assert_template "search" assert_template :layout => "map" - assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta lat, @controller.params[:lat] assert_in_delta lon, @controller.params[:lon] @@ -295,7 +290,7 @@ private assert_response :success assert_template "search" assert_template :layout => "xhr" - assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta lat, @controller.params[:lat] assert_in_delta lon, @controller.params[:lon] diff --git a/test/functional/message_controller_test.rb b/test/controllers/message_controller_test.rb similarity index 88% rename from test/functional/message_controller_test.rb rename to test/controllers/message_controller_test.rb index 45d0a267c..44271f5dd 100644 --- a/test/functional/message_controller_test.rb +++ b/test/controllers/message_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class MessageControllerTest < ActionController::TestCase fixtures :users, :messages @@ -65,6 +65,44 @@ class MessageControllerTest < ActionController::TestCase assert_select "input[type='submit'][value='Send']", :count => 1 end + # Check that the subject is preserved over errors + assert_difference "ActionMailer::Base.deliveries.size", 0 do + assert_difference "Message.count", 0 do + post :new, + :display_name => users(:public_user).display_name, + :message => { :title => "Test Message", :body => "" } + end + end + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Send message" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title", :count => 1 do + assert_select "[value=Test Message]" + end + assert_select "textarea#message_body", :text => "", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + + # Check that the body text is preserved over errors + assert_difference "ActionMailer::Base.deliveries.size", 0 do + assert_difference "Message.count", 0 do + post :new, + :display_name => users(:public_user).display_name, + :message => { :title => "", :body => "Test message body" } + end + end + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Send message" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title", :count => 1 do + assert_select "[value=]" + end + assert_select "textarea#message_body", :text => "Test message body", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + # Check that sending a message works assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "Message.count", 1 do diff --git a/test/functional/node_controller_test.rb b/test/controllers/node_controller_test.rb similarity index 99% rename from test/functional/node_controller_test.rb rename to test/controllers/node_controller_test.rb index 5c01cba3d..3d689bb3f 100644 --- a/test/functional/node_controller_test.rb +++ b/test/controllers/node_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class NodeControllerTest < ActionController::TestCase api_fixtures diff --git a/test/functional/notes_controller_test.rb b/test/controllers/notes_controller_test.rb similarity index 99% rename from test/functional/notes_controller_test.rb rename to test/controllers/notes_controller_test.rb index 374c879d6..6f2125193 100644 --- a/test/functional/notes_controller_test.rb +++ b/test/controllers/notes_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class NotesControllerTest < ActionController::TestCase fixtures :users, :notes, :note_comments diff --git a/test/functional/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb similarity index 99% rename from test/functional/oauth_clients_controller_test.rb rename to test/controllers/oauth_clients_controller_test.rb index 77f07b288..a1df9f0f2 100644 --- a/test/functional/oauth_clients_controller_test.rb +++ b/test/controllers/oauth_clients_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OauthClientsControllerTest < ActionController::TestCase fixtures :users, :client_applications diff --git a/test/functional/oauth_controller_test.rb b/test/controllers/oauth_controller_test.rb similarity index 96% rename from test/functional/oauth_controller_test.rb rename to test/controllers/oauth_controller_test.rb index 85358892e..879e259c3 100644 --- a/test/functional/oauth_controller_test.rb +++ b/test/controllers/oauth_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OauthControllerTest < ActionController::TestCase ## diff --git a/test/functional/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb similarity index 99% rename from test/functional/old_node_controller_test.rb rename to test/controllers/old_node_controller_test.rb index ac318f84b..5b0436348 100644 --- a/test/functional/old_node_controller_test.rb +++ b/test/controllers/old_node_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'old_node_controller' class OldNodeControllerTest < ActionController::TestCase diff --git a/test/functional/old_relation_controller_test.rb b/test/controllers/old_relation_controller_test.rb similarity index 99% rename from test/functional/old_relation_controller_test.rb rename to test/controllers/old_relation_controller_test.rb index 55e8a7377..1db613cd4 100644 --- a/test/functional/old_relation_controller_test.rb +++ b/test/controllers/old_relation_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'old_relation_controller' class OldRelationControllerTest < ActionController::TestCase diff --git a/test/functional/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb similarity index 99% rename from test/functional/old_way_controller_test.rb rename to test/controllers/old_way_controller_test.rb index 2e9ec8263..40315caa5 100644 --- a/test/functional/old_way_controller_test.rb +++ b/test/controllers/old_way_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'old_way_controller' class OldWayControllerTest < ActionController::TestCase diff --git a/test/functional/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb similarity index 98% rename from test/functional/redactions_controller_test.rb rename to test/controllers/redactions_controller_test.rb index 83bb3adc2..44a760694 100644 --- a/test/functional/redactions_controller_test.rb +++ b/test/controllers/redactions_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'redactions_controller' class RedactionsControllerTest < ActionController::TestCase diff --git a/test/functional/relation_controller_test.rb b/test/controllers/relation_controller_test.rb similarity index 99% rename from test/functional/relation_controller_test.rb rename to test/controllers/relation_controller_test.rb index 4737fdf51..66d601284 100644 --- a/test/functional/relation_controller_test.rb +++ b/test/controllers/relation_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'relation_controller' class RelationControllerTest < ActionController::TestCase diff --git a/test/functional/search_controller_test.rb b/test/controllers/search_controller_test.rb similarity index 93% rename from test/functional/search_controller_test.rb rename to test/controllers/search_controller_test.rb index 7fd060dc4..c75304774 100644 --- a/test/functional/search_controller_test.rb +++ b/test/controllers/search_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class SearchControllerTest < ActionController::TestCase ## diff --git a/test/functional/site_controller_test.rb b/test/controllers/site_controller_test.rb similarity index 87% rename from test/functional/site_controller_test.rb rename to test/controllers/site_controller_test.rb index f2dab3404..86a92490a 100644 --- a/test/functional/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class SiteControllerTest < ActionController::TestCase api_fixtures @@ -112,6 +112,30 @@ class SiteControllerTest < ActionController::TestCase get :permalink, :code => 'wBz3--' assert_response :redirect assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :m => '' + assert_response :redirect + assert_redirected_to :controller => :site, :action => :index, :mlat => '4.8779296875', :mlon => '3.955078125', :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :layers => 'T' + assert_response :redirect + assert_redirected_to :controller => :site, :action => :index, :layers => 'T', :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :node => 1 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :way => 2 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :relation => 3 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :changeset => 4 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :changeset, :id => 4, :anchor => 'map=3/4.8779296875/3.955078125' end # Test the key page diff --git a/test/functional/swf_controller_test.rb b/test/controllers/swf_controller_test.rb similarity index 84% rename from test/functional/swf_controller_test.rb rename to test/controllers/swf_controller_test.rb index 09b8f3aae..d7213133b 100644 --- a/test/functional/swf_controller_test.rb +++ b/test/controllers/swf_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class SwfControllerTest < ActionController::TestCase ## diff --git a/test/functional/trace_controller_test.rb b/test/controllers/trace_controller_test.rb similarity index 99% rename from test/functional/trace_controller_test.rb rename to test/controllers/trace_controller_test.rb index 1a074082b..01c81a1aa 100644 --- a/test/functional/trace_controller_test.rb +++ b/test/controllers/trace_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class TraceControllerTest < ActionController::TestCase fixtures :users, :gpx_files diff --git a/test/functional/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb similarity index 99% rename from test/functional/user_blocks_controller_test.rb rename to test/controllers/user_blocks_controller_test.rb index d52ff68c4..ffb5744ea 100644 --- a/test/functional/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserBlocksControllerTest < ActionController::TestCase fixtures :users, :user_roles, :user_blocks diff --git a/test/functional/user_controller_test.rb b/test/controllers/user_controller_test.rb similarity index 99% rename from test/functional/user_controller_test.rb rename to test/controllers/user_controller_test.rb index 3a9c93238..c068ee408 100644 --- a/test/functional/user_controller_test.rb +++ b/test/controllers/user_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserControllerTest < ActionController::TestCase fixtures :users diff --git a/test/functional/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb similarity index 99% rename from test/functional/user_preference_controller_test.rb rename to test/controllers/user_preference_controller_test.rb index 32ece63cd..f8cafe6a9 100644 --- a/test/functional/user_preference_controller_test.rb +++ b/test/controllers/user_preference_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserPreferenceControllerTest < ActionController::TestCase fixtures :users, :user_preferences diff --git a/test/functional/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb similarity index 99% rename from test/functional/user_roles_controller_test.rb rename to test/controllers/user_roles_controller_test.rb index 4e4bd6da7..1d005824d 100644 --- a/test/functional/user_roles_controller_test.rb +++ b/test/controllers/user_roles_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserRolesControllerTest < ActionController::TestCase fixtures :users, :user_roles diff --git a/test/functional/way_controller_test.rb b/test/controllers/way_controller_test.rb similarity index 99% rename from test/functional/way_controller_test.rb rename to test/controllers/way_controller_test.rb index 332f92dc7..6e2ee3b0f 100644 --- a/test/functional/way_controller_test.rb +++ b/test/controllers/way_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'way_controller' class WayControllerTest < ActionController::TestCase diff --git a/test/fixtures/current_node_tags.yml b/test/fixtures/current_node_tags.yml index 5087310e7..9c41a375e 100644 --- a/test/fixtures/current_node_tags.yml +++ b/test/fixtures/current_node_tags.yml @@ -33,3 +33,27 @@ public_v_t1: k: 'testvisible' v: 'yes' +nwn_name: + node_id: 18 + k: 'name' + v: 'Test Node' + +nwn_name_ru: + node_id: 18 + k: 'name:ru' + v: 'проверки узла' + +nwn_building: + node_id: 18 + k: 'building' + v: 'yes' + +nwn_tourism: + node_id: 18 + k: 'tourism' + v: 'museum' + +nwn_shop: + node_id: 18 + k: 'shop' + v: 'gift' diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml index 3f34ddabe..af6ea01d5 100644 --- a/test/fixtures/current_nodes.yml +++ b/test/fixtures/current_nodes.yml @@ -171,3 +171,12 @@ redacted_node: tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 +node_with_name: + id: 18 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: true + version: 2 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 diff --git a/test/fixtures/node_tags.yml b/test/fixtures/node_tags.yml index 6b908aa54..21a63f5b1 100644 --- a/test/fixtures/node_tags.yml +++ b/test/fixtures/node_tags.yml @@ -52,3 +52,62 @@ public_v_t1: v: 'yes' version: 1 +nwnv1_name: + node_id: 18 + k: 'name' + v: 'Test Node' + version: 1 + +nwnv1_name_ru: + node_id: 18 + k: 'name:ru' + v: 'проверки узла' + version: 1 + +nwnv1_building: + node_id: 18 + k: 'building' + v: 'yes' + version: 1 + +nwnv1_tourism: + node_id: 18 + k: 'tourism' + v: 'museum' + version: 1 + +nwnv1_shop: + node_id: 18 + k: 'shop' + v: 'gift' + version: 1 + +nwnv2_name: + node_id: 18 + k: 'name' + v: 'Test Node' + version: 2 + +nwnv2_name_ru: + node_id: 18 + k: 'name:ru' + v: 'проверки узла' + version: 2 + +nwnv2_building: + node_id: 18 + k: 'building' + v: 'yes' + version: 2 + +nwnv2_tourism: + node_id: 18 + k: 'tourism' + v: 'museum' + version: 2 + +nwnv2_shop: + node_id: 18 + k: 'shop' + v: 'gift' + version: 2 diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml index 5de3d94af..7841c6e0e 100644 --- a/test/fixtures/nodes.yml +++ b/test/fixtures/nodes.yml @@ -211,3 +211,24 @@ redacted_node_current_version: version: 2 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 + +node_with_name_redacted_version: + node_id: 18 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: true + version: 1 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 + redaction_id: 1 + +node_with_name_current_version: + node_id: 18 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: true + version: 2 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 15e3cc394..8d1fcbd7a 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -213,3 +213,17 @@ super_user: terms_agreed: "2010-01-01 11:22:33" terms_seen: true languages: en + +north_pole_user: + id: 17 + email: santa@example.com + status: active + pass_crypt: <%= Digest::MD5.hexdigest('test') %> + creation_time: "2008-05-01 01:23:45" + display_name: santa + data_public: true + terms_agreed: "2010-01-01 11:22:33" + terms_seen: true + languages: en + home_lat: 89.9 + home_lon: 146.8 diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb new file mode 100644 index 000000000..46c35f950 --- /dev/null +++ b/test/helpers/application_helper_test.rb @@ -0,0 +1,187 @@ +require 'test_helper' + +class ApplicationHelperTest < ActionView::TestCase + fixtures :users, :user_roles + + def setup + I18n.locale = "en" + end + + def test_linkify + %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link| + text = "Test #{link} is made into a link" + + html = linkify(text) + assert_equal false, html.html_safe? + assert_equal "Test #{link} is made into a link", html + + html = linkify(text.html_safe) + assert_equal true, html.html_safe? + assert_equal "Test #{link} is made into a link", html + end + + %w(test@example.com mailto:test@example.com).each do |link| + text = "Test #{link} is not made into a link" + + html = linkify(text) + assert_equal false, html.html_safe? + assert_equal text, html + + html = linkify(text.html_safe) + assert_equal true, html.html_safe? + assert_equal text, html + end + end + + def test_rss_link_to + link = rss_link_to(:controller => :diary_entry, :action => :rss) + assert_equal "\"Rss\"", link + end + + def test_atom_link_to + link = atom_link_to(:controller => :changeset, :action => :feed) + assert_equal "\"Rss\"", link + end + + def test_style_rules + @user = nil + + css = style_rules + assert_match /\.hidden /, css + assert_match /\.hide_unless_logged_in /, css + assert_no_match /\.hide_if_logged_in /, css + assert_no_match /\.hide_if_user_/, css + assert_no_match /\.show_if_user_/, css + assert_match /\.hide_unless_administrator /, css + assert_match /\.hide_unless_moderator /, css + + @user = users(:normal_user) + + css = style_rules + assert_match /\.hidden /, css + assert_no_match /\.hide_unless_logged_in /, css + assert_match /\.hide_if_logged_in /, css + assert_match /\.hide_if_user_1 /, css + assert_match /\.show_if_user_1 /, css + assert_match /\.hide_unless_administrator /, css + assert_match /\.hide_unless_moderator /, css + + @user = users(:moderator_user) + + css = style_rules + assert_match /\.hidden /, css + assert_no_match /\.hide_unless_logged_in /, css + assert_match /\.hide_if_logged_in /, css + assert_match /\.hide_if_user_5 /, css + assert_match /\.show_if_user_5 /, css + assert_match /\.hide_unless_administrator /, css + assert_no_match /\.hide_unless_moderator /, css + + @user = users(:administrator_user) + + css = style_rules + assert_match /\.hidden /, css + assert_no_match /\.hide_unless_logged_in /, css + assert_match /\.hide_if_logged_in /, css + assert_match /\.hide_if_user_6 /, css + assert_match /\.show_if_user_6 /, css + assert_no_match /\.hide_unless_administrator /, css + assert_match /\.hide_unless_moderator /, css + end + + def test_if_logged_in + html = if_logged_in { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_logged_in(:span) { "Test 2" } + assert_equal "Test 2", html + end + + def test_if_not_logged_in + html = if_not_logged_in { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_not_logged_in(:span) { "Test 2" } + assert_equal "Test 2", html + end + + def test_if_user + html = if_user(users(:normal_user)) { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_user(users(:normal_user), :span) { "Test 2" } + assert_equal "Test 2", html + + html = if_user(nil) { "Test 3" } + assert_nil html + + html = if_user(nil, :span) { "Test 4" } + assert_nil html + end + + def test_unless_user + html = unless_user(users(:normal_user)) { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = unless_user(users(:normal_user), :span) { "Test 2" } + assert_equal "Test 2", html + + html = unless_user(nil) { "Test 3" } + assert_equal "
    Test 3
    ", html + + html = unless_user(nil, :span) { "Test 4" } + assert_equal "Test 4", html + end + + def test_if_administrator + html = if_administrator { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_administrator(:span) { "Test 2" } + assert_equal "Test 2", html + end + + def test_richtext_area + html = richtext_area(:message, :body, :cols => 40, :rows => 20) + assert_not_nil html + end + + def test_dir + assert_equal "ltr", dir + + params[:dir] = "rtl" + assert_equal "rtl", dir + params.delete(:dir) + + I18n.locale = "he" + + assert_equal "rtl", dir + + params[:dir] = "ltr" + assert_equal "ltr", dir + params.delete(:dir) + end + + def test_friendly_date + date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23)) + assert_match /^.*<\/span>$/, date + + date = friendly_date(Time.now - 1.hour) + assert_match /^about 1 hour<\/span>$/, date + + date = friendly_date(Time.now - 2.days) + assert_match /^2 days<\/span>$/, date + + date = friendly_date(Time.now - 3.weeks) + assert_match /^21 days<\/span>$/, date + + date = friendly_date(Time.now - 4.months) + assert_match /^4 months<\/span>$/, date + end + + def test_body_class + end + + def test_current_page_class + end +end diff --git a/test/helpers/asset_helper_test.rb b/test/helpers/asset_helper_test.rb new file mode 100644 index 000000000..20e450ed5 --- /dev/null +++ b/test/helpers/asset_helper_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class AssetHelperTest < ActionView::TestCase + def test_assets + assert assets("iD").kind_of?(Hash) + end +end diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb new file mode 100644 index 000000000..a48ac4df8 --- /dev/null +++ b/test/helpers/browse_helper_test.rb @@ -0,0 +1,151 @@ +# -*- coding: utf-8 -*- + +require 'test_helper' + +class BrowseHelperTest < ActionView::TestCase + include ERB::Util + include ApplicationHelper + + api_fixtures + + def setup + I18n.locale = "en" + end + + def test_printable_name + assert_equal "17", printable_name(current_nodes(:redacted_node)) + assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) + assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) + + I18n.locale = "ru" + + assert_equal "17", printable_name(current_nodes(:redacted_node)) + assert_equal "проверки узла (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "проверки узла (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) + assert_equal "проверки узла (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) + + I18n.locale = "de" + + assert_equal "17", printable_name(current_nodes(:redacted_node)) + assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) + assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) + end + + def test_link_class + assert_equal "node", link_class("node", current_nodes(:visible_node)) + assert_equal "node deleted", link_class("node", current_nodes(:invisible_node)) + assert_equal "node deleted", link_class("node", current_nodes(:redacted_node)) + assert_equal "node building yes shop gift tourism museum", link_class("node", current_nodes(:node_with_name)) + assert_equal "node building yes shop gift tourism museum", link_class("node", nodes(:node_with_name_current_version)) + assert_equal "node deleted", link_class("node", nodes(:node_with_name_redacted_version)) + end + + def test_link_title + assert_equal "", link_title(current_nodes(:visible_node)) + assert_equal "", link_title(current_nodes(:invisible_node)) + assert_equal "", link_title(current_nodes(:redacted_node)) + assert_equal "building=yes, shop=gift, and tourism=museum", link_title(current_nodes(:node_with_name)) + assert_equal "building=yes, shop=gift, and tourism=museum", link_title(nodes(:node_with_name_current_version)) + assert_equal "", link_title(nodes(:node_with_name_redacted_version)) + end + + def test_format_key + html = format_key("highway") + assert_equal "highway", html + + html = format_key("unknown") + assert_equal "unknown", html + end + + def test_format_value + html = format_value("highway", "primary") + assert_equal "primary", html + + html = format_value("highway", "unknown") + assert_equal "unknown", html + + html = format_value("unknown", "unknown") + assert_equal "unknown", html + end + + def test_icon_tags + tags = icon_tags(current_nodes(:node_with_name)) + assert_equal 3, tags.count + assert tags.include?(["building", "yes"]) + assert tags.include?(["tourism", "museum"]) + assert tags.include?(["shop", "gift"]) + + tags = icon_tags(nodes(:node_with_name_current_version)) + assert_equal 3, tags.count + assert tags.include?(["building", "yes"]) + assert tags.include?(["tourism", "museum"]) + assert tags.include?(["shop", "gift"]) + + tags = icon_tags(nodes(:node_with_name_redacted_version)) + assert_equal 3, tags.count + assert tags.include?(["building", "yes"]) + assert tags.include?(["tourism", "museum"]) + assert tags.include?(["shop", "gift"]) + end + + def test_wiki_link + link = wiki_link("key", "highway") + assert_equal "http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link + + link = wiki_link("tag", "highway=primary") + assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link + + I18n.locale = "de" + + link = wiki_link("key", "highway") + assert_equal "http://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link + + link = wiki_link("tag", "highway=primary") + assert_equal "http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link + + I18n.locale = "tr" + + link = wiki_link("key", "highway") + assert_equal "http://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link + + link = wiki_link("tag", "highway=primary") + assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link + end + + def test_wikipedia_link + link = wikipedia_link("wikipedia", "http://en.wikipedia.org/wiki/Full%20URL") + assert_nil link + + link = wikipedia_link("wikipedia", "https://en.wikipedia.org/wiki/Full%20URL") + assert_nil link + + link = wikipedia_link("wikipedia", "Test") + assert_equal "http://en.wikipedia.org/wiki/Test?uselang=en", link[:url] + assert_equal "Test", link[:title] + + link = wikipedia_link("wikipedia", "de:Test") + assert_equal "http://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url] + assert_equal "de:Test", link[:title] + + link = wikipedia_link("wikipedia:fr", "de:Test") + assert_equal "http://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url] + assert_equal "de:Test", link[:title] + + I18n.locale = "pt-BR" + + link = wikipedia_link("wikipedia", "zh-classical:Test#Section") + assert_equal "http://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url] + assert_equal "zh-classical:Test#Section", link[:title] + + link = wikipedia_link("foo", "Test") + assert_nil link + end +end diff --git a/test/helpers/changeset_helper_test.rb b/test/helpers/changeset_helper_test.rb new file mode 100644 index 000000000..3fa5d266d --- /dev/null +++ b/test/helpers/changeset_helper_test.rb @@ -0,0 +1,15 @@ +require 'test_helper' + +class ChangesetHelperTest < ActionView::TestCase + fixtures :changesets, :users + + def test_changeset_user_link + assert_equal "test2", changeset_user_link(changesets(:public_user_first_change)) + assert_equal "anonymous", changeset_user_link(changesets(:normal_user_first_change)) + end + + def test_changeset_details + assert_match /^Created .*<\/abbr> by anonymous$/, changeset_details(changesets(:normal_user_first_change)) + assert_match /^Closed .*<\/abbr> by test2<\/a>$/, changeset_details(changesets(:public_user_closed_change)) + end +end diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb new file mode 100644 index 000000000..8fb2bc073 --- /dev/null +++ b/test/helpers/note_helper_test.rb @@ -0,0 +1,21 @@ +require 'test_helper' + +class NoteHelperTest < ActionView::TestCase + include ERB::Util + include ApplicationHelper + + fixtures :users + + def test_note_event + date = Time.new(2014, 3, 5, 21, 37, 45) + + assert_match /^Created by anonymous .*<\/span> ago<\/abbr>$/, note_event("open", date, nil) + assert_match /^Resolved by test2<\/a> .*<\/span> ago<\/abbr>$/, note_event("closed", date, users(:public_user)) + end + + def test_note_author + assert_equal "", note_author(nil) + assert_equal "test2", note_author(users(:public_user)) + assert_equal "test2", note_author(users(:public_user), :only_path => false) + end +end diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb new file mode 100644 index 000000000..cf7a11243 --- /dev/null +++ b/test/helpers/title_helper_test.rb @@ -0,0 +1,13 @@ +require 'test_helper' + +class TitleHelperTest < ActionView::TestCase + def test_set_title + set_title(nil) + assert_equal "OpenStreetMap", response.header["X-Page-Title"] + assert_nil @title + + set_title("Test Title") + assert_equal "OpenStreetMap | Test Title", response.header["X-Page-Title"] + assert_equal "Test Title", @title + end +end diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index f40a96675..a2361d618 100644 --- a/test/integration/client_application_test.rb +++ b/test/integration/client_application_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ClientApplicationTest < ActionDispatch::IntegrationTest fixtures :users, :client_applications diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb index fa4821b7a..f3581f6a2 100644 --- a/test/integration/cors_test.rb +++ b/test/integration/cors_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class CORSTest < ActionDispatch::IntegrationTest # Rails 4 adds a built-in `options` method. When we upgrade, we can remove diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index fbb947af4..dd03fde46 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OAuthTest < ActionDispatch::IntegrationTest fixtures :users, :client_applications, :gpx_files diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb index 357c20212..a4ff2eb7e 100644 --- a/test/integration/redirect_test.rb +++ b/test/integration/redirect_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RedirectTest < ActionDispatch::IntegrationTest def test_legacy_redirects diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb index aec204e71..b36082cac 100644 --- a/test/integration/short_links_test.rb +++ b/test/integration/short_links_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ShortLinksTest < ActionDispatch::IntegrationTest ## diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb index 94ec46e0a..db81117c3 100644 --- a/test/integration/user_blocks_test.rb +++ b/test/integration/user_blocks_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserBlocksTest < ActionDispatch::IntegrationTest fixtures :users, :user_blocks, :user_roles diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 6530b7ccb..503160e9d 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserCreationTest < ActionDispatch::IntegrationTest fixtures :users diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb index 278a68e7b..58e70bfd2 100644 --- a/test/integration/user_diaries_test.rb +++ b/test/integration/user_diaries_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserDiariesTest < ActionDispatch::IntegrationTest fixtures :users, :diary_entries diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index 6d8e3e7e0..66f8f4b09 100644 --- a/test/integration/user_login_test.rb +++ b/test/integration/user_login_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserLoginTest < ActionDispatch::IntegrationTest fixtures :users diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb index 3d2fab4d0..08031b4de 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserRolesTest < ActionDispatch::IntegrationTest fixtures :users, :user_roles diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb index 7063e39c5..1bed53bce 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserTermsSeenTest < ActionDispatch::IntegrationTest fixtures :users diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js new file mode 100644 index 000000000..d7fe4a2fd --- /dev/null +++ b/test/javascripts/osm_test.js @@ -0,0 +1,252 @@ +//= require jquery +//= require jquery.cookie +//= require osm +//= require leaflet +//= require leaflet.osm +//= require leaflet.map +//= require i18n/translations +//= require querystring + +var querystring = require('querystring-component'); + +describe("OSM", function () { + describe(".apiUrl", function () { + it("returns a URL for a way", function () { + expect(OSM.apiUrl({type: "way", id: 10})).to.eq("/api/0.6/way/10/full"); + }); + + it("returns a URL for a node", function () { + expect(OSM.apiUrl({type: "node", id: 10})).to.eq("/api/0.6/node/10"); + }); + + it("returns a URL for a specific version", function () { + expect(OSM.apiUrl({type: "node", id: 10, version: 2})).to.eq("/api/0.6/node/10/2"); + }); + }); + + describe(".params", function () { + it("parses params", function () { + var params = OSM.params("?foo=a&bar=b"); + expect(params).to.have.property("foo", "a"); + expect(params).to.have.property("bar", "b"); + }); + }); + + describe(".mapParams", function () { + beforeEach(function () { + delete OSM.home; + delete OSM.location; + document.location.hash = ""; + document.cookie = "_osm_location=; expires=Thu, 01 Jan 1970 00:00:00 GMT"; + + // Test with another cookie set. + document.cookie = "_osm_session=deadbeef"; + }); + + it("parses marker params", function () { + var params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845"); + expect(params).to.have.property("mlat", 57.6247); + expect(params).to.have.property("mlon", -3.6845); + expect(params).to.have.property("marker", true); + }); + + it("parses object params", function () { + var params = OSM.mapParams("?node=1"); + expect(params).to.have.property("object"); + expect(params.object).to.eql({type: "node", id: 1}); + + params = OSM.mapParams("?way=1"); + expect(params).to.have.property("object"); + expect(params.object).to.eql({type: "way", id: 1}); + + params = OSM.mapParams("?relation=1"); + expect(params).to.have.property("object"); + expect(params.object).to.eql({type: "relation", id: 1}); + }); + + it("parses bbox params", function () { + var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]); + var params = OSM.mapParams("?bbox=-3.6845,57.6247,-3.7845,57.7247"); + expect(params).to.have.property("bounds").deep.equal(expected); + + params = OSM.mapParams("?minlon=-3.6845&minlat=57.6247&maxlon=-3.7845&maxlat=57.7247"); + expect(params).to.have.property("bounds").deep.equal(expected); + }); + + it("parses lat/lon/zoom params", function () { + var params = OSM.mapParams("?lat=57.6247&lon=-3.6845"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 5); + + params = OSM.mapParams("?lat=57.6247&lon=-3.6845&zoom=10"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 10); + + params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 12); + + params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845&zoom=16"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 16); + }); + + it("parses lat/lon/zoom from the hash", function () { + document.location.hash = "#map=16/57.6247/-3.6845"; + params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 16); + }); + + it("sets lat/lon from OSM.home", function () { + OSM.home = {lat: 57.6247, lon: -3.6845}; + var params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + }); + + it("sets bbox from OSM.location", function () { + OSM.location = {minlon: -3.6845, minlat: 57.6247, maxlon: -3.7845, maxlat: 57.7247}; + var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]); + var params = OSM.mapParams("?"); + expect(params).to.have.property("bounds").deep.equal(expected); + }); + + it("parses params from the _osm_location cookie", function () { + document.cookie = "_osm_location=-3.6845|57.6247|5|M"; + var params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 5); + expect(params).to.have.property("layers", "M"); + }); + + it("defaults lat/lon to London", function () { + var params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 51.5); + expect(params).to.have.property("lon", -0.1); + expect(params).to.have.property("zoom", 5); + + params = OSM.mapParams("?zoom=10"); + expect(params).to.have.property("lat", 51.5); + expect(params).to.have.property("lon", -0.1); + expect(params).to.have.property("zoom", 10); + }); + + it("parses layers param", function () { + var params = OSM.mapParams("?"); + expect(params).to.have.property("layers", ""); + + document.cookie = "_osm_location=-3.6845|57.6247|5|C"; + params = OSM.mapParams("?"); + expect(params).to.have.property("layers", "C"); + + document.location.hash = "#map=5/57.6247/-3.6845&layers=M" + params = OSM.mapParams("?"); + expect(params).to.have.property("layers", "M"); + }); + }); + + describe(".parseHash", function () { + it("parses lat/lon/zoom params", function () { + var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M"); + expect(args).to.have.property("center").deep.equal(L.latLng(57.6247, -3.6845)); + expect(args).to.have.property("zoom", 5); + }); + + it("parses layers params", function () { + var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M"); + expect(args).to.have.property("layers", "M"); + }); + }); + + describe(".formatHash", function () { + it("formats lat/lon/zoom params", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 9 }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845"); + }); + + it("respects zoomPrecision", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 5 }; + expect(OSM.formatHash(args)).to.eq("#map=5/57.625/-3.685"); + + args = { center: L.latLng(57.6247, -3.6845), zoom: 9 }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845"); + }); + + it("formats layers params", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "C" }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845&layers=C"); + }); + + it("ignores default layers", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "M" }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845"); + }); + }); + + describe(".zoomPrecision", function () { + it("suggests 0 digits for z0-1", function () { + expect(OSM.zoomPrecision(0)).to.eq(0); + expect(OSM.zoomPrecision(1)).to.eq(0); + }); + + it("suggests 1 digit for z2", function () { + expect(OSM.zoomPrecision(2)).to.eq(1); + }); + + it("suggests 2 digits for z3-4", function () { + expect(OSM.zoomPrecision(3)).to.eq(2); + expect(OSM.zoomPrecision(4)).to.eq(2); + }); + + it("suggests 3 digits for z5-8", function () { + expect(OSM.zoomPrecision(5)).to.eq(3); + expect(OSM.zoomPrecision(6)).to.eq(3); + expect(OSM.zoomPrecision(7)).to.eq(3); + expect(OSM.zoomPrecision(8)).to.eq(3); + }); + + it("suggests 4 digits for z9-16", function () { + expect(OSM.zoomPrecision(9)).to.eq(4); + expect(OSM.zoomPrecision(10)).to.eq(4); + expect(OSM.zoomPrecision(11)).to.eq(4); + expect(OSM.zoomPrecision(12)).to.eq(4); + expect(OSM.zoomPrecision(13)).to.eq(4); + expect(OSM.zoomPrecision(14)).to.eq(4); + expect(OSM.zoomPrecision(15)).to.eq(4); + expect(OSM.zoomPrecision(16)).to.eq(4); + }); + + it("suggests 5 digits for z17-20", function () { + expect(OSM.zoomPrecision(17)).to.eq(5); + expect(OSM.zoomPrecision(18)).to.eq(5); + expect(OSM.zoomPrecision(19)).to.eq(5); + expect(OSM.zoomPrecision(20)).to.eq(5); + }); + }); + + describe(".locationCookie", function () { + it("creates a location cookie value", function () { + $("body").html($("
    ")); + var map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 }); + map.updateLayers(""); + expect(OSM.locationCookie(map)).to.eq("-3.6845|57.6247|9|M"); + }); + + it("respects zoomPrecision", function () { + $("body").html($("
    ")); + var map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 }); + map.updateLayers(""); + expect(OSM.locationCookie(map)).to.eq("-3.6845|57.6247|9|M"); + + map.setZoom(5); + expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|5|M"); + }); + }); +}); diff --git a/test/unit/bounding_box_test.rb b/test/lib/bounding_box_test.rb similarity index 99% rename from test/unit/bounding_box_test.rb rename to test/lib/bounding_box_test.rb index 1a1059ddf..a5e4a39e0 100644 --- a/test/unit/bounding_box_test.rb +++ b/test/lib/bounding_box_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class BoundingBoxTest < ActiveSupport::TestCase def setup diff --git a/test/lib/country_test.rb b/test/lib/country_test.rb new file mode 100644 index 000000000..14827c05f --- /dev/null +++ b/test/lib/country_test.rb @@ -0,0 +1,28 @@ +require 'test_helper' + +class CountryTest < ActiveSupport::TestCase + def test_gb + gb = Country.find_by_code("GB") + assert_not_nil gb + assert_equal "GB", gb.code + assert_equal -8.623555, gb.min_lon + assert_equal 59.360249, gb.max_lat + assert_equal 1.759, gb.max_lon + assert_equal 49.906193, gb.min_lat + end + + def test_au + au = Country.find_by_code("AU") + assert_not_nil au + assert_equal "AU", au.code + assert_equal 112.911057, au.min_lon + assert_equal -10.062805, au.max_lat + assert_equal 153.639252, au.max_lon + assert_equal -43.64397, au.min_lat + end + + def test_xx + xx = Country.find_by_code("XX") + assert_nil xx + end +end diff --git a/test/unit/i18n_test.rb b/test/lib/i18n_test.rb similarity index 94% rename from test/unit/i18n_test.rb rename to test/lib/i18n_test.rb index 2fb13824c..ea67e084e 100644 --- a/test/unit/i18n_test.rb +++ b/test/lib/i18n_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class I18nTest < ActiveSupport::TestCase I18n.available_locales.each do |locale| @@ -48,6 +48,8 @@ class I18nTest < ActiveSupport::TestCase end end end + + assert ["ltr", "rtl"].include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl" end end private diff --git a/test/unit/password_hash_test.rb b/test/lib/password_hash_test.rb similarity index 96% rename from test/unit/password_hash_test.rb rename to test/lib/password_hash_test.rb index 825942afa..bf253c0b8 100644 --- a/test/unit/password_hash_test.rb +++ b/test/lib/password_hash_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class PasswordHashTest < ActiveSupport::TestCase def test_md5_without_salt diff --git a/test/unit/rich_text_test.rb b/test/lib/rich_text_test.rb similarity index 98% rename from test/unit/rich_text_test.rb rename to test/lib/rich_text_test.rb index c43dd0e9a..e99d594a4 100644 --- a/test/unit/rich_text_test.rb +++ b/test/lib/rich_text_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RichTextTest < ActiveSupport::TestCase include ActionDispatch::Assertions::SelectorAssertions diff --git a/test/unit/short_link_test.rb b/test/lib/short_link_test.rb similarity index 96% rename from test/unit/short_link_test.rb rename to test/lib/short_link_test.rb index cdc6b3cfd..7aa21f363 100644 --- a/test/unit/short_link_test.rb +++ b/test/lib/short_link_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ShortLinkTest < ActiveSupport::TestCase ## diff --git a/test/lib/utf8_test.rb b/test/lib/utf8_test.rb new file mode 100644 index 000000000..1604b52f6 --- /dev/null +++ b/test/lib/utf8_test.rb @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +require 'test_helper' + +class UTF8Test < ActiveSupport::TestCase + def test_valid? + assert_equal true, UTF8.valid?("test") + assert_equal true, UTF8.valid?("vergrößern") + assert_equal true, UTF8.valid?("ルシステムにも対応します") + assert_equal true, UTF8.valid?("輕觸搖晃的遊戲") + + assert_equal false, UTF8.valid?("\xC0") # always invalid utf8 + assert_equal false, UTF8.valid?("\xC2\x4a") # 2-byte multibyte identifier, followed by plain ASCII + assert_equal false, UTF8.valid?("\xC2\xC2") # 2-byte multibyte identifier, followed by another one + assert_equal false, UTF8.valid?("\x4a\x82") # plain ASCII, followed by multibyte continuation + assert_equal false, UTF8.valid?("\x82\x82") # multibyte continuations without multibyte identifier + assert_equal false, UTF8.valid?("\xe1\x82\x4a") # three-byte identifier, contination and (incorrectly) plain ASCII + end +end diff --git a/test/unit/acl_test.rb b/test/models/acl_test.rb similarity index 70% rename from test/unit/acl_test.rb rename to test/models/acl_test.rb index 991e6eb84..9d8431912 100644 --- a/test/unit/acl_test.rb +++ b/test/models/acl_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class AclTest < ActiveSupport::TestCase # Replace this with your real tests. diff --git a/test/unit/changeset_tag_test.rb b/test/models/changeset_tag_test.rb similarity index 96% rename from test/unit/changeset_tag_test.rb rename to test/models/changeset_tag_test.rb index cff75a5be..1564361c4 100644 --- a/test/unit/changeset_tag_test.rb +++ b/test/models/changeset_tag_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ChangesetTagTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/changeset_test.rb b/test/models/changeset_test.rb similarity index 98% rename from test/unit/changeset_test.rb rename to test/models/changeset_test.rb index 9533cd55e..b6e5ba46a 100644 --- a/test/unit/changeset_test.rb +++ b/test/models/changeset_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ChangesetTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/diary_comment_test.rb b/test/models/diary_comment_test.rb similarity index 77% rename from test/unit/diary_comment_test.rb rename to test/models/diary_comment_test.rb index e6d7a71b4..e96c12230 100644 --- a/test/unit/diary_comment_test.rb +++ b/test/models/diary_comment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class DiaryCommentTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/diary_entry_test.rb b/test/models/diary_entry_test.rb similarity index 97% rename from test/unit/diary_entry_test.rb rename to test/models/diary_entry_test.rb index 0801aa299..e8667bc74 100644 --- a/test/unit/diary_entry_test.rb +++ b/test/models/diary_entry_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class DiaryEntryTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/friend_test.rb b/test/models/friend_test.rb similarity index 74% rename from test/unit/friend_test.rb rename to test/models/friend_test.rb index 6416e38c7..c9f671e7e 100644 --- a/test/unit/friend_test.rb +++ b/test/models/friend_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class FriendTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/language_test.rb b/test/models/language_test.rb similarity index 69% rename from test/unit/language_test.rb rename to test/models/language_test.rb index a171c1e2e..a9d6f5d6a 100644 --- a/test/unit/language_test.rb +++ b/test/models/language_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class LanguageTest < ActiveSupport::TestCase test "language count" do diff --git a/test/unit/message_test.rb b/test/models/message_test.rb similarity index 99% rename from test/unit/message_test.rb rename to test/models/message_test.rb index 3da91de38..079e10c42 100644 --- a/test/unit/message_test.rb +++ b/test/models/message_test.rb @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class MessageTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/node_tag_test.rb b/test/models/node_tag_test.rb similarity index 95% rename from test/unit/node_tag_test.rb rename to test/models/node_tag_test.rb index 2f2631792..aa50b2f39 100644 --- a/test/unit/node_tag_test.rb +++ b/test/models/node_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class NodeTagTest < ActiveSupport::TestCase api_fixtures def test_tag_count - assert_equal 7, NodeTag.count + assert_equal 12, NodeTag.count node_tag_count(:visible_node, 1) node_tag_count(:invisible_node, 1) node_tag_count(:used_node_1, 1) diff --git a/test/unit/node_test.rb b/test/models/node_test.rb similarity index 99% rename from test/unit/node_test.rb rename to test/models/node_test.rb index 2b28b3ee6..f6f5be296 100644 --- a/test/unit/node_test.rb +++ b/test/models/node_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class NodeTest < ActiveSupport::TestCase api_fixtures def test_node_count - assert_equal 17, Node.count + assert_equal 18, Node.count end def test_node_too_far_north diff --git a/test/unit/oauth_nonce_test.rb b/test/models/oauth_nonce_test.rb similarity index 91% rename from test/unit/oauth_nonce_test.rb rename to test/models/oauth_nonce_test.rb index def869a05..ffbad0af6 100644 --- a/test/unit/oauth_nonce_test.rb +++ b/test/models/oauth_nonce_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OauthNonceTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/oauth_token_test.rb b/test/models/oauth_token_test.rb similarity index 94% rename from test/unit/oauth_token_test.rb rename to test/models/oauth_token_test.rb index 9ec005c96..da2e449f1 100644 --- a/test/unit/oauth_token_test.rb +++ b/test/models/oauth_token_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OauthTokenTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/old_node_tag_test.rb b/test/models/old_node_tag_test.rb similarity index 93% rename from test/unit/old_node_tag_test.rb rename to test/models/old_node_tag_test.rb index af7a186d8..249b810a9 100644 --- a/test/unit/old_node_tag_test.rb +++ b/test/models/old_node_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldNodeTagTest < ActiveSupport::TestCase api_fixtures def test_old_node_tag_count - assert_equal 9, OldNodeTag.count, "Unexpected number of fixtures loaded." + assert_equal 19, OldNodeTag.count, "Unexpected number of fixtures loaded." end def test_length_key_valid diff --git a/test/unit/old_node_test.rb b/test/models/old_node_test.rb similarity index 97% rename from test/unit/old_node_test.rb rename to test/models/old_node_test.rb index fdd61f090..2ccf6d18c 100644 --- a/test/unit/old_node_test.rb +++ b/test/models/old_node_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldNodeTest < ActiveSupport::TestCase api_fixtures def test_node_count - assert_equal 21, OldNode.count + assert_equal 23, OldNode.count end def test_node_too_far_north diff --git a/test/unit/old_relation_tag_test.rb b/test/models/old_relation_tag_test.rb similarity index 97% rename from test/unit/old_relation_tag_test.rb rename to test/models/old_relation_tag_test.rb index faff45dd0..ec4987ee0 100644 --- a/test/unit/old_relation_tag_test.rb +++ b/test/models/old_relation_tag_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldRelationTagTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/old_relation_test.rb b/test/models/old_relation_test.rb similarity index 98% rename from test/unit/old_relation_test.rb rename to test/models/old_relation_test.rb index 31ff83197..14fe8a72c 100644 --- a/test/unit/old_relation_test.rb +++ b/test/models/old_relation_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldRelationTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/old_way_tag_test.rb b/test/models/old_way_tag_test.rb similarity index 96% rename from test/unit/old_way_tag_test.rb rename to test/models/old_way_tag_test.rb index dbc001980..07bdfbca8 100644 --- a/test/unit/old_way_tag_test.rb +++ b/test/models/old_way_tag_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldWayTagTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/old_way_test.rb b/test/models/old_way_test.rb similarity index 98% rename from test/unit/old_way_test.rb rename to test/models/old_way_test.rb index 44975d153..c002ebe39 100644 --- a/test/unit/old_way_test.rb +++ b/test/models/old_way_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldWayTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/redaction_test.rb b/test/models/redaction_test.rb similarity index 95% rename from test/unit/redaction_test.rb rename to test/models/redaction_test.rb index c19570fc4..61b64f211 100644 --- a/test/unit/redaction_test.rb +++ b/test/models/redaction_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'osm' class RedactionTest < ActiveSupport::TestCase diff --git a/test/unit/relation_member_test.rb b/test/models/relation_member_test.rb similarity index 75% rename from test/unit/relation_member_test.rb rename to test/models/relation_member_test.rb index 2b1fe113f..82eaa7e58 100644 --- a/test/unit/relation_member_test.rb +++ b/test/models/relation_member_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RelationMemberTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/relation_tag_test.rb b/test/models/relation_tag_test.rb similarity index 98% rename from test/unit/relation_tag_test.rb rename to test/models/relation_tag_test.rb index 0833c572d..0b5bedb05 100644 --- a/test/unit/relation_tag_test.rb +++ b/test/models/relation_tag_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RelationTagTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/relation_test.rb b/test/models/relation_test.rb similarity index 99% rename from test/unit/relation_test.rb rename to test/models/relation_test.rb index 4caa6ce41..7141f54f0 100644 --- a/test/unit/relation_test.rb +++ b/test/models/relation_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RelationTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/trace_test.rb b/test/models/trace_test.rb similarity index 98% rename from test/unit/trace_test.rb rename to test/models/trace_test.rb index d2720e993..9ec40f18f 100644 --- a/test/unit/trace_test.rb +++ b/test/models/trace_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class TraceTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/tracepoint_test.rb b/test/models/tracepoint_test.rb similarity index 73% rename from test/unit/tracepoint_test.rb rename to test/models/tracepoint_test.rb index c49f9fbdc..74a0d22f9 100644 --- a/test/unit/tracepoint_test.rb +++ b/test/models/tracepoint_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class TracepointTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/tracetag_test.rb b/test/models/tracetag_test.rb similarity index 94% rename from test/unit/tracetag_test.rb rename to test/models/tracetag_test.rb index 473071088..74a1d49aa 100644 --- a/test/unit/tracetag_test.rb +++ b/test/models/tracetag_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class TracetagTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/user_preference_test.rb b/test/models/user_preference_test.rb similarity index 96% rename from test/unit/user_preference_test.rb rename to test/models/user_preference_test.rb index d95989a4f..4d485b276 100644 --- a/test/unit/user_preference_test.rb +++ b/test/models/user_preference_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserPreferenceTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/user_test.rb b/test/models/user_test.rb similarity index 96% rename from test/unit/user_test.rb rename to test/models/user_test.rb index 1283f4168..7f24469f6 100644 --- a/test/unit/user_test.rb +++ b/test/models/user_test.rb @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserTest < ActiveSupport::TestCase api_fixtures @@ -109,7 +109,7 @@ class UserTest < ActiveSupport::TestCase assert !users(:inactive_user).is_friends_with?(users(:normal_user)) assert !users(:inactive_user).is_friends_with?(users(:public_user)) end - + def test_users_nearby # second user has their data public and is close by normal user assert_equal [users(:public_user)], users(:normal_user).nearby @@ -117,8 +117,10 @@ class UserTest < ActiveSupport::TestCase assert_equal [], users(:public_user).nearby # inactive_user has no user nearby assert_equal [], users(:inactive_user).nearby + # north_pole_user has no user nearby, and doesn't throw exception + assert_equal [], users(:north_pole_user).nearby end - + def test_friends_with # normal user is a friend of second user # it should be a one way friend accossitation @@ -155,7 +157,7 @@ class UserTest < ActiveSupport::TestCase end def test_visible - assert_equal 14, User.visible.count + assert_equal 15, User.visible.count assert_raise ActiveRecord::RecordNotFound do User.visible.find(users(:suspended_user).id) end @@ -165,7 +167,7 @@ class UserTest < ActiveSupport::TestCase end def test_active - assert_equal 13, User.active.count + assert_equal 14, User.active.count assert_raise ActiveRecord::RecordNotFound do User.active.find(users(:inactive_user).id) end @@ -178,7 +180,7 @@ class UserTest < ActiveSupport::TestCase end def test_public - assert_equal 15, User.public.count + assert_equal 16, User.public.count assert_raise ActiveRecord::RecordNotFound do User.public.find(users(:normal_user).id) end diff --git a/test/unit/user_token_test.rb b/test/models/user_token_test.rb similarity index 76% rename from test/unit/user_token_test.rb rename to test/models/user_token_test.rb index 1fe263454..7be5a2cf7 100644 --- a/test/unit/user_token_test.rb +++ b/test/models/user_token_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserTokenTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/way_node_test.rb b/test/models/way_node_test.rb similarity index 72% rename from test/unit/way_node_test.rb rename to test/models/way_node_test.rb index 9d6a3b755..174fe0bdd 100644 --- a/test/unit/way_node_test.rb +++ b/test/models/way_node_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class WayNodeTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/way_tag_test.rb b/test/models/way_tag_test.rb similarity index 96% rename from test/unit/way_tag_test.rb rename to test/models/way_tag_test.rb index 9766e9c77..4d6116159 100644 --- a/test/unit/way_tag_test.rb +++ b/test/models/way_tag_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class WayTagTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/way_test.rb b/test/models/way_test.rb similarity index 99% rename from test/unit/way_test.rb rename to test/models/way_test.rb index 6b9237da7..eb5baef10 100644 --- a/test/unit/way_test.rb +++ b/test/models/way_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class WayTest < ActiveSupport::TestCase api_fixtures diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 1927b00eb..1e63410fa 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -2732,14 +2732,13 @@ input[type=number] { .form-field .addr-number { width: 33.3333%; - border-left: 0; - border-right: 0; - border-bottom: 0; + border: 0; border-radius: 0; } .form-field .addr-street { width: 66.6666%; + border-top: 0; border-right: 0; border-bottom: 0; border-radius: 0; diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js index fd19d32de..c7bb96219 100644 --- a/vendor/assets/iD/iD.js +++ b/vendor/assets/iD/iD.js @@ -16151,7 +16151,7 @@ window.iD = function () { return d3.rebind(context, dispatch, 'on'); }; -iD.version = '1.3.5'; +iD.version = '1.3.7'; (function() { var detected = {}; @@ -16187,7 +16187,7 @@ iD.version = '1.3.5'; })(); iD.taginfo = function() { var taginfo = {}, - endpoint = 'http://taginfo.openstreetmap.org/api/4/', + endpoint = 'https://taginfo.openstreetmap.org/api/4/', tag_sorts = { point: 'count_nodes', vertex: 'count_nodes', @@ -16323,7 +16323,7 @@ iD.taginfo = function() { }; iD.wikipedia = function() { var wiki = {}, - endpoint = 'http://en.wikipedia.org/w/api.php?'; + endpoint = 'https://en.wikipedia.org/w/api.php?'; wiki.search = function(lang, query, callback) { lang = lang || 'en'; @@ -17702,10 +17702,14 @@ iD.actions.MergePolygon = function(ids, newRelationId) { graph = graph.remove(m); }); - members.forEach(function(m) { - var entity = graph.entity(m.id); - relation = relation.mergeTags(entity.tags); - graph = graph.replace(entity.update({ tags: {} })); + entities.closedWay.forEach(function(way) { + function isThisOuter(m) { + return m.id === way.id && m.role !== 'inner'; + } + if (members.some(isThisOuter)) { + relation = relation.mergeTags(way.tags); + graph = graph.replace(way.update({ tags: {} })); + } }); return graph.replace(relation.update({ @@ -17719,6 +17723,8 @@ iD.actions.MergePolygon = function(ids, newRelationId) { if (entities.other.length > 0 || entities.closedWay.length + entities.multipolygon.length < 2) return 'not_eligible'; + if (!entities.multipolygon.every(function(r) { return r.isComplete(graph); })) + return 'incomplete_relation'; }; return action; @@ -17783,7 +17789,7 @@ iD.actions.Noop = function() { */ iD.actions.Orthogonalize = function(wayId, projection) { - var threshold = 7, // degrees within right or straight to alter + var threshold = 12, // degrees within right or straight to alter lowerThreshold = Math.cos((90 - threshold) * Math.PI / 180), upperThreshold = Math.cos(threshold * Math.PI / 180); @@ -20567,6 +20573,9 @@ iD.operations.Merge = function(selectedIDs, context) { if (j === 'restriction' && m && p) return t('operations.merge.restriction', {relation: context.presets().item('type/restriction').name()}); + if (p === 'incomplete_relation' && j && m) + return t('operations.merge.incomplete_relation'); + if (j && m && p) return t('operations.merge.' + j); @@ -20678,9 +20687,18 @@ iD.operations.Rotate = function(selectedIDs, context) { }; operation.available = function() { - return selectedIDs.length === 1 && - context.entity(entityId).type === 'way' && - context.geometry(entityId) === 'area'; + var graph = context.graph(), + entity = graph.entity(entityId); + + if (selectedIDs.length !== 1 || + entity.type !== 'way') + return false; + if (context.geometry(entityId) === 'area') + return true; + if (entity.isClosed() && + graph.parentRelations(entity).some(function(r) { return r.isMultipolygon(); })) + return true; + return false; }; operation.disabled = function() { @@ -22024,7 +22042,9 @@ iD.History = function(context) { toJSON: function() { if (stack.length <= 1) return; - var allEntities = {}; + var allEntities = {}, + baseEntities = {}, + base = stack[0]; var s = stack.map(function(i) { var modified = [], deleted = []; @@ -22037,6 +22057,12 @@ iD.History = function(context) { } else { deleted.push(id); } + + // make sure that the originals of changed or deleted entities get merged + // into the base of the stack after restoring the data from JSON. + if (id in base.graph.entities) { + baseEntities[id] = base.graph.entities[id]; + } }); var x = {}; @@ -22050,8 +22076,9 @@ iD.History = function(context) { }); return JSON.stringify({ - version: 2, + version: 3, entities: _.values(allEntities), + baseEntities: _.values(baseEntities), stack: s, nextIDs: iD.Entity.id.next, index: index @@ -22064,13 +22091,22 @@ iD.History = function(context) { iD.Entity.id.next = h.nextIDs; index = h.index; - if (h.version === 2) { + if (h.version === 2 || h.version === 3) { var allEntities = {}; h.entities.forEach(function(entity) { allEntities[iD.Entity.key(entity)] = iD.Entity(entity); }); + if (h.version === 3) { + // this merges originals for changed entities into the base of + // the stack even if the current stack doesn't have them (for + // example when iD has been restarted in a different region) + var baseEntities = h.baseEntities.map(iD.Entity); + stack[0].graph.rebase(baseEntities, _.pluck(stack, 'graph')); + tree.rebase(baseEntities); + } + stack = h.stack.map(function(d) { var entities = {}, entity; @@ -22142,8 +22178,6 @@ iD.History = function(context) { var json = context.storage(getKey('saved_history')); if (json) history.fromJSON(json); - - context.storage(getKey('saved_history', null)); }, _getKey: getKey @@ -22487,7 +22521,11 @@ iD.Tree = function(head) { return rect; } - function updateParents(entity, insertions) { + function updateParents(entity, insertions, memo) { + if (memo && memo[entity.id]) return; + memo = memo || {}; + memo[entity.id] = true; + head.parentWays(entity).forEach(function(parent) { if (rectangles[parent.id]) { rtree.remove(rectangles[parent.id]); @@ -22500,7 +22538,7 @@ iD.Tree = function(head) { rtree.remove(rectangles[parent.id]); insertions.push(parent); } - updateParents(parent, insertions); + updateParents(parent, insertions, memo); }); } @@ -23053,7 +23091,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) { var bing = iD.BackgroundSource(data), key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM - url = 'http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' + + url = 'https://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' + key + '&jsonp={callback}', providers = []; @@ -23072,7 +23110,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) { dispatch.change(); }); - var template = 'http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z', + var template = 'https://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z', subdomains = [0, 1, 2, 3]; bing.url = function(coord) { @@ -29371,7 +29409,6 @@ iD.ui.preset.access = function(field) { }; iD.ui.preset.address = function(field, context) { var event = d3.dispatch('change'), - housename, housenumber, street, city, @@ -29469,12 +29506,6 @@ iD.ui.preset.address = function(field, context) { var enter = wrap.enter().append('div') .attr('class', 'preset-input-wrap'); - enter.append('input') - .property('type', 'text') - .attr('placeholder', field.t('placeholders.housename')) - .attr('class', 'addr-housename') - .attr('id', 'preset-input-' + field.id); - enter.append('input') .property('type', 'text') .attr('placeholder', field.t('placeholders.number')) @@ -29497,7 +29528,6 @@ iD.ui.preset.address = function(field, context) { // Update - housename = wrap.select('.addr-housename'); housenumber = wrap.select('.addr-number'); street = wrap.select('.addr-street'); city = wrap.select('.addr-city'); @@ -29528,7 +29558,6 @@ iD.ui.preset.address = function(field, context) { function change() { event.change({ - 'addr:housename': housename.value() || undefined, 'addr:housenumber': housenumber.value() || undefined, 'addr:street': street.value() || undefined, 'addr:city': city.value() || undefined, @@ -29543,7 +29572,6 @@ iD.ui.preset.address = function(field, context) { }; address.tags = function(tags) { - housename.value(tags['addr:housename'] || ''); housenumber.value(tags['addr:housenumber'] || ''); street.value(tags['addr:street'] || ''); city.value(tags['addr:city'] || ''); @@ -29551,7 +29579,7 @@ iD.ui.preset.address = function(field, context) { }; address.focus = function() { - housename.node().focus(); + housenumber.node().focus(); }; return d3.rebind(address, event, 'on'); @@ -45609,7 +45637,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "New & Misaligned TIGER Roads", "type": "tms", "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap", - "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/enf.ho204tap,enf.ho20a3n1,enf.game1617/{zoom}/{x}/{y}.png", + "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/enf.y5c4ygb9,enf.ho20a3n1,enf.game1617/{zoom}/{x}/{y}.png", "scaleExtent": [ 0, 22 @@ -62599,7 +62627,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "icon": "hospital", "fields": [ "building_area", - "social_facility", "address", "opening_hours" ] @@ -62657,7 +62684,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "dentist's office" ], "tags": { - "amenity": "doctors" + "amenity": "dentist" }, "icon": "hospital", "fields": [ @@ -63338,6 +63365,95 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," ], "name": "Shelter" }, + "amenity/social_facility": { + "name": "Social Facility", + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "amenity": "social_facility" + }, + "fields": [ + "social_facility_for", + "address", + "phone", + "opening_hours", + "wheelchair", + "operator" + ] + }, + "amenity/social_facility/food_bank": { + "name": "Food Bank", + "geometry": [ + "point", + "area" + ], + "terms": [], + "tags": { + "amenity": "social_facility", + "social_facility": "food_bank" + }, + "fields": [ + "social_facility_for", + "address", + "phone", + "opening_hours", + "wheelchair", + "operator" + ] + }, + "amenity/social_facility/group_home": { + "name": "Group Home", + "geometry": [ + "point", + "area" + ], + "terms": [ + "elderly", + "old", + "senior living" + ], + "tags": { + "amenity": "social_facility", + "social_facility": "group_home", + "social_facility_for": "senior" + }, + "fields": [ + "social_facility_for", + "address", + "phone", + "opening_hours", + "wheelchair", + "operator" + ] + }, + "amenity/social_facility/homeless_shelter": { + "name": "Homeless Shelter", + "geometry": [ + "point", + "area" + ], + "terms": [ + "houseless", + "unhoused", + "displaced" + ], + "tags": { + "amenity": "social_facility", + "social_facility": "shelter", + "social_facility:for": "homeless" + }, + "fields": [ + "social_facility_for", + "address", + "phone", + "opening_hours", + "wheelchair", + "operator" + ] + }, "amenity/studio": { "name": "Studio", "geometry": [ @@ -63803,6 +63919,102 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Apartments" }, + "building/barn": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "barn" + }, + "name": "Barn" + }, + "building/bunker": { + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "bunker" + }, + "name": "Bunker", + "searchable": false + }, + "building/cabin": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "cabin" + }, + "name": "Cabin" + }, + "building/cathedral": { + "icon": "place-of-worship", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "cathedral" + }, + "name": "Cathedral" + }, + "building/chapel": { + "icon": "place-of-worship", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "chapel" + }, + "name": "Chapel" + }, + "building/church": { + "icon": "place-of-worship", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "church" + }, + "name": "Church" + }, "building/commercial": { "icon": "commercial", "geometry": [ @@ -63815,6 +64027,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Commercial Building" }, + "building/construction": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "construction" + }, + "name": "Building Under Construction" + }, + "building/detached": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "detached" + }, + "name": "Detached Home" + }, + "building/dormitory": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "dormitory" + }, + "name": "Dormitory" + }, "building/entrance": { "icon": "entrance", "geometry": [ @@ -63841,6 +64101,69 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Garage", "icon": "warehouse" }, + "building/garages": { + "icon": "warehouse", + "fields": [ + "capacity" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "garages" + }, + "name": "Garages" + }, + "building/greenhouse": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "greenhouse" + }, + "name": "Greenhouse" + }, + "building/hospital": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "hospital" + }, + "name": "Hospital Building" + }, + "building/hotel": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "hotel" + }, + "name": "Hotel Building" + }, "building/house": { "icon": "building", "fields": [ @@ -63883,6 +64206,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Industrial Building" }, + "building/public": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "public" + }, + "name": "Public Building" + }, "building/residential": { "icon": "building", "fields": [ @@ -63899,6 +64238,167 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Residential Building" }, + "building/retail": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "retail" + }, + "name": "Retail Building" + }, + "building/roof": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "roof" + }, + "name": "Roof" + }, + "building/school": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "school" + }, + "name": "School Building" + }, + "building/shed": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "shed" + }, + "name": "Shed" + }, + "building/stable": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "stable" + }, + "name": "Stable" + }, + "building/static_caravan": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "static_caravan" + }, + "name": "Static Mobile Home" + }, + "building/terrace": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "terrace" + }, + "name": "Row Houses" + }, + "building/train_station": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "train_station" + }, + "name": "Train Station", + "searchable": false + }, + "building/university": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "university" + }, + "name": "University Building" + }, + "building/warehouse": { + "icon": "building", + "fields": [ + "address", + "levels" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "building": "warehouse" + }, + "name": "Warehouse" + }, "craft/basket_maker": { "name": "Basket Maker", "geometry": [ @@ -64391,7 +64891,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," ] }, "craft/painter": { - "name": "painter", + "name": "Painter", "geometry": [ "point", "area" @@ -67660,6 +68160,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "railway/station": { "icon": "rail", + "fields": [ + "building_area" + ], "geometry": [ "point", "vertex", @@ -67778,6 +68281,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," ], "name": "Liquor Store" }, + "shop/art": { + "icon": "art-gallery", + "fields": [ + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "art store", + "art gallery" + ], + "tags": { + "shop": "art" + }, + "name": "Art Shop" + }, "shop/bakery": { "icon": "bakery", "fields": [ @@ -67852,6 +68376,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Bicycle Shop" }, + "shop/bookmaker": { + "icon": "shop", + "fields": [ + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "bookmaker" + }, + "name": "Bookmaker" + }, "shop/books": { "icon": "shop", "fields": [ @@ -68371,6 +68912,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Locksmith" }, + "shop/lottery": { + "icon": "shop", + "fields": [ + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "lottery" + }, + "name": "Lottery Shop" + }, "shop/mall": { "icon": "shop", "fields": [ @@ -97020,7 +97578,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "address": { "type": "address", "keys": [ - "addr:housename", "addr:housenumber", "addr:street", "addr:city", @@ -97031,7 +97588,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "label": "Address", "strings": { "placeholders": { - "housename": "Housename", "number": "123", "street": "Street", "city": "City", @@ -97652,6 +98208,28 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "type": "typeCombo", "label": "Type" }, + "social_facility_for": { + "key": "social_facility:for", + "type": "radio", + "label": "People served", + "placeholder": "Homeless, Disabled, Child, etc", + "options": [ + "abused", + "child", + "disabled", + "diseased", + "drug_addicted", + "homeless", + "juvenile", + "mental_health", + "migrant", + "orphan", + "senior", + "underprivileged", + "unemployed", + "victim" + ] + }, "source": { "key": "source", "type": "text", @@ -109637,8 +110215,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "locales": [ "af", + "sq", "ar", "ar-AA", + "hy", "ast", "bn", "bs", @@ -109667,6 +110247,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "ja", "kn", "ko", + "ko-KR", "lv", "lt", "no", @@ -109684,6 +110265,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "sl", "es", "sv", + "ta", "te", "tr", "uk", @@ -109825,7 +110407,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "annotation": "Merged {n} lines.", "not_eligible": "These features can't be merged.", "not_adjacent": "These lines can't be merged because they aren't connected.", - "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation." + "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.", + "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded." }, "move": { "title": "Move", @@ -110160,7 +110743,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "address": { "label": "Address", "placeholders": { - "housename": "Housename", "number": "123", "street": "Street", "city": "City", @@ -110488,6 +111070,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "shop": { "label": "Type" }, + "social_facility_for": { + "label": "People served", + "placeholder": "Homeless, Disabled, Child, etc" + }, "source": { "label": "Source" }, @@ -110833,6 +111419,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Shelter", "terms": "lean-to" }, + "amenity/social_facility": { + "name": "Social Facility", + "terms": "" + }, + "amenity/social_facility/food_bank": { + "name": "Food Bank", + "terms": "" + }, + "amenity/social_facility/group_home": { + "name": "Group Home", + "terms": "elderly,old,senior living" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Homeless Shelter", + "terms": "houseless,unhoused,displaced" + }, "amenity/studio": { "name": "Studio", "terms": "recording studio,studio,radio,radio studio,television,television studio" @@ -110961,10 +111563,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Apartments", "terms": "" }, + "building/barn": { + "name": "Barn", + "terms": "" + }, + "building/bunker": { + "name": "Bunker", + "terms": "" + }, + "building/cabin": { + "name": "Cabin", + "terms": "" + }, + "building/cathedral": { + "name": "Cathedral", + "terms": "" + }, + "building/chapel": { + "name": "Chapel", + "terms": "" + }, + "building/church": { + "name": "Church", + "terms": "" + }, "building/commercial": { "name": "Commercial Building", "terms": "" }, + "building/construction": { + "name": "Building Under Construction", + "terms": "" + }, + "building/detached": { + "name": "Detached Home", + "terms": "" + }, + "building/dormitory": { + "name": "Dormitory", + "terms": "" + }, "building/entrance": { "name": "Entrance", "terms": "" @@ -110973,6 +111611,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Garage", "terms": "" }, + "building/garages": { + "name": "Garages", + "terms": "" + }, + "building/greenhouse": { + "name": "Greenhouse", + "terms": "" + }, + "building/hospital": { + "name": "Hospital Building", + "terms": "" + }, + "building/hotel": { + "name": "Hotel Building", + "terms": "" + }, "building/house": { "name": "House", "terms": "" @@ -110985,10 +111639,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Industrial Building", "terms": "" }, + "building/public": { + "name": "Public Building", + "terms": "" + }, "building/residential": { "name": "Residential Building", "terms": "" }, + "building/retail": { + "name": "Retail Building", + "terms": "" + }, + "building/roof": { + "name": "Roof", + "terms": "" + }, + "building/school": { + "name": "School Building", + "terms": "" + }, + "building/shed": { + "name": "Shed", + "terms": "" + }, + "building/stable": { + "name": "Stable", + "terms": "" + }, + "building/static_caravan": { + "name": "Static Mobile Home", + "terms": "" + }, + "building/terrace": { + "name": "Row Houses", + "terms": "" + }, + "building/train_station": { + "name": "Train Station", + "terms": "" + }, + "building/university": { + "name": "University Building", + "terms": "" + }, + "building/warehouse": { + "name": "Warehouse", + "terms": "" + }, "craft/basket_maker": { "name": "Basket Maker", "terms": "basket,basketry,basket maker,basket weaver" @@ -111082,7 +111780,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "terms": "glasses,optician" }, "craft/painter": { - "name": "painter", + "name": "Painter", "terms": "painter" }, "craft/photographer": { @@ -111965,6 +112663,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Liquor Store", "terms": "alcohol" }, + "shop/art": { + "name": "Art Shop", + "terms": "art store,art gallery" + }, "shop/bakery": { "name": "Bakery", "terms": "" @@ -111981,6 +112683,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Bicycle Shop", "terms": "" }, + "shop/bookmaker": { + "name": "Bookmaker", + "terms": "" + }, "shop/books": { "name": "Bookstore", "terms": "" @@ -112101,6 +112807,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Locksmith", "terms": "keys" }, + "shop/lottery": { + "name": "Lottery Shop", + "terms": "" + }, "shop/mall": { "name": "Mall", "terms": "" diff --git a/vendor/assets/iD/iD/locales/af.json b/vendor/assets/iD/iD/locales/af.json index 68e404902..e4ebee1d0 100644 --- a/vendor/assets/iD/iD/locales/af.json +++ b/vendor/assets/iD/iD/locales/af.json @@ -237,8 +237,7 @@ "local_layer": "Plaaslike GPX leer" }, "help": { - "title": "Help", - "help": "# Help\n\nHierdie is 'n probram vir [OpenStreetMap](http://www.openstreetmap.org/), die gratis en veranderbarie kaart van die wêreld. Jy kan dit gebruik om nuwe data by te voeg of op te dateer waar jy bly en die \"open-source\" en \"open-data\" kaart beter te maak vir almal wat dit gebruik.\n\nVerandering wat jy aanbring op die kaart sal sigbaar wees vir almal at OpenStreetMap gebruik. Jy het nodig om 'n [nuwe gebruikersnaam](https://www.openstreetmap.org/user/new) vir jou self te skep voor jy data kan toevoeg by die kaart. \n\nDie [iD editor](http://ideditor.com/) is 'n gemeenskapsprojek met die [kode beskikbaar op GitHub](https://github.com/systemed/iD).\n" + "title": "Help" }, "intro": { "navigation": { diff --git a/vendor/assets/iD/iD/locales/ast.json b/vendor/assets/iD/iD/locales/ast.json index 2cca16950..f6bf78d5e 100644 --- a/vendor/assets/iD/iD/locales/ast.json +++ b/vendor/assets/iD/iD/locales/ast.json @@ -82,7 +82,9 @@ }, "disconnect": { "title": "Desconeutar", - "key": "D" + "description": "Desconectar estes llinies/árees una d'otra.", + "key": "D", + "annotation": "Llinies/árees desconectaes." }, "merge": { "title": "Entemecer", @@ -165,6 +167,7 @@ }, "restore": { "heading": "Tien cambios ensin guardar", + "description": "¿Quier recuperar los cambios ensin guardar d'una sesión d'edición anterior?", "restore": "Restaurar", "reset": "Restaurar" }, @@ -188,6 +191,7 @@ "splash": { "welcome": "Bienllegáu al editor d'OpenStreetMap iD", "text": "iD ye una ferramienta amistosa pero potente pa collaborar col meyor mapamundi llibre del mundu. Esta ye la versión {version}. Pa más información visite {website} ya informe de fallos en {github}.", + "walkthrough": "Aniciar la Visita guiada", "start": "Editar yá" }, "source_switch": { @@ -215,15 +219,15 @@ "local_layer": "Ficheru GPX llocal" }, "help": { - "title": "Ayuda", - "help": "# Ayuda\n\nEsti ye un editor pa [OpenStreetMap](http://www.openstreetmap.org/), el\nmapa del mundu llibre y editable. Pue usalu p'amestar y anovar los\ndatos nel to área, faciendo un mapa del mundu de códigu y datos\nabiertos meyor pa tol mundu.\n\nLes ediciones que faiga nesti mapa sedrán visibles pa cualquiera qu'use\nOpenStreetMap. Pa poder editar, necesitará una\n[cuenta de baldre n'OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nEl [editor iD](http://ideditor.com/) ye un proyeutu collaborativu col [códigu\nfonte disponible en GitHub](https://github.com/systemed/iD).\n" + "title": "Ayuda" }, "intro": { "navigation": { "title": "Navegacion", "drag": "L'área principal del mapa presenta los datos d'OpenStreetMap enriba d'un fondu. Pue navegar arrastrando y moviendo, igual que cualquier mapa web. **¡Arrastre'l mapa!**", "select": "Les carauterístiques del mapa representense de trés maneres: usando puntos, llinies o árees. Toles carauterístiques puen seleicionase calcando nelles. **Calque nel puntu pa selicionalu.**", - "header": "La testera amuesanos el tipu de carauterística." + "header": "La testera amuesanos el tipu de carauterística.", + "pane": "Al seleicionar una carauterística, s'amuesa l'editor de carauterístiques. La testera amuesa el tipu de carauterística ya'l panel principal amuesa los atributos de la carauterística, como'l so nome y direición. **Zarre l'editor de carauterístiques col botón zarrar d'arriba a la drecha.**" }, "points": { "title": "Puntos" @@ -240,9 +244,66 @@ } }, "presets": { + "categories": { + "category-golf": { + "name": "Golf" + }, + "category-landuse": { + "name": "Usu del terrén" + }, + "category-rail": { + "name": "Ferrocarril" + }, + "category-road": { + "name": "Carretera" + }, + "category-route": { + "name": "Ruta" + }, + "category-water-area": { + "name": "Agua" + }, + "category-water-line": { + "name": "Agua" + } + }, "fields": { "access": { - "label": "Accesu" + "label": "Accesu", + "placeholder": "Desconocíu", + "types": { + "access": "Xeneral", + "foot": "A pie", + "motor_vehicle": "Vehículos de motor", + "bicycle": "Bicicletes", + "horse": "Caballos" + }, + "options": { + "yes": { + "title": "Permitíu", + "description": "Accesu permitíu por llei; un drechu de pasu" + }, + "no": { + "title": "Torgáu", + "description": "Accesu nun permitíu al públicu en xeneral" + }, + "permissive": { + "title": "Permisivu", + "description": "Accesu permitíu mentanto'l propietariu nun quite'l permisu" + }, + "private": { + "title": "Priváu", + "description": "Accesu permitíu sólo col permisu del propietariu de manera individual" + }, + "designated": { + "title": "Designáu", + "description": "Accesu permitíu acordies con señales o lleis llocales especifiques" + }, + "destination": { + "title": "Destín", + "description": "Accesu permitíu sólo de pasu a un destín" + } + } }, "address": { "label": "Direición", @@ -250,18 +311,49 @@ "housename": "Nome de casa", "number": "123", "street": "Cai", - "city": "Ciudá" + "city": "Ciudá", + "postcode": "Códigu postal" } }, "admin_level": { "label": "Nivel alministrativu" }, + "aerialway": { + "label": "Tipu" + }, + "aerialway/access": { + "label": "Accesu" + }, + "aerialway/capacity": { + "label": "Capacidá (por hora)", + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "label": "Duración (minutos)", + "placeholder": "1, 2, 3..." + }, + "aerialway/heating": { + "label": "Calefacción" + }, + "aerialway/occupancy": { + "label": "Ocupación", + "placeholder": "2, 4, 8..." + }, + "aerialway/summer/access": { + "label": "Accesu (branu)" + }, "aeroway": { "label": "Tipu" }, "amenity": { "label": "Tipu" }, + "artist": { + "label": "Artista" + }, + "artwork_type": { + "label": "Tipu" + }, "atm": { "label": "Caxeru automáticu" }, @@ -271,14 +363,34 @@ "bicycle_parking": { "label": "Tipu" }, + "boundary": { + "label": "Tipu" + }, "building": { "label": "Edificiu" }, "building_area": { "label": "Edificiu" }, + "cans": { + "label": "Aceuta lates" + }, "capacity": { - "label": "Capacidá" + "label": "Capacidá", + "placeholder": "50, 100, 200..." + }, + "cardinal_direction": { + "label": "Direición" + }, + "clock_direction": { + "label": "Direición", + "options": { + "clockwise": "Sentíu horariu", + "anticlockwise": "Sentíu antihorariu" + } + }, + "clothes": { + "label": "Aceuta ropa" }, "collection_times": { "label": "Hores de recoyida" @@ -289,6 +401,9 @@ "country": { "label": "País" }, + "covered": { + "label": "Cubierto" + }, "crossing": { "label": "Tipu" }, @@ -301,6 +416,12 @@ "denotation": { "label": "Notabilidá" }, + "description": { + "label": "Descripción" + }, + "electrified": { + "label": "Electrificación" + }, "elevation": { "label": "Altor" }, @@ -311,17 +432,56 @@ "label": "Tipu" }, "fax": { - "label": "Fax" + "label": "Fax", + "placeholder": "+31 42 123 4567" }, "fee": { "label": "Pagu" }, + "fire_hydrant/type": { + "label": "Tipu" + }, + "fixme": { + "label": "Arréglame" + }, + "gauge": { + "label": "Anchu de vía" + }, + "generator/method": { + "label": "Métodu" + }, + "generator/source": { + "label": "Fonte" + }, + "generator/type": { + "label": "Tipu" + }, + "glass": { + "label": "Aceuta vidriu" + }, + "golf_hole": { + "label": "Referencia", + "placeholder": "Númberu de furacu (1-18)" + }, + "handicap": { + "label": "Handicap", + "placeholder": "1-18" + }, "highway": { "label": "Tipu" }, "historic": { "label": "Tipu" }, + "iata": { + "label": "IATA" + }, + "icao": { + "label": "ICAO" + }, + "information": { + "label": "Tipu" + }, "internet_access": { "label": "Accesu a Internet", "options": { @@ -333,6 +493,10 @@ "landuse": { "label": "Tipu" }, + "lanes": { + "label": "Carriles", + "placeholder": "1, 2, 3..." + }, "layer": { "label": "Capa" }, @@ -340,16 +504,25 @@ "label": "Tipu" }, "levels": { - "label": "Niveles" + "label": "Niveles", + "placeholder": "2, 4, 6..." + }, + "lit": { + "label": "Lluz" + }, + "location": { + "label": "Allugamientu" }, "man_made": { "label": "Tipu" }, "maxspeed": { - "label": "Velocidá máxima" + "label": "Velocidá máxima", + "placeholder": "40, 50, 60..." }, "name": { - "label": "Nome" + "label": "Nome", + "placeholder": "Nome común (si lu tien)" }, "natural": { "label": "Natural" @@ -366,14 +539,31 @@ "oneway": { "label": "Sentíu únicu" }, + "oneway_yes": { + "label": "Sentíu únicu" + }, "opening_hours": { "label": "Horariu" }, "operator": { "label": "Operador" }, + "paper": { + "label": "Aceuta papel" + }, + "par": { + "label": "Par", + "placeholder": "3, 4, 5..." + }, "phone": { - "label": "Teléfonu" + "label": "Teléfonu", + "placeholder": "+31 42 123 4567" + }, + "piste/difficulty": { + "label": "Dificultá" + }, + "piste/type": { + "label": "Tipu" }, "place": { "label": "Tipu" @@ -387,6 +577,9 @@ "ref": { "label": "Referencia" }, + "relation": { + "label": "Tipu" + }, "religion": { "label": "Relixon", "options": { @@ -399,12 +592,24 @@ "taoist": "Taoista" } }, + "restriction": { + "label": "Tipu" + }, + "route": { + "label": "Tipu" + }, + "route_master": { + "label": "Tipu" + }, "service": { "label": "Tipu" }, "shelter": { "label": "Refuxu" }, + "shelter_type": { + "label": "Tipu" + }, "shop": { "label": "Tipu" }, @@ -416,20 +621,35 @@ }, "structure": { "label": "Estructura", + "placeholder": "Desconocíu", "options": { "bridge": "Ponte", - "tunnel": "Túnel" + "tunnel": "Túnel", + "embankment": "Rellenu", + "cutting": "Trinchera" } }, + "studio_type": { + "label": "Tipu" + }, "surface": { "label": "Superficie" }, "tourism": { "label": "Tipu" }, + "towertype": { + "label": "Tipu de torre" + }, "tracktype": { "label": "Tipu" }, + "tunnel": { + "label": "Túnel" + }, + "vending": { + "label": "Tipu de mercancía" + }, "water": { "label": "Tipu" }, @@ -437,7 +657,8 @@ "label": "Tipu" }, "website": { - "label": "Sitiu web" + "label": "Sitiu web", + "placeholder": "http://un.exemplu.ast/" }, "wetland": { "label": "Tipu" @@ -453,26 +674,60 @@ } }, "presets": { + "address": { + "name": "Direición", + "terms": "Señes,Allugamientu" + }, "aeroway": { "name": "Via d'aviación" }, "aeroway/aerodrome": { - "name": "Aeropuertu" + "name": "Aeropuertu", + "terms": "Aeródromu,Aeroclub,Aerotaxi,Aereotresporte,Campu d'aviación" + }, + "aeroway/apron": { + "name": "Aparcamientu d'aviones" + }, + "aeroway/gate": { + "name": "Puerta d'aeropuertu" + }, + "aeroway/hangar": { + "name": "Hangar" }, "aeroway/helipad": { - "name": "Helipuertu" + "name": "Helipuertu", + "terms": "Helitaxi" + }, + "aeroway/runway": { + "name": "Pista" + }, + "aeroway/taxiway": { + "name": "Cai de rodaxe" + }, + "aeroway/terminal": { + "name": "Terminal d'aeropuertu" }, "amenity": { "name": "Infraestructures" }, + "amenity/arts_centre": { + "name": "Centru d'arte" + }, + "amenity/atm": { + "name": "Caxeru automáticu", + "terms": "Caxeru" + }, "amenity/bank": { - "name": "Bancu" + "name": "Bancu", + "terms": "Caxa,Aforros" }, "amenity/bar": { - "name": "Bar" + "name": "Bar", + "terms": "Chigre,Tasca" }, "amenity/bench": { - "name": "Asientu" + "name": "Asientu", + "terms": "Asientu" }, "amenity/bicycle_parking": { "name": "Aparcaderu de bicicletes" @@ -481,14 +736,40 @@ "name": " Alquiler de bicicletes" }, "amenity/cafe": { - "name": "Café" + "name": "Café", + "terms": "Cafetería" + }, + "amenity/car_rental": { + "name": "Alquiler d'automóviles" + }, + "amenity/car_sharing": { + "name": "Compartir coche" + }, + "amenity/car_wash": { + "name": "Llaváu de coches" }, "amenity/cinema": { - "name": "Cine" + "name": "Cine", + "terms": "Cinematógrafu,Multicine" + }, + "amenity/clinic": { + "name": "Clínica", + "terms": "Urxencies,Hospital" }, "amenity/courthouse": { "name": "Xulgáu" }, + "amenity/dentist": { + "name": "Dentista", + "terms": "Estomatólogu,Clínica dental" + }, + "amenity/doctor": { + "name": "Doctor", + "terms": "Médicu,Especialista" + }, + "amenity/drinking_water": { + "name": "Agua potable" + }, "amenity/embassy": { "name": "Embaxada" }, @@ -498,26 +779,42 @@ "amenity/fire_station": { "name": "Parque de bomberos" }, + "amenity/fountain": { + "name": "Fonte" + }, "amenity/fuel": { - "name": "Gasolinera" + "name": "Gasolinera", + "terms": "Combustible,Gas,Estación de serviciu" }, "amenity/grave_yard": { "name": "Enterramientos" }, "amenity/hospital": { - "name": "Hospital" + "name": "Hospital", + "terms": "Clínica,Residencia sanitaria" + }, + "amenity/kindergarten": { + "name": "Escuela infantil", + "terms": "Guardería,Preescolar" }, "amenity/library": { - "name": "Biblioteca" + "name": "Biblioteca", + "terms": "Llibros,Centru de llectura" }, "amenity/marketplace": { "name": "Mercáu" }, "amenity/pharmacy": { - "name": "Farmacia" + "name": "Farmacia", + "terms": "Botica,Parafarmacia" }, "amenity/place_of_worship": { - "name": "Llugar de cultu" + "name": "Llugar de cultu", + "terms": "Cultu,Templu" + }, + "amenity/place_of_worship/buddhist": { + "name": "Templu budista", + "terms": "Pagoda" }, "amenity/place_of_worship/christian": { "name": "Ilesia" @@ -540,17 +837,29 @@ "amenity/pub": { "name": "Pub" }, + "amenity/recycling": { + "name": "Reciclaxe", + "terms": "Llimpieza,Reutilización,Escombru" + }, "amenity/restaurant": { "name": "Restaurante" }, "amenity/school": { "name": "Escuela" }, + "amenity/studio": { + "name": "Estudiu", + "terms": "Música,Radio,Televisión" + }, "amenity/swimming_pool": { "name": "Piscina" }, + "amenity/taxi": { + "name": "Parada de taxis" + }, "amenity/telephone": { - "name": "Teléfonu" + "name": "Teléfonu", + "terms": "Cabina" }, "amenity/theatre": { "name": "Teatru" @@ -564,6 +873,20 @@ "amenity/university": { "name": "Universidá" }, + "amenity/vending_machine": { + "name": "Máquina de venta automática", + "terms": "Máquina,Autoventa" + }, + "amenity/veterinary": { + "name": "Veterinariu", + "terms": "Clínica veterinaria" + }, + "amenity/waste_basket": { + "name": "Papelera" + }, + "area": { + "name": "Área" + }, "barrier": { "name": "Barrera" }, @@ -573,27 +896,123 @@ "barrier/entrance": { "name": "Entrada" }, + "barrier/fence": { + "name": "Valla" + }, + "barrier/gate": { + "name": "Puerta" + }, + "barrier/hedge": { + "name": "Sebe" + }, + "barrier/lift_gate": { + "name": "Barrera" + }, + "barrier/retaining_wall": { + "name": "Muru de contención" + }, "barrier/toll_booth": { "name": "Cabina de peaxe" }, + "barrier/wall": { + "name": "Muria" + }, "boundary/administrative": { "name": "Llende alministrativa" }, "building": { "name": "Edificiu" }, + "building/commercial": { + "name": "Edificiu comercial" + }, "building/entrance": { "name": "Entrada" }, + "building/garage": { + "name": "Garaxe", + "terms": "Cochera,Aparcaderu" + }, "building/house": { "name": "Casa" }, + "building/industrial": { + "name": "Edificiu industrial", + "terms": "Nave,Fábrica,Taller" + }, + "building/residential": { + "name": "Edificiu residencial", + "terms": "Vivienda,Pisos" + }, + "craft/basket_maker": { + "name": "Cesteru", + "terms": "Goxeru,Paxos,Macones" + }, + "craft/beekeeper": { + "name": "Apicultor", + "terms": "Abeyes,Miel" + }, + "craft/blacksmith": { + "name": "Ferrería", + "terms": "Ferreru,Ferrador" + }, + "craft/bookbinder": { + "name": "Encuadernador", + "terms": "Encuadernación" + }, + "craft/carpenter": { + "name": "Carpintería", + "terms": "Carpinteru,Ebanista" + }, + "craft/clockmaker": { + "name": "Reloxería", + "terms": "Reloxeru" + }, + "craft/key_cutter": { + "name": "Llaves", + "terms": "Duplicáu de llaves" + }, + "craft/locksmith": { + "name": "Cerraxería", + "terms": "Cerraxeru,Cierres" + }, + "craft/optician": { + "name": "Óptica", + "terms": "Ópticu,Lentes,Gafes" + }, + "craft/photographer": { + "name": "Fotografía", + "terms": "Fotógrafu,Reveláu" + }, + "craft/photographic_labratory": { + "name": "Llaboratoriu fotográficu", + "terms": "Reveláu,Ampliaciones fotográfiques" + }, + "emergency/ambulance_station": { + "name": "Parque d'ambulancies", + "terms": "Centru d'emerxencies" + }, + "emergency/fire_hydrant": { + "name": "Toma de mangueres", + "terms": "Apagafueos,Fueu,Boca de riegu" + }, + "emergency/phone": { + "name": "Teléfonu d'emerxencia", + "terms": "S.O.S.,Teléfonu d'ayuda,Teléfonu de socorru" + }, "entrance": { "name": "Entrada" }, + "golf/hole": { + "name": "Furacu de golf" + }, "highway": { "name": "Carretera" }, + "highway/bridleway": { + "name": "Camín de caballeríes", + "terms": "Camín de ferradura" + }, "highway/bus_stop": { "name": "Parada d'autobús" }, @@ -606,26 +1025,53 @@ "highway/footway": { "name": "Camín peatonal" }, + "highway/living_street": { + "name": "Cai residencial", + "terms": "Semipeatonal,Zona 30" + }, + "highway/mini_roundabout": { + "name": "Mini-rotonda" + }, "highway/motorway": { "name": "Autopista" }, + "highway/motorway_junction": { + "name": "Xunión d'autopista" + }, + "highway/motorway_link": { + "name": "Enllaz d'autopista" + }, "highway/path": { "name": "Camín" }, + "highway/pedestrian": { + "name": "Peatonal" + }, "highway/primary": { "name": "Carretera autonómica" }, "highway/residential": { "name": "Cai urbana" }, + "highway/road": { + "name": "Carretera desconocida" + }, "highway/secondary": { "name": "Carretera secundaria" }, "highway/service": { "name": "Vía de serviciu" }, + "highway/service/emergency_access": { + "name": "Accesu d'emerxencia" + }, "highway/steps": { - "name": "Escaleres" + "name": "Escaleres", + "terms": "Escalinata,Escalones" + }, + "highway/stop": { + "name": "Señal de stop", + "terms": "Stop,Alto,Parada" }, "highway/tertiary": { "name": "Carretera terciaria" @@ -639,6 +1085,9 @@ "highway/trunk": { "name": "Carretera nacional" }, + "highway/trunk_link": { + "name": "Enllaz de carretera nacional" + }, "highway/turning_circle": { "name": "Vuelta en cai ensin salida" }, @@ -648,12 +1097,28 @@ "historic": { "name": "Sitiu históricu" }, + "historic/archaeological_site": { + "name": "Xacimientu arqueolóxicu" + }, + "historic/boundary_stone": { + "name": "Finxu" + }, "historic/castle": { "name": "Castiellu" }, "historic/monument": { "name": "Monumentu" }, + "historic/ruins": { + "name": "Ruines" + }, + "historic/wayside_cross": { + "name": "Cruceru", + "terms": "Cruz,Cruce" + }, + "historic/wayside_shrine": { + "name": "Capiella" + }, "landuse": { "name": "Usu del suelu" }, @@ -696,6 +1161,9 @@ "landuse/residential": { "name": "Residencial" }, + "landuse/retail": { + "name": "Comercial" + }, "landuse/vineyard": { "name": "Viñéu" }, @@ -708,6 +1176,9 @@ "leisure/golf_course": { "name": "Campu de golf" }, + "leisure/marina": { + "name": "Puertu deportivu" + }, "leisure/park": { "name": "Parque" }, @@ -729,30 +1200,56 @@ "leisure/pitch/tennis": { "name": "Pista de tenis" }, + "leisure/pitch/volleyball": { + "name": "Campu de voleibol" + }, "leisure/playground": { "name": "Xuegos infantiles" }, + "leisure/slipway": { + "name": "Rampla de botadura" + }, "leisure/stadium": { "name": "Estadiu" }, "leisure/swimming_pool": { "name": "Piscina" }, + "leisure/track": { + "name": "Pista de carreres", + "terms": "Circuitu" + }, + "line": { + "name": "Llinia" + }, "man_made": { "name": "Construcciones" }, "man_made/lighthouse": { "name": "Faru" }, + "man_made/observation": { + "name": "Torre de vixilancia", + "terms": "Observatoriu,Torre d'observación" + }, "man_made/pier": { "name": "Embarcaderu" }, "man_made/survey_point": { "name": "Vértiz xeodésicu" }, + "man_made/tower": { + "name": "Torre" + }, + "man_made/wastewater_plant": { + "name": "Planta depuradora" + }, "man_made/water_tower": { "name": "Torre de depósitu" }, + "man_made/water_well": { + "name": "Pozu d'agua" + }, "natural": { "name": "Natural" }, @@ -801,12 +1298,69 @@ "office": { "name": "Oficina" }, + "office/administrative": { + "name": "Oficina alministrativa", + "terms": "Alministración,Centru municipal" + }, + "office/architect": { + "name": "Arquitectu", + "terms": "Arquitectura,Construcción" + }, + "office/company": { + "name": "Oficina d'empresa", + "terms": "Delegación,Sucursal" + }, + "office/employment_agency": { + "name": "Axencia d'emplegu", + "terms": "INEM,ETT,Serviciu d'emplegu" + }, + "office/estate_agent": { + "name": "Axencia inmobiliaria" + }, + "office/financial": { + "name": "Oficina financiera", + "terms": "Financiera,Inversión,Créditu" + }, + "office/government": { + "name": "Oficina gubernamental", + "terms": "Gobiernu,Ministeriu,Delegación" + }, + "office/insurance": { + "name": "Oficina de seguros", + "terms": "Aseguradora,Seguros,Riesgu" + }, "place": { "name": "Llugar" }, + "place/city": { + "name": "Ciudá" + }, "place/island": { "name": "Islla" }, + "place/isolated_dwelling": { + "name": "Vivienda aisllada" + }, + "point": { + "name": "Puntu" + }, + "power": { + "name": "Enerxía" + }, + "power/generator": { + "name": "Xenerador d'enerxía", + "terms": "Central eléctrica" + }, + "power/line": { + "name": "Llinia eléctrica" + }, + "power/minor_line": { + "name": "Llinia eléctrica secundaria", + "terms": "Electricidá,Baxa tensión" + }, + "power/pole": { + "name": "Poste eléctricu" + }, "power/sub_station": { "name": "Subestación" }, @@ -819,12 +1373,39 @@ "railway": { "name": "Ferrocarril" }, + "railway/abandoned": { + "name": "Ferrocarril abandonáu" + }, + "railway/disused": { + "name": "Ferrocarril ensin usu" + }, + "railway/funicular": { + "name": "Funicular", + "terms": "Cremallera,Cable" + }, + "railway/halt": { + "name": "Apeaderu de ferrocarril", + "terms": "Parada" + }, "railway/level_crossing": { "name": "Pasu a nivel" }, + "railway/monorail": { + "name": "Monocarril" + }, + "railway/narrow_gauge": { + "name": "Ferrocarril de vía estrecha", + "terms": "FEVE,Vía estrecha" + }, + "railway/platform": { + "name": "Andén ferroviariu" + }, "railway/rail": { "name": "Carril" }, + "railway/station": { + "name": "Estación de ferrocarril" + }, "railway/subway": { "name": "Metro" }, @@ -834,36 +1415,149 @@ "railway/tram": { "name": "Tranvía" }, + "relation": { + "name": "Rellación" + }, + "route/ferry": { + "name": "Ruta de ferry" + }, "shop": { "name": "Tienda" }, "shop/bakery": { "name": "Panadería" }, + "shop/bicycle": { + "name": "Tienda de ciclismu" + }, + "shop/books": { + "name": "Llibrería" + }, + "shop/boutique": { + "name": "Boutique" + }, "shop/butcher": { "name": "Carnicería" }, + "shop/car": { + "name": "Venta d'automóviles" + }, + "shop/car_parts": { + "name": "Repuestos d'automóviles" + }, + "shop/car_repair": { + "name": "Taller d'automóviles" + }, + "shop/clothes": { + "name": "Tienda de ropa" + }, + "shop/computer": { + "name": "Informática" + }, + "shop/confectionery": { + "name": "Confitería" + }, + "shop/department_store": { + "name": "Grandes almacenes" + }, + "shop/doityourself": { + "name": "Bricolage" + }, + "shop/dry_cleaning": { + "name": "Tintorería" + }, + "shop/electronics": { + "name": "Electrónica" + }, + "shop/fishmonger": { + "name": "Pescadería" + }, "shop/florist": { "name": "Floristería" }, "shop/furniture": { "name": "Mueblería" }, + "shop/garden_centre": { + "name": "Xardinería" + }, + "shop/gift": { + "name": "Regalos" + }, + "shop/greengrocer": { + "name": "Frutería" + }, "shop/hairdresser": { "name": "Peluquería" }, + "shop/hardware": { + "name": "Ferretería" + }, + "shop/hifi": { + "name": "Equipos de música" + }, + "shop/jewelry": { + "name": "Xoyería" + }, + "shop/kiosk": { + "name": "Quioscu" + }, + "shop/laundry": { + "name": "Llavandería" + }, + "shop/locksmith": { + "name": "Cerraxería", + "terms": "Cerradura,Llaves" + }, "shop/mall": { "name": "Centru comercial" }, + "shop/mobile_phone": { + "name": "Telefonía móvil" + }, + "shop/motorcycle": { + "name": "Venta de motos" + }, + "shop/music": { + "name": "Tienda de música" + }, + "shop/newsagent": { + "name": "Puestu de periódicos" + }, "shop/optician": { "name": "Óptica" }, + "shop/outdoor": { + "name": "Material d'aire llibre" + }, + "shop/pet": { + "name": "Tienda de mascotes" + }, + "shop/photo": { + "name": "Fotografía", + "terms": "Fotógrafu,Reveláu,Material fotográficu" + }, "shop/shoes": { "name": "Zapatería" }, + "shop/sports": { + "name": "Material deportivu" + }, "shop/supermarket": { "name": "Supermercáu" }, + "shop/toys": { + "name": "Xuguetería" + }, + "shop/travel_agency": { + "name": "Axencia de viaxes" + }, + "shop/tyres": { + "name": "Neumáticos" + }, + "shop/video": { + "name": "Tienda de videos" + }, "tourism": { "name": "Turismu" }, @@ -891,6 +1585,42 @@ "tourism/zoo": { "name": "Zoo" }, + "type/boundary/administrative": { + "name": "Llende alministrativa" + }, + "type/multipolygon": { + "name": "Multipolígonu" + }, + "type/restriction": { + "name": "Torga" + }, + "type/route": { + "name": "Ruta" + }, + "type/route/bicycle": { + "name": "Ruta ciclista" + }, + "type/route/bus": { + "name": "Ruta d'autobús" + }, + "type/route/detour": { + "name": "Ruta d'esviación" + }, + "type/route/ferry": { + "name": "Ruta de ferry" + }, + "type/route/foot": { + "name": "Ruta a pie" + }, + "type/route/train": { + "name": "Ruta de tren" + }, + "type/route/tram": { + "name": "Ruta de tranvía" + }, + "type/route_master": { + "name": "Ruta maestra" + }, "waterway/canal": { "name": "Canal" }, diff --git a/vendor/assets/iD/iD/locales/bg-BG.json b/vendor/assets/iD/iD/locales/bg-BG.json index bcf5f2ff1..8e75471d2 100644 --- a/vendor/assets/iD/iD/locales/bg-BG.json +++ b/vendor/assets/iD/iD/locales/bg-BG.json @@ -285,7 +285,6 @@ }, "help": { "title": "Помощ", - "help": "# Помощ⏎\n⏎\nТова е редактор за [OpenStreetMap](http://www.openstreetmap.org/), ⏎\nсвободната и редактируема карта на света. Може да го използате да⏎\nдобавяте и обновявате информацията за вашия регион, създавайки⏎\nкарта на света с отворен код и данни, по-добра за всеки.⏎\n⏎\nРедакциите, които правите на тази карта ще са видими за всеки, който⏎\nползва OpenStreetMap. За да направите редакция ви трябва⏎\n[безплатен OpenStreetMap акаунт](https://www.openstreetmap.org/user/new).⏎\n⏎\n[iD редакторът](http://ideditor.com/) е съвместен проект, с [изходен код⏎\nналичен в GitHub](https://github.com/systemed/iD).⏎\n", "roads": "# Пътища\n\nМожете да създавате, поправяте и изтривате пътища с този редактор.\nПътищата могат да бъдат най-различни видове: пътеки, автомагистрали,\nтуристически пътеки, велосипедни алеи и много други - всеки често \nпрекосяван обект трябва да може да се картографира.\n\n### Избиране\n\nЩракнете върху път за да го изберете. Край него трябва да се появи контур, \nзаедно с малко меню с инструменти върху картата и странична лента, \nпоказваща повече информация за пътя.\n\n### Модифициране\n\nЧесто ще виждате пътища, които не са подравнени към изображението \nпод тях или към GPS трак. Можете да оправите тези пътища така, че\nда бъдат на правилното си място.\n\nПърво щракнете върху пътя, който искате да промените. Това ще го\nосвети и ще покаже контролни точки по продължението му, които\nможете да завлачите на по-добри места. Ако искате да добавите\nнови контролни точки за повече детайл, щракнете два пъти върху\nчастта от пътя без възел и такъв ще бъде създаден.\n\nАко пътят се свързва с друг път, но не се свързва коректно на картата,\nможете да завлачите една от контролните точки върху другия път с цел\nда ги съедините. Свързването на пътищата е важно за картата и \nнеобходимо при даването на упътвания за шофьори.\n\nМожете също да щракнете бутонът 'Преместване' или бързия \nклавиш `M`, за да преместите целия път наведнъж, а след това\nщракнете отново, за да запазите преместването.\n\n### Изтриване\n\nАко пътят е изцяло грешен - можете да видите, че не съществува\nна сателитното изображение или в най-добрия случай сте се убедили\nна място, че не съществува - можете да го изтриете, което го премахва\nот картата. Бъдете внимателни, когато изтривате елементи - като \nвсяка друга редакция, резултатите се виждат от всички, а сателитните \nизображения често са неактуални, така че пътят може просто да е\nновопостроен.\n\nМожете да изтриете път като щракнете върху нея за да го изберете, \nа след това щракнете върху иконата кошче или да натиснете бутона\n'Delete'.\n\n### Създаване\n\nОткрили сте, че някъде трябва да има път, но такъв няма? Щракнете\nна иконата 'Линия' в горния ляв край на редактора или натиснете\nбързия клавиш `2` за да започнете чертането на линия.\n\nЩракнете върху началото на пътя на картата за да започнете чертането.\nАко пътят се разклонява от съществуващ такъв, започнете като щракнете\nвърху мястото, където те се свързват.\n\nСлед това щракайте точки по продължението на пътя така, че той да\nследва правилния маршрут, според сателитното изображение или GPS.\nАко пътят, който чертаете, пресича друг път, свържете го като щракнете\nвърху точката на пресичане. Когато сте готови с чертането, щракнете \nдва пъти или натиснете 'Return' или 'Enter' от клавиатурата.\n", "addresses": "# Адреси\n\nАдресите са една от най-полезните информации на картата.\n\nВъпреки че, адресите често са представяни като части от улици, в\nOpenStreetMap те се записват като атрибути на сгради и места \nпокрай улици.\n\nМожете да добавяте адресна информация към места изобразени като\nконтури на сграда, също и към тези изобразени като кочка. Оптималния\nизточник на адресна информация е от измерване на терен или \nлични познания - както и с всички останали обекти, копирането от \nкомерсиални източници като Google Maps е стриктно забранено.\n", "buildings": "# Сгради\n\nOpenStreetMap е най-голямата в света база данни за сгради. Можете да \nсъздавате и подобрявате тази база данни.\n\n### Избиране\n\nМожете да изберете сграда като щракнете върху нейния контур. Това ще \nосвети сградата и ще отвори малко меню с инструменти, както и \nстранична лента с повече информация за сградата.\n\n### Модифициране\n\nПонякога сградите са неправилно поставени или имат грешни тагове.\n\nЗа да преместите цяла сграда, изберете я и след това натиснете \nинструмента 'Преместване'. Движете мишката за да преместите \nсградата и щракнете, когато е на точното си място.\n\nЗа да оправите формата на сградата, щракнете и завлачете възлите, \nкоито оформят контура и ги поставете на по-добри позиции.\n\n### Създаване\n\nЕдин от основните въпроси около добавянето на сгради в картата \nе, че OpenStreetMap може да записва сградите и като контур, и като \nточка. Практическо правило е сграда да се картографира като контур \nвинаги, когато това е възможно, а отделните компании, жилища, услуги и \nдруги обекти, които оперират в сгради - като точки поставени в \nконтура на сградата.\n\nЗапочнете чертането на контура на сградата като натиснете бутонът \n'Площи' в горния ляв край на интерфейса и завършете като натиснете\n'Enter' от клавиатурата или като щракнете върху първия начертан възел,\nза да затворите контура.\n\n### Изтриване\n\nАко сградата е изцяло грешна - можете да видите, че не съществува\nна сателитното изображение или в най-добрия случай сте се убедили\nна място, че не съществува - можете да я изтриете, което я премахва\nот картата. Бъдете внимателни, когато изтривате елементи - като \nвсяка друга редакция, резултатите се виждат от всички, а сателитните \nизображения често са неактуални, така че сградата може просто да е\nновопостроена.\n\nМожете да изтриете сграда като щракнете върху нея за да я изберете, \nа след това щракнете върху иконата кошче или да натиснете бутона\n'Delete'.\n" diff --git a/vendor/assets/iD/iD/locales/bn.json b/vendor/assets/iD/iD/locales/bn.json index 62defe0ec..9b49520b6 100644 --- a/vendor/assets/iD/iD/locales/bn.json +++ b/vendor/assets/iD/iD/locales/bn.json @@ -17,7 +17,7 @@ }, "browse": { "title": "ঘুরে ফিরে দেখুন", - "description": "মানচিত্র প্যান এবং জুম করুন " + "description": "মানচিত্র প্যান এবং জুম করুন।" }, "draw_area": { "tail": "অাপনার এলাকায় নোড সংযোজন-এর জন্য ক্লিক করুন। এলাকাটি সম্পুর্ন করার জন্য প্রথম নোড-এ ক্লিক করুন।" @@ -46,7 +46,7 @@ "description": "এই রেখাকে প্রলম্বিত করুন.", "not_eligible": "কোন রেখাকে এখানে প্রলম্বিত করা যাবে না.", "annotation": { - "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে", + "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে।", "area": "একটি ক্ষেত্রকে বড় করা হয়েছে" } }, @@ -176,7 +176,7 @@ }, "redo": { "tooltip": "পুনরায় করুন: {action}", - "nothing": "পুনরায় করার কিছুই নেই." + "nothing": "পুনরায় করার কিছুই নেই।" }, "tooltip_keyhint": "শর্টকাট:", "browser_notice": "এই এডিটরটি ফায়ারফক্স, ক্রোম, সাফারি, অপেরা এবং ইন্টারনেট এক্সপ্লোরার ৯ এবং তার উপরে কাজ করে। দয়া করে অাপনার ব্রাউসারটিকে উন্নত করুন অথবা ম্যাপ এ পরিবর্তন করতে পটল্যাচ ২ ব্যব্হার করুন।", @@ -306,8 +306,7 @@ "browse": ".জিপিখুজুন" }, "help": { - "title": "সাহায্য", - "help": "# সাহায্য⏎\n⏎\nএটি, দুনিয়ার বিনামুল্য/মুক্ত এবং পরিবর্তনযোগ্য ম্যাপ, [ওপেনস্ট্রীটম্যাপ](http://www.openstreetmap.org/)-এর⏎\nএকটি এডিটর। অাপনি অাপনার এলাকার তথ্য সংযোজন করা ও পরিবর্তন করার জন্য⏎\nএটি ব্যবহার করে, সকলের জন্য উন্নীত একটি ওপেন-সোর্স এবং ওপেন-ডাটা ম্যাপ⏎\nতৈরী করতে পারেন।\n⏎\nঅাপনি এই ম্যাপ-এ যা পরিবর্তন করবেন তা ওপেনস্ট্রীটম্যাপ-এর যারা ব্যবহার করে⏎\nতাদের সবার কাছে দৃশ্যমান হবে। পরিবর্তন করার জন্য অাপনার একটি [বিনামুল্য⏎\nওপেনস্ট্রীটম্যাপ অ্যাকাউন্ট](https://www.openstreetmap.org/user/new) লাগবে।⏎\n⏎\n[iD এডিটর](http://ideditor.com/) একটি কোল্যাবোরেটিভ প্রকল্প, [যার সোর্স কোড Github-এ লভ্য](https://github.com/systemed/iD)।\n⏎\n" + "title": "সাহায্য" }, "intro": { "navigation": { diff --git a/vendor/assets/iD/iD/locales/bs.json b/vendor/assets/iD/iD/locales/bs.json index 7b3489255..df16cc768 100644 --- a/vendor/assets/iD/iD/locales/bs.json +++ b/vendor/assets/iD/iD/locales/bs.json @@ -327,7 +327,6 @@ }, "help": { "title": "Pomoć", - "help": "# Pomoć\n\nOvo je editor za [OpenStreetMap](http://www.openstreetmap.org/), besplatnu kartu svijeta koja se može uređivati. Možete ga koristiti da dodate i osvježite podatke u Vašem području, praveći boljom kartu svijeta koja ima open-source i open-data karakter.\n\nUređivanja koje obavite na ovoj karti će biti vidliva svakome ko koristi OpenStreetMap. Da bi uredili nešto, trebate \n[besplatni OpenStreetMap račun](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je kolaborativni projekat sa [kodom dostupnim na stranici GitHub](https://github.com/systemed/iD).\n", "editing_saving": "# Uređivanje i spremanje\n\nOvaj editor je dizajniran da primarno radi online, i pristupate mu\nkroz web stranicu upravo sada.\n\n### Odabir značajki\n\nDa odaberete značajku na karti, kao npr. cestu ili tačku od interesa, kliknite\nna istu na karti. Ovo će osvijetliti odabranu značajku, otvoriti panel sa\ndetaljima o istoj, i pokazati izbor stvari koje možete uraditi sa značajkom.\n\nDa odaberete više značajki odjednom, držite tipku 'Shift'. Onda ili kliknite\nna značajke koje želite odabrati, ili povucite na karti da nacrtate pravougaonik.\nOvo će nacrtati kutiju i odabrati sve tačke unutar iste.\n\n### Spremanje uređivanja\n\nKada uradite promjene kao što su uređivanje cesta, zgrada i mjesta, isti se\npohranjuju lokalno sve dok ih ne spremite na server. Ne brinite ako napravite\ngrešku - možete poništiti promjene klikom na dugme \"Poništiti\", i vratiti\npromjene klikom na dugme \"Vratiti\".\n\nKliknite na 'Spremiti' da završite grupu uređivanja - npr, ako ste završili\ndio grada i želite započeti uređivanje na novom području. Imaćete priliku\nda pregledate šta ste uradili, a editor daje prijedloge od pomoći\ni upozorenja ako se nešto ne čini uredu sa promjenama.\n\nAko sve izgleda uredno, možete unijeti kratak komentar kojim objašnjavate promjene\nkoje ste napravili, i kliknite na 'Spremiti' opet kako bi postavili promjene\nna [OpenStreetMap.org](http://www.openstreetmap.org/), gdje su one vidljive\nsvim drugim korisnicima i dostupne za druge da ih dalje uređuju i poboljšavaju.\n\nAko ne možete završiti vaša uređivanja u jednom sjedenju, možete napustiti prozor\neditora i vratiti se (na istom pregledniku i računaru), i\naplikacija editora će ponuditi da vratite vaš rad.\n", "roads": "# Putevi\n\nMožete crtati, popravljati, i brisati puteve sa ovim uređivačem. Putevi mogu biti svih\nvrsta: staze, ceste, tragovi, biciklističke staze, i više - bilo koji često prelaženi\nsegment bi trebao biti moguć za ucrtavanje.\n\n### Odabir\n\nKliknite na put da ga odaberete. vanjska linija bi trebala postati vidljiva, zajedno\nsa malim menijem alata na karti i bočnom trakom koja pokazuje više informacija\no putu.\n\n### Izmjena\n\nČesto ćete vidjeti puteve koji nisu poravnati da satelistskim slikama iza njih\nili sa GPS trasom. Možete podesiti ove puteve tako da su na pravom\nmjestu.\n\nPrvi klik na put koji želite mijenjati. Ovo će ga označiti i pokazati\nkontrolne tačke uz njega koje možete pomjerati na bolje lokacije. Ukoliko\nželite dodati nove kontrolne tačke za više detalja, dva puta kliknite na dio\nputa bez čvora, i jedan će biti dodan.\n\nUkoliko se put povezuje na drugi put, ali se neprikladno povezuje na\nkartu, možete povući jednu od njegovih kontnrolnih tačaka na drugi put u\nnamjeri da ih spojite. Održavanje puteva povezanim je važno za kartu\ni od vitalnoj je značaja za obezbjeđivanje uputa za vožnju.\n\nMožete takođe kliknuti na alat 'Pomjeriti' ili pritisnuti 'M' tipku koja je prečica da pomičete cijeli put\nistovremeno, i onda kliknete opet da spasite to pomicanje. \n\n### Brisanje\n\nUkoliko je put u potpunosti netačan - možete vidjeti da ne postoji na satelitskoj\nslici i idealno bi bilo da potvrdite da nije prisutan lokalno - možete ga izbrisati,\nšto ga uklanja sa karte. Budite pažljivi kada brišete značajke -\nkao i svako drugo uređivanje, rezultati su vidljivi svima i satelitske slike\nsu često stare, tako da bi put mogao ustvari biti novoizgrađeni.\n\nMožete izbrisati put klikom na njega da ga odaberete, i onda klikajući na\nikonu kante za smeće ili pritiskom na tipku 'Delete'.\n\n### Pravljenje\n\nNašli ste negdje da bi tu trebao biti put ali ga nema? Kliknite ikonu 'Linija'\nu donjem lijevom uglu uređivača ili pritisnite tipku`2` da bi započeli crtanje\nlinije.\n\nKliknite na početak puta na kartu da započnete crtanje. Ukoliko se put\ngranan sa postojećeg puta, započnite sa mjesta gdje se povezuju.\n\nOnda kliknite na tačke uzduž puta tako da slijedi pravu putanju, prema\nsatelitskim slikama ili prema GPS-u. Ukoliko se put koji crtate križa sa drugim putem, povežite\nga klikom na tačku križanja. Kada završite crtanje, dva puta kliknite\nili pritisnite 'Backspace' ili 'Enter' na Vašoj tastaturi.\n", "gps": "# GPS\n\nGPS podaci su napouzdaniji izvor podataka za OpenStreetMap. Ovaj uređivač\npodržava lokalne trase - `.gpx` datoteke na Vašem lokalnom računaru. Možete sakupiti\novu vrstu GPS trasa sa brojnim \"smartphone\" aplikacijama kao i sa\nličnim GPS hardverom.\n\nZa informacije kako izbršiti GPS istraživanje, pročitajte\n[Istraživanje sa GPS-om](http://learnosm.org/en/beginner/using-gps/).\n\nDa bi koristili GPX trase za mapiranje, povucite i spustite GPX datoteku na uređivač\nkarte. Ukoliko je prepoznat, biće dodan karti kao svjetlo zelena\nlinija. Kliknite na meni 'Podešavanja pozadine' na lijevoj strani da omogućite,\nonemogućite, ili uvećate ovaj novi sloj pokretan GPX-om.\n\nGPX trasa ne biva direktno postavljena na OpenStreetMap - najbolji način\nda se ona koristi je crtanje na karti, koristeći je kao vodilju za nove značajke koje\nVi dodajete, i takođe možete [da je postavite na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nza druge korisnike da je koriste.\n", @@ -1289,9 +1288,6 @@ "craft/optician": { "name": "Optičar" }, - "craft/painter": { - "name": "Slikar" - }, "craft/photographer": { "name": "Fotograf" }, diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json index e8278fb58..a95f8a840 100644 --- a/vendor/assets/iD/iD/locales/ca.json +++ b/vendor/assets/iD/iD/locales/ca.json @@ -134,7 +134,8 @@ "annotation": "Heu fusionat {n} línies.", "not_eligible": "Aquestes característiques no poden ser fusionades.", "not_adjacent": "Aquestes línies no poden ser com fusionades ja que no estàn connectades.", - "restriction": "Aquestes línies no poden ser fusionades perquè com a mínim una d'elles és membre de la relació \"{relation}\"" + "restriction": "Aquestes línies no poden ser fusionades perquè com a mínim una d'elles és membre de la relació \"{relation}\"", + "incomplete_relation": "Aquestes característiques no poden ser fusionades perquè com a mínim una no s'ha descarregat del tot." }, "move": { "title": "Mou", @@ -332,7 +333,7 @@ }, "help": { "title": "Ajuda", - "help": "# Ajuda\n\nAixò és un editor per al [OpenStreetMap](http://www.openstreetmap.org/), el mapa lliure i editable del món. Podeu utilitzar-lo per afegir i actualitzar\nles dades a la vostra àrea, contribuint així a fer un mapa de codi obert, amb dades lliures del món i\nmillor per a tothom.\n\nLes edicions que feu en aquest mapa seran visibles per tothom que faci servir OpenStreetMap. per tal de començar a editar, necessitareu un\n[compte gratuït d'OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n L'[Editor iD](http://ideditor.com/) és un projecte cooperatiu que té el [codi font\ndisponible a GitHub](https://github.com/systemed/iD).\n", + "help": "# Ajuda\n\nAixò és un editor per al [OpenStreetMap](http://www.openstreetmap.org/), el mapa lliure i editable del món. Podeu utilitzar-lo per afegir i actualitzar\nles dades a la vostra àrea, contibuint així a fer un mapa de codi obert i amb dades lliures del món\nmillor per a tothom.\n\nLes edicions que feu en aquest mapa seran visibles per tothom que faci servir OpenStreetMap. per tal de començar a editar, necessitareu un\n[compte gratuït d'OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n L'[Editor iD](http://ideditor.com/) iés un projecte cooperatiu que té el [codi font\ndisponible a GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Edició i desat\n\nAquest editor està dissenyat per treballar principalment en línia, i hi has accedit mitjançant una pàgina web.\n\n### Selecció de característiques\n\nPer selecionar una característica del mapa, com ara una carretera o un punt d'interès, clica-hi a sobre. Això ressaltarà la característica, obrirà un panell amb els detalls sobre aquesta, i un menú amb les coses que hi pots fer .\n\nPots seleccionar múltiples característiques, prement la tecla 'Shift' i clicant-les per separat, o bé clicant i arrossegant el cursor. Això seleccionarà totes les característiques que englobi el requadre que es dibuixarà i permetrà modificar totes les característiques seleccionades en un sol cop.\n\n### Desant les edicions\n\nQuan facis canvis com ara editar carreteres, edificis, o llocs, aquests canvis es guarden localment fins que els desis al servidor. No et preocupis si comets algun error- pots desfer els canvis clicant el botó de desfer, i pots refer els canvis clicant el botó de refer.\n\nClica 'Desa' per acabar un grup d'edicions - per exemple, si has acabat de delimitar l'àrea d'una ciutat i vols començar a fer-ne una altra. Tindràs la oportunitat de revisar la feina feta,\ni l'editor proporcionarà suggeriments que et podràn ajudar\ni també mostrarà alertes si alguna cosa no està del tot bé als teus canvis.\n\nSi tot sembla correcte, pots escriure un breu comentari explicant el canvis\nque has fet, i clicar desa un altre cop per publicar els canvis\na [OpenStreetMap.org](http://www.openstreetmap.org/), on seràn visibles\nper a tots els altres usuaris i disponibles per a altres editors per refer-los o bé millorar-los.\n\nSi no pots acabar les teves edicions en una sessió, pots sortir de la finestra d'edició i tornar més tard (al mateix navegador i ordinador), i l'aplicació d'edició\npreguntarà si vols restaurar els canvis anteriors.\n", "roads": "# Carreteres\n\nPots crear, ajustar i eliminar carreteres amb aquest editor. Les carreteres poden ser\nde molts tipus: pistes, autovies, camins, carrils bici, i molts més - tots els segments\nmés comuns han de ser cartografiables.\n\n### Selecció\n\nClica a la carretera per seleccionar-la. Al fer això els seus contorns es faran visibles, \ncom també un petit menú d'eines i una barra lateral que mostrarà més informació\nsobre la carretera.\n\n### Modificació\n\nDe vegades veuràs carreteres que no estan alineades amb la imatge del darrere \no amb una traça de GPS. Podeu ajustar aquestes carreteres per tal que estiguin al lloc\ncorrecte.\n\nPrimer clica a la carretera que vols canviar. Això la ressaltarà i mostrarà els punts de control\nque pots arrossegar a les ubicacions desitjades. Si el que\nvols és afegir nous punts per obtenir un grau de detall més alt, fes doble clic en una part de la carretera sense cap punt, i se'n afegirà un.\n\nSi la carretera es connecta amb una altra, però no ho reflecteix al mapa, \npots arrossegar un dels punts de control cap a l'altre carretera \nper tal d'unir-les. Fer que les carreteres es connectin és molt important \nper al mapa i essencial per proveir direccions per a la conducció.\n\nTambé pots clicar l'eina «Moure» o prémer la tecla «M» per moure la carretera sencera, tota de cop, i llavors clicar altra vegada per guardar aquest moviment.\n\n### Eliminació\n\nSi una carretera està totalment malament -pots apreciar que no existeix a la imatge per satèl·lit\ni a més a més, els veïns ens han confirmat que no existeix - la pots eliminar, cosa que la treurà del mapa. Vés amb molt de compte a l'hora d'eliminar característiques -\ncom ara altres edicions; els resultats podran ser vistos per tothom i moltes vegades la imatgeria per satèl·lit no està actualitzada, per tant la carretera es pot haver estat construida recentment.\n\nPots eliminar una carretera clicant-la, i llavors clicant la icona de la paperera o bé prement la tecla «Suprimir».\n\n### Creació\n\nHas trobat que en algun lloc hi hauria d'haver una carretera però no hi és? Clica la icona «Línia»\nal marge superior esquerre de la zona del mapa o bé prem la tecla «2» per començar a dibuixar\nuna línia.\n\nClica a l'inici de la carretera al mapa per començar a dibuixar. Si la carretera comença amb una bifurcació en una carretera existent, cliqueu al lloc a on connecten.\n\nA continuació clica a diferents punts al llarg de la carretera per tal que segueixi el traçat correcte, d'acord amb la imatge del satèl·lit o la traça del GPS. Si la carretera que estàs dibuixant s'encreua amb una altra carretera, connecta-les clicant al punt d'intersecció. Quan acabis el dibuix, fes doble clic o prem «Retorn» del teclat.\n", "gps": "# GPS\n\nLes dades de GPS són la font més fiable de dades per a l'OpenStreetMap. Aquest editor és compatible amb les taces locals - fitxers`.gpx`al teu ordinador local. Pots recollir \naquest tipus de traça GPS amb algunes aplicacions per a smartphones com també \ndispositius personals de GPS.\n\nPer a més informació sobre com recollir dades amb GPS, llegeix\n[Recollir dades amb GPS](http://learnosm.org/en/beginner/using-gps/).\n\nper fer servir una traça GPX per editar el mapa, arrossega i deixa el fitxer GPX a l'editor. \nSi es detecta, s'afegirà el mapa com una línia verda llampant. \nClica a 'Paràmetres de configuració del fons' al cantó esquerre per activar,\ndesactivar, o per ajustar la vista a aquesta capa GPX.\n\nLa traça GPX no és pujada directament a OpenStreetMap - la millor manera de \nfer-la servir és dibuixar tu el mapa, fent-la servir com a guia per a les noves característiques que afegiràs. també les pots [pujar a l'OpenStreetMap] \n(http://www.openstreetmap.org/trace/create)\nperquè d'altres persones les utilitzin.\n", @@ -791,6 +792,10 @@ "shop": { "label": "Tipus" }, + "social_facility_for": { + "label": "Persones ateses", + "placeholder": "Indigents, Invàlids, Infants, etc" + }, "source": { "label": "Font" }, @@ -995,6 +1000,9 @@ "amenity/clinic": { "name": "Clínica" }, + "amenity/clock": { + "name": "Rellotge" + }, "amenity/college": { "name": "Campus universitari", "terms": "Col·legi, Campus universitàri, universitat, facultat" @@ -1113,6 +1121,18 @@ "amenity/shelter": { "name": "Refugi" }, + "amenity/social_facility": { + "name": "Equipament social" + }, + "amenity/social_facility/food_bank": { + "name": "Banc d'aliments" + }, + "amenity/social_facility/group_home": { + "name": "Residència social" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Refugi per a indigents" + }, "amenity/studio": { "name": "Estudi" }, @@ -1235,15 +1255,55 @@ "building/apartments": { "name": "Apartaments" }, + "building/barn": { + "name": "Graner" + }, + "building/bunker": { + "name": "Búnquer" + }, + "building/cabin": { + "name": "Cabina" + }, + "building/cathedral": { + "name": "Catedral" + }, + "building/chapel": { + "name": "Capella" + }, + "building/church": { + "name": "Església" + }, "building/commercial": { "name": "Edifici comercial" }, + "building/construction": { + "name": "Edifici en construcció" + }, + "building/detached": { + "name": "Xalet unifamiliar", + "terms": "casa aïllada, casa d'urbanització, xalet, chalet, xalets, chalets, casa i jardí, casa amb jardí" + }, + "building/dormitory": { + "name": "Edifici d'habitacions" + }, "building/entrance": { "name": "Entrada" }, "building/garage": { "name": "garatge " }, + "building/garages": { + "name": "Garatges" + }, + "building/greenhouse": { + "name": "Hivernacle" + }, + "building/hospital": { + "name": "Edifici hospitalari" + }, + "building/hotel": { + "name": "Edifici hoteler" + }, "building/house": { "name": "Casa" }, @@ -1253,9 +1313,42 @@ "building/industrial": { "name": "Edifici industrial" }, + "building/public": { + "name": "Edifici públic" + }, "building/residential": { "name": "Edifici residencial" }, + "building/retail": { + "name": "Edifici de grans magatzems" + }, + "building/roof": { + "name": "Teulada" + }, + "building/school": { + "name": "Edifici escolar" + }, + "building/shed": { + "name": "Traster" + }, + "building/stable": { + "name": "Estable" + }, + "building/static_caravan": { + "name": "Caravana fixa" + }, + "building/terrace": { + "name": "Cases unifamiliars" + }, + "building/train_station": { + "name": "Estació de ferrocarril" + }, + "building/university": { + "name": "Edifici universitari" + }, + "building/warehouse": { + "name": "Magatzem" + }, "craft/basket_maker": { "name": "Cistellaire" }, @@ -1286,6 +1379,9 @@ "craft/clockmaker": { "name": "Rellotger" }, + "craft/confectionary": { + "name": "Confiteria" + }, "craft/dressmaker": { "name": "Sastreria" }, @@ -1295,12 +1391,27 @@ "craft/gardener": { "name": "Jardiner" }, + "craft/glaziery": { + "name": "Vidrieria" + }, + "craft/handicraft": { + "name": "Botiga d'artesà" + }, "craft/hvac": { "name": "Empresa d'instal·lacions climàtiques" }, + "craft/insulator": { + "name": "Aïllador" + }, "craft/jeweler": { "name": "Joieria" }, + "craft/key_cutter": { + "name": "Fabricant de claus" + }, + "craft/locksmith": { + "name": "Copisteria de claus" + }, "craft/metal_construction": { "name": "Construccions metàliques" }, @@ -1308,7 +1419,7 @@ "name": "Òptica" }, "craft/painter": { - "name": "pintor" + "name": "Pintor" }, "craft/photographer": { "name": "Fotògraf" @@ -1316,12 +1427,57 @@ "craft/photographic_labratory": { "name": "Laboratori fotogràfic" }, + "craft/plasterer": { + "name": "Guixaire" + }, "craft/plumber": { "name": "Llauner" }, + "craft/pottery": { + "name": "Terrisseria" + }, + "craft/rigger": { + "name": "Aparellador" + }, + "craft/roofer": { + "name": "Constructor de teulades" + }, + "craft/saddler": { + "name": "Cuirasser" + }, + "craft/sailmaker": { + "name": "Fabricant de veles" + }, + "craft/sawmill": { + "name": "Serradora" + }, + "craft/scaffolder": { + "name": "Muntador de bastides" + }, "craft/sculpter": { "name": "Escultor" }, + "craft/shoemaker": { + "name": "Sabater" + }, + "craft/stonemason": { + "name": "Manobra" + }, + "craft/sweep": { + "name": "Netejador de xemeneies" + }, + "craft/tailor": { + "name": "Sastreria" + }, + "craft/tiler": { + "name": "Enrajolador" + }, + "craft/tinsmith": { + "name": "Llauner" + }, + "craft/upholsterer": { + "name": "Creador de mobles" + }, "craft/watchmaker": { "name": "Fabricant de rellotges" }, @@ -1614,7 +1770,8 @@ "name": "Camp de vòleibol" }, "leisure/playground": { - "name": "Zona de jocs infantils" + "name": "Zona de jocs infantils", + "terms": "Parc Infantil" }, "leisure/slipway": { "name": "Pendent per a embarcacions" @@ -1928,6 +2085,9 @@ "shop/alcohol": { "name": "Botiga de licors" }, + "shop/art": { + "name": "Botiga d'art" + }, "shop/bakery": { "name": "Fleca" }, @@ -1940,6 +2100,9 @@ "shop/bicycle": { "name": "Botiga de bicicletes" }, + "shop/bookmaker": { + "name": "Cusidor de llibres" + }, "shop/books": { "name": "Llibreria" }, @@ -2030,6 +2193,9 @@ "shop/locksmith": { "name": "Copisteria de claus" }, + "shop/lottery": { + "name": "Administració de loteria" + }, "shop/mall": { "name": "Centre comercial" }, diff --git a/vendor/assets/iD/iD/locales/cs.json b/vendor/assets/iD/iD/locales/cs.json index 0815f84c9..a11534410 100644 --- a/vendor/assets/iD/iD/locales/cs.json +++ b/vendor/assets/iD/iD/locales/cs.json @@ -29,8 +29,8 @@ "operations": { "add": { "annotation": { - "point": "Uzel přidán.", - "vertex": "Uzel byl přidán k cestě.", + "point": "Přidán uzel.", + "vertex": "Přidán uzel k cestě.", "relation": "Přidána relace." } }, @@ -55,7 +55,7 @@ "annotation": "Kreslení přerušeno." }, "change_role": { - "annotation": "Role prvku relace byla změněna." + "annotation": "Změněna role prvku relace." }, "change_tags": { "annotation": "Upraveny vlastnosti." @@ -97,11 +97,11 @@ "title": "Smazat", "description": "Odstranit objekt z mapy.", "annotation": { - "point": "Uzel byl smazán.", - "vertex": "Uzel z cesty byl smazán.", - "line": "Cesta byla smazána.", - "area": "Plocha byla smazána.", - "relation": "Relace byla smazána.", + "point": "Smazán uzel.", + "vertex": "Smazán uzel z cesty.", + "line": "Smazána cesta.", + "area": "Smazána plocha.", + "relation": "Smazána relace.", "multiple": "Bylo smazáno {n} objektů." }, "incomplete_relation": "Tento objekt nelze smazat, protože je stažený jen částečně." @@ -125,7 +125,7 @@ "description": "Rozpojit tyto cesty/plochy.", "key": "D", "annotation": "Cesty/plochy byly rozpojeny.", - "not_connected": "Není tu žádná cesta/plocha, kterou by bylo možné rozdělit." + "not_connected": "Není tu žádná cesta/plocha, kterou by bylo možné rozpojit." }, "merge": { "title": "Spojit", @@ -141,11 +141,11 @@ "description": "Posunout objekt na jiné místo.", "key": "M", "annotation": { - "point": "Uzel posunut.", - "vertex": "Uzel v cestě byl posunut.", - "line": "Cesta byla posunuta.", - "area": "Plocha byla posunuta.", - "multiple": "Objekty byly posunuty." + "point": "Posunut uzel.", + "vertex": "Posunut uzel v cestě.", + "line": "Posunuta cesta.", + "area": "Posunuta plocha.", + "multiple": "Posunuty objekty." }, "incomplete_relation": "Tento objekt nelze posunout, protože je stažený jen částečně." }, @@ -284,7 +284,7 @@ }, "success": { "edited_osm": "OSM upraveno!", - "just_edited": "Právě jste upravil OpenStreetMap!", + "just_edited": "Právě jste upravil/a OpenStreetMap!", "view_on_osm": "Zobrazit na OSM", "facebook": "Sdílet na Facebooku", "twitter": "Sdílet na Twitteru", @@ -332,11 +332,11 @@ }, "help": { "title": "Pomoc", - "help": "# Pomoc\n\nToto je editor [OpenStreetMap](http://www.openstreetmap.org/), svobodné a otevřené mapy světa, vytvářené jako open-source a open-data. S pomocí editoru můžete přidávat a upravovat data v mapě třeba ve svém okolí, a zlepšovat tak celou mapu pro každého.\n\nVaše úpravy mapy budou viditelné každým, kdo používá OpenStreetMap. Je ovšem třeba mít uživatelský účet na OpenStreetMap, který si můžete [snadno a zdarma zřídit](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je projekt vytvářený spoluprácí více lidí, se [zdrojovým kódem na GitHubu](https://github.com/systemed/iD).\n", + "help": "# Pomoc\n\nToto je editor [OpenStreetMap](http://www.openstreetmap.org/), svobodné a otevřené mapy světa, vytvářené jako open-source a open-data. S pomocí editoru můžete přidávat a upravovat data v mapě třeba ve svém okolí, a zlepšovat tak celou mapu pro každého.\n\nVaše úpravy mapy budou viditelné každým, kdo používá OpenStreetMap. Je ovšem třeba mít uživatelský účet na OpenStreetMap, který si můžete [snadno a zdarma zřídit](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je projekt vytvářený spoluprácí více lidí, se [zdrojovým kódem na GitHubu](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Editace a publikace\n\nTento editor pracuje primárně online - právě teď k němu přistupujete prostřednictvím webové stránky.\n\n### Výběr objektů\n\nChcete-li vybrat objekt, jako třeba silnici nebo obchod, klikněte na něj v mapě. Objekt se tím označí, otevře se boční panel s vlastnostmi objektu a zobrazí se nabídka akcemi, které lze s objektem provést.\n\nMůžete označit a pracovat s několika objekty najednou: podržte klávesu 'Shift', a pak buď postupně označte dotyčné objekty, anebo klikněte na mapu a táhněte myší či prstem - editor označí všechny objekty uvnitř příslušného obdélníku.\n\n### Publikace změn\n\nKdyž provedete nějaké úpravy objektů v mapě, úpravy jsou uloženy lokálně ve vašem prohlížeči. Nelekejte se, když uděláte chybu - úpravy lze vrátit zpět tlačítkem Zpět, a naopak je znovu provést tlačítkem Znovu.\n\nPo dokončení bloku úprav klikněte na 'Uložit' - například když jste upravili jednu část města, a chcete začít úpravy někde jinde. Zobrazí se přehled úprav, které jste provedli, editor tyto úpravy zkontroluje, a když se mu něco nebude zdát, zobrazí varování a návrhy.\n\nKdyž bude všechno v pořádku, můžete přidat krátký komentář s vysvětlením vašich úprav a kliknout znovu 'Uložit'. Úpravy se tímto publikují na [OpenStreetMap.org](http://www.openstreetmap.org/), kde za chvíli budou viditelné pro všechny uživatele a bude na nich možné provádět další úpravy.\n\nPokud nechcete nebo nemůžete pravy dokončit teď, stačí prostě odejít ze stránky pryč. Až příště navštívíte stránku (na stejném počítači, ve stejném prohlížeči), editor vám nabídne možnost znovu načíst neuložené úpravy.\n", "roads": "# Cesty\n\nEditor umožňuje vytvářet, opravovat a mazat silnice, pěšiny, cyklostezky, železnice atd. Zmapovat by mělo jít jakýkoli druh komunikace.\n\n### Výběr\n\nKdyž na cestu kliknete, zbarví se její obrys, otevře se u ní malá nabídka s nástroji a dále boční panel s informacemi o cestě.\n\n### Úpravy\n\nČasto narazíte na cesty, které jen nepřesně sledují pozadí či trasu GPS. Takové cesty můžete zarovnat na správné místo.\n\nNapřed klikněte na cestu, kterou chcete upravit. Cesta se rozsvítí a podél ní se objeví kontrolní uzly, které můžete posunout na správné místo. Pokud chcete přidat další kontrolní body a zpřesnit tak průběh cesty, stačí dvakrát kliknout na kus cesty mezi dvěma uzly - na zvolené místo přibude nový uzel.\n\nKdyž je reálná cesta napojena na jinou, ale v mapě spojeny nejsou, posuňte myší kontrolní uzel jedné cesty nad druhou - cesty se pak spojí. Propojení cest je velmi důležité pro správnou funkci navigací.\n\nTaké můžete posunout najednou celou cestu: buď klikněte na ikonu posunu v menu zobrazeném u cesty nebo stiskněte klávesu `M` a potom klikněte myší pro ukončení posunu. Jen pozor - pokud jsou vůči pozadí či GPS stopě všechny objekty v okolí, pravděpodobně to bude chybným pozadím a ne chybnou polohou objektů.\n\n### Mazání\n\nPokud je cesta úplně špatně, můžete ji zcela odstranit z mapy. Neměli byste se spoléhat pouze na satelitní snímky - mohou být zastaralé nebo zavádějící -, ideální je se přesvědčit na místě, že cesta opravdu neexistuje. Zvlášť při mazání objektů buďte opatrní - výsledek vaší úpravy se projeví v mapě pro všechny její uživatele.\n\nCestu smažete tak, že na ni kliknete a zvolíte ikonu odpadkového koše nebo stisknete klávesu Delete.\n\n### Vytváření\n\nNarazili jste na cestu, která by v mapě měla být, ale není? Klikněte na tlačítko 'Cesta' vlevo nahoře nebo stiskněte klávesu `2` - to vám umožní nakreslit novou cestu.\n\nKlikněte na místo, kde cesta začíná. Pokud cesta vychází z jiné, existující cesty, klikněte na místo, kde se cesty oddělují.\n\nPotom postupně klikejte na body, kudy cesta vede, podle satelitních snímků nebo trasy z GPS. Pokud vaše cesta protíná jinou, je třeba je propojit tak, že kliknete na bod křížení. Nakonec dvakrát klikněte na stejné místo nebo stiskněte klávesu 'Return' nebo 'Enter', cesta se tak ukončí.\n", "gps": "# GPS\n\nData z GPS jsou nejdůvěryhodnějším zdrojem informací pro OpenStreetMap. Tento editor podporuje zobrazení tras ve formátu `.gpx` nahraných z vašeho počítače. Takovou trasu můžete nasbírat s pomocí nejrůznějších aplikací pro mobily nebo s pomocí specializované navigace.\n\nPro více informací, jak provést takový sběr dat z GPS, viz např. návod anglicky:\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nPokud už máte záznam ve formátu GPX, přetáhněte soubor myší či prstem nad editor. Rozpozná-li editor formát souboru, zobrazí se trasa v mapě jako světle zelená čára. Pokud chcete tuto novou vrstvu zapnout, vypnout nebo zvětšit na velikost pracovní plochy, klikněte na menu 'Nastavení pozadí' na pravé straně.\n\nTrasa GPX nebude přímo nahrána na OpenStreetMap - pouze slouží jako vodítko, podle kterého se můžete orientovat, a podle kterého můžete kreslit nové objekty do mapy. Pokud chcete přímo trasu GPX poskytnout i ostatním, můžete ji [nahrát do samostatné databáze OpenStreetMap](http://www.openstreetmap.org/trace/create).⏎\n", - "imagery": "# Podkladové snímky\n\nSatelitní a letecké snímky jsou důležitým zdrojem mapových dat. V menu 'Nastavení pozadí' na levé straně editoru je k dispozici kombinace leteckých snímků, satelitních snímků a dalších volně dostupných podkladů.\n\nImplicitní vrstvou jsou satelitní snímky [Bing](http://www.bing.com/maps/), ale jakmile se přesunete do konkrétní geografické oblasti a nastavíte dostatečné zvětšení, nabídnou se vám další mapové podklady. V některých státech, jako jsou Spojené státy, Francie či Dánskou, jsou k dispozici snímky ve vysoké kvalitě. Pro velkou část České republiky jsou také dostupné velmi detailní satelitní snímky a navíc data z katastru nemovitostí.\n\nPodklady jsou někdy posunuté vůči mapě, kvůli chybám na straně poskytovatele snímů. Pokud uvidíte, že je mnoho cest v mapě posunuto vůči pozadí, nesnažte se je hned přesunout - posun obvykle znamená chybu v podkladu a ne chybu v mapě. V menu 'Nastavení pozadí' klikněte na 'Zarovnat pozadí' - to vám dovolí posunout podklad, aby lícoval s mapou.\n", + "imagery": "# Podkladové snímky\n\nSatelitní a letecké snímky jsou důležitým zdrojem mapových dat. V menu 'Nastavení pozadí' na levé straně editoru je k dispozici kombinace leteckých snímků, satelitních snímků a dalších volně dostupných podkladů.\n\nImplicitní vrstvou jsou satelitní snímky [Bing](http://www.bing.com/maps/), ale jakmile se přesunete do konkrétní geografické oblasti a nastavíte dostatečné zvětšení, nabídnou se vám další mapové podklady. V některých státech, jako jsou Spojené státy, Francie či Dánskou, jsou k dispozici snímky ve vysoké kvalitě. Pro velkou část České republiky jsou také dostupné velmi detailní satelitní snímky (data z katastru nemovitostí bohužel zatím nejsou v iD jednoduše dostupná).\n\nPodklady jsou někdy posunuté vůči mapě, kvůli chybám na straně poskytovatele snímků. Pokud uvidíte, že je mnoho cest v mapě posunuto vůči pozadí, nesnažte se je hned přesunout - posun obvykle znamená chybu v podkladu a ne chybu v mapě. V menu 'Nastavení pozadí' klikněte na 'Zarovnat pozadí' - to vám dovolí posunout podklad, aby lícoval s mapou.\n", "addresses": "# Adresy\n\nJednou z nejužitečnějších součástí mapy jsou adresy.\n\nAdresy jsou sice někdy chápány jako označení kousku ulice, ale v OpenStreetMap jsou uloženy v budovách či objektech podél ulice. V České republice jsou adresy většinou samostatným uzlem uvnitř budovy.\n\nMůžete tedy data o adrese vkládat jak k samostatnému bodu, tak k ploše označující budovu.\nNejlepším zdrojem informací o adresách je průzkum přímo v terénu či jeho dobrá znalost - stejně jako u celého projektu OpenStreetMap je přebírání dat z komerčních zdrojů typu Google Maps přísně zakázáno.\n", "inspector": "# Používání Inspektoru\n\nInspektor je prvek uživatelského rozhraní na levé straně, který umožňuje editovat vlastnosti zvoleného objektu.\n\n### Výběr typu objektu\n\nJakmile vytvoříte uzel, cestu nebo plochu, můžete zvolit typ vytvořeného objektu. Např. jestli jde o silnici nebo pěšinu, obchod nebo hospodu. Inspektor zobrazí tlačítka pro nejčastější typy objektů; další můžete najít prostřednictvím pole pro vyhledávání.\n\nKdyž u tlačítka typu objektu kliknete na 'i' vpravo dole, zobrazí se vám o něm více informací. Když kliknete na samotné tlačítko, vyberete příslušný typ.\n\n### Formuláře a editace vlastností\n\nPoté, co vyberete typ objektu nebo když vyberete objekt s už přiřazeným typem, v inspektoru se zobrazí pole s bližšími informacemi o objektu - jako třeba název nebo adresa.\n\nPod těmito poli jsou další ikony. Když na ně kliknete, tak můžete přidávat další detaily, jako vazbu na [Wikipedii](http://www.wikipedia.org/), přístup pro vozíčkáře atd.\n\nPokud chcete přidat k objektu ještě nějaké jiné vlastnosti, klikněte na 'Další vlastnosti' úplně dole. Jedním z informačních zdrojů pak může být [Taginfo](http://taginfo.openstreetmap.org/), kde se dozvíte o nejčastějších kombinacích tagů.\n\nZměny provedené v inspektoru jsou ihned vidět na mapě zobrazené ve vašem prohlížeči. Můžete je vrátit zpět kliknutím na tlačítko 'Undo'.\n", "buildings": "# Budovy\n\nOpenStreetMap je největší databází budov na světě. Můžete tuto databázi rozšiřovat a vylepšovat.\n\n### Výběr\n\nBudovu označíte kliknutím na její hranici. Budova se v editoru rozsvítí, otevře se malá nabídka nástrojů a boční panel s informacemi o budově.\n\n### Úpravy\n\nBudovy někdy mohou mít špatnou polohu, tvar nebo nesprávné vlastnosti.\n\nPokud chcete posunout celou budovu, označte ji a kliněte na ikonu posunu - pak můžete pohnout budovou myší. Posun ukončíte kliknutím.\n\nKdyž má budova špatný tvar, klikněte na uzel na hranici budovy a posuňte ho na správné místo.\n\n### Vytváření\n\nMohou být budovy v mapě zaznamenané jako plochy, nebo jako samostatné uzly? Pravidlo je takové, že _pokud je to možné, budovy by se měly mapovat jako plochy_, a firmy, podniky, zařízení a další subjekty působící v budově by se měly mapovat jako uzly uvnitř budovy. V České republice se jako uzly uvnitř budovy obvykle mapují i adresy.\n\nChcete-li nakreslit novou budovu, klikněte na tlačítko 'Plocha' vlevo nahoře a klikáním nakreslete obrys budovy. Kreslení ukončíte buď kliknutím na první nakreslený uzel nebo stisknutím klávesy 'Enter' nebo 'Return'.\n\n### Smazání\n\nBudovy lze také mazat - ale dělejte to pouze v případě, že jste si opravdu jistí, že budova ve skutečnosti neexistuje. Satelitní snímky nejsou dostatečným důkazem, protože mohou být zastaralé nebo zavádějící. Buďte opatrní - když budovu smažete, budova zmizí z mapy pro všechny její uživatele.\n\nBudovu smažete tak, že ji označíte kliknutím a potom buď kliknete na ikonu odpadkového koše, nebo stisknete klávesu 'Delete'.\n", @@ -403,22 +403,22 @@ "name": "Využití krajiny" }, "category-path": { - "name": "Pěšina" + "name": "Síť cest" }, "category-rail": { - "name": "Železnice" + "name": "Železniční síť" }, "category-road": { - "name": "Silnice" + "name": "Silniční síť" }, "category-route": { "name": "Trasa" }, "category-water-area": { - "name": "Voda" + "name": "Vodstvo" }, "category-water-line": { - "name": "Voda" + "name": "Vodstvo" } }, "fields": { @@ -885,8 +885,8 @@ "terms": "gondola,gondolová lanovka,kabinková lanovka,kabinová lanovka,kabinová lanová dráha,kabinková lanová dráha" }, "aerialway/magic_carpet": { - "name": "Pásový dopravník", - "terms": "pásový dopravník,lyžařský vlek,vlek,lanovka na pásu,pohybivý pás,eskalátor" + "name": "Pojízdný koberec", + "terms": "pojízdný koberec,pásový dopravník,lyžařský vlek,vlek,lanovka na pásu,pohybivý pás,eskalátor" }, "aerialway/platter": { "name": "Vlek - talíř (poma)", @@ -918,7 +918,7 @@ }, "aeroway/apron": { "name": "Odbavovací plocha", - "terms": "apron" + "terms": "apron,stojánka,odbavovací plocha" }, "aeroway/gate": { "name": "Letištní gate", @@ -1261,12 +1261,12 @@ "terms": "budova" }, "building/apartments": { - "name": "Byty", - "terms": "bytovka,obytná budova,panelák,věžák,barák,činžák" + "name": "Bytový dům", + "terms": "bytovka,bytový dům,obytná budova,panelák,věžák,barák,činžák,činžovní dům" }, "building/commercial": { "name": "Obchodní budova", - "terms": "Obchody,firmy,firma,prodej,podnik,podniky,kanceláře" + "terms": "obchody,firmy,firma,prodej,podnik,podniky,kanceláře" }, "building/entrance": { "name": "Vchod", @@ -1277,8 +1277,8 @@ "terms": "garáž,garáže,parkování,kryté parkování" }, "building/house": { - "name": "Dům", - "terms": "dům" + "name": "Rodinný dům", + "terms": "dům,rodinný dům,řadový dům,domek" }, "building/hut": { "name": "Chatička", @@ -1598,7 +1598,7 @@ }, "highway/rest_area": { "name": "Odpočívadlo", - "terms": "odpočívadlo,místo k zastavení,dálniční odpočívadlo" + "terms": "odpočívadlo,místo k zastavení,odpočívka,dálniční odpočívadlo" }, "highway/road": { "name": "Silnice neznámého typu", @@ -1638,7 +1638,7 @@ }, "highway/services": { "name": "Odpočívadlo se službami", - "terms": "odpočívadlo,odpočívadlo se službami,čerpací stanice,dálniční odpočívadlo" + "terms": "odpočívadlo,odpočívadlo se službami,odpočívka,čerpací stanice,dálniční odpočívadlo" }, "highway/steps": { "name": "Schody", @@ -1733,7 +1733,7 @@ "terms": "hřbitov,pohřebiště" }, "landuse/commercial": { - "name": "Obchody", + "name": "Podniky, kanceláře", "terms": "obchodní,komerční" }, "landuse/construction": { @@ -2165,12 +2165,12 @@ "terms": "generátor, elektrický generátor, elektrárna, zdroj proudu" }, "power/line": { - "name": "Elektrické vedení vysokého napětí", - "terms": "elektrické vedení,vysoké napětí,přenosová soustava,energetika" + "name": "Elektrické vedení vyššího napětí (nad 50 kV)", + "terms": "elektrické vedení,velmi vysoké napětí,zvláště vysoké napětí,přenosová soustava,energetika" }, "power/minor_line": { - "name": "Elektrické vedení nízkého napětí", - "terms": "elektrické vedení,nízké napětí,přenosová soustava,elektrický kabel,energetika" + "name": "Elektrické vedení nížšího napětí (pod 50 kV)", + "terms": "elektrické vedení,nízké napětí,vysoké napětí,přenosová soustava,elektrický kabel,energetika" }, "power/pole": { "name": "Eletrický sloup", diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json index ae6165068..1e62c8b03 100644 --- a/vendor/assets/iD/iD/locales/da.json +++ b/vendor/assets/iD/iD/locales/da.json @@ -134,7 +134,8 @@ "annotation": "Fusionerede {n} linjer.", "not_eligible": "Disse elementer kan ikke fusioneres.", "not_adjacent": "Disse linjer kan ikke fusioneres fordi de ikke er knyttet sammen", - "restriction": "Disse linjer kan ikke flettes sammen, da mindst en af disse er medlem af \"{relation}\" relation." + "restriction": "Disse linjer kan ikke flettes sammen, da mindst en af disse er medlem af \"{relation}\" relation.", + "incomplete_relation": "Disse kortegenskaber kan ikke fusioneres, da de ikke er blevet downloadet fuldstændigt." }, "move": { "title": "Flyt", @@ -332,7 +333,7 @@ }, "help": { "title": "Hjælp", - "help": "# Hjælp\n\nDette er et redigeringsværktøj for [OpenStreetMap](http://www.openstreetmap.org/), det\nåbne og redigerbare verdenskort. Du kan bruge det til at tilføje og opdatere\ngeodata i dit område og derved bidrage til et verdenskort med opensource og frie geodata\ntil gavn for alle.\n\nÆndringer du laver på dette kort vil blive synlige for alle der benytter\nOpenStreetMap. For at lave en rettelse skal du oprette en\n[gratis OpenStreetMap konto](https://www.openstreetmap.org/user/new).\n\n[iD redigeringsværktøjet](http://ideditor.com/) er et kollaborativt projekt med [kildekode\n tilgængelig på GitHub](https://github.com/systemed/iD). \n", + "help": "# Hjælp\n\nDette er et redigeringsværktøj for [OpenStreetMap](http://www.openstreetmap.org/), det\nåbne og redigeringsbare verdenskort. Du kan bruge dette værktøj til at opdatere\ngeodata i dit lokalområde. Derved skaber du et bedre verdenskort med open source og frie geodata\ntil gavn for alle.\n\nDine ændringer på kortet vil blive synligt for alle og enhver der benytter\nOpenStreetMap. For at lave redigeringer skal du oprette\n[en gratis OpenStreetMap konto](https://www.openstreetmap.org/user/new).\n\nDette [iD redigeringsværktøj](http://ideditor.com/) er et kollaborativ projekt og [kildekoden\ner tilgængelig på GitHub](https://github.com/systemed/iD). \n", "editing_saving": "# Redigering & Gem\n\nDette redigeringsværktøj er lavet primært til at arbejde online, og du\narbejder gennem et website lige nu.\n\n### Vælg Objekter\n\nFor at vælge et kortobjekt, som fx en vej eller et interessepunkt, klik\npå dette på kortet. Dette vil highlighte det valgte objekt, åbne et panel med\nyderligere detajler om det og samtidigt vise en menu med forskellige ting du kan gøre\nmed dette objekt.\n\nFlere objekter på en gang kan vælges ved at holde \"Shift\" knappen ned, klik og udvælg\npå kortet. Dette vil vælge alle indtegnede objekter indenfor en firkant. Dette tillader\ndig at gøre flere ting med flere objekter på en gang.\n\n### Gem Redigeringer\n\nNår du laver ændringer fx tilføjer veje, bygninger og steder, så er disse\ngemt lokalt på din computer lige ind til du har gemt dem på OpenStreetMaps server.\nDu skal ikke bekymre dig om, hvis du laver en fejl - du kan fortryde ændringer ved at klikke på \"Fortryd\" knappen.\n\nKlik på \"Gem\" for at afslutte dine ændringer - fx du har lavet et komplet område af en by og du ønsker at gå i gang med et nyt område. Du har mulighed for at gennemse hvad du har lavet og redigeringsværktøjet giver nogle hjælpsomme forslag og advarsler, hvis der er noget som ikke ser helt korrekt ud.\n\nHvis alting ser fint nok ud, så kan du skrive en lille kort kommentar om de ændringer du lige har lavet og klik så \"Gem\" igen for at sende ændringerne til [OpenStreetMap.org](http://www.openstreetmap.org/). Dine ændringer vil nu være synlige og tilgængelige for alle. Der igen kan bygge videre og forbedre data.\n\nHvis du ikke kan afslutte dine ændringer lige med det samme, så kan du forlade redigeringsværktøjet og komme igen senere (NB kræver du bruger samme browser og computer igen). Redigeringsværktøjet vil nu gendanne alt dit arbejde igen.\n", "roads": "# Veje\n\nDu kan oprette, tilrette og slette veje med dette tegneværktøj. Veje kan være af mange forskellige typer: stier, landeveje, spor, cykelstier mv. Enhver ofte benyttet rute kan kortlægges.\n\n### Vælg\n\nKlik på en vej for at vælge den. Et omrids dukker op sammen med en lille værktøjsmenu og et sidepanel der viser flere oplysninger om vejen.\n\n### Ændring\n\nOfte ses veje der ikke er justeret i forhold til luftfotoet bag dem eller i forhold til et GPS-spor. Du kan justere disse veje så de er placeret rigtigt.\n\nKlik først på vejen du vil ændre. Dette fremhæver den og viser kontrolpunkter langs med den som kan trækkes det rigtige sted hen. Hvis du har brug for flere kontrolpunkter for at gøre vejen mere detaljeret, kan du dobbeltklikke på en del af vejen, så dukker et punkt op.\n\nHvis vejen er forbundet til andre veje, men ikke er korrekt forbundet på kortet, så træk et af kontrolpunkterne hen på den anden vej for at koble dem sammen. Det er vigtigt for kortet, faktisk vitalt for rutevejledninger, at veje er forbundet.\n\nDu kan også klikke på flytteværktøjet eller trykke på tastegenvejen \"M\" for at flytte hele vejen på en gang, og så klikke igen for at gemme flytningen.\n\n### Sletning\n\nHvis en vej er helt forkert - du kan ikke se den på et luftfoto og du har ideelt set fået bekræftet at vejen ikke findes lokalt - så kan du slette vejen. Men pas på med at slette hvad andre har lavet - som med andre ændringer er resultatet synligt for alle og luftfoto kan være forældede så vejen kunne være bygget i mellemtiden.\n\nDu kan slette en bygning ved at vælge den og klikke på skraldespands-ikonet - alternativt kan du bruge slet-tasten på dit tastatur.\n\n### Oprettelse\n\nHar du fundet et sted hvor der skulle være en vej, men den er ikke på kortet? Klik på linje-ikonet i øverste venstre del af tegneværktøjet eller klik på tastegenvejen \"2\" for at tegne en linje.\n\nKlik på begyndelsen af vejen for at påbegynde den. Hvis vejen forgrener sig fra en eksisterende vej, så begynd vejen der hvor de er forbundet.\n\nKlik derefter på punkter på vejens forløb så det passer med luftfoto eller GPS-spor. Hvis vejen du tegner krydser en anden vej, så kobl dem sammen ved at klikke på punktet hvor de skærer hinanden. Når du er færdig med at tegne, så dobbeltklik eller tryk på enter-tasten på tastaturet.\n", "gps": "## GPS\n\nGPS data er de mest troværdige data for OpenStreetMap. Dette redigeringsværktøj\nunderstøtter lokalt lagrede - `.gpx` filer på din computer. Du kan indsamle\nGPX spor med mange forskellige smartphone applikationer og med dedikeret\nGPS hardware.\n\nDu kan finde mere information om hvordan du laver en GPS undersøgelse - læs\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nFor at bruge et GPX spor til kortlægning - træk og slip GPX filen indover kortet i \nredigeringsværktøjet. Hvis den bliver genkendt som gyldigt format, så vil den blive tilføjet kortet som en\nlyse grøn linje. Klik på \"Baggrundsindstillinger\" menuen på den højre side for tilkoble\neller frakoble. Eller også zoom til det nye GPX understøttet lag.\n\nGPX sporet er ikke direkte oploadet til OpenStreetMap - Den bedste måde\nat bruge dette spor at indtegne efter det og bruge det som en rettesnor for de\nnye objekter du tilføjer. Du kan også [opload GPX sporet til OpenStreetMap](http://www.openstreetmap.org/trace/create)\nderved kan andre brugere også bruge dette.\n", @@ -791,6 +792,10 @@ "shop": { "label": "Type" }, + "social_facility_for": { + "label": "Serviceret folk", + "placeholder": "Hjemmeløse, Handicappede, Børn osv" + }, "source": { "label": "Kilde" }, @@ -1136,6 +1141,22 @@ "name": "Shelter", "terms": "Shelter, læskur" }, + "amenity/social_facility": { + "name": "Sociale faciliteter", + "terms": "Sociale faciliteter" + }, + "amenity/social_facility/food_bank": { + "name": "Fødevarebank", + "terms": "Fødevarebank, folkekøkken" + }, + "amenity/social_facility/group_home": { + "name": "Gruppehjem", + "terms": "Gruppehjem" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Hjemmeløsskur", + "terms": "Hjemmeløsskur" + }, "amenity/studio": { "name": "Studie", "terms": "Studie" @@ -1264,10 +1285,46 @@ "name": "Lejligheder", "terms": "Lejligheder, Ejerlejligheder" }, + "building/barn": { + "name": "Lade", + "terms": "Lade, Stald" + }, + "building/bunker": { + "name": "Bunker", + "terms": "Bunker" + }, + "building/cabin": { + "name": "Hytte", + "terms": "Hytte" + }, + "building/cathedral": { + "name": "Katedral", + "terms": "Katedral, Domkirke" + }, + "building/chapel": { + "name": "Kapel", + "terms": "Kapel" + }, + "building/church": { + "name": "Kirke", + "terms": "Kirke" + }, "building/commercial": { "name": "Indkøbscenter", "terms": "Indkøbscenter, Storcenter" }, + "building/construction": { + "name": "Bygning under konstruktion", + "terms": "Bygning under konstruktion, Byggeplads" + }, + "building/detached": { + "name": "Parcelhus", + "terms": "Parcelhus" + }, + "building/dormitory": { + "name": " Kollegie", + "terms": " Kollegie, Klubværelse, Kollegium" + }, "building/entrance": { "name": "Indgang", "terms": "Indgang" @@ -1276,6 +1333,22 @@ "name": "Garage", "terms": "Garage, Carport" }, + "building/garages": { + "name": "Garager", + "terms": "Garager" + }, + "building/greenhouse": { + "name": "Drivhus", + "terms": "Drivhus" + }, + "building/hospital": { + "name": "Hospitalsbygning", + "terms": "Hospitalsbygning, Sygehusbygning" + }, + "building/hotel": { + "name": "Hotelbygning", + "terms": "Hotelbygning" + }, "building/house": { "name": "Hus", "terms": "Hus, Parcelhus" @@ -1288,10 +1361,54 @@ "name": "Industribygning", "terms": "Industribygning" }, + "building/public": { + "name": "Offentlig bygning", + "terms": "Offentlig bygning" + }, "building/residential": { "name": "Beboelsesbygning", "terms": "Beboelsesbygning, Parcelhus" }, + "building/retail": { + "name": "Butiksbygning", + "terms": "Butiksbygning, Forretningsbygning" + }, + "building/roof": { + "name": "Tag", + "terms": "Tag" + }, + "building/school": { + "name": "Skolebygning", + "terms": "Skolebygning" + }, + "building/shed": { + "name": "Skur", + "terms": "Skur" + }, + "building/stable": { + "name": "Stald", + "terms": "Stald, Hestestald, Kostald, Grisestald" + }, + "building/static_caravan": { + "name": "Fast mobilt hus", + "terms": "Fast mobilt hus" + }, + "building/terrace": { + "name": "Rækkehuse", + "terms": "Rækkehuse" + }, + "building/train_station": { + "name": "Togstation", + "terms": "Togstation, Station" + }, + "building/university": { + "name": "Universitetsbygning", + "terms": "Universitetsbygning" + }, + "building/warehouse": { + "name": "Lager", + "terms": "Lager, Lagerhotel, Varelager" + }, "craft/basket_maker": { "name": "Kurvemager", "terms": "Kurvemager" @@ -2268,6 +2385,10 @@ "name": "Vinforhandler", "terms": "Vinforhandler, Vinbutik, Vinforretning" }, + "shop/art": { + "name": "Kunstbutik", + "terms": "Kunstbutik, Kunstforretning" + }, "shop/bakery": { "name": "Bager", "terms": "Bager, Bageri" @@ -2284,6 +2405,10 @@ "name": "Cykelbutik", "terms": "Cykelforretning, Cykelbutik" }, + "shop/bookmaker": { + "name": "Bookmaker", + "terms": "Bookmaker" + }, "shop/books": { "name": "Boghandler", "terms": "Boghandler" @@ -2404,6 +2529,10 @@ "name": "Låsesmed", "terms": "Låsesmed" }, + "shop/lottery": { + "name": "Lotteributik", + "terms": "Lotteributik, Lotteriforretning" + }, "shop/mall": { "name": "Indkøbscenter", "terms": "Indkøbscenter" diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json index 4644c9d4b..0556e801a 100644 --- a/vendor/assets/iD/iD/locales/de.json +++ b/vendor/assets/iD/iD/locales/de.json @@ -134,7 +134,8 @@ "annotation": "{n} Linien vereinigt.", "not_eligible": "Diese Objekte können nicht vereinigt werden.", "not_adjacent": "Diese Linien können nicht vereinigt werden, da sie nicht verbunden sind.", - "restriction": "Diese Linien können nicht vereinigt werden, da mindestens eine Linie ein Mitglied einer \"{relation}\" Relation ist." + "restriction": "Diese Linien können nicht vereinigt werden, da mindestens eine Linie ein Mitglied einer \"{relation}\" Relation ist.", + "incomplete_relation": "Diese Objekte können nicht zusammengefügt werden, da mindestens eines noch nicht vollständig heruntergeladen wurde." }, "move": { "title": "Verschieben", @@ -332,7 +333,7 @@ }, "help": { "title": "Hilfe", - "help": "#Hilfe\n\nDies ist ein Editor für [OpenStreetMap](http://www.openstreetmap.org/), der freien und editierbaren Weltkarte. Du kannst ihn verwenden, um Daten in deiner Umgebung hinzuzufügen oder zu verändern und so diese Karte mit freien Quellen und freien Daten für jeden verbessern.\n\nVeränderungen werden für alle Nutzer von OpenStreetMap sichtbar. Um Veränderungen vornehmen zu können, musst du ein [kostenloses OpenStreetMap Profil](https://www.openstreetmap.org/user/new) anlegen.\n\nDer [iD editor](http://ideditor.com/) ist ein Gemeinschaftsprojekt dessen [Quellcode\nauf GitHub verfügbar ist](https://github.com/systemed/iD).\n\n", + "help": "#Hilfe\n\nDies ist ein Editor für [OpenStreetMap](http://www.openstreetmap.org/), der freien und editierbaren Weltkarte. Du kannst ihn verwenden, um Daten in deiner Umgebung hinzuzufügen oder zu verändern und so diese Karte mit freien Quellen und freien Daten für jeden verbessern.\n\nVeränderungen werden für alle Nutzer von OpenStreetMap sichtbar. Um Veränderungen vornehmen zu können, musst du ein [kostenloses OpenStreetMap Profil](https://www.openstreetmap.org/user/new) anlegen.\n\nDer [iD editor](http://ideditor.com/) ist ein Gemeinschaftsprojekt dessen [Quellcode\nauf GitHub verfügbar ist](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Editieren & Speichern\n\nDieser Editor wurde entworfen, um online zu arbeiten und du erreichst ihn über diese Webseite.\n\n### Objekte auswählen\n\nUm ein Kartenobjekt wie eine Straße oder ein Sonderziel (POI) auszuwählen, klicke auf der Karte darauf. Dadurch wird das Objekt hervorgehoben und ein Bedienfeld mit Details und Möglichkeiten zur Veränderung aufgerufen.\n\nMehrere Objekte kannst du auswählen indem du die Shift-Taste (Umschalttaste) drückst und die Objekte einzeln anklickst oder klickst und einen Rahmen darum ziehst.\nSo können mehrere Objekte gleichzeitig geändert werden.\n\n### Speichern der Änderungen\n\nWenn du Änderungen an einer Straße, einem Gebäude oder einem Platz vorgenommen hast, sind diese lokal gespeichert, bis du sie auf dem Server speicherst. Keine Sorge falls du einen Fehler machen solltest: Du kannst Änderungen jederzeit über den Rückgängig-Knopf rückgängig machen oder über den Wiederherstellen-Knopf noch einmal ausführen.\n\nKlicke auf \"Speichern\", um eine Gruppe von Änderungen zu speichern. Zum Beispiel, wenn du in einem Stadtteil fertig bist und in einer neuen Gegend editieren willst.\nDu bekommst dann die Möglichkeit noch einmal zu überprüfen, was du gerade getan hast und der Editor zeigt dir nützliche Hinweise oder mögliche Fehler, wenn etwas nicht in Ordnung zu sein scheint.\n\nWenn alles gut aussieht kannst du einen kurzen Kommentar schreiben, der erklärt, was du gemacht hast. Drücke nun \"Speichern\", um die Änderungen auf dem Server zu speichern.\nNun können es alle auf [OpenStreetMap.org](http://www.openstreetmap.org/) sehen und darauf aufbauen.\n\nWenn du es zeitlich nicht schaffst, kannst du das Editor-Fenster einfach schließen. Wenn du die Seite wieder aufrufst (mit dem gleichen Browser und Computer) wird dir angeboten, die letzte Sitzung wiederherzustellen.\n", "roads": "# Straßen\n\nMit dem Editor kannst du Wege erstellen, verändern und löschen. Wege können alles mögliche sein, zum Beispiel Pfade, Straßen, Schienen, Fahrradwege und anderes.\n\n### Auswählen\n\nKlicke auf einen Weg, um ihn auszuwählen. Er sollte nun hervorgehoben werden. Außerdem erscheint ein kleines Werkzeugmenü und eine Seitenleiste mit den Eigenschaften des Weges.\n\n### Modifizieren\n\nOft sieht man, dass Wege nicht mit dem Luftbild oder einer GPS-Spur übereinstimmen. Du kannst den Weg aber so anpassen, dass er an der richtigen Stelle ist. Beachte jedoch, dass Luftbilder einen Versatz aufweisen können.\n\nAls Erstes wählst du einen Weg aus. Dieser wird nun hervorgehoben und es werden die Knoten des Weges angezeigt. Diese kannst du verschieben, bis sie an der richtigen Stelle sind. Wenn du neue Knoten hinzufügen möchtest, klicke doppelt zwischen den Knoten auf die Linie und es wird ein neuer Punkt erzeugt.\n\nWenn zwei Wege in Wirklichkeit mit einander verbunden sind, aber auf der Karte nicht, kannst du sie verbinden, indem du einen Knoten des einen Weges auf den anderen Weg ziehst. Dass Wege verbunden sind, ist wichtig für die Karte und essentiell für die Nutzung von Routenführung.\n\nDu kannst auch das \"Bewegen\"-Werkzeug nutzen oder \"M\" drücken, um den kompletten Weg zu verschieben. Beende die Aktion mit einem Klick.\n\n### Löschen\n\nWenn du weißt, dass ein Weg nicht existiert, kannst du ihn löschen, um ihn von der Karte zu entfernen. Sei beim Löschen von Objekten besonders vorsichtig, da diese Änderungen von jedem gesehen werden können und Luftbilder oft veraltet sind. Das heißt, dass ein Weg, der im Luftbild nicht zu sehen ist, vielleicht einfach neu gebaut wurde.\n\nDu kannst Wege löschen, indem du sie anklickst und das Mülltonnensymbol auswählst oder die \"Entfernen\"-Taste drückst.\n\n### Erstellen\n\nDu kennst einen Weg der nicht eingezeichnet ist? Dann klicke auf das \"Linien\"-Symbol oben links im Editor oder drücke die Taste \"2\" und beginne mit dem Zeichnen einer Linie.\n\nKlicke dort hin, wo die Straße anfängt. Sollte sie von einer bereits existierenden Straße abzweigen, klicke an der entsprechenden Stelle auf diese Straße.\n\nZeichne nun den Weg, indem du Punkte anhand der Luftaufnahme oder der GPS-Spur entlang des Weges setzt. Sollte der Weg einen anderen kreuzen, klicke auf den Kreuzungspunkt, um beide Wege zu verbinden. Wenn du mit dem Zeichnen fertig bist, klicke doppelt oder drücke \"Enter\" auf der Tastatur, um den Weg abzuschließen.\n", "gps": "# GPS\n\nGPS-Daten sind die vertrauenswürdigste Quelle für OpenStreetMap.\nDieser Editor unterstützt lokale GPS-Spuren — \".gpx\"-Dateien auf \ndeinem Computer. Du kannst diese GPS-Spuren mit Hilfe diverser\nSmartphone-Apps oder anderen GPS-Geräten aufnehmen.\n\nFür Informationen über das Sammeln von GPS-Daten kannst du dir\nfolgende Anleitung durchlesen: [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/) (zur Zeit nur auf Englisch)\n\nUm einen GPX-Track zu verwenden, ziehe ihn einfach in den Karteneditor.\nWenn er erkannt wurde, wird dieser Track als leuchtend grüne Linie auf\nder Karte dargestellt. Klicke auf \"Hintergrundeinstellungen\", um sie zu\n(de-)aktivieren, oder um zum Gebiet des Tracks zu gelangen (Lupe).\n\nDer GPX-Track wird nicht automatisch direkt zu OpenStreetMap hochgeladen.\nAm besten verwendest du ihn, um neue Wege hinzuzufügen. Möchtest du den \nGPX-Track jedem zugänglich machen, kannst du ihn über die [Track-Upload-Seite](http://www.openstreetmap.org/trace/create) hochladen.\n", @@ -465,7 +466,7 @@ "address": { "label": "Adresse", "placeholders": { - "housename": "Hausname", + "housename": "postalischer Hausname", "number": "123", "street": "Straße", "city": "Stadt", @@ -791,6 +792,10 @@ "shop": { "label": "Typ" }, + "social_facility_for": { + "label": "Sozialküche", + "placeholder": "Obdachlose, Behinderte, Kinder, etc." + }, "source": { "label": "Quelle" }, @@ -957,7 +962,7 @@ "terms": "Geldautomat" }, "amenity/bank": { - "name": "Bank", + "name": "Bank (Geldinstitut)", "terms": "Kasse,Kontor,Kreditgenossenschaft,Lagerstelle,Fiskus,Fonds,Vermögen,Investmentfirma,Register,Rücklage,Vorrat,Tresor,Rücklagen,Grundkapital,Vorrat,Lager,Lagerhaus,Sparkasse,Schatz,Treuhandgesellschaft,Tresorraum" }, "amenity/bar": { @@ -965,7 +970,7 @@ "terms": "Bar" }, "amenity/bench": { - "name": "Bank", + "name": "Sitzbank", "terms": "Bank, Sitzbank" }, "amenity/bicycle_parking": { @@ -1136,6 +1141,22 @@ "name": "Unterstand", "terms": "Unterstand, Schutzdach, Schutzraum, Schuppen" }, + "amenity/social_facility": { + "name": "Sozialeinrichtung", + "terms": "Sozialeinrichtung, Sozialhilfeeinrichtung" + }, + "amenity/social_facility/food_bank": { + "name": "Essensausgabe", + "terms": "Essensausgabe, Sozialmarkt" + }, + "amenity/social_facility/group_home": { + "name": "Wohngemeinschaft", + "terms": "Wohngemeinschaft, Gemeinschaftswohnen" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Obdachlosenheim", + "terms": "Obdachlosenheim, Obdachlosenasyl" + }, "amenity/studio": { "name": "Atelier", "terms": "Atelier, Werkstatt, Studio" @@ -1264,10 +1285,46 @@ "name": "Wohnungen", "terms": "Wohnung" }, + "building/barn": { + "name": "Scheune", + "terms": "Scheune, Stall" + }, + "building/bunker": { + "name": "Bunker", + "terms": "Bunker, Schutzraum" + }, + "building/cabin": { + "name": "Hütte", + "terms": "Hütte, Wochenendhaus" + }, + "building/cathedral": { + "name": "Kathedrale", + "terms": "Kathedrale, Dom" + }, + "building/chapel": { + "name": "Kapelle (Sakralbau)", + "terms": "Kapelle" + }, + "building/church": { + "name": "Kirche", + "terms": "Kirche" + }, "building/commercial": { "name": "Geschäftshaus", "terms": "Gewerbehaus,gewerblich genutztes Gebäude," }, + "building/construction": { + "name": "im Bau befindliches Gebäude", + "terms": "Gebäude im Bau" + }, + "building/detached": { + "name": "Doppelhaus", + "terms": "Haushälfte, Doppelhaus" + }, + "building/dormitory": { + "name": "Schlafsaal", + "terms": "Schlafsaal, Dormitorium" + }, "building/entrance": { "name": "Eingang", "terms": "Eingang" @@ -1276,6 +1333,22 @@ "name": "Garage", "terms": "Garage" }, + "building/garages": { + "name": "Garagen", + "terms": "Garagen" + }, + "building/greenhouse": { + "name": "Gewächshaus", + "terms": "Glashaus, Gewächshaus, Treibhaus" + }, + "building/hospital": { + "name": "Krankenhausgebäude", + "terms": "Krankenhausgebäude, Klinikgebäude" + }, + "building/hotel": { + "name": "Hotelgebäude", + "terms": "Hotelgebäude" + }, "building/house": { "name": "Haus", "terms": "Haus" @@ -1288,10 +1361,54 @@ "name": "Industriegebäude", "terms": "Industriegebäude" }, + "building/public": { + "name": "Öffentliches Gebäude", + "terms": "Öffentliches Gebäude" + }, "building/residential": { "name": "Wohngebäude", "terms": "Wohnhaus,Einfamilienhaus,Mehrfamilienhaus" }, + "building/retail": { + "name": "Geschäftsgebäude", + "terms": "Geschäftsgebäude, Gebäude mit Läden" + }, + "building/roof": { + "name": "Dach", + "terms": "Dach" + }, + "building/school": { + "name": "Schulgebäude", + "terms": "Schulgebäude, Schulhaus" + }, + "building/shed": { + "name": "Schuppen", + "terms": "Hütte, Baracke" + }, + "building/stable": { + "name": "Stall", + "terms": "Stall, Stallgebäude" + }, + "building/static_caravan": { + "name": "Feststehender Wohnwagen", + "terms": "Abgestellter Wohnwagen" + }, + "building/terrace": { + "name": "Reihenhäuser", + "terms": "Reihenhäuser" + }, + "building/train_station": { + "name": "Bahnhof", + "terms": "Bahnhof, Haltestelle, Haltepunkt" + }, + "building/university": { + "name": "Universitätsgebäude", + "terms": "Universitätsgebäude, Campusgebäude" + }, + "building/warehouse": { + "name": "Lagerhalle", + "terms": "Lagerhaus, Lagergebäude" + }, "craft/basket_maker": { "name": "Korbflechter", "terms": "Korbflecher, Korbmacher, Korbhersteller" @@ -1386,7 +1503,7 @@ }, "craft/painter": { "name": "Maler", - "terms": "Maler, Anstreicher, Lackierer" + "terms": "Maler, Anstreicher" }, "craft/photographer": { "name": "Fotograf", @@ -1734,7 +1851,7 @@ }, "landuse/commercial": { "name": "Gewerbegebiet", - "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Buissenes Park,Büros" + "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Business Park,Büros" }, "landuse/construction": { "name": "Baustelle", @@ -2268,6 +2385,10 @@ "name": "Spirituosenladen", "terms": "Alkohol" }, + "shop/art": { + "name": "Kunsthandlung", + "terms": "Kunsthandlung, Kunstladen" + }, "shop/bakery": { "name": "Bäckerei", "terms": "Bäckerei" @@ -2282,7 +2403,11 @@ }, "shop/bicycle": { "name": "Fahrradladen", - "terms": "Fahrradladen, Fahrrad-Geschäft, Fahrrad-Handlung" + "terms": "Fahrradladen, Fahrradgeschäft, Fahrrad-Geschäft, Fahrrad-Handlung" + }, + "shop/bookmaker": { + "name": "Buchmacher", + "terms": "Buchmacher" }, "shop/books": { "name": "Buchhandlung", @@ -2404,6 +2529,10 @@ "name": "Schlosser", "terms": "Schlosser, Schlüsseldienst" }, + "shop/lottery": { + "name": "Lottoannahmestelle", + "terms": "Lottoannahmestelle" + }, "shop/mall": { "name": "Einkaufzentrum", "terms": "Einkaufszentrum, Mall" diff --git a/vendor/assets/iD/iD/locales/el.json b/vendor/assets/iD/iD/locales/el.json index ea9c6545d..d7be5cabe 100644 --- a/vendor/assets/iD/iD/locales/el.json +++ b/vendor/assets/iD/iD/locales/el.json @@ -230,7 +230,11 @@ "unknown": "Άγνωστο", "feature_list": "Αναζήτηση χαρακτηριστικών", "edit": "Επεξεργασία χαρακτηριστικού", - "none": "Κανένα" + "none": "Κανένα", + "node": "Κόμβος", + "way": "Διαδρομή", + "relation": "Σχέση", + "location": "Τοποθεσία" }, "background": { "title": "Παρασκήνιο", @@ -298,8 +302,7 @@ "browse": "Εξερεύνηση για αρχείο .gpx" }, "help": { - "title": "Βοήθεια", - "help": "# Βοήθεια\n\nΑυτός είναι ένας επεξεργαστής για το [OpenStreetMap](http://www.openstreetmap.org/),\n τον ελεύθερο και επεξεργάσιμο παγκόσμιο χάρτη. Μπορείτε να τον χρησιμοποιήσετε για\n προσθήκη ή ενημέρωση δεδομένων στην περιοχή σας, φτιάχνοντας έναν ανοικτού-κώδικα\n και ανοικτών-δεδομένων παγκόσμιο χάρτη καλύτερο για όλους.\n\nΟι διορθώσεις που κάνετε σε αυτό το χάρτη θα είναι ορατές σε όλους όσους \nχρησιμοποιούν το OpenStreetMap. Για να είναι δυνατόν να κάνετε κάποια \nδιόρθωση, χρειάζεστε ένα \n[δωρεάν λογαριασμό OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nΟ [iD editor](http://ideditor.com/) είναι ένα συνεργατικό έργο με τον [πηγαίο κώδικα\nδιαθέσιμο στο GitHub](https://github.com/systemed/iD).\n" + "title": "Βοήθεια" }, "intro": { "navigation": { @@ -323,6 +326,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Κτίριο" + }, "category-landuse": { "name": "Χρήση Γης" }, @@ -390,6 +396,26 @@ "admin_level": { "label": "Δοιηκητική Βαθμίδα" }, + "aerialway": { + "label": "Τύπος" + }, + "aerialway/access": { + "label": "Πρόσβαση" + }, + "aerialway/capacity": { + "label": "Χωρητικότητα (ανά ώρα)", + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "label": "Διάρκεια (σε λεπτά)", + "placeholder": "1, 2, 3..." + }, + "aerialway/occupancy": { + "placeholder": "2, 4, 8..." + }, + "aerialway/summer/access": { + "label": "Πρόσβαση (καλοκαίρι)" + }, "aeroway": { "label": "Είδος" }, @@ -574,6 +600,12 @@ "label": "Τηλέφωνο", "placeholder": "+31 42 123 4567" }, + "piste/difficulty": { + "label": "Δυσκολία" + }, + "piste/type": { + "label": "Τύπος" + }, "place": { "label": "Είδος" }, @@ -619,6 +651,9 @@ "shelter": { "label": "Καταφύγιο" }, + "shelter_type": { + "label": "Τύπος" + }, "shop": { "label": "Είδος" }, @@ -638,6 +673,9 @@ "cutting": "Ανασκαφή" } }, + "studio_type": { + "label": "Τύπος" + }, "supervised": { "label": "Επιτηρείται" }, @@ -656,6 +694,12 @@ "trail_visibility": { "label": "Ορατότητα Μονοπατιού" }, + "tree_type": { + "label": "Τύπος" + }, + "tunnel": { + "label": "Σήραγγα" + }, "water": { "label": "Είδος" }, @@ -771,6 +815,10 @@ "name": "Κινηματογράφος", "terms": "Κινηματογράφος" }, + "amenity/clock": { + "name": "Ρολόι", + "terms": "ωρολόγιο" + }, "amenity/college": { "name": "Κολλέγιο", "terms": "Κολέγιο" @@ -779,6 +827,14 @@ "name": "Δικαστήριο", "terms": "Δικαστικό Μέγαρο, Δικαστήριο" }, + "amenity/dentist": { + "name": "Οδοντιατρείο", + "terms": "οδοντίατρος, οδοντογιατρός" + }, + "amenity/doctor": { + "name": "Ιατρείο", + "terms": "γιατρός, ιατρός" + }, "amenity/drinking_water": { "name": "Πόσιμο Νερό", "terms": "Πόσιμο νερό, Βρύση" @@ -899,6 +955,10 @@ "name": "Πανεπιστήμιο", "terms": "Πανεπιστήμιο" }, + "amenity/vending_machine": { + "name": "Μηχάνημα Αυτόματης Πώλησης", + "terms": "αυτόματος πωλητής" + }, "amenity/waste_basket": { "name": "Κάδος Απορριμάτων", "terms": "Κάλαθος αχρήστων, Καλάθι σκουπιδιών" @@ -1004,6 +1064,41 @@ "name": "Κτίριο Κατοικιών", "terms": "Κτήριο κατοικιών, Αστικό κτήριο" }, + "craft/brewery": { + "name": "Ζυθοποιείο", + "terms": "ζυθοποιός, ζυθοποιία" + }, + "craft/carpenter": { + "name": "Ξυλουργείο", + "terms": "μαραγκός, ξυλουργός" + }, + "craft/clockmaker": { + "name": "Ωρολογοποιός", + "terms": "ρολογάς" + }, + "craft/confectionary": { + "name": "Ζαχαροπλαστείο", + "terms": "ζαχαροπλάστης, ζαχαροπλαστική" + }, + "craft/electrician": { + "name": "Ηλεκτρολόγος", + "terms": "ηλεκτροτεχνίτης" + }, + "craft/optician": { + "name": "Οπτικός", + "terms": "οφθαλμίατρος,οφθαλμολόγος" + }, + "craft/sawmill": { + "name": "Πριονιστήριο" + }, + "craft/shoemaker": { + "name": "Τσαγκάρης", + "terms": "παπουτσής,υποδηματοποιός" + }, + "craft/tailor": { + "name": "Ραφτική", + "terms": "ράφτης" + }, "emergency/ambulance_station": { "name": "Σταθμός Ασθενοφόρων", "terms": "Σταθμός ασθενοφόρων" @@ -1420,6 +1515,24 @@ "name": "Γραφείο", "terms": "Γραφείο" }, + "office/accountant": { + "name": "Λογιστής", + "terms": "Λογιστική" + }, + "office/architect": { + "name": "Αρχιτέκτονας", + "terms": "Πολιτικός μηχανικός" + }, + "office/estate_agent": { + "name": "Κτηματομεσιτικό Γραφείο", + "terms": "μεσιτικό γραφείο, μεσίτης" + }, + "office/newspaper": { + "name": "Εφημερίδα" + }, + "office/political_party": { + "name": "Πολιτικό Κόμμα" + }, "place": { "name": "Τόπος", "terms": "Τόπος" @@ -1593,6 +1706,7 @@ "terms": "Ψιλικατζίδικο, Παντοπολείο" }, "shop/deli": { + "name": "Ντελικατέσεν", "terms": "Εκλεκτά τρόφιμα, Μεζεδοπωλείο, Ντελικατέσεν" }, "shop/department_store": { @@ -1688,6 +1802,10 @@ "name": "Κατάστημα Κατοικίδιων", "terms": "Κατάστημα κατοικιδίων" }, + "shop/photo": { + "name": "Φωτογραφείο", + "terms": "φωτογράφος" + }, "shop/shoes": { "name": "Κατάστημα Υπόδησης", "terms": "Κατάστημα υποδημάτων" diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json index f8db4d76e..ef23eab65 100644 --- a/vendor/assets/iD/iD/locales/en-GB.json +++ b/vendor/assets/iD/iD/locales/en-GB.json @@ -82,6 +82,12 @@ "amenity/theatre": { "name": "Theatre" }, + "building/static_caravan": { + "name": "Static Caravan" + }, + "building/terrace": { + "name": "Terraced houses" + }, "leisure/sports_center": { "name": "Sports Centre" }, diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json index 5cb257b77..1b40481ad 100644 --- a/vendor/assets/iD/iD/locales/en.json +++ b/vendor/assets/iD/iD/locales/en.json @@ -134,7 +134,8 @@ "annotation": "Merged {n} lines.", "not_eligible": "These features can't be merged.", "not_adjacent": "These lines can't be merged because they aren't connected.", - "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation." + "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.", + "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded." }, "move": { "title": "Move", @@ -336,7 +337,7 @@ }, "help": { "title": "Help", - "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/systemed/iD).\n", + "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n", "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n", "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n", @@ -797,6 +798,10 @@ "shop": { "label": "Type" }, + "social_facility_for": { + "label": "People served", + "placeholder": "Homeless, Disabled, Child, etc" + }, "source": { "label": "Source" }, @@ -1142,6 +1147,22 @@ "name": "Shelter", "terms": "lean-to" }, + "amenity/social_facility": { + "name": "Social Facility", + "terms": "" + }, + "amenity/social_facility/food_bank": { + "name": "Food Bank", + "terms": "" + }, + "amenity/social_facility/group_home": { + "name": "Group Home", + "terms": "elderly,old,senior living" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Homeless Shelter", + "terms": "houseless,unhoused,displaced" + }, "amenity/studio": { "name": "Studio", "terms": "recording studio,studio,radio,radio studio,television,television studio" @@ -1270,10 +1291,46 @@ "name": "Apartments", "terms": "" }, + "building/barn": { + "name": "Barn", + "terms": "" + }, + "building/bunker": { + "name": "Bunker", + "terms": "" + }, + "building/cabin": { + "name": "Cabin", + "terms": "" + }, + "building/cathedral": { + "name": "Cathedral", + "terms": "" + }, + "building/chapel": { + "name": "Chapel", + "terms": "" + }, + "building/church": { + "name": "Church", + "terms": "" + }, "building/commercial": { "name": "Commercial Building", "terms": "" }, + "building/construction": { + "name": "Building Under Construction", + "terms": "" + }, + "building/detached": { + "name": "Detached Home", + "terms": "" + }, + "building/dormitory": { + "name": "Dormitory", + "terms": "" + }, "building/entrance": { "name": "Entrance", "terms": "" @@ -1282,6 +1339,22 @@ "name": "Garage", "terms": "" }, + "building/garages": { + "name": "Garages", + "terms": "" + }, + "building/greenhouse": { + "name": "Greenhouse", + "terms": "" + }, + "building/hospital": { + "name": "Hospital Building", + "terms": "" + }, + "building/hotel": { + "name": "Hotel Building", + "terms": "" + }, "building/house": { "name": "House", "terms": "" @@ -1294,10 +1367,54 @@ "name": "Industrial Building", "terms": "" }, + "building/public": { + "name": "Public Building", + "terms": "" + }, "building/residential": { "name": "Residential Building", "terms": "" }, + "building/retail": { + "name": "Retail Building", + "terms": "" + }, + "building/roof": { + "name": "Roof", + "terms": "" + }, + "building/school": { + "name": "School Building", + "terms": "" + }, + "building/shed": { + "name": "Shed", + "terms": "" + }, + "building/stable": { + "name": "Stable", + "terms": "" + }, + "building/static_caravan": { + "name": "Static Mobile Home", + "terms": "" + }, + "building/terrace": { + "name": "Row Houses", + "terms": "" + }, + "building/train_station": { + "name": "Train Station", + "terms": "" + }, + "building/university": { + "name": "University Building", + "terms": "" + }, + "building/warehouse": { + "name": "Warehouse", + "terms": "" + }, "craft/basket_maker": { "name": "Basket Maker", "terms": "basket,basketry,basket maker,basket weaver" @@ -1391,7 +1508,7 @@ "terms": "glasses,optician" }, "craft/painter": { - "name": "painter", + "name": "Painter", "terms": "painter" }, "craft/photographer": { @@ -2274,6 +2391,10 @@ "name": "Liquor Store", "terms": "alcohol" }, + "shop/art": { + "name": "Art Shop", + "terms": "art store,art gallery" + }, "shop/bakery": { "name": "Bakery", "terms": "" @@ -2290,6 +2411,10 @@ "name": "Bicycle Shop", "terms": "" }, + "shop/bookmaker": { + "name": "Bookmaker", + "terms": "" + }, "shop/books": { "name": "Bookstore", "terms": "" @@ -2410,6 +2535,10 @@ "name": "Locksmith", "terms": "keys" }, + "shop/lottery": { + "name": "Lottery Shop", + "terms": "" + }, "shop/mall": { "name": "Mall", "terms": "" diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json index 398d2c1ef..6689264bf 100644 --- a/vendor/assets/iD/iD/locales/es.json +++ b/vendor/assets/iD/iD/locales/es.json @@ -134,7 +134,8 @@ "annotation": "{n} líneas combinadas.", "not_eligible": "Estos elementos no pueden ser fusionados.", "not_adjacent": "Estas líneas no pueden ser fusionadas porque no están conectadas", - "restriction": "Estas líneas no se pueden combinar porque al menos una es miembro de una relación de \"{relation}\"." + "restriction": "Estas líneas no se pueden combinar porque al menos una es miembro de una relación de \"{relation}\".", + "incomplete_relation": "Estos elementos no se pueden combinar porque al menos uno de ellos no se ha descargado por completo." }, "move": { "title": "Mover", @@ -314,7 +315,7 @@ "untagged_point": "Punto sin etiquetar", "untagged_line": "Línea sin etiquetar", "untagged_area": "Área sin etiquetar", - "many_deletions": "Está eliminando {n} objetos ¿Está seguro de que quieres hacer esto? Esta acción los eliminará del mapa que todos ven en openstreetmap.org.", + "many_deletions": "Está eliminando {n} objetos ¿Está seguro que quiere hacer esto? Esta acción los eliminará del mapa que todos ven en openstreetmap.org.", "tag_suggests_area": "La etiqueta {tag} sugiere que esta línea debería ser una área, pero no lo es.", "untagged_tooltip": "Seleccione un tipo de característica que describa lo que es esta {geometry}.", "deprecated_tags": "Etiquetas obsoletas: {tags}" @@ -332,7 +333,7 @@ }, "help": { "title": "Ayuda", - "help": "# Ayuda\n\nEste es un editor para [OpenStreetMap](http://www.openstreetmap.org/), el mapa libre y editable del mundo. Puede utilizarlo para agregar y actualizar datos de su área, haciendo este mapa, de fuente y datos abiertos, mejor para todos.\n\nLos cambios que haga en este mapa serán visibles para todo el que use OpenStreetMap. Para poder hacer una edición, necesitara una [cuenta gratuita en OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nEl [editor iD](http://ideditor.com/) es un proyecto colaborativo con el [código fuente disponible en GitHub](https://github.com/systemed/iD).\n", + "help": "# Ayuda\n\nEste es un editor para [OpenStreetMap](http://www.openstreetmap.org/), el\nmapa del mundo libre y editable. Puedes usarlo para agregar y actualizar\ndatos en tu región, haciendo un mapa del mundo de código y datos abiertos\nmejor para todos.\n\nLas ediciones que haces en este mapa serán visibles para todos quienes usen\nOpenStreetMap. Para hacer una edición, necesitarás una\n[cuenta gratuita de OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nEl [editor iD](http://ideditor.com/) es un proyecto colaborativo con [código\nfuente disponible en GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Editar & Guardar\n\nEste editor está diseñado para trabajar en línea principalmente, ya que en estos momentos esta accediendo a través de un sitio web.\n\n### Seleccionar elementos gráficos\n\nPara seleccionar un elemento del mapa, como una carretera o un punto de interés, simplemente haz clic sobre él. Esto resaltará el elemento seleccionado, abriendo un panel con sus características, y mostrará un menú de cosas que puedes hacer con ese elemento.\n\nSe pueden seleccionar múltiples elementos de una vez manteniendo pulsada la tecla 'Mayús' y haciendo clic y arrastrando el ratón sobre el mapa. Esto seleccionará todas los elementos que están dentro del recuadro que se dibuja, lo que le permite realizar acciones con todos ellos al mismo tiempo.\n\n### Guardar ediciones\n\nCuando haga cambios -como editar carreteras, edificios o lugares- estos se almacenan localmente en tu ordenador hasta que decidas guardarlos en el servidor. No se preocupe si cometes un error - puede deshacer los cambios haciendo clic en el botón 'Deshacer', y rehacerlos de nuevo haciendo clic en el botón 'Rehacer'.\n\nHaga clic en 'Guardar' para finalizar un grupo de ediciones (por ejemplo, si ha completado una zona de la ciudad y quisiera empezar en una nueva área). Antes de subir los cambios al servidor tendrás oportunidad de revisar lo que has hecho, y el editor proporciona avisos y sugerencias útiles si algo parece que no es correcto en los cambios.\n\nSi ve que todo es correcto escriba un breve comentario explicando el cambio que ha hecho y haga clic en 'Guardar' de nuevo para registrar los cambios en [OpenStreetMap.org](http:\\/\\/www.openstreetmap.org\\/), donde serán visibles para todos los demás usuarios y estarán disponible para que otros colaboradores del proyecto puedan seguir construyendo y mejorando el mapa.\n\nSi aún no ha terminado sus ediciones en una sesión, puede dejar la ventana del editor abierta y volver más tarde (en el mismo navegador y ordenador), y el editor le permitirá retomar tu trabajo.\n", "roads": "# Carreteras\n\nPuede crear, corregir y borrar carreteras con este editor. Las vías pueden ser de todas las clases: caminos, carreteras, senderos, ciclovías, etc. A cualquier línea dibujada en el mapa se le debe indicar el tipo de elemento lineal que es.\n\n### Seleccionar\n\nHaga clic sobre una vía para seleccionarla. Verá sobre ella como se visualiza su esquema, formada por nodos y segmentos, junto con un menú de herramientas que aparece sobre el mapa y una barra lateral que muestra más información sobre la vía.\n\n### Modificar\n\nA menudo verá viales que no están alineados correctamente con la imagen aérea de fondo o con la traza GPS. Puede ajustar esas vías para situarlas en el lugar exacto.\n\nPrimero haga clic sobre la vía que desea cambiar. Esto la resaltará y mostrará los nodos o puntos de control a lo largo de la vía que la forman. A continuación simplemente arrastre esos puntos a la posición correcta. Si desea añadir nuevos puntos de control para dibujar la carretera con mayor detalle haga doble clic sobre la parte de la vía donde quiere añadir el nuevo nodo y este será creado en la vía. \n\nSi la vía conecta con otra carretera o camino pero esta conexión no aparece correctamente en el mapa puede arrastrar uno de los puntos de la vía hasta la otra carretera y se unirá automáticamente a ella mediante un nodo común. Es muy importante tener las carreteras conectadas en el mapa, ya que es esencial para proporcionar instrucciones correctas para la conducción si queremos que la cartografía se útil, por ejemplo, para los navegadores GPS.\n\n### Eliminar\n\nSi un camino es totalmente incorrecto -ha observado que no aparece en las imágenes de satélite y de manera ideal lo ha confirmado en campo- puede eliminarlo, lo cual lo borrará del mapa. Sea precavido al eliminar elementos del mapa. Como cualquier otra edición que haga este cambio será visto por todo el mundo y las imágenes de satélite a menudo no están actualizadas, por lo que una carretera que no existe en ellas pero sí en el mapa simplemente puede aparecer porque es de reciente construcción y otro usuario la ha añadido. \n\n### Crear\n\n¿Ha encontrado un lugar donde debería existir una carretera pero no aparece? Haga clic con el ratón sobre el icono 'Línea' situado en la parte superior izquierda del editor o simplemente presione la tecla '2' de su teclado que es el acceso rápido para comenzar a dibujar una línea. \n\nHaga clic sobre el mapa en el inicio de la carretera para comenzar a dibujar. Si la vía se ramifica a partir de una carretera ya existente empiece haciendo clic sobre el lugar donde ambas conectan.\n\nHaga clic en puntos a lo largo de la vía para definir el trazado correcto de la carretera. La densidad de puntos dependerá de la complejidad del recorrido, por lo que es aconsejable dibujar desde un nivel de zoom apropiado. Si la vía que está dibujando atraviesa otra carretera conéctela con esta haciendo clic sobre el punto de intersección. Una vez haya terminado el dibujo haga doble clic con el ratón o presiones la tecla 'Return' o 'Intro' de su teclado para finalizar.\n", "gps": "# GPS\n\nLos datos procedentes de un GPS son la fuente más fiable para OpenStreetMap. Este editor soporta archivos `.gpx` con trazas guardadas en su equipo local. Este tipo de trazas GPS se pueden obtener con un gran número de aplicaciones para teléfonos inteligentes, así como con receptores GPS normales.\n\nPara más información acerca de como obtener datos en campo mediante GPS lea [Capturando información mediante GPS] (http://learnosm.org/en/beginner/using-gps/).\n\nPara utilizar una traza GPX para cartografiar simplemente arrastre y suelte el archivo GPX sobre el editor de mapas. Si es reconocido, se añadirá al mapa como una línea verde brillante. Haga clic en el menú 'Configuración de fondo' de la izquierda para activar, desactivar o hacer zoom sobre esta nueva capa de con la traza GPX.\n\nTenga en cuenta que la traza GPX no es subida directamente a OpenStreetMap, sino que se utiliza para dibujar sobre ella en el mapa, ayudándole como guía para los nuevos elementos que desea añadir.\n", @@ -475,6 +476,9 @@ "admin_level": { "label": "Nivel administrativo" }, + "aerialway": { + "label": "Tipo" + }, "aerialway/access": { "label": "Acceso" }, @@ -486,6 +490,10 @@ "label": "Duración (minutos)", "placeholder": "1, 2, 3..." }, + "aerialway/occupancy": { + "label": "Ocupación", + "placeholder": "2, 4, 8..." + }, "aeroway": { "label": "Tipo" }, @@ -519,6 +527,9 @@ "building_area": { "label": "Edificio" }, + "cans": { + "label": "Acepta envases" + }, "capacity": { "label": "Capacidad", "placeholder": "50, 100, 200..." @@ -533,6 +544,9 @@ "anticlockwise": "En sentido antihorario" } }, + "clothes": { + "label": "Acepta ropas" + }, "collection_times": { "label": "Horario de recogida" }, @@ -560,6 +574,9 @@ "description": { "label": "Descripción" }, + "electrified": { + "label": "Electrificación" + }, "elevation": { "label": "Altura" }, @@ -574,7 +591,7 @@ "placeholder": "+31 42 123 4567" }, "fee": { - "label": "Tarifa" + "label": "Couta" }, "fire_hydrant/type": { "label": "Tipo" @@ -582,6 +599,9 @@ "fixme": { "label": "Arreglame" }, + "gauge": { + "label": "Gálibo" + }, "generator/method": { "label": "Método" }, @@ -591,6 +611,9 @@ "generator/type": { "label": "Tipo" }, + "glass": { + "label": "Acepta vidrio" + }, "golf_hole": { "label": "Referencia", "placeholder": "Número de hoyo (1-18)" @@ -683,6 +706,9 @@ "operator": { "label": "Operador" }, + "paper": { + "label": "Acepta papel" + }, "par": { "label": "Par", "placeholder": "3, 4, 5..." @@ -697,6 +723,12 @@ "label": "Teléfono", "placeholder": "+31 42 123 4567" }, + "piste/difficulty": { + "label": "Dificultad" + }, + "piste/type": { + "label": "Tipo" + }, "place": { "label": "Tipo" }, @@ -748,6 +780,9 @@ "shop": { "label": "Tipo" }, + "social_facility_for": { + "placeholder": "Personas sin hogar, discapacitados, niños, etc" + }, "source": { "label": "Fuente" }, @@ -764,6 +799,9 @@ "cutting": "Desmonte" } }, + "studio_type": { + "label": "Tipo" + }, "supervised": { "label": "Vigilado" }, @@ -822,6 +860,27 @@ "name": "Dirección", "terms": "dirección, domicilio, señas, residencia" }, + "aerialway": { + "name": "Pista aérea" + }, + "aerialway/cable_car": { + "name": "Teleférico", + "terms": "transbordador, funicular, telecabina, telesilla, telesquí" + }, + "aerialway/chair_lift": { + "name": "Telesilla", + "terms": "telesquí, teleférico, funicular" + }, + "aerialway/gondola": { + "name": "Góndola", + "terms": "Telecabina" + }, + "aerialway/magic_carpet": { + "name": "Alfombra mágica" + }, + "aerialway/pylon": { + "name": "Pilona" + }, "aeroway": { "name": "Aerovía", "terms": "Zonas de un aeropuerto" @@ -916,6 +975,13 @@ "name": "Cine", "terms": "cinematógrafo,cine" }, + "amenity/clinic": { + "name": "Clínica", + "terms": "clínica, centro médico, hospital" + }, + "amenity/clock": { + "name": "Reloj" + }, "amenity/college": { "name": "Universidad", "terms": "facultad,universidad,escuela profesional, instituto" @@ -924,6 +990,14 @@ "name": "Palacio de Justicia", "terms": "tribunal, magistratura, judicatura, audiencia,justicia" }, + "amenity/dentist": { + "name": "Dentista", + "terms": "dentista, odontólogo" + }, + "amenity/doctor": { + "name": "Médico", + "terms": "médico, doctor, facultativo, medicina, curador" + }, "amenity/drinking_water": { "name": "Agua potable", "terms": "potable,bebible,fuente,manantial, fontana, fontanal, hontanar, venero" @@ -949,7 +1023,7 @@ "terms": "gasolinera,surtidor, estación de servicio" }, "amenity/grave_yard": { - "name": "Camposanto", + "name": "Cementerio", "terms": "cementerio,camposanto, necrópolis, sacramental" }, "amenity/hospital": { @@ -1026,7 +1100,18 @@ "terms": "escuela,colegio, academia, instituto, liceo, conservatorio" }, "amenity/shelter": { - "name": "Refugio" + "name": "Refugio", + "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio" + }, + "amenity/social_facility": { + "name": "Instalación social" + }, + "amenity/social_facility/food_bank": { + "name": "Banco de alimentos" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Refugio de vagabundos", + "terms": "Refugio social" }, "amenity/swimming_pool": { "name": "Piscina", @@ -1045,7 +1130,7 @@ "terms": "Teatro" }, "amenity/toilets": { - "name": "Baños", + "name": "Aseos", "terms": "baños, baño, aseo, letrina, lavabo, servicio, tocador, ducha" }, "amenity/townhall": { @@ -1059,6 +1144,10 @@ "amenity/vending_machine": { "name": "Máquina expendedora" }, + "amenity/veterinary": { + "name": "Veterinario", + "terms": "veterinario, albéitar, mascotas, animales" + }, "amenity/waste_basket": { "name": "Papelera", "terms": "papelera, cubo, contenedor, basura, papeles, deshecho" @@ -1147,10 +1236,39 @@ "name": "Apartamentos", "terms": "apartamento, piso, vivienda, alojamiento, buhardilla, estudio, edificio" }, + "building/barn": { + "name": "Granero" + }, + "building/bunker": { + "name": "Búnker", + "terms": "Fortaleza" + }, + "building/cabin": { + "name": "Cabina" + }, + "building/cathedral": { + "name": "Catedral", + "terms": "Iglesia, Lugar de culto, templo, basílica, parroquia, santuario, oratorio, iglesia, basílica" + }, + "building/chapel": { + "name": "Capilla" + }, + "building/church": { + "name": "Iglesia", + "terms": "templo, basílica, capilla, colegiata, parroquia, santuario, ermita, oratorio,iglesia, basílica, catedral" + }, "building/commercial": { "name": "Edificio comercial", "terms": "centro comercial, edificio comercial" }, + "building/construction": { + "name": "Edificio bajo construcción", + "terms": "Edificio en construcción" + }, + "building/detached": { + "name": "Casa unifamiliar", + "terms": "Chalet, unifamiliar" + }, "building/entrance": { "name": "Entrada", "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco" @@ -1159,6 +1277,20 @@ "name": "Garaje", "terms": "garaje,cochera" }, + "building/garages": { + "name": "Garajes", + "terms": "garajes, cocheras" + }, + "building/greenhouse": { + "name": "Invernadero" + }, + "building/hospital": { + "name": "Edificio hospital", + "terms": "Hospital, sanatorio, Centro de primeros auxilios" + }, + "building/hotel": { + "name": "Edificio Hotel" + }, "building/house": { "name": "Casa", "terms": "domicilio, hogar, vivienda, morada, residencia" @@ -1171,13 +1303,164 @@ "name": "Edificio industrial", "terms": "fábrica,factoría, industria, manufactura, taller, empresa, explotación" }, + "building/public": { + "name": "Edificio Público" + }, "building/residential": { "name": "Edificio residencial", "terms": "bloque" }, + "building/roof": { + "name": "Tejado" + }, + "building/school": { + "name": "Edificio Escuela", + "terms": "Edificio colegio" + }, + "building/shed": { + "name": "Cobertizo" + }, + "building/stable": { + "name": "Establo", + "terms": "Cuadra, caballeriza" + }, + "building/static_caravan": { + "name": "Caravana estática" + }, + "building/terrace": { + "name": "Bloque" + }, + "building/train_station": { + "name": "Estación de ferrocarril", + "terms": "parada, alto, detención, apeadero, terminal, tren, ferrocarril" + }, + "building/university": { + "name": "Edificio universidad" + }, + "building/warehouse": { + "name": "Almacén", + "terms": "almacén, depósito, bodega, lonja, nave" + }, + "craft/beekeeper": { + "name": "Apicultor" + }, + "craft/blacksmith": { + "name": "Herrero" + }, + "craft/boatbuilder": { + "name": "Constructor de barco" + }, + "craft/bookbinder": { + "name": "Capa" + }, + "craft/brewery": { + "name": "Cervecería" + }, + "craft/carpenter": { + "name": "Carpintería", + "terms": "carpintero, ebanistería, ebanista, madera, madedero" + }, + "craft/caterer": { + "name": "Abastecedor, Proveedor" + }, + "craft/clockmaker": { + "name": "Relojero" + }, + "craft/confectionary": { + "name": "Golosinas", + "terms": "golosinas, chucherías, caramelos" + }, + "craft/dressmaker": { + "name": "Modista" + }, + "craft/electrician": { + "name": "Electricista", + "terms": "electricista, iluminista, trabajo de electricista" + }, + "craft/gardener": { + "name": "Jardinero, Jardinería" + }, + "craft/glaziery": { + "name": "Vidriería" + }, + "craft/handicraft": { + "name": "Artesanía" + }, + "craft/hvac": { + "name": "Aire acondicionado" + }, + "craft/insulator": { + "name": "Aislante" + }, + "craft/jeweler": { + "name": "Joyería", + "terms": "joyero, relojería, relojero, platería, orfebrería, orfebre" + }, + "craft/locksmith": { + "name": "Cerrajero", + "terms": "Cerrajero, cerraduras" + }, + "craft/metal_construction": { + "name": "Construcción metálica" + }, + "craft/optician": { + "name": "Óptico", + "terms": "óptico, óptica, gafas" + }, + "craft/painter": { + "name": "Pintor, albañil" + }, + "craft/photographer": { + "name": "Fotógrafo", + "terms": "fotógrafo, retratista" + }, + "craft/photographic_labratory": { + "name": "Laboratorio fotográfico" + }, + "craft/plasterer": { + "name": "Yesero", + "terms": "yeso, albañil, obra" + }, + "craft/plumber": { + "name": "Fontanero" + }, + "craft/pottery": { + "name": "Cerámica", + "terms": "cerámica, cerasmista, alfarería, cantarería, alcaller, alfar" + }, + "craft/saddler": { + "terms": "guarnicionero, talabartero, guarnicería" + }, + "craft/sailmaker": { + "name": "Velero", + "terms": "Fabricante de velas" + }, + "craft/sawmill": { + "name": "Aserradero" + }, + "craft/scaffolder": { + "name": "Andamiaje" + }, + "craft/sculpter": { + "name": "Escultor", + "terms": "escultor, artista, cincelador, imaginero, tallista, modelista" + }, + "craft/shoemaker": { + "name": "zapatero, remendón, zapatería, arreglo de zapatos", + "terms": "zapatero, remendón" + }, + "craft/tailor": { + "name": "Sastre" + }, "craft/upholsterer": { "name": "Tapicero" }, + "craft/watchmaker": { + "name": "Relojero" + }, + "craft/window_construction": { + "name": "Construcción de ventanas" + }, "embankment": { "name": "Terraplén" }, @@ -1197,12 +1480,19 @@ "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla" }, "footway/crossing": { - "name": "Cruce peatonal" + "name": "Cruce peatonal", + "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones" }, "footway/sidewalk": { "name": "Acera", "terms": "acera, paso, bordillo, anden, borde, peatonal, peatón" }, + "golf/fairway": { + "name": "Calle" + }, + "golf/hole": { + "name": "Hoyo de golf" + }, "highway": { "name": "Vía", "terms": "calle, cañada, ronda, carril, pista, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, senda" @@ -1267,6 +1557,10 @@ "name": "Calle urbana", "terms": "calle, vía, paseo, avenida, bulevar, rambla, ronda, carrera, arteria, corredera, callejón, travesía, pasadizo, pasaje, rúa, vial, costanilla, callejuela" }, + "highway/rest_area": { + "name": "Área de Descanso", + "terms": "Área de descanso" + }, "highway/road": { "name": "Carretera sin categoría conocida", "terms": "calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía" @@ -1303,12 +1597,17 @@ "name": "Pasillo de aparcamiento", "terms": "aparcamiento, parking" }, + "highway/services": { + "name": "Área de Servicio", + "terms": "área de servicios, área de descanso" + }, "highway/steps": { "name": "Escaleras", "terms": "escalera, escalinata, grada, gradería, escala, escalerilla, peldaños, escalones" }, "highway/stop": { - "name": "Señal de Stop" + "name": "Señal de Stop", + "terms": "señal de detención, señal de parada, señal, stop, detención, parada" }, "highway/tertiary": { "name": "Carretera local", @@ -1407,7 +1706,8 @@ "terms": "Granja" }, "landuse/farmland": { - "name": "Tierra de labranza" + "name": "Tierra de labranza", + "terms": "granja, tierra de cultivo" }, "landuse/farmyard": { "name": "Tierras de cultivo", @@ -1597,10 +1897,15 @@ "terms": "Aerodromo, Aeropuerto, Pista" }, "military/barracks": { - "name": "Cuartel" + "name": "Cuartel", + "terms": "cuartel, barracones, acantonamiento, acuartelamiento, campamento" }, "military/bunker": { - "name": "Búnker" + "name": "Búnker", + "terms": "búnker, refugio subterráneo" + }, + "military/range": { + "name": "Rango militar" }, "natural": { "name": "Natural", @@ -1762,8 +2067,8 @@ "terms": "urbe, capital, metrópoli, ciudad, núcleo urbano, localidad, villa" }, "place/hamlet": { - "name": "Aldea", - "terms": "aldea, caserío, poblado, pueblo, aldehuela, aldeorrio, villorrio, pueblecito" + "name": "Aldea o barrio", + "terms": "aldea, caserío, poblado, pueblo, aldehuela, aldeorrio, villorrio, localidad, barrio, vecindario" }, "place/island": { "name": "Isla", @@ -1824,7 +2129,8 @@ "name": "Plataforma" }, "public_transport/stop_position": { - "name": "Punto de parada" + "name": "Punto de parada", + "terms": "punto de detención, stop, parada" }, "railway": { "name": "Ferrocarril", @@ -1838,6 +2144,9 @@ "name": "Ferrocarril en desuso", "terms": "Ferrocarril en deshuso" }, + "railway/funicular": { + "name": "Funicular" + }, "railway/halt": { "name": "Apeadero", "terms": "apeadero,estación,ferrocarril,tren,andén" @@ -1850,6 +2159,9 @@ "name": "Monorraíl ", "terms": "Monorail" }, + "railway/narrow_gauge": { + "name": "Carril de vía estrecha" + }, "railway/platform": { "name": "Andén", "terms": "Andén de ferrocarril" @@ -1890,6 +2202,10 @@ "name": "Licorería", "terms": "licor, trago, bebida, alcohol, tienda, licorería" }, + "shop/art": { + "name": "Tienda de arte", + "terms": "Galería de arte" + }, "shop/bakery": { "name": "Panadería o pastelería", "terms": "panadería, horno, tahona, tienda, pastelería, confitería, pastel, pan, bollería, bollo" @@ -1906,6 +2222,9 @@ "name": "Tienda de bicicletas", "terms": "tienda de bicicletas, bici" }, + "shop/bookmaker": { + "name": "Librero" + }, "shop/books": { "name": "Librería", "terms": "librería, venta de libros" @@ -2022,6 +2341,9 @@ "shop/locksmith": { "name": "Cerrajero" }, + "shop/lottery": { + "name": "Administración de loterías" + }, "shop/mall": { "name": "Centro comercial", "terms": "mall,centro comercial,plaza comercial" @@ -2119,16 +2441,16 @@ "terms": "casa" }, "tourism/guest_house": { - "name": "Pensión", - "terms": "hostal,hotel,pensión" + "name": "Hospedaje", + "terms": "hostal, hotel, pensión, B&B, Bed & Breakfast, casa rural, bed and breakfast, posada, cama y desayuno, alojamiento, alojamiento rural, agroturismo, casa de aldea, casa de labranza, hostería" }, "tourism/hostel": { "name": "Albergue", - "terms": "hostal,hotel,pensión" + "terms": "hostal, hotel, pensión, alojamiento, albergue, hostería" }, "tourism/hotel": { "name": "Hotel", - "terms": "hotel,hostal,pensión" + "terms": "hotel, hostal, pensión, alojamiento" }, "tourism/information": { "name": "Información", @@ -2136,7 +2458,7 @@ }, "tourism/motel": { "name": "Motel", - "terms": "hostal,hotel.motel,pensión" + "terms": "hostal, hotel, motel, pensión, alojamiento" }, "tourism/museum": { "name": "Museo", @@ -2147,10 +2469,12 @@ "terms": "picnic,barbacoa,espercimiento" }, "tourism/theme_park": { - "name": "Parque temático" + "name": "Parque temático", + "terms": "parque temático, parque de atracciones, atracciones" }, "tourism/viewpoint": { - "name": "Vista panorámica" + "name": "Vista panorámica", + "terms": "oteadero, punto de vista, mirador, vistas" }, "tourism/zoo": { "name": "Zoo", @@ -2180,22 +2504,27 @@ "name": "Ruta en bicicleta" }, "type/route/bus": { - "name": "Ruta del colectivo" + "name": "Ruta del colectivo", + "terms": "ruta de autobús, ruta de bus, línea de autobús, recorrido, trayecto, itinerario, bus, autobús" }, "type/route/detour": { - "name": "Ruta de desvío" + "name": "Ruta de desvío", + "terms": "ruta de desvío, dirección alternativa, alternativa, ruta, itinerario alternativo," }, "type/route/ferry": { - "name": "Ruta de Ferry" + "name": "Ruta de Ferry", + "terms": "ruta, itinerario, rumbo, dirección, trayecto, ferry, transbordador" }, "type/route/foot": { - "name": "Ruta a pie" + "name": "Ruta a pie", + "terms": "ruta, itinerario, rumbo, dirección, trayecto, peatonal, pie, senderismo , camino, derrotero, vía" }, "type/route/hiking": { "name": "Ruta de senderismo" }, "type/route/pipeline": { - "name": "Ruta de tubería" + "name": "Ruta de tubería", + "terms": "ruta, itinerario, rumbo, dirección, trayecto, ferry, trasbordador, tubería, gasoducto, oleoducto, conducto, cañería" }, "type/route/power": { "name": "Ruta de red elécrica" @@ -2213,7 +2542,8 @@ "name": "Ruta maestra" }, "vertex": { - "name": "Otro" + "name": "Otro", + "terms": "diferente, distinto, ajeno, otro" }, "waterway": { "name": "Vía fluvial", diff --git a/vendor/assets/iD/iD/locales/fa.json b/vendor/assets/iD/iD/locales/fa.json index cf6da1659..2f3f4c0ff 100644 --- a/vendor/assets/iD/iD/locales/fa.json +++ b/vendor/assets/iD/iD/locales/fa.json @@ -332,7 +332,6 @@ }, "help": { "title": "کمک", - "help": "#کمک\n\nاین یک ویرایشگر برای [OpenStreetMap](http://www.openstreetmap.org/) است،\nنقشه ای رایگان و قابل ویرایش از جهان. شما میتوانید از آن برای افزودن و بروز رسانی\nداده ها در ناحیه تان استفاده کنید، ساختن نقشه ی منبع باز و داده باز از جهان\nبرای همه کس بهتر است.\n\nویرایش هایی که شما در این نقشه می سازید برای هر کسی که از OpenStreetMap استفاده میکند\nقابل استفاده است. برای ایجاد یک ویرایش، شما نیاز دارید به\n[حساب رایگان OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[ویرایشگر ID](http://ideditor.com/) یک پروژه مشترک است با [منبع کد در GitHub \nموجود است](https://github.com/systemed/iD).\n", "roads": "# جاده ها\n\nشما میتوانید جاده ها را ایجاد کنید، تعمیر کنید، و حذف کنید به وسیله ی این ویرایشگر. جاده ها میتوانند همه نوعی باشند:\nپیاده روی، بزرگراه، راه آهن، راه موتور سیکلت، و بیشتر - هر چیزی که غالبا - برای عبور است \nباید نقشه شود.\n\n### انتخاب کردن\n\nروی جاده کلیک کنید تا انتخاب شود. طرح کلی باید قابل نمایش باشد، همراه\nیک منوی ابزار کوچک روی نقشه و یک نوار کناری نشان میدهد اطلاعات بیشتری\nدرباره جاده.\n\n### اصلاح کردن\n\nاغلب جاده هایی که میبینید با تصاویر نقشه نگاری پشت سرشان یا پیگیری GPS\nهم طراز نیستند. شما میتوانید این جاده ها را در مکان درستشان تطبیق\nدهید.\n\nاولین کلیک روی نقشه شما میخواهید تغییر دهید. اینکار آنرا برجسته میکند و نقاط\nکنترل را نشان میدهد شما میتوانید آنرا به مکان بهتری بکشید. اگر\nبخواهید نقاط کنترل جدید بیشتری برای اطلاعات بیشتر اضافه کنید، روی قسمتی\nاز نقشه که بدون گره است دوبار کلیک کنید، و یکی اضاف خواهد شد.\n\nاگر جاده به جاده های دیگر متصل باشد، اما روی نقشه به درستی \nمتصل نباشد، شما میتوانید یکی از نقاط کنترل را بکشید به سایر جاده ها برای\nفراهم کردن پیوستن آنها. داشتن جاده های پیوسته و متصل برای نقشه مهم است\nو ارائه دستورالعمل ها ی رانندگی ضروری است.\n\nهمچنین میتوانید روی ابزار 'انتقال' کلیک کنید یا کلید میانبر `M` را فشار دهید تا همه جاده یک بار منتقل\nشود، و بعد دوباره کلیک کنید تا جابجایی ذخیره شود.\n\n### حذف کردن\n\nاگر جاده کامل اشتباه است - میتوانید ببینید که در تصویر ماهواره ای موجود نیست و بصورت ایده آل\nبطور محلی پذیرفته شده که در حال حاضر موجود نیست - شما میتوانید\nآنرا حذف کنید، با پاک کردن آن از نقشه. هنگام حذف ویژگی محتاط باشید-\nشبیه هر ویرایش دیگری، نتایج توسط هر کسی دیده میشود تصاویر ماهواره ای غالبا تاریخ گذشته اند،\nپس ممکن است به طور ساده جاده جدیدا ساخته شده باشد.\n\nشما میتوانید جاده ای را حذف کنید با کلیک روی آن و انتخاب آن، سپس کلیک روی آیکون سطل زباله\nیا فشار دکمه ی 'Delete'.\n\n### ایجاد کردن\n\nجاهایی یافت میشوند که باید جاده باشند ولی اینگونه نیست؟ روی آیکون 'خط'\nدر بالا سمت چپ ویرایشگر کلیک کنید یا کلید میانبر`2` را فشار دهید\nتا کشیدن یک خط شروع شود.\n\nبرای شروع کشیدن روی ابتدای جاده کلیک کنید. اگر جاده\nشاخه ای از جاده ی موجود باشد، با کلیک روی مکانی که به هم متصل اند شروع کنید.\n\nسپس روی نقاط در امتداد جاده کلیک کنید به طوری که از مسیر سمت راست ، طبق تصاویر ماهواره ای\nیا GPS پیروی کند. اگر جاده ی در حال کشیدن شما از سایر جاده ها میگذرد، با کلیک\nروی نقطه تقاطع آنرا متصل کنید. وقتی کشیدنتان انجان شد، دوبار کلیک کنید\nیا 'بازگشت' را فشار دهید یا روی صفحه کلید 'Enter' را فشار دهید.\n", "addresses": "# آدرس ها\n\nآدرس ها مقداری از اطلاعات بسیار سودمند برای نقشه هستند.\n\nاگرچه آدرس ها اغلب بعنوان بخش هایی از جاده نمایان میشوند، در OpenStreetMap\nآنها بعنوان ویژگی هایی از ساختمان ها و مکان ها در امتداد خیابان ها ثبت میشوند.\n\nشما میتوانید اطلاعات آدرس را به مکان های نقشه شده بعنوان خطوط اضافه ساخته شده و\nهمچنین آنهایی که بعنوان یک نقطه نقشه شده اند اضافه کنید. منبع مناسب برای داده های آدرس\nبررسی بر روی زمین و دانش شخصی است -مثل هر ویژگی دیگری،\nکپی برداری از منابع تجاری مثل نقشه های گوگل به شدت\nممنوع است.\n", "buildings": "# ساختمان ها\n\nOpenStreetMap یک دیتابیس عظیم جهان از ساختمان ها است. شما میتوانید\nاین دیتابیس را بسازید و بهبود بخشید.\n\n### انتخاب کردن\n\nمیتوانید با کلیک روی مرز ساختمان آن را انتخاب کنید. اینکار ساختمان را\nبرجسته میکند و یک منو ابزار کوچک باز میکند همجنین یک نوار کناری اطلاعات بیشتری \nدرباره ی ساختمان نشان میدهد.\n\n### اصلاح کردن\n\nگاهی اوقات ساختمان ها نادرست جاگذاری شده اند یا برچسب نادرست دارند.\n\nبرای انتقال کل ساختمان، آنرا انتخاب کنید، بعد روی ابزار 'انتقال' کلیک کنید. موس تان\nرا برای تغییر ساختمان حرکت دهید، و وقتی به درستی جایگذاری شد کلیک کنید.\n\nبرای تعمیر قسمت خاصی از ساختمان، روی گره هایی که مرز را مشخص میکنند کلیک کنید\nو آنها را به مکان بهتری بکشید.\n\n### ایجاد کردن\n\nیکی از موضوعات اصلی پیرامون افزودن ساختمان ها به نقشه این است که \nOpenStreetMap ساختمان ها را هم بصورت نقاط و هم شکل ها ثبت میکند. قاعده کلی برای\n _نقشه کردن ساختمان ها بصورت شکل هر وقت ممکن باشد_ این است، و نقشه کردن شرکت ها، خانه ها،\nامکانات رفاهی، و چیزهای دیگری که به عنوان ساختمان کاربرد دارند قرار گرفتن نقاط با شکل\nساختمان است\n\nکشیدن ساختمان بصورت شکل را شروع کنید با کلیک روی کلید 'فضا' در بالا سمت چپ \nرابط کاربری، و به آن پایان دهید توسط فشار دادن دکمه ی 'بازگشت' در صفحه کلیدتان\nیا کلیک روی اولین گره کشیده شده تا شکل بسته شود.\n\n### حذف کردن\n\nاگر ساختمانی کاملا نادرست است- میتوانید ببینید که در تصویر ماهواره ای\nموجود نیست و ایده آل تر بصورت محلی پذیرفته شده که موجود نیست - میتوانید\nآن را حذف کنید، با پاک کردن آن از نقشه. هنگام حذف ویژگی محتاط باشید\nشبیه هر ویرایش دیگری، نتایج توسط هر کسی دیده میشود و تصاویر ماهواره ای\nغالبا تاریخ گذشته است، پس بطور ساده ممکن است ساختمان جدیدا ساخته شده.\n\nمیتوانید یک ساختمان را حذف کنید با کلیک روی آن و انتخاب آن، سپس\nروی آیکون سطل زباله کلیک کنید یا کلید 'Delete' را فشار دهید.\n" @@ -1333,9 +1332,6 @@ "craft/optician": { "name": "عینک ساز" }, - "craft/painter": { - "name": "نقاش" - }, "craft/photographer": { "name": "عکاس" }, diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json index b4ee46bb6..b3930bd81 100644 --- a/vendor/assets/iD/iD/locales/fi.json +++ b/vendor/assets/iD/iD/locales/fi.json @@ -264,13 +264,14 @@ "percent_brightness": "{opacity}% kirkkaus", "none": "Ei kohteita", "custom": "Mukautettu", + "fix_misalignment": "Korjaa ilmakuvavirhe", "reset": "palauta" }, "restore": { "heading": "Kaikkia muutoksia ei ole tallennettu", "description": "Haluatko palauttaa tallentamattomat muutokset edelliseltä muokkauskerralta?", "restore": "Palauta", - "reset": "Palauta" + "reset": "Älä palauta" }, "save": { "title": "Tallenna", @@ -327,7 +328,14 @@ }, "help": { "title": "Ohje", - "help": "# Ohje⏎\n⏎\nTämä ohjelma on [OpenStreetMapin](http://www.openstreetmap.org/)⏎\n muokkaamiseen tarkoitettu ohjelma. OpenStreetMap on ilmainen ja⏎\nvapaasti muokattava maailmankartta. Voit lisätä ja muokata vapaasti⏎\nkotiseutusi ympäristön kohteita, jolloin kaikki voivat hyödyntää tietojasi.⏎\n⏎\nKaikki tällä ohjelmalla karttaan tehdyt muutokset tulevat julkisesti näkyviin⏎\nOpenStreetMap-karttapalvelussa. Kartan muokkaamiseen vaaditaan⏎\n[ilmainen OpenStreetMap-käyttäjätunnus](https://www.openstreetmap.org/user/new).⏎\n⏎\n[iD-kartanmuokkausohjelma](http://ideditor.com/) on avoin yhteistyöprojekti, jonka⏎\n[lähdekoodi on saatavilla GitHubista](https://github.com/systemed/iD).⏎\n" + "help": "# Ohje\n\nTämä on ohjelma [OpenStreetMap-kartan](http://www.openstreetmap.org/)\nilmaisen ja muokattavan kartan muokkaamiseen. Voit käyttää ja \nmuokata sitä alueellasi vapaasti ja osallistua ihmisten tekemän\nmaailmankartan luomiseen.\n\nKarttaan tehtävät muutokset ovat näkyvillä kaikille\nOpenStreetMapin käyttäjille. Kartan muokkaaminen edellyttää\n[ilmaista OpenStreetMap-käyttäjätiliä](https://www.openstreetmap.org/user/new).\n\n[iD-muokkausohjelma](http://ideditor.com/) on yhteistyöprojekti, jonka [lähdekoodi\non saatavilla GitHubista](https://github.com/openstreetmap/iD).\n", + "editing_saving": "# Muokkaaminen ja tallentaminen\n\nTätä muokkausohjelmaa tulisi ensisijaisesti käyttää toimivalla\n Internet-yhteydellä, kuten nyt verkkoselaimella.\n\n### Karttakohteiden valitseminen\n\nValitse karttakohde, kuten tie tai ravintola napsauttamalla\nsitä kerran kartalla. Tällöin karttakohde korostetaan ja vasemmalle\navautuu kohteen muokkausnäkymä.\n\nValitse useita karttakohteita kerralla napsauttamalla niitä\nja pitämällä Shiht-näppäin pohjassapohjassa tai vetämällä kartalle valintaikkunan.\nKaikki valintaikkunan sisällä olevat kohteet valitaan.\n\n### Muokkausten tallentaminen\n\nKartalle tehtävät muutokset tallennetaan tietokoneelle,\nkunnes ne tallennetaan palvelimelle. Älä pelkää virheiden\ntekemistä - muutoksen voi perua napsauttamalla Kumoa ja tuoda\ntakaisin napsauttamalla Tee uudelleen\n\nTallenna kaikki karttaan tehdyt muutokset napsauttamalla\n\"Tallenna\" - tee näin säännöllisesti. Karttalaadun varmistamiseksi\niD varmistaa muutokset tyypillisten huolimattomuusvirheiden varalta\nja varoittaa, jos osa muutoksista edellyttää toimenpiteitä ennen tallennusta.\n\nJos huomautettavaa ei ole, lisää pieni kommentti tehdyistä muutoksista\nja tallenna muutokset palvelimelle napsauttamalla jälleen \"Tallenna\".\nMuutokset tulevat näkyviin [OpenStreetMap.orgiin](http://www.openstreetmap.org/), missä ne ovat\nkaikkien käyttäjien nähtävissä ja tarkasteltavissa.\n\nJos muutokset meinaavat jäädä kesken ja et halua vielä tallentaa niitä,\nvoit sulkea selainikkunan. Seuraavalla kerralla iD-muokkain\nmahdollistaa viime kerran muokkausten palauttamisten.\n", + "roads": "# Tiet\n\nTällä muokkausohjelmalla voi lisätä, muokata ja poistaa teitä. Tie-sanalla\ntarkoitetaan kaikkia väyliä, kuten moottoriteitä, latuja, polkuja, pyöräteitä\nja monia muita.\n\n### Valitseminen\n\nValitse tie napsauttamalla sitä. Tien ulkoreuna korostuu, sen viereen\navautuu pikatoimintopalkki ja sivupalkkiin ilmestyy tien kohdemuokkain.\n\n### Siirtäminen ja muotoileminen\n\nKartalta voi löytää usein teitä, jotka eivät täsmää taustalla olevan ilmakuvan\ntai GPS-jäljen kanssa. Tällaiset tiet tulisi siirtää nopeasti oikealle paikalleen.\n\nAloita napsauttamalla siirrettävää tietä. Tien ulkoreunat korostuvat ja sen\nviivapisteet korostuvat. Tien muotoa voi muuttaa vetämällä viivapisteitä\nuusiin paikkoihin. Uuden viivapisteen voi luoda kaksoisnapsauttamalla\nmitä tahansa tien kohtaa, jossa ei jo ole viivapistettä.\n\nJos oikeassa maailmassa on kahden tien risteys, mutta ne eivät risteä\nkartalla, vedä joku viivapiste toiseen tiehen, jolloin niiden välille tulee\nristeys. Ei riitä, että tiet vain näyttävät risteävän kartalla, vaan niillä tulee\nolla yhteinen viivapiste. Tämä on erityisen tärkeää navigaattoreiden\nreititysohjelmistojen toimivuuden vuoksi.\n\nSiirrä koko tietä kerralla pikatoimintopalkin Siirrä-toiminnolla tai painamalla\nnäppäimistöstä M-näppäintä. Siirrä tie uudelle paikalleen ja lukitse siirto\nnapsauttamalla.\n\n### Poistaminen\n\nJos tie on täysin virheellinen - se esimerkiksi puuttuu satelliittikuvasta\nkokonaan tai se ei varmasti ole enää olemassa - se tulee poistaa\nkartalta. Mieti tarkkaan ennen karttakohteiden poistamispäätöstä -\nmuutos näkyy kartalla kaikille ja lisäksi satelliittikuvat ovat usein\nvanhentuneita, joten tie on jo voitu ehtiä rakentaa uudelleen.\n\nPoista tie valitsemalla se ja napsauttamalla sitten roskakorin\nkuvaketta tai napsauttamalla näppäimistön Delete-näppäintä.\n\n### Luominen\n\nPuuttuuko tie kartalta? Aloita tien piirtäminen napsauttamalla yläpalkista\nViiva tai paina pikanäppäintä `2` näppäimistöstä.\n\nNapsauta seuraavaksi tien lähtöpistettä. Jos tie lähtee jo kartalla olevan tien\nristeyksestä, napsauta risteyskohtaa.\n\nJatka napsauttelemalla tielle viivapisteitä säännöllisin välimatkoin\nseuraamalla ilmakuvaa tai GPS-jälkeä. Jos tie risteää jonkun muun tien kanssa, muodosta risteys napsauttamalla risteyskohtaa ja jatka taas normaaliin tapaan. Lopeta piirtäminen ja viimeistele tie\nkaksoisnapsauttamalla tai painamalla Enter-näppäintä. Peru tien piirtäminen ja poista tie painamalla näppäimistön askelpalautinta.\n", + "gps": "# GPS\n\nGPS-mittaukset ovat tärkein OpenStreetMapin aineiston lähde. Tämä\nmuokkausohjelma tukee omalta tietokoneeltasi käytettäviä `.gpx`-tiedostoja.\nGPS-mittauksia voi tehdä useilla älypuhelinsovelluksilla ja tietysti myös\nerillisillä GPS-mittalaitteilla.\n\nLisätietoja GPS-mittausten tekemisestä on sivuilla\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)\nja [Aloittelijan opas](http://wiki.openstreetmap.org/wiki/Fi:Beginners_Guide_1.1).\n\nKäytä GPX-tiedostoa kartoittamisen apuna vetämällä ja pudottamalla\ntiedosto kartanmuokkausohjelmaan. Jos se toimii, GPS-jälki ilmestyy\nkarttapohjalle kirkkaanvihreänä viivana. Tämän uuden GPX-karttatason\nasetuksia voi muuttaa Taustan asetukset -valikossa.\n\nTällä tavalla kartoittamisen apuna käytettyä GPX-tiedostoa ei tallenneta\nOpenStreetMapiin - tiedosto tulee hyödynnettyä parhaiten tallentamalla\ntiedosto myös muiden [karttakehittäjien käyttöön](http://www.openstreetmap.org/trace/create).\n", + "imagery": "# Ilmakuvat\n\nIlmakuvat ovat tärkeä kartoittamisen apuväline. Lentokuvien,\nsatelliittikuvien ja vapaasti koottujen materiaalien kokoelma on\nkäytettävissä Taustan asetukset -valikosta oikean reunan sivupalkista.\n\nOletuksena taustalla näytetään [Bing-karttojen](http://www.bing.com/maps/) satelliittikuvat,\nmutta karttaa lähentämällä vaihtoehtoja tulee lisää.\nJoissakin maissa, kuten Suomessa, Ranskassa ja Tanskassa\non saatavilla korkealaatuisia lentokoneesta kuvattuja ilmakuvia.\n\nIlmakuva voi näyttää virheelliseltä palveluntarjoajan sivuston\nvirheen vuoksi. Jos tiestön sijainti heittää ilmakuvasta, älä ala heti\nsiirtämään niitä vastaamaan taustakuvaa, vaan siirrä ilmakuvataustaa\nvastaamaan tiestöä asetuksella \"Korjaa ilmakuvavirhe\"\nTaustan asetusten alaosassa.\n", + "addresses": "# Osoitteet\n\nOsoitteet ovat yksi tärkeimmistä kartalla olevasta tiedosta.\n\nSen lisäksi että osoitetiedot ovat myös katujen nimiä,\nOpenStreetMapissa ne ovat olennaisia myös rakennusten\nja muiden kadunvarsikohteiden tiedoissa.\n\nOsoitetietoja voi katujen lisäksilisätä rakennuksien ulkoreunille\nja paikkapisteille. Paras osoitetietojen lähde on jalkautuminen tai\noma paikallistuntemus - kuten kaikessa muussakin muokkaamisessa,\ntietojen kopioiminen kaupallisista lähteistä kuten Google Kartoista\non ehdottomasti kielletty.\n", + "inspector": "# Kohdemuokkaimen käyttö\n\nKohdemuokkain on näytön vasemmassa reunassa oleva osio,\njolla muutetaan valitun kohteen ominaisuuksia.\n\n### Kohteen tyypin valitseminen\n\nPisteen, viivan tai alueen lisäämisen jälkeen tulee valita, millainen kohde\nse on - kuten kahvila, moottoritie, joki tai leikkipuisto. Kohdemuokkain\nnäyttää painikkeet yleisimmille kohteille. Jos kohde ei näy listalla, hae\npaikkaa hakusanalla ja valitse se sitten luettelosta. Haku ymmärtää myös\nsynonyymit ja englanninkieliset nimet, joten kokeile sitä rohkeasti.\n\nTarkastele kohdetyypin lisätietoja tarkemmin napsauttamalla i-kirjainta\nsen reunassa. Valitse kohdetyyppi muokattavalle kohteelle napsauttamalla.\n\n### Kohteen tagien muokkaaminen\n\nKun kohdetyyppi on valittu, kohdemuokkain näyttää tietokenttiä, joilla\nvoidaan kuvailla kohteen ominaisuuksia, kuten nimi ja osoite.\n\nKenttäjoukon alapuolella on rivi painikkeita, joilla voi avata lisäkenttiä,\nkuten [Wikipedia-sivun](http://fi.wikipedia.org/), esteettömyystiedot\nja paljon muuta.\n\nKohdemuokkaimen alaosassa on Kaikki tagit -kohta, jossa voi lisätä\nkohteelle mitä tahansa tageja eli ominaisuustietoja. [Taginfosta](http://taginfo.openstreetmap.org/)\nlöytää lisätietoja erilaisista tageista ja niiden käyttömahdollisuuksista.\n\nKohdemuokkaimella tehtävät muutokset päivittyvät muokkauskartalle.\nreaaliaikaisesti. Muutoksen voi kuitenkin aina perua napsauttamalla\nKumoa-painiketta.\n", + "buildings": "# Rakennukset\n\nOpenStreetMap sisältää maailman laajimman rakennustietokannan.\nVoit osallistua tämän tietokannan luomiseen ja kehittämiseen.\n\n### Valitseminen\n\nValitse rakennus napsauttamalla sen seinää. Rakennus korostuu,\nrakennuksen viereen tulee pikatoiminto palkki ja rakennuksen\nmuokkausnäkymä avautuu.\n\n### Muokkaaminen\n\nJoskus rakennukset ovat väärin sijoitettuja tai niiden tiedot ovat virheellisiä.\n\nSiirrä rakennusta valitsemalla se ja napsauttamalla Muokkaa. Liikuta\nrakennusta hiirellä ja aseta se uudelle paikalleen napsauttamalla.\n\nMuuta rakennuksen muotoa napsauttamalla ja vetämällä\nsen rajojen pisteitä oikeille kohdille.\n\n### Piirtäminen\n\nYksi yleisimmistä rakennusten piirtämiseen liittyvistä kysymyksistä on se,\nettä OpenStreetMapissa rakennus voidaan piirtää tai merkitä vain pisteellä.\nNyrkkisääntö on, että rakennusten ulkomuodot tulisi aina pyrkiä piirtämään\nmahdollisimman tarkasti ja sijoittaa mahdolliset sisällä toimivat yritykset paikkapisteinä sen sisään.\n\nAloita rakennuksen piirtäminen napsauttamalla yläpalkista Alue.\nPeruuta piirtäminen painamalla näppäimistön askelpalautinta.\nViimeistele rakennus sulkemalla se napsauttamalla lähtöpistettä uudelleen.\n\n### Poistaminen\n\nJos rakennus on täysin virheellinen - se esimerkiksi puuttuu satelliittikuvasta\nkokonaan tai se ei varmasti ole enää olemassa - se tulee poistaa\nkartalta. Mieti tarkkaan ennen karttakohteiden poistamispäätöstä -\nmuutos näkyy kartalla kaikille ja lisäksi satelliittikuvat ovat usein\nvanhentuneita, joten rakennus on jo voitu ehtiä rakentaa uudelleen.\n\nPoista rakennus valitsemalla se ja napsauttamalla sitten roskakorin\nkuvaketta tai napsauttamalla näppäimistön Delete-näppäintä.\n" }, "intro": { "navigation": { @@ -344,7 +352,7 @@ "search": "Pisteillä voidaan esittää monia erilaisia ominaisuuksia. Lisäämäsi piste on Kahvila. **Hae '{name}'**", "choose": "**Valitse Kahvila listalta.**", "describe": "Paikkapiste on nyt merkitty kahvilaksi. Lisää paikkapistelle lisätietoja muokkausnäkymässä. **Lisää paikan nimi**", - "close": "Muokkausnäkymä suljetaan napsauttamalla Sulje-painiketta. **Sulje muokkausnäkymä**", + "close": "Muokkausnäkymä suljetaan napsauttamalla rastia oikeasta yläkulmasta. **Sulje muokkausnäkymä**", "reselect": "Useimmat paikat on jo merkitty kartalle, mutta niiden tiedoissa voi olla puutteita. Niitä voidaan lisätä jälkikäteen. **Valitse äsken luotu karttapiste.**", "fixname": "**Vaihda paikkapisteen nimi ja sulje muokkausnäkymä.**", "reselect_delete": "Kaikki karttakohteet voidaan poistaa. **Napsauta äsken luotua karttapistettä.**", @@ -361,14 +369,15 @@ }, "lines": { "title": "Viivat", - "add": "Viivoja käytetään esittämään sellaisia ominaisuuksia kuin tiet, rautatiet ja joet. **Napsauta Line-painiketta uuden viivan lisäämiseksi.**", + "add": "Viivoja käytetään muun muassa teiden, jokien ja rautateiden piirtämiseen. **Lisää uusi viiva napsauttamalla Viiva.**", "start": "**Aloita viiva napsauttamalla tien loppupistettä.**", "intersect": "Lisää pisteitä viivaan napsauttamalla karttaa. Karttaa voi liikuttaa vetämällä viivan piirtämisen aikana. Tiet ja monet muutkin viivat ovat osa isompaa kokonaisuutta. Reitityksen takia on tärkeää, että tiet on yhdistetty toisiinsa oikein. **Luo kahden kadun risteys napsauttamalla Flower Streetiä.**", "finish": "Viimeistele viiva kaksoisnapsauttamalla viimeisen viivapisteen kohdalla. **Lopeta viivan piirtäminen.**", "road": "**Valitse Tie listalta.**", "residential": "Tiet luokitellaan niiden suuruden mukaan eri ryhmiin, yleisin niistä on asuinaluetie. **Valitse tietyypiksi Asuinaluetie**", "describe": "**Nimeä tie ja sulje muokkausnäkymä.**", - "restart": "Tee kadulle risteys Flower Streetin kanssa." + "restart": "Tee kadulle risteys Flower Streetin kanssa.", + "wrong_preset": "Et valinnut Asuinkatu-tietyyppiä. **Kokeile uudelleen napsauttamalla tätä**" }, "startediting": { "title": "Aloita kartanmuokkaus!", @@ -452,6 +461,9 @@ "postcode": "Postinumero" } }, + "admin_level": { + "label": "Hallinnointitaso" + }, "aerialway": { "label": "Tyyppi" }, @@ -459,20 +471,26 @@ "label": "Käyttöoikeus" }, "aerialway/bubble": { - "label": "kupla" + "label": "Tuulisuoja" }, "aerialway/capacity": { - "label": "Kapasiteetti (per tunti)", + "label": "Tuntikapasiteetti", "placeholder": "500, 2500, 5000..." }, "aerialway/duration": { "label": "Kesto (minuuttia)", "placeholder": "1, 2, 3..." }, + "aerialway/heating": { + "label": "Lämmitys" + }, "aerialway/occupancy": { - "label": "asuminen", + "label": "Vaunun matkustajamäärä", "placeholder": "2, 4, 8..." }, + "aerialway/summer/access": { + "label": "Käyttöoikeus kesällä" + }, "aeroway": { "label": "Tyyppi" }, @@ -506,6 +524,9 @@ "building_area": { "label": "Rakennus" }, + "cans": { + "label": "Tölkinkeräys" + }, "capacity": { "label": "Paikkamäärä", "placeholder": "50, 100, 200..." @@ -520,6 +541,9 @@ "anticlockwise": "Vastapäivään" } }, + "clothes": { + "label": "Vaatekeräys" + }, "collection_times": { "label": "Tyhjennysaika" }, @@ -529,6 +553,9 @@ "country": { "label": "Maa" }, + "covered": { + "label": "Katos" + }, "crossing": { "label": "Tyyppi" }, @@ -538,12 +565,18 @@ "denomination": { "label": "Suuntaus" }, + "denotation": { + "label": "Esittäminen" + }, "description": { "label": "Kuvaus" }, "elevation": { "label": "Korkeus" }, + "emergency": { + "label": "Kiireellinen" + }, "entrance": { "label": "Tyyppi" }, @@ -554,12 +587,27 @@ "fee": { "label": "Hinta" }, + "fire_hydrant/type": { + "label": "Tyyppi" + }, "fixme": { "label": "Korjaa minut" }, "gauge": { "label": "Raideväli" }, + "generator/method": { + "label": "Metodi" + }, + "generator/source": { + "label": "Lähde" + }, + "generator/type": { + "label": "Tyyppi" + }, + "glass": { + "label": "Lasinkeräys" + }, "highway": { "label": "Tyyppi" }, @@ -572,6 +620,9 @@ "icao": { "label": "ICAO" }, + "incline": { + "label": "Kaltevuus" + }, "internet_access": { "label": "Internet-yhteys", "options": { @@ -638,6 +689,12 @@ "operator": { "label": "Toimija" }, + "paper": { + "label": "Paperinkeräys" + }, + "park_ride": { + "label": "Autoparkki" + }, "parking": { "label": "Tyyppi" }, @@ -646,10 +703,10 @@ "placeholder": "+358 40 123 4567" }, "piste/difficulty": { - "label": "haastavuus" + "label": "Haastavuus" }, "piste/grooming": { - "label": "siistiytyminen" + "label": "Latupohjan soveltuvuus" }, "piste/type": { "label": "Tyyppi" @@ -691,7 +748,7 @@ "label": "Tyyppi" }, "sac_scale": { - "label": "Polun haastavuus" + "label": "Haastavuus" }, "service": { "label": "Tyyppi" @@ -737,7 +794,7 @@ "label": "Tyyppi" }, "trail_visibility": { - "label": "Polun näkyvyys" + "label": "Näkyvyys" }, "tunnel": { "label": "Tunneli" @@ -767,37 +824,38 @@ }, "presets": { "address": { - "name": "Osoite" + "name": "Osoite", + "terms": "asuinpaikka, viittauskohde" }, "aerialway": { - "name": "ilmarata" + "name": "Ilmarata" }, "aerialway/cable_car": { "name": "köysirata" }, "aerialway/chair_lift": { - "name": "tuolihissi" + "name": "Tuolihissi" }, "aerialway/gondola": { - "name": "gondolivaunu" + "name": "Gondolihissi" }, "aerialway/magic_carpet": { - "name": "taikamattohissi" + "name": "Mattohissi" }, "aerialway/platter": { - "name": "Köysihinaushissi" + "name": "Sompahissi" }, "aerialway/pylon": { "name": "ilmaradan pylväs" }, "aerialway/rope_tow": { - "name": "hinaushiihtohissi" + "name": "Naruhissi" }, "aerialway/station": { "name": "Ilmarata-asema" }, "aerialway/t-bar": { - "name": "hiihtohissi" + "name": "Ankkurihissi" }, "aeroway": { "name": "Kiitorata", @@ -836,7 +894,8 @@ "terms": "lentoterminaali, lentokenttäterminaali, lentoasematerminaali, terminaali, lentokenttä, lentoasema" }, "amenity": { - "name": "Palvelu" + "name": "Palvelu", + "terms": "mukavuus,mielyttävyys,palvelu" }, "amenity/arts_centre": { "name": "Taidekeskus" @@ -876,7 +935,7 @@ "terms": "autovuokraamo, autonvuokraus, auton vuokraus, auto, vuokra-auto" }, "amenity/car_sharing": { - "name": "KImppakyyti" + "name": "Kimppakyyti" }, "amenity/car_wash": { "name": "Autopesula", @@ -891,7 +950,8 @@ "terms": "leffa, leffateatteri, elokuva, elokuvateatteri" }, "amenity/clinic": { - "name": "klinikka" + "name": "Klinikka", + "terms": "lääkäriasema, lääkärikeskus, klinikka" }, "amenity/clock": { "name": "Kello" @@ -949,6 +1009,10 @@ "amenity/marketplace": { "name": "Tori" }, + "amenity/parking": { + "name": "Autopysäköinti", + "terms": "auto, parkki, parkkihalli, pysäköintialue, pysäköinti, parkki, parkkipaikka, pysäköintialue, parkkialue" + }, "amenity/pharmacy": { "name": "Apteekki", "terms": "apteekki, lääke, lääkkeet, lääkemyymälä, lääkkeenmyynti, farmasia, farmaseutti" @@ -982,6 +1046,10 @@ "amenity/pub": { "name": "Pubi" }, + "amenity/recycling": { + "name": "Kierrätyspiste", + "terms": "kierrättäminen, kierrätys, lajittelu, uudelleenkäyttö, uudelleenkäyttäminen, ympäristö, lajittelupiste, lajitteluasema, jäte, jätteet, roskat, roska, roskikset, roskis, säiliö, roskasäiliö" + }, "amenity/restaurant": { "name": "Ravintola" }, @@ -1018,7 +1086,7 @@ "terms": "yliopisto, korkeakoulu, college, ammattikorkeakoulu, amk" }, "amenity/veterinary": { - "name": "eläinlääkäri" + "name": "Eläinlääkäri" }, "amenity/waste_basket": { "name": "Roskakori", @@ -1112,10 +1180,11 @@ "name": "Asuinrakennus" }, "craft/basket_maker": { - "name": "korintekijä" + "name": "Koripaja", + "terms": "kori, paju, pajukori, korivalmistaja, koripaja" }, "craft/beekeeper": { - "name": "mehiläistarhuri" + "name": "Mehiläistarha" }, "craft/blacksmith": { "name": "seppä" @@ -1124,52 +1193,55 @@ "name": "veneentekijä" }, "craft/bookbinder": { - "name": "kirjansitoja" + "name": "Kirjansitomo" }, "craft/brewery": { "name": "panimo" }, "craft/carpenter": { - "name": "kirvesmies" + "name": "Puuseppä" }, "craft/carpet_layer": { "name": "matontekijä" }, "craft/caterer": { - "name": "pitopalvelu" + "name": "Pitopalvelu" }, "craft/clockmaker": { - "name": "kelloseppä" + "name": "Kelloseppä" }, "craft/confectionary": { - "name": "konditori" + "name": "Konditoria" }, "craft/dressmaker": { "name": "ompelija" }, "craft/electrician": { - "name": "sähköasentaja" + "name": "Sähköasentaja" }, "craft/gardener": { "name": "puutarhuri" }, "craft/glaziery": { - "name": "lasittaja" + "name": "Lasinpuhallus" }, "craft/handicraft": { - "name": "käsityö" + "name": "Käsityöt", + "terms": "käsityö, käsityöläinen" }, "craft/hvac": { "name": "LVI" }, "craft/insulator": { - "name": "eriste" + "name": "Eristeliike", + "terms": "eriste, eristeet, eristesuunnittelija, eristesuunnittelu, eristeliike" }, "craft/jeweler": { "name": "kultaseppä" }, "craft/key_cutter": { - "name": "avaimentekijä" + "name": "Lukkoseppä", + "terms": "avain, lukko, avaimet, lukot, lukkoseppä, lukkoliike, avainliike, avainseppä" }, "craft/locksmith": { "name": "lukkoseppä" @@ -1180,14 +1252,11 @@ "craft/optician": { "name": "optikko" }, - "craft/painter": { - "name": "maalari" - }, "craft/photographer": { "name": "valokuvaaja" }, "craft/photographic_labratory": { - "name": "valokuvauslaboratorio" + "name": "Valokuvakehittämö" }, "craft/plasterer": { "name": "rappaaja" @@ -1202,7 +1271,7 @@ "name": "nosturi" }, "craft/roofer": { - "name": "katontekijä" + "name": "Kattoseppä" }, "craft/saddler": { "name": "satulaseppä" @@ -1211,22 +1280,23 @@ "name": "purjeentekijä" }, "craft/sawmill": { - "name": "saha" + "name": "Saha", + "terms": "saha, sahaamo, lauta, puu" }, "craft/scaffolder": { "name": "rakennustelineasentaja" }, "craft/sculpter": { - "name": "kuvanveistäjä" + "name": "Kuvanveistämö" }, "craft/shoemaker": { "name": "suutari" }, "craft/stonemason": { - "name": "kivenhakkaaja" + "name": "Kivenhakkaamo" }, "craft/sweep": { - "name": "nuohooja" + "name": "Nuohooja" }, "craft/tailor": { "name": "räätäli" @@ -1235,13 +1305,14 @@ "name": "laatoittaja" }, "craft/tinsmith": { - "name": "tinaseppä" + "name": "Peltiseppä" }, "craft/upholsterer": { - "name": "verhoilija" + "name": "Verhoiluliike", + "terms": "verhoilija, kangasverhoilu, verhoilu, kangasverhoilija, kangas, kankaat, ompelu, ompelija" }, "craft/watchmaker": { - "name": "kelloseppä" + "name": "Rannekelloseppä" }, "emergency/ambulance_station": { "name": "Ambulanssiasema", @@ -1258,20 +1329,40 @@ "entrance": { "name": "Sisäänkäynti" }, + "footway/crossing": { + "name": "Suojatieväylä" + }, + "footway/sidewalk": { + "name": "Jalkakäytävä" + }, + "golf/bunker": { + "name": "Hiekkaeste", + "terms": "bunker, bunkkeri, hiekkabunkkeri, hiekkakuoppa, golf" + }, + "golf/fairway": { + "name": "Golf-väylä", + "terms": "golf-väylä, väylä, peliväylä, golf" + }, + "golf/green": { + "name": "Viheriö", + "terms": "puttigreeni, puttigriini, viheriöalue, golf, maali, maalipaikka, golf-reikä, puttausalue, putti" + }, "golf/hole": { "name": "golf-reikä" }, "golf/lateral_water_hazard": { - "name": "sivusuuntainen vesieste" + "name": "Sivuvesieste" }, "golf/rough": { - "name": "karheikko" + "name": "Karheikko", + "terms": "karheikko, raffi, golf" }, "golf/tee": { - "name": "tiiauspaikka" + "name": "Tiiauspaikka", + "terms": "tiiauspaikka, golf, lyöntipaikka, lähtöalue, lyöntialue, tiiausalue" }, "golf/water_hazard": { - "name": "vesieste" + "name": "Vesieste" }, "highway": { "name": "Tie" @@ -1519,6 +1610,9 @@ "leisure/swimming_pool": { "name": "Uima-allas" }, + "leisure/track": { + "name": "Kilparata" + }, "line": { "name": "Viiva" }, @@ -1534,6 +1628,10 @@ "man_made/lighthouse": { "name": "Majakka" }, + "man_made/observation": { + "name": "Näkötorni", + "terms": "observatorio, näköalatasanne, näköala, maisema, maisematorni" + }, "man_made/pier": { "name": "Laituri" }, @@ -1615,8 +1713,24 @@ "office": { "name": "Toimisto" }, + "office/it": { + "name": "Tietotekniikkatoimisto", + "terms": "tietotalo, tietotekniikka, teknologia, tietoteknologia, IT-talo, IT-teknologia, IT-tekniikka, teknologiatalo" + }, + "office/lawyer": { + "name": "Lakitoimisto", + "terms": "asianajotoimisto, asianajajatoimisto, asianajo, asianajaja, lakimies, juristi, toimisto, lakiasia, lakiasiaintoimisto" + }, + "office/ngo": { + "name": "Kansalaisjärjestö", + "terms": "kansalaisjärjestö, järjestö, kansanliike, kansanjärjestö, kansalaisjärjestötoimisto, toimisto" + }, + "office/political_party": { + "name": "Puoluetoimisto", + "terms": "politiikka, politiikko, poliittinen, puolue, hallinto, toimisto" + }, "piste": { - "name": "rinne/hiihtoreitti" + "name": "Laskettelurinne/hiihtolatu" }, "place": { "name": "Paikka" @@ -1631,6 +1745,9 @@ "place/island": { "name": "Saari" }, + "place/isolated_dwelling": { + "name": "Yksittäinen asunto" + }, "place/locality": { "name": "Paikkakunta" }, @@ -1776,6 +1893,9 @@ "shop/electronics": { "name": "Elektroniikkamyymälä" }, + "shop/farm": { + "name": "Tuota messuosasto" + }, "shop/fishmonger": { "name": "Kalakauppias" }, @@ -1792,11 +1912,12 @@ "name": "Lahjamyymälä" }, "shop/greengrocer": { - "name": "Vihanneskauppias" + "name": "Kasviskauppa", + "terms": "vihanneskauppias, vihannes, vihannekset, juures, juurekset, hedelmä, hedelmät, marja, marjat, kasvis, kasvikset" }, "shop/hairdresser": { "name": "Parturi-kampaamo", - "terms": "parturi, kampaaja, parturi-kampaamo, hiustenleikkuu, hiukset, hiusliike, hiusmyymälä, hiustenvärjäys, parranajo, parta" + "terms": "parturi, kampaaja, kampaamo, parturi-kampaamo, hiustenleikkuu, hiukset, hiusliike, hiusmyymälä, hiustenvärjäys, parranajo, parta" }, "shop/hardware": { "name": "Rautakauppa" @@ -1929,6 +2050,9 @@ "type/boundary/administrative": { "name": "Hallinnollinen raja" }, + "type/multipolygon": { + "name": "Monikulmiot" + }, "type/restriction": { "name": "Rajoitus" }, diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json index 33f8fcac9..f78780555 100644 --- a/vendor/assets/iD/iD/locales/fr.json +++ b/vendor/assets/iD/iD/locales/fr.json @@ -332,7 +332,7 @@ }, "help": { "title": "Aide", - "help": "#Aide\n\n Ceci est un éditeur pour [OpenStreetMap](http://www.openstreetmap.org/), la carte du\n monde gratuite et éditable. Vous pouvez l'utiliser pour ajouter ou corriger les données\n dans votre zone, et participer ainsi à la réalisation d'une carte du monde libre de droits.\n\n Les modifications que vous réaliserez seront visibles par tout le monde. Pour commencer\n à éditer, vous devez créer un [compte gratuit sur OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n [iD editor](http://ideditor.com/) est un projet collaboratif dont le [code source est\n disponible sur GitHub](https://github.com/systemed/iD).\n", + "help": "#Aide\n\n Ceci est un éditeur pour [OpenStreetMap](http://www.openstreetmap.org/), la carte du\n monde gratuite et éditable. Vous pouvez l'utiliser pour ajouter ou corriger les données\n dans votre zone, et participer ainsi à la réalisation d'une carte du monde libre de droits.\n\n Les modifications que vous réaliserez seront visibles de tout le monde. Pour commencer\n à éditer, vous devez créer un [compte gratuit sur OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n [iD editor](http://ideditor.com/) est un projet collaboratif dont le [code source est\n disponible sur GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Éditer et sauvegarder⏎\n⏎\nCet éditeur est conçu principalement pour travailler en mode connecté, et vous l'accéder depuis un site Web en ce moment.⏎\n⏎\n### Sélectionner un élément de la carte⏎\n⏎\nPour sélection un élément de la carte, tel qu'une rue ou un point d'intérêt, cliquez sur ce dernier⏎\nsur la carte. Cette action mettra l'élément en surbrillance, et ouvrira le panneau latéral⏎\nqui affiche les propriétés de l'élément. Un menu apparaîtra également sur la carte,⏎\npermettant de poser des actions sur l'élément (telles que le déplacer, repositionner⏎\nses points constituants, etc).\n⏎\nPour sélectionner plusieurs éléments, appuyez sur la touche 'Majuscule'. Puis, cliquez⏎\nun à un sur les éléments à sélectionner. Alternativement, il est possible de dessinez un rectangle⏎\nsur la carte (toujours en appuyant sur 'Majuscule) pour effectuer la sélection multiple.⏎\nles points à sélectionner.⏎\n⏎\n### Enregistrer les modifications⏎\n⏎\nL'éditeur enregistre localement (sur votre ordinateur) toutes les modifications⏎\nque vous effectuez sur les éléments de la carte (les rues, les bâtiments, etc.).⏎\nCes modifications seront envoyées au serveur OpenStreetMap uniquement⏎\nlorsque vous appuierez sur \"Sauvegarder\".⏎\n⏎\nNe vous faites donc pas de souci si vous faites une erreur. Vous pouvez annuler⏎\ntout changement effectué en appuyant sur le bouton d'annulation (la flèche de demi-tour⏎\npointant vers la gauche).⏎\n⏎\nLorsque vous avez terminé un groupe de modifications - par exemple, vous avez⏎\ncomplété une partie de la ville et vous voulez en débuter une nouvelle,⏎\nil suffit d'appuyer sur le bouton \"Sauvegarder\". Vos changements ne seront pas⏎\nenvoyés immédiatement - vous avez l'occasion de réviser le travail effectué⏎\navant de confirmer les changements. ⏎\n⏎\nSi tout semble bon, entrez un commentaire décrivant vos changements⏎\n(par exemple: \"Ajout d'une boulangerie\" ou \"Ajout de commerces du quartier\"),⏎\npuis appuyez à nouveau sur le bouton 'Sauvegarder' (qui, cette fois-ci, apparaîtra\nen bleu dans le panneau latéral). Vos changements seront alors envoyés à⏎\n[OpenStreetMap.org](http://www.openstreetmap.org/), où il seront partagés et rendus⏎\nvisibles à tous les autres utilisateurs.\n⏎\nSi vous ne pouvez pas terminer vos changements en une seule séance, vous pouvez⏎\nfermer la fenêtre de l'éditeur. Vos changements seront enregistrés localement.⏎\nLorsque vous ouvrirez à nouveau l'éditeur, sur le même ordinateur et avec le même⏎\nnavigateur Web, l'éditeur vous proposera de récupérer le travail de la séance précédente.⏎\n", "roads": "# Routes\n\nVous pouvez créer, mettre à jour et supprimer des routes à l'aide de l'éditeur. Il peut s'agir de tous types de routes : chemins, autoroutes, pistes cyclables, et plus encore : toute voie régulièrement fréquentée peut être cartographiée.\n\n### Sélection\n\nCliquez sur une route pour la sélectionner. Elle sera alors surlignée et un menu 'outils' apparaîtra sur la carte, ainsi qu'une barre d'état affichant des informations supplémentaires.\n\n### Modification\n\nIl est fréquent que les routes ne soient pas bien alignées avec l'imagerie satellite ou avec les traces GPS. Vous pouvez ajuster et corriger la position des routes.\n\nCliquez d'abord sur la route à modifier. Elle est alors surlignée et des points de contrôle apparaissent qui permettent de corriger sa position. Pour ajouter des points de contrôle, double-cliquez sur un segment de la route sans nœuds.\n\nSi la route est connectée à une autre, mais que la connexion est incorrecte, vous pouvez déplacer un de ses points de contrôle sur la seconde route pour corriger la connexion. Des routes bien connectées sont essentielles pour la carte et pour fournir de bonnes informations d'itinéraire.\n\nVous pouvez également cliquer sur l'outil 'Déplacer' ou appuyer sur le raccourci `M` pour déplacer l'ensemble de la route en une fois, puis cliquer de nouveau une fois pour sauvegarder le déplacement.\n\n### Suppression\n\nSi une route est complètement fausse - c'est-à-dire qu'elle n'apparaît pas sur l'image satellite, et que dans l'idéal, vous avez confirmé qu'elle n'existe pas sur le terrain - vous pouvez la supprimer, ce qui l'enlèvera de la carte. Faites attention lorsque vous supprimez des éléments : comme n'importe quelle autre modification, le résultat sera visible par tout le monde sur la carte. Les photos aériennes sont souvent dépassées et la route est peut-être tout simplement récente.\n\nPour supprimer une route, sélectionnez-la en cliquant dessus, puis cliquez sur l'icône 'Poubelle' ou appuyez sur la touche 'Suppr'.\n\n### Création\n\nVous avez constaté qu'une route de votre connaissance manque à la carte ? Cliquez sur l'icône 'Ligne' en haut à gauche de l'éditeur ou appuyez sur le raccourci `2` pour dessiner une route. \n\nPour commencer le dessin, cliquez sur l'endroit où commence la route. Si elle commence à l'embranchement d'une autre route, commencez le dessin en cliquant à l'endroit de la connexion.\n\nCliquez ensuite régulièrement le long de la route pour ajouter des points, en utilisant l'imagerie satellite comme référence. Si la route que vous dessinez croise une autre route, connectez les deux en cliquant à l'endroit de l'intersection. Lorsque vous avez terminé le dessin, double-cliquez ou appuyez sur 'Entrée'.\n", "gps": "# GPS⏎\n⏎\nLes traces GPS sont les données les plus fiables pour OpenStreetMap. ⏎\nCet éditeur connaît les traces au format -`.gpx`. Vous pouvez enregistrer ce\ntype de traces avec un grand nombre d'applications pour smartphones\nainsi qu'avec certains GPS de randonnées.⏎\n⏎\nPour plus d'informations sur la manière de relever des traces GPS, vous\npouvez consulter le guide [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).⏎\n⏎\nPour utiliser un relevé GPX, il vous suffit de glisser-déposer le fichier GPX\ndirectement sur la carte. S'il est reconnu, il sera ajouté sur la carte sous\nla forme d'une ligne vert clair. Cliquez sur le menu \"Configuration du fond\nde carte\" à gauche pour activer et désactiver l'affichage de la trace, ou\nencore pour centrer le zoom sur la trace.⏎\n⏎\nLes traces GPX ne sont pas directement enregistrée dans OpenStreetMap.⏎\nLe meilleur moyen de les utiliser est de les prendre comme guide pour ajouter⏎\nvous même des informations sur la carte ou bien en les [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npour les fournir aux autres contributeurs⏎\n", @@ -482,7 +482,8 @@ "label": "Accès" }, "aerialway/capacity": { - "label": "Capacité (par heure)" + "label": "Capacité (par heure)", + "placeholder": "500, 2500, 5000..." }, "aerialway/duration": { "label": "Durée (minutes)", @@ -491,6 +492,10 @@ "aerialway/heating": { "label": "Chauffé" }, + "aerialway/occupancy": { + "label": "Nombre de places", + "placeholder": "2, 4, 8..." + }, "aerialway/summer/access": { "label": "Accès (été)" }, @@ -717,6 +722,9 @@ "piste/difficulty": { "label": "Difficulté" }, + "piste/grooming": { + "label": "Damage" + }, "piste/type": { "label": "Type" }, @@ -787,6 +795,9 @@ "cutting": "Tranchée" } }, + "studio_type": { + "label": "Type" + }, "supervised": { "label": "Supervisé" }, @@ -845,12 +856,37 @@ "name": "Adresse", "terms": "Adresse" }, + "aerialway": { + "name": "Remontée mécanique" + }, "aerialway/cable_car": { "name": "Téléphérique" }, "aerialway/chair_lift": { "name": "Télésiège" }, + "aerialway/gondola": { + "name": "Gondole" + }, + "aerialway/magic_carpet": { + "name": "Bande transporteuse de personnes" + }, + "aerialway/platter": { + "name": "Téléski", + "terms": "Remonte-pente, tire-fesses, téléski à enrouleurs, téléski à perches débrayables" + }, + "aerialway/pylon": { + "name": "Pylône de remontée mécanique" + }, + "aerialway/rope_tow": { + "name": "Télécorde" + }, + "aerialway/station": { + "name": "Gare de remontée mécanique" + }, + "aerialway/t-bar": { + "name": "Téléski bi-place" + }, "aeroway": { "name": "Aviation", "terms": "Piste de décollage, Piste d'atterissage, Piste" @@ -948,7 +984,12 @@ "terms": "Cinéma" }, "amenity/clinic": { - "name": "Clinique" + "name": "Clinique", + "terms": "Clinique" + }, + "amenity/clock": { + "name": "Horloge", + "terms": "Horloge" }, "amenity/college": { "name": "Enseignement supérieur (non universitaire)", @@ -959,10 +1000,12 @@ "terms": "Palais de Justice, Tribunal" }, "amenity/dentist": { - "name": "Dentiste" + "name": "Dentiste", + "terms": "Dentiste" }, "amenity/doctor": { - "name": "Médecin" + "name": "Médecin", + "terms": "Docteur, Médecin" }, "amenity/drinking_water": { "name": "Eau potable", @@ -1072,6 +1115,9 @@ "name": "Abri", "terms": "Abri" }, + "amenity/studio": { + "name": "Studio" + }, "amenity/swimming_pool": { "name": "Piscine", "terms": "Piscine" @@ -1104,6 +1150,10 @@ "name": "Machine distributrice", "terms": "Machine distributrice" }, + "amenity/veterinary": { + "name": "Vétérinaire", + "terms": "Vétérinaire" + }, "amenity/waste_basket": { "name": "Corbeille", "terms": "Corbeille, Poubelle" @@ -1192,6 +1242,15 @@ "name": "Résidence", "terms": "Appartements" }, + "building/cathedral": { + "name": "Cathédrale" + }, + "building/chapel": { + "name": "Chapelle" + }, + "building/church": { + "name": "Église" + }, "building/commercial": { "name": "Bâtiment commercial", "terms": "Bâtiment commercial" @@ -1204,6 +1263,12 @@ "name": "Garage", "terms": "Garage" }, + "building/greenhouse": { + "name": "Serre" + }, + "building/hotel": { + "name": "Hôtel" + }, "building/house": { "name": "Maison", "terms": "Maison" @@ -1216,15 +1281,31 @@ "name": "Bâtiment industriel", "terms": "Bâtiment industriel" }, + "building/public": { + "name": "Établissement public" + }, "building/residential": { "name": "Bâtiment résidentiel", "terms": "Bâtiment résidentiel" }, + "building/school": { + "name": "Bâtiment d'enseignement" + }, + "building/stable": { + "name": "Étable" + }, + "building/train_station": { + "name": "Gare ferroviaire" + }, + "building/university": { + "name": "Université" + }, "craft/blacksmith": { "name": "Forgeron" }, "craft/boatbuilder": { - "name": "Constructeur de bateaux" + "name": "Constructeur de bateaux", + "terms": "Constructeur de bâteaux" }, "craft/bookbinder": { "name": "Relieur" @@ -1248,7 +1329,8 @@ "name": "Couturier" }, "craft/electrician": { - "name": "Electricien" + "name": "Electricien", + "terms": "Électricien" }, "craft/gardener": { "name": "Jardinier" @@ -1266,7 +1348,8 @@ "terms": "chauffage,ventilation,climatisation,chauffagistes" }, "craft/jeweler": { - "name": "Bijoutier" + "name": "Bijoutier", + "terms": "Bijoutier" }, "craft/locksmith": { "name": "Serrurier" @@ -1276,13 +1359,12 @@ "terms": "Construction métallique" }, "craft/optician": { - "name": "Opticien" - }, - "craft/painter": { - "name": "peintre" + "name": "Opticien", + "terms": "Opticien" }, "craft/photographer": { - "name": "Photographe" + "name": "Photographe", + "terms": "Photographe" }, "craft/photographic_labratory": { "name": "Laboratoire Photographique" @@ -1291,7 +1373,8 @@ "name": "Plâtrier" }, "craft/plumber": { - "name": "Plombier" + "name": "Plombier", + "terms": "Plombier" }, "craft/pottery": { "name": "Pottier" @@ -1437,6 +1520,9 @@ "name": "Route résidentielle", "terms": "Route résidentielle" }, + "highway/rest_area": { + "name": "Aire de repos" + }, "highway/road": { "name": "Voie de type inconnu", "terms": "Route inconnue" @@ -1473,6 +1559,10 @@ "name": "Allée de parking", "terms": "Allée de parking, allée de stationnement" }, + "highway/services": { + "name": "Aire de service", + "terms": "Aire de service" + }, "highway/steps": { "name": "Escalier", "terms": "Escalier" @@ -1725,7 +1815,8 @@ "name": "Terre-plein" }, "man_made/flagpole": { - "name": "Porte-drapeau" + "name": "Porte-drapeau", + "terms": "Hampe" }, "man_made/lighthouse": { "name": "Phare", @@ -1894,17 +1985,20 @@ "terms": "Agence immobilière" }, "office/financial": { - "name": "Établissement financier" + "name": "Établissement financier", + "terms": "Bureau financier" }, "office/government": { - "name": "Établissement Public" + "name": "Établissement Public", + "terms": "Bureau du gouvernement" }, "office/insurance": { "name": "Agence d'assurance", "terms": "Agence d'assurance" }, "office/it": { - "name": "Bureau informatique" + "name": "Bureau informatique", + "terms": "Bureau informatique" }, "office/lawyer": { "name": "Cabinet d'avocats", @@ -1942,6 +2036,9 @@ "name": "Agence de voyage", "terms": "Agence de voyage" }, + "piste": { + "name": "Piste de ski" + }, "place": { "name": "Toponymie", "terms": "Lieu" @@ -2028,6 +2125,9 @@ "name": "Voie ferrée désaffectée", "terms": "Voie ferrée non utilisée" }, + "railway/funicular": { + "name": "Funiculaire" + }, "railway/halt": { "name": "Hall de gare", "terms": "Halte ferroviaire" diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json index 13b562724..a0afa93b3 100644 --- a/vendor/assets/iD/iD/locales/hr.json +++ b/vendor/assets/iD/iD/locales/hr.json @@ -134,7 +134,8 @@ "annotation": "Spojeno {n} linija.", "not_eligible": "Ova svojstva se ne mogu spojiti.", "not_adjacent": "Ove se linije ne mogu stopiti u jednu jer nisu spojene.", - "restriction": "Ove se linije ne mogu spojiti jer je barem jedna član \"{relation}\" relacije." + "restriction": "Ove se linije ne mogu spojiti jer je barem jedna član \"{relation}\" relacije.", + "incomplete_relation": "Ove se značajke ne mogu spojiti jer bar jedna od njih nije potpuno preuzeta s Interneta." }, "move": { "title": "Premjesti", @@ -332,7 +333,7 @@ }, "help": { "title": "Pomoć", - "help": "# Pomoć\n\niD je program za uređivanje [OpenStreetMap](http://www.openstreetmap.org/), besplatne karte svijeta. \nMožeš ga koristiti za dodavanje i obnavljanje podataka u svom području,\nčime stvaraš bolju kartu svijeta otvorenog koda i podataka dostupnu\nsvima.\n\nKorekcije koje napraviš na karti će biti vidljive svakome tko koristi\nOpenStreetMap. Da bi mogao/la uređivati kartu, trebaš [besplatni\nOpenStreetMap korisnički račun](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je suradnički projekt sa [izvornim kôdom dostupnim na GitHub-u](https://github.com/systemed/iD).\n", + "help": "# Pomoć\n\niD je program za uređivanje [OpenStreetMap](http://www.openstreetmap.org/), \nbesplatne karte svijeta. Možeš ga koristiti za dodavanje i obnavljanje podataka u \nsvom području, čime stvaraš bolju kartu svijeta slobodnih izvornika i podataka \ndostupnu svima.\n\nKorekcije koje napraviš na karti će biti vidljive svakome tko koristi\nOpenStreetMap. Da bi mogao/la uređivati kartu, trebaš [besplatni\nOpenStreetMap korisnički račun](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je suradnički projekt sa [izvornim kôdom dostupnim \nna GitHub-u](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Uređivanje i spremanje promjena\n\nOvaj uređivač je primarno dizajniran za uređivanje na mreži i trenutačno ga\nkoristiš kroz internet preglednik kao web stranicu.\n\n### Odabir značajki\n\nZa odabir značajke karte, npr. ceste ili točke od interesa, klikni na nju na karti.\nPojaviti će se obrub oko značajke, otvoriti će se bočno okno koje prikazuje više\ndetalja o značajki i prikazati će se alatni izbornik sa mogućnostima koje možeš\nnapraviti na značajki.\n\nZa odabir nekoliko značajki istovremeno, drži tipku \"Shift\". Zatim ili klikni na\nznačajke koje želiš odabrati ili klikni i povuci za crtanje četverokuta. Time ćeš\nodabrati sve točke unutar četverokuta.\n\n### Spremanje uređivanja\n\nKada napraviš promjene na karti, npr. urediš ulice, zgrade i mjesta, one su\nspremljene lokalno sve dok ih ne spremiš na server. Nemoraš se briniti ukoliko\nnapraviš pogrešku - možeš poništiti promjene klikom na tipku \"Opovrgni\" i\nponoviti promjene klikom na tipku \"Ponovi\".\n\nKlikni na tipku \"Spremi\" da završiš grupu promjena - na primjer ako si završio/la\npodručje grada i želiš početi uređivati novo područje. Nakon što stisneš \"Spremi\"\nmoći ćeš pregledati sve promjene koje si napravio/la i uređivač će ti dati korisne\nprijedloge i upozorenja ako je nešto neuobičajeno među promjenama.\n\nAko je sve u redu, možeš ostaviti kratak komentar u kojem ćeš opisati napravljenu\npromjenu na karti. Ponovno klikni \"Spremi\" za postavljanje promjena na\n[OpenStreetMap.org](http://www.openstreetmap.org/), gdje će biti vidljive svim\ndrugim korisnicima i dostupne drugima za dopunu i nadogradnju.\n\nAko ne možeš završiti sve planirane promjene odjednom, možeš ugasiti prozor\nuređivača i kasnije se vratiti (na isti internet preglednik i isto računalo) i uređivač\nće ti ponuditi da nastaviš gdje si stao/la. \n", "roads": "# Ceste\n\nMožeš stvarati, popraviti/urediti i obrisati ceste pomoću ovog uređivača. Ceste\nmogu biti svih vrsta: puteljci, ceste, poljski putovi, biciklističke staze i drugo -\nsve staze preko kojih se često prolazi bi se trebale kartirati.\n\n### Odabir\n\nKlikni na cestu da ju odabereš. Pojaviti će se obrub oko ceste, zajedno s\nmalim alatnim izbornikom na karti i bočnim oknom koji prikazuje dodatne\ninformacije o selektiranoj cesti.\n\n### Uređivanje\n\nČesto ćeš vidjeti ceste koje se ne podudaraju s pozadinskim snimcima ili s\nGNSS tragom. Možeš urediti te ceste tako da se nalaze na ispravnom mjestu.\n\nPrvo klikni na cestu koju želiš urediti. To će ju označiti i prikazati kontrolne\ntočke unutar nje koje možeš premjestiti na točnije lokacije. Ako želiš dodati\nnove kontrolne točke za precizniju putanju, klikni dvoklikom na dio ceste gdje\nnema točke kako bi dodao/la novu.\n\nAko se cesta spaja s drugom cestom, ali nije ispravno spojena na karti, možeš\npovući kontrolnu točku na drugu cestu kako bi ih spojio/la. Spojene ceste su\nvrlo važne za kartu i osnova za omogućavanje uputa za navigaciju.\n\nTakođer možeš kliknuti alat \"Premjesti\" ili pritisnuti kraticu - tipku `M` za\npomak cijele ceste odjednom i zatim kliknuti ponovno za spremanje tog\npomaka.\n\n### Brisanje\n\nAko je cesta potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i ako\nsi utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će ju\nobrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je cesta nedavno sagrađena.\n\nZa brisanje ceste najprije ju označi, a zatim klikni na ikonicu kante za smeće ili\npritisni tipku \"Delete\".\n\n### Stvaranje\n\nAko si pronašao/la cestu koja bi trebala biti ucrtana ali nije, klikni ikonicu\n\"Linija\" na gornjem lijevom dijelu uređivača ili pritisni kraticu - tipku `2` da\nzapočneš crtanje linije.\n\nKlikni na početak ceste na karti da započneš crtanje. Ako se cesta odvaja od\npostojeće ceste, klikni na mjesto gdje se spajaju.\n\nZatim klikni na točke duž ceste tako da prate ispravnu putanju ceste, prema\npodacima satelitske snimke ili GNSS traga. Ako se cesta koju crtaš križa s\ndrugom cestom, spoji ih klikom na mjestu raskrižja. Kada si završio/la s\ncrtanjem, klikni dvoklikom sastrane ili pritisni tipku \"Return\" ili \"Enter\" na\ntipkovnici.\n", "gps": "# GNSS\n\nGNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke sa tvog računala.\nTakav oblik GNSS traga možeš prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa više informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeš također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n", @@ -366,7 +367,7 @@ "areas": { "title": "Područja", "add": "Područja su detaljniji način za prikaz značajki. Omogućavaju informacije na granicama značajke. Područja se mogu koristiti za većinu značajki i često su preferirana. **Klikni na gumb Područje za dodavanje novog područja.**", - "corner": "Područja se crtaju postavljanjem točaka koje označavaju granicu područja. **Postavi početnu točku na jedan od ćoškova igrališta.**", + "corner": "Područja se crtaju postavljanjem točaka koje označavaju granicu područja. **Postavi početnu točku na jedan rub igrališta.**", "place": "Nacrtaj područje dodavanjem više točaka. Završi područje tako da klikneš na početnu točku. **Nacrtaj područje igrališta.**", "search": "**Pretraži za '{name}'.**", "choose": "**Odaberi igralište sa liste.**", @@ -378,8 +379,8 @@ "start": "**Započni liniju tako da klikneš na kraj ceste.**", "intersect": "Klikni za dodavanje više točaka na liniju. Možeš pomicati pogled na kartu dok crtaš ako je potrebno. Ceste i mnoge druge vrste linija su dio veće mreže. Važno je da su sve linije pravilno spojene kako bi softveri za određivanje rute ispravno funkcionirali. **Klikni na Flower Street za stvaranje raskrižja povezujući dvije linije.**", "finish": "Linije se mogu završiti tako da ponovno kliknete na posljednju točku. **Završi crtanje ceste.**", - "road": "**Odaberi cestu sa liste.**", - "residential": "Postoje različite vrste cesta, najčešća je Gradska cesta. **Odaberi tip Gradska cesta**", + "road": "**Odaberi Prometnica sa liste.**", + "residential": "Postoje različite vrste cesta, najčešća je Ulica. **Odaberi tip Ulica**", "describe": "**Dodaj naziv ceste i zatvori uređivač svojstava.**", "restart": "Cesta treba presijecati Flower Street.", "wrong_preset": "Nisi označio/la cestu koja predstavlja ulicu. **Klikni ovdje za ponovni odabir**" @@ -393,6 +394,12 @@ }, "presets": { "categories": { + "category-building": { + "name": "Građevina" + }, + "category-golf": { + "name": "Golf" + }, "category-landuse": { "name": "Uporaba zemlje" }, @@ -407,6 +414,12 @@ }, "category-route": { "name": "Ruta" + }, + "category-water-area": { + "name": "Voda" + }, + "category-water-line": { + "name": "Voda" } }, "fields": { @@ -447,6 +460,9 @@ } } }, + "access_simple": { + "label": "Pristup" + }, "address": { "label": "Adresa", "placeholders": { @@ -460,6 +476,21 @@ "admin_level": { "label": "Administratorsko područje" }, + "aerialway/access": { + "label": "Pristup" + }, + "aerialway/capacity": { + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "placeholder": "1, 2, 3..." + }, + "aerialway/heating": { + "label": "Grijano" + }, + "aerialway/occupancy": { + "placeholder": "2, 4, 8..." + }, "aeroway": { "label": "Vrsta" }, @@ -562,6 +593,9 @@ "generator/type": { "label": "Vrsta" }, + "handicap": { + "placeholder": "1-18" + }, "highway": { "label": "Vrsta" }, @@ -643,6 +677,9 @@ "operator": { "label": "Operator" }, + "par": { + "placeholder": "3, 4, 5..." + }, "park_ride": { "label": "Parkiraj i idi javnim prijevozom" }, @@ -653,6 +690,12 @@ "label": "Telefon", "placeholder": "+385 01 123 4567" }, + "piste/difficulty": { + "label": "Težina" + }, + "piste/type": { + "label": "Vrsta" + }, "place": { "label": "Vrsta" }, @@ -865,6 +908,12 @@ "name": "Kino", "terms": "dvorana za gledanje filmova,kinematograf,kino dvorana" }, + "amenity/clinic": { + "name": "Klinika" + }, + "amenity/clock": { + "name": "Sat" + }, "amenity/college": { "name": "Fakultet", "terms": "koledž,fakultet,veleučilište,visoko učilište" @@ -873,6 +922,12 @@ "name": "Zgrada suda", "terms": "sudnica" }, + "amenity/dentist": { + "name": "Zubar" + }, + "amenity/doctor": { + "name": "Doktor" + }, "amenity/drinking_water": { "name": "Pitka voda", "terms": "voda za piće,pitka voda,pipa,fontana,slavina" @@ -973,6 +1028,9 @@ "name": "Škola", "terms": "škola,gimnazija" }, + "amenity/shelter": { + "name": "Sklonište" + }, "amenity/swimming_pool": { "name": "Sportski bazen", "terms": "bazen" @@ -1005,6 +1063,9 @@ "name": "Automat za prodaju", "terms": "aparat za prodaju sokova,aparat za prodaju slatkiša,aparat za prodaju,aparat za kupovinu,prodajni aparat,automat za prodaju,automat za kupovinu,prodajni automat,automat za kavu" }, + "amenity/veterinary": { + "name": "Veterinar" + }, "amenity/waste_basket": { "name": "Kanta za smeće", "terms": "smeće,koš za smeće,kanta za smeće" @@ -1037,7 +1098,8 @@ "terms": "jarak,rov,prokop,šanac,jama,kanal" }, "barrier/entrance": { - "name": "Ulaz" + "name": "Ulaz", + "terms": "ulaz " }, "barrier/fence": { "name": "Ograda", @@ -1099,6 +1161,48 @@ "building/residential": { "name": "Stambena zgrada" }, + "craft/beekeeper": { + "name": "Pčelar" + }, + "craft/blacksmith": { + "name": "Kovač" + }, + "craft/boatbuilder": { + "name": "Brodograditelj" + }, + "craft/carpenter": { + "name": "Stolar" + }, + "craft/electrician": { + "name": "Električar" + }, + "craft/gardener": { + "name": "Vrtlar" + }, + "craft/locksmith": { + "name": "Bravar" + }, + "craft/optician": { + "name": "Optičar" + }, + "craft/photographer": { + "name": "Fotograf" + }, + "craft/plumber": { + "name": "Vodoinstalater" + }, + "craft/roofer": { + "name": "Krovopokrivač" + }, + "craft/sawmill": { + "name": "Pilana" + }, + "craft/shoemaker": { + "name": "Obućar" + }, + "craft/tailor": { + "name": "Krojač" + }, "emergency/ambulance_station": { "name": "Garaža hitne pomoći", "terms": "garaža hitne pomoći,stanica hitne pomoći,stanica za hitnu pomoć,hitna pomoć" @@ -1113,6 +1217,9 @@ "entrance": { "name": "Ulaz" }, + "golf/rough": { + "name": "Grubo" + }, "highway": { "name": "Prometnica" }, @@ -1164,6 +1271,9 @@ "highway/residential": { "name": "Ulica" }, + "highway/rest_area": { + "name": "Odmorište" + }, "highway/road": { "name": "Nepoznata cesta" }, @@ -1430,6 +1540,12 @@ "name": "Vodocrpilište", "terms": "vodocrpilište,vodovod,vodovodna instalacija,vađenje pitke vode" }, + "military/barracks": { + "name": "Vojarna" + }, + "military/bunker": { + "name": "Bunker" + }, "natural": { "name": "Prirodne značajke", "terms": "prirodno,prirodne značajke,prirodan,prirodni,prirodno,šuma,močvara,drvored,drvo,krš,blato,pijesak,livada,pašnjak" @@ -1513,6 +1629,18 @@ "office": { "name": "Ured" }, + "office/accountant": { + "name": "Računovođa" + }, + "office/architect": { + "name": "Arhitekt" + }, + "office/ngo": { + "name": "Nevladina organizacija" + }, + "office/travel_agent": { + "name": "Putnička agencija" + }, "place": { "name": "Mjesto", "terms": "mjesto,naseljeno mjesto" @@ -1601,6 +1729,9 @@ "name": "Jednotračna željeznička pruga", "terms": "monorail željeznička pruga,pruga sa jednim kolosjekom" }, + "railway/narrow_gauge": { + "name": "Uskotračna željeznica" + }, "railway/platform": { "name": "Željeznički peron", "terms": "željeznički peron,peron,platforma,željeznička platforma" diff --git a/vendor/assets/iD/iD/locales/hu.json b/vendor/assets/iD/iD/locales/hu.json index 8205bb9c4..6ba8a3d46 100644 --- a/vendor/assets/iD/iD/locales/hu.json +++ b/vendor/assets/iD/iD/locales/hu.json @@ -252,7 +252,11 @@ "incomplete": "", "feature_list": "Elem keresése", "edit": "Elem szerkesztése", - "none": "Nincs" + "none": "Nincs", + "node": "Csomópont", + "way": "Út", + "relation": "Kapcsolat", + "location": "Pozíció" }, "background": { "title": "Háttér", @@ -328,9 +332,13 @@ }, "help": { "title": "Súgó", - "help": "# Súgó\n\nEz egy szerkesztőprogram az ingyenes és szerkeszthető világtérképhez,\naz [OpenStreetMap](http://www.openstreetmap.org/)-hez. A környékeden lévő\nadatok bővítésére, frissítésére használhatod, ezzel egy szabad forrású\nés szabad adatú térképet előállítva a világról, ami mindenkinek jó.\n\nA térképen végzett szerkesztéseidet minden OpenStreetMap használó látni fogja.\nA szerkesztéshez egy [ingyenes OpenStreetMap regisztrációra](https://www.openstreetmap.org/user/new) lesz szükséged.\n\nAz [iD szerkesztő](http://ideditor.com/) egy kollaboratív projekt,\n[GitHubon elérhető forráskóddal](https://github.com/systemed/iD).\n", + "help": "# Súgó\n\nEz egy szerkesztő az [OpenStreetMap](http://www.openstreetmap.org/)-hoz, az ingyenes és szerkeszthető világtérképhez. A környezetedről tölthetsz fel, vagy frissíthetsz adatokat, ezáltal mindenki számára jobbá téve egy ingyenes térképet.\n\nAmit ezen a térképen alkotsz, mindenki számára látható lesz, aki használja az OpenStreetMap-ot. A szerkesztéshez mindösszesen egy [ingyenes OpenStreetMap fiókra](https://www.openstreetmap.org/user/new) lesz szükséged.\n\nAz [iD szerkesztő](http://ideditor.com/) egy együttműködésen alapuló projekt, a [GitHub-on elérhető forráskóddal](https://github.com/openstreetmap/iD).\n", + "editing_saving": "# Szerkesztés és Mentés\n\nA szerkesztőt elsődlegesen online munkára tervezték és te jelenleg\negy weblapon éred el.\n\n### Elemek kiválasztása\n\nEgy térképelem, mint út vagy érdekes hely kiválasztásához kattints rá a térképen.\nEttől a kiválasztott elem kiemelődik és megnyílik egy panel az adataival,\nés egy menüvel, ami mutatja, miket tudsz az elemmel csinálni.\n\nTöbb elemet a 'Shift' gomb nyomva tartása közbeni kattintással, vagy\nhúzással tudsz kiválasztani. A húzással kijelölöd a bekeretezett részen lévő\nösszes elemet, lehetővé téve, hogy egyszerre több mindent változtass.\n\n### Szerkesztések mentése\n\nAmikor utakat, épületeket, helyeket szerkesztesz, ezek a változások\nhelyileg lesznek tárolva, amíg nem mented őket a szerverre. Ne aggódj, ha \nelrontasz valamit - vissza tudod vonni a változtatásaidat a visszavonás gombra\nkattintva, a mégis gombra kattintva pedig a korábban visszavont változtatásaidat\nállíthatod vissza.\n\nKattints a 'Mentés' gombra, ha végeztél egy terület szerkesztésével - például,\nha befejezted egy város részletének szerkesztését és egy másik területet szeretnél\nszerkeszteni. Lehetőséged lesz visszanézni, hogy mit csináltál. A szerkesztő hasznos\ntanácsokat biztosít és figyelmeztet ha valami nem tűnik megfelelőnek a változtatásaiddal.\n\nHa minden rendben van, beírhatsz egy rövid ismertetést a szerkesztéseiddel kapcsolatban\nés újból a 'Mentés' gombra kattintva közzéteheted a változtatásaidat és az információkat\nvelük kapcsolatban az [OpenStreetMap.org](http://www.openstreetmap.org/) webhelyen,\nahol az összes felhasználónak láthatóak és elérhetőek lesznek, hogy azokra építhessenek,\nfejleszthessék azokat.\n\nHa nem tudod befejezni a szerkesztéseidet egyszerre, elhagyhatod a szerkesztő ablakot, mert\namikor visszatérsz (ugyanazzal a böngészővel és számítógéppel), a szerkesztő fel fogja ajánlani,\nhogy visszaállítsa-e a korábbi munkádat.\n", "roads": "# Utak\n\nA szerkesztőprogrammal tudsz utakat létrehozni, javítani és törölni. Az utak \nsokfélék lehetnek: ösvények, közutak, kerékpárutak, stb. – minden gyakran \nkeresztezett szakaszt térképezni kell.\n\n### Kiválasztás\n\nÚt kiválasztásához kattints rá. Meg fog jelenni kiemelve, mellette egy kis eszköztár \nmenüvel és egy oldalsávval, ami további információkat mutat az útról.\n\n### Módosítás\n\nGyakran láthatod, hogy az út nincs a mögötte lévő légifelvételhez, vagy GPS \nnyomvonalhoz igazítva. Ha megbizonyosodtál arról, hogy nem a légifelvétel téved, \nhelyreigazíthatod az utakat.\n\nElőször is kattints a módosítandó útra. Ettől kiemelődik az út és megjelennek a\nkezelőpontjai, amiket mozgatni tudsz a megfelelő helyre. Ha új kezelőpontot \nszeretnél hozzáadni, hogy részletesebb utat kapj, kattints duplán az útnak egy \nolyan részére, ahol még nincs pont.\n\nHa egy út egy másik útba csatlakozik, de a térképen nincsenek összekapcsolva, \nhúzd az egyik út kezelőpontját a másik útra, és össze fognak kapcsolódni. \nAz utak megfelelő összekapcsolása a térképen nagyon fontos, útvonaltervezéshez \nlétfontosságú.\n\nHasználhatod a 'Mozgatás' eszközt is, vagy megnyomhatod az 'M' gyorsbillentyűt, ha az \naz egész utat szeretnéd mozgatni. Mozgatás után kattintással rögzítheted az új helyén.\n\n### Törlés\n\nHa egy út teljesen hibás – ha azt látod, hogy egyáltalán nincs rajta a légifelvételen, \nés biztos vagy benne, hogy nem is létezik –, törölheted, amivel eltávolítod a térképről. \nLegyél óvatos elemek törlésekor, akárcsak bármilyen más szerkesztésnél, a mindenki \náltal látható eredmény és a légifelvétel gyakran elavult, lehet, hogy az utat nemrég építették.\n\nAz út törléséhez előbb válaszd ki, majd kattints a kuka ikonra, vagy nyomd meg a Delete \nbillentyűt.\n\n### Létrehozás\n\nTaláltál egy utat, ami még nincs rajta a térképen? Kattints a bal felső eszköztár 'Vonal' \nikonjára vagy nyomd meg a '2'-es billentyűt és kezdd el rajzolni a vonalat.\n\nA rajzolás megkezdéséhez kattints a térképen az út elejére. Ha az út \negy másik meglévő útból ágazik ki, arra a helyre kattints, ahol csatlakoznak.\n\nEzután kattintással hozz létre pontokat a műholdkép vagy GPS nyomvonal alapján, \nhogy a vonal az út középvonalát kövesse. Ha az utad keresztez egy másik utat, kapcsold \nössze őket a metszéspontjukra kattintva. Ha kész vagy a rajzolással, kattints duplán, \nvagy nyomj a billentyűzeten egy 'Enter'-t.\n", + "gps": "# GPS\n\nA GPS adatok az OpenStreetMap legmegbízhatóbb adatforrásai. Ez a\nszerkesztőprogram támogatja a helyi nyomvonalak - `.gpx` fájlok betöltését \na számítógépről. Ilyen GPS nyomvonalakat számos okostelefonnal és kézi \nGPS-szel tudsz rögzíteni.\n\nGPS-es felmérés végzéséhez segítséget találsz [ezen az oldalon](http://learnosm.org/en/beginner/using-gps/).\n\nA GPX nyomvonal használatához húzd rá a GPX fájlt a szerkesztőprogramra.\nBetöltés után meg fog jelenni a térképen egy világoszöld vonalként.\nKattints a bal oldali menüben a 'Háttérbeállítás' gombra a nyomvonal \nmegjelenítéséhez, elrejtéséhez és a GPX rétegre közelítéshez.\n\nA GPX nyomvonal nem lesz közvetlenül feltöltve az OpenStreetMapre. \nA használathoz legjobb, ha úgy rajzolsz a térképen, hogy segítségként \nhasználod az új elemek felviteléhez, de [fel is töltheted](http://www.openstreetmap.org/trace/create),\nhogy használhassák mások is.\n", + "imagery": "# Légifelvétel\n\nA légifelvétel a térképezés egyik fontos forrása. A repülőgépes ortofotók, műholdképek és szabadon összeállított források kombinációja rendelkezésre áll a szerkesztőben a bal oldali menü 'Háttérbeállítások' gombjára kattintva.\n\nAlapértelmezésként a [Bing Maps](http://www.bing.com/maps/) műholdkép réteg jelenik meg a szerkesztőben, de ahogy új helyekre görgeted a térképet, új források jelennek meg. Néhány országban, mint az Egyesül Államok, Franciaország, vagy Dánia nagyon jó minőségű légifelvételek érhetőek el egyes területeken.\n\nA légifelvételek gyakran el vannak csúszva a valósághoz képest, a légifelvétel szolgáltatók hibájából. Ha látsz egy csomó utat eltolódva a háttértől, ne húzd őket rögtön a háttérképhez. Ehelyett igazítsd úgy a háttérképet, hogy a meglévő adatok illeszkedjenek rá. Ehhez kattints a Háttérbeállítások menü 'Elcsúszás korrigálása' gombjára.\n", "addresses": "# Lakcímek\n\nA lakcímek a térkép egyik leghasznosabb információi.\n\nHabár a címeket gyakran az utca részeként ábrázolják, az OpenStreetMap\naz utca mentén levő házak és helyek tulajdonságaiként tárolja őket.\n\nCím információkat adhatsz épület körvonalként felrajzolt helyekhez, vagy\nönálló pontokhoz. A címadatok javasolt forrása a helyszíni felmérés, vagy\nszemélyes ismeretek. Mint minden más adatnál, a kereskedelmi források\n(mint Google Maps) másolása szigorúan tilos.\n", + "inspector": "# A címkeszerkesztő használata\n\nA címkeszerkesztő az ablak jobb oldalán jelenik meg, amikor egy elemet \nkiválasztasz, lehetővé téve a részleteinek szerkesztését.\n\n### Elemtípus kiválasztása\n\nMiután létrehoztál egy pontot, vonalat, vagy területet, ki tudod választani, hogy \naz elem milyen típusú, például közút, lakóút, szupermarket, vagy egy kávézó.\nA címkeszerkesztő gombokat jelenít meg a leggyakoribb elemtípussal, a többi \ntípust pedig a keresődobozba írva tudod megtalálni.\n\nKattints az 'i'-re az elemtípus gomb jobb sarkában, hogy többet tudj meg róla. \nA típus kiválasztásához kattints rá.\n\n### Űrlapok használata és a címkék szerkesztése\n\nMiután választottál egy elemtípust, vagy kiválasztottál egy típussal rendelkező \nelemet, a címkeszerkesztő megjelenít egy űrlapot az elem részletes adataival, \nmint a neve, vagy címe.\n\nA mezők alatt egy ikonsort láthatsz, amivel egyéb részleteket adhatsz meg, \npéldául [Wikipédia](http://www.wikipedia.org/) hivatkozás, kerekesszékes \nmegközelíthetőséget, stb.\n\nA címkeszerkesztő legalján találsz egy 'Összes címke' gombot, amivel bármilyen \ntetszőleges címkét megadhatsz. A [Taginfo](http://taginfo.openstreetmap.org/) \negy jó forrás, ha többet akarsz megtudni a népszerű címkekombinációkról.\n\nA címkeszerkesztőben végzett változtatások automatikusan alkalmazva \nlesznek a térképen. Bármikor visszavonhatod őket a 'Visszavonás' gombbal.\n\n", "buildings": "# Épületek\n\nAz OpenStreetMap a világ legnagyobb épület adatbázisa. Te is bővítheted és \nfejlesztheted ezt az adatbázist.\n\n### Kiválasztás\n\nÉpületet a körvonalára kattintva tudsz kiválasztani. Ez kiemeli az épületet és megnyitja az eszközmenüt és a további információkat mutató oldalsávot.\n\n### Módosítás\n\nAz épületek gyakran pontatlan helyen vannak, vagy pontatlan a címkézésük.\n\nEgy egész épület mozgatásához kattints a 'Mozgatás' eszközre. Mozgasd az \negeret az épület eltolásához, és kattints, ha jó helyre került.\n\nAz épület egyedi alakjának javításához kattints a korvonalának pontjaira és \nhúzd őket jó helyre.\n\n### Létrehozás\n\nAz épületek létrehozása körüli egyik fő kérdés, hogy az OpenStreetMap \naz épületeket alakzatként és pontként is tudja tárolni. Az ökölszabály, hogy \n_az épületet alakzatként kell térképezni, hacsak lehet_ és a cégeket, lakásokat, \nszolgáltatásokat és egyéb a házon belül működő dolgokat a ház körvonalán belüli \npontként kell térképezni.\n\nKezd az épület alakzatként rajzolását a 'Terület' gombra kattintva a bal felső \neszköztáron. Befejezni az 'Enter' billentyűvel, vagy a terület első pontjára kattintva \ntudod, bezárva az alakzatot.\n\n### Törlés\n\nHa egy épület teljesen hibás – például azt látod, hogy nincs rajta a műholdképen és \nbiztos vagy benne, hogy nem létezik – törölheted, ezzel eltávolítva a térképről.\n\nHa egy épület teljesen hibás – ha azt látod, hogy egyáltalán nincs rajta a légifelvételen, \nés biztos vagy benne, hogy nem is létezik –, törölheted, ezzel eltávolítva a térképről.\nLegyél óvatos elemek törlésekor, akárcsak bármilyen más szerkesztésnél, a mindenki \náltal látható eredmény és a légifelvétel gyakran elavult, lehet, hogy a ház egyszerűen új építésű.\n\n\nHáz törléséhez előbb válaszd ki, majd kattints a kuka ikonra, vagy nyomd meg a Delete \nbillentyűt.\n" }, "intro": { diff --git a/vendor/assets/iD/iD/locales/hy.json b/vendor/assets/iD/iD/locales/hy.json new file mode 100644 index 000000000..4157b1008 --- /dev/null +++ b/vendor/assets/iD/iD/locales/hy.json @@ -0,0 +1,128 @@ +{ + "modes": { + "add_line": { + "title": "Գիծ" + }, + "add_point": { + "title": "Կետ", + "tail": "Կետ ավելացնելու համար կտացրեք քարտեզի վրա։" + } + }, + "operations": { + "add": { + "annotation": { + "point": "Կետ է ավլեացրել։" + } + }, + "disconnect": { + "title": "Անջատել", + "description": "Անջատել գծերը/տարածքները իրարից։" + }, + "merge": { + "title": "Միացնել", + "description": "Միացնել այս գծերը։" + } + }, + "translate": { + "translate": "Թարգմանել", + "localized_translation_language": "Ընտրեք լեզուն", + "localized_translation_name": "Անուն" + }, + "intro": { + "lines": { + "title": "Գծեր" + } + }, + "presets": { + "categories": { + "category-golf": { + "name": "Գոլֆ" + } + }, + "fields": { + "access": { + "label": "Մատչելիություն" + }, + "address": { + "label": "Հասցե", + "placeholders": { + "housename": "Շենքի անվանում", + "number": "123", + "street": "Փողոց", + "city": "Քաղաք" + } + }, + "atm": { + "label": "Բանկոմատ" + }, + "building": { + "label": "Շինություն" + }, + "building_area": { + "label": "Շինություն" + }, + "covered": { + "label": "Ծածկված" + }, + "cuisine": { + "label": "Խոհանոց" + }, + "maxspeed": { + "label": "Արագության սահմանափակում" + }, + "opening_hours": { + "label": "Աշխատանքային ժամեր" + }, + "phone": { + "label": "Հեռախոս" + }, + "website": { + "label": "Կայք" + } + }, + "presets": { + "aeroway/aerodrome": { + "name": "Օդանավակայան" + }, + "aeroway/helipad": { + "name": "Ուղաթիռային հրապարակ" + }, + "amenity/bank": { + "name": "Բանկ" + }, + "amenity/bar": { + "name": "Բար" + }, + "amenity/bicycle_parking": { + "name": "Հեծանվային կայանատեղի" + }, + "amenity/bicycle_rental": { + "name": "Հեծանիվի վարձակալություն" + }, + "amenity/cafe": { + "name": "Սրճարան" + }, + "amenity/cinema": { + "name": "Կինոթատրոն" + }, + "amenity/fast_food": { + "name": "Արագ սնունդ" + }, + "barrier/gate": { + "name": "Դարպաս" + }, + "barrier/wall": { + "name": "Պատ" + }, + "highway/bus_stop": { + "name": "Ավտոբուսի կանգառ" + }, + "highway/crossing": { + "name": "Անցում (հետիոտնի)" + }, + "highway/steps": { + "name": "Աստիճաններ" + } + } + } +} \ No newline at end of file diff --git a/vendor/assets/iD/iD/locales/id.json b/vendor/assets/iD/iD/locales/id.json index 3392478f7..307e6544e 100644 --- a/vendor/assets/iD/iD/locales/id.json +++ b/vendor/assets/iD/iD/locales/id.json @@ -316,8 +316,7 @@ "zoom": "Perbesar ke jejak GPX" }, "help": { - "title": "Bantuan", - "help": "#Bantuan\n\nIni adalah penyunting untuk [OpenStreetMap] (http://www.openstreetmap.org/), peta dunia gratis dan bisa disunting. Anda dapat menggunakannya dengan menambahkan dan memperbarui data di area anda, membangun sebuah peta sumber-terbuka dan data-terbuka yang lebih baik untuk semua orang.\n\nPerubahan yang anda buat akan terlihat ke semua orang yang menggunakan OpenStreetMap. Untuk melakukan penyutingan, anda membutuhkan [free OpenStreetMap account] (https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) adalah proyek kolaborasi dengan [kode sumber tersedia di GitHub](http://github.com/systemed/iD).\n" + "title": "Bantuan" }, "intro": { "navigation": { @@ -392,6 +391,7 @@ "placeholder": "Tidak diketahui", "types": { "access": "Umum", + "foot": "Kaki", "motor_vehicle": "Sepeda Motor", "bicycle": "Sepeda", "horse": "Kuda" diff --git a/vendor/assets/iD/iD/locales/is.json b/vendor/assets/iD/iD/locales/is.json index 4aa6dc037..a014a4a10 100644 --- a/vendor/assets/iD/iD/locales/is.json +++ b/vendor/assets/iD/iD/locales/is.json @@ -293,7 +293,6 @@ }, "help": { "title": "Hjálp", - "help": "# Hjálp\n\nÞetta er ritill fyrir [OpenStreetMap](http://www.openstreetmap.org/), \nfrítt og breytanlegt kort af heiminum. Þú getur notað ritilinn til að \nbæta við og breyta gögnum á þínu svæði. Þannig geturðu bætt þetta\nopen-source og open-data verkefni fyrir alla.\n\nBreytingar sem þú gerir á þessu korti verða sýnilegar öllum sem nota\nOpenStreetMap. Til að geta gert breytingar þarftu \n[ókeypis OpenStreetMap notandanafn](https://www.openstreetmap.org/user/new).\n\n[iD ritillinn](http://ideditor.com/) er samstarfsverkefni hvers [frumkóði er \naðgengilegur á GitHub](https://github.com/systemed/iD).\n", "roads": "# Vegir\n\nÞú getur bætt við, lagað og eytt vegum með þessum ritli. \nVegir geta verið af öllum gerðum: slóðar, hraðbrautir, hjólastígar\nog fleira - það á að vera hægt að gera öllu slíku skil hér.\n\n### Velja\n\nSmelltu á veg til að velja hann. Útlína hans verður nú sýnileg, \násamt smá aðgerðavali á kortinu og valmynd til hliðar sem sýnir\nmeiri upplýsingar um veginn.\n\n### Breyta\n\nÞú getur komið auga á vegi sem eru ekki í samræmi við loftmyndina\ná bak við þá eða GPS-slóða. Þú getur breytt veginum þannig að hann\nfari í rétt horf.\n\nFyrst smellirðu á veginn sem þú vilt breyta. Þetta sýnir útlínur hans\nog stjórnhnúta sem þú getur dregið til. Ef þú vilt bæta við fleiri\nstjórnhnútum þá tvísmellirðu á hluta af veginum sem er ekki með \nhnút og þá bætist nýr við.\n\nEf að vegurinn tengist öðrum vegi, en tengist ekki rétt á kortinu,\nþá geturðu dregið stjórnhnút annars vegsins yfir á hinn veginn til\nað tengja þá saman. Að vegamót séu rétt staðsett er mikilvægt \nfyrir kortið og bráðnauðsynlegt fyrir ökuleiðbeiningar.\n\nÞú getur líka smellt á 'Færa' tólið eða ýtt á 'M' á lyklaborðinu\ntil að færa allan veginn í einu og smellt svo aftur til að \nbreytingin taki gildi.\n\n### Eyða\n\nEf að vegurinn er út úr kú - þú sérð á gervihnattamyndinni að \nhann er ekki þar og helst hefurðu séð með eigin augum að hann\ner ekki til - þá er hægt að eyða honum þannig að hann hverfi af \nkortinu. Farðu varlega með að eyða út hlutum - líkt og með aðrar\nbreytingar þá verða allir varir við þær og stundum eru \nloftmyndirnar úreltar, þannig að þetta gæti verið glænýr vegur.\n\nÞú getur eytt vegi með því að smella á hann svo hann sé valinn, \nsmella svo á ruslatunnutáknið eða með því að ýta á 'Delete'\ntakkann.\n\n### Búa til\n\nFannstu stað þar sem vegur ætti að vera til staðar en er ekki á\nkortinu? Smelltu á 'Lína' takkann efst til vinstri eða ýttu á\n'2' á lyklaborðinu til að byrja að teikna línu.\n\nSmelltu þar sem vegurinn hefst á kortinu til að byrja á honum.\nEf að vegurinn tengist öðrum vegi geturðu byrjað á að búa til\nvegamótin með því að smella fyrst á eldri veginn.\n\nSettu svo hnútana þar sem við á svo að vegurinn fari rétta leið,\neftir því sem GPS-slóðin eða loftmyndin sýnir. Ef að vegurinn\ná vegamót við annan veg smelltu á hann þar sem vegamótin eiga að \nvera. Þegar teikningu vegar er lokið tvísmellirðu með músinni á \nlokahnútnum eða ýtir á 'Enter' á lyklaborðinu.\n", "addresses": "# Heimilisföng\n\nHeimilisföng eru einhverjar nytsömustu upplýsingarnar sem hægt er að setja á kort.\n\nÞó að heimilisföng tilheyri yfirleitt götum, þá tilheyra þau húsunum sjálfum í\nOpenStreetMap, merkt inn á byggingar og staði meðfram götum.\n\nÞú getur bætt heimimlisföngum við bæði byggingar sem eru merktar inn sem svæði\nsem og byggingar sem eru merktar inn sem punktar. Best er að heimilisföngin\nséu sett inn af þeim sem þekkja staðhætti vel - eins og með annað þá er ekki \nleyfilegt að afrita heimilisföng af öðrum vefjum, til að mynda er bannað að \nafrita af Google Maps.\n", "buildings": "# Byggingar\n\nOpenStreetMap er stærsta gagnasafn heims með byggingum. Þú getur\nbætt við þetta gagnasafn.\n\n### Velja\n\nÞú getur valið byggingu með því að ýta á útlínur hennar. Þetta \nlýsir upp bygginguna og opnar tækjaslá sem og valmynd sem hefur\nað geyma frekari upplýsingar um bygginguna.\n\n### Breyta\n\nStundum eru byggingar vitlaust staðsettar eða með vitlausum\nupplýsingum.\n\nTil að færa byggingu í einu lagi er hún valin og svo smellt á 'Færa'\ntólið. Færðu músina til að hliðra byggingunni og smelltu svo þegar\nhún er komin á réttan stað.\n\n### Búa til\n\nÞegar byggingum er bætt við kort er hægt að nota bæði svæði og \npunkta. Þumalputtareglan er sú að nota svæði fyrir byggingu þegar \nhægt er, og merkja svo þau fyrirtæki, stofnanir og annað sem \nstarfa þar sem punkta innan svæðisins.\n\nBúðu til byggingu sem svæði með því að ýta á takkann 'Svæði' efst til vinstri, smelltu svo þar sem byggingin byrjar og merktu\nþannig útlínur hennar. Þú klárar bygginguna svo með því að tengja\nsíðasta hnútinn við fyrsta hnútinn eða með því að ýta á 'Enter'\ná lyklaborðinu.\n\n### Eyða\n\nEf að bygging er út úr kú - þú sérð að hún er ekki til á \nloftmyndinni og hefur helst séð með eigin augum að hún er ekki til\nstaðar - þá geturðu eytt henni af kortinu. Farðu varlega þegar þú\neyðir hlutum - breytingarnar munu sjást hjá öllum sem nota kortið\nog það getur verið að loftmyndin sé bara gömul og byggingin ný.\n\nÞú getur eytt byggingu með því að velja hana, ýta svo á \nruslatunnutáknið eða með því að ýta á 'Delete' á lyklaborðinu.\n" diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json index be46a72d7..6a5724b43 100644 --- a/vendor/assets/iD/iD/locales/it.json +++ b/vendor/assets/iD/iD/locales/it.json @@ -134,7 +134,8 @@ "annotation": "Unite {n} linee.", "not_eligible": "Questi elementi non possono essere uniti.", "not_adjacent": "Queste linee non possono essere unite perché non sono connesse.", - "restriction": "Queste linee non possono essere unite perché almeno una è membro di una relazione \"{relation}\"." + "restriction": "Queste linee non possono essere unite perché almeno una è membro di una relazione \"{relation}\".", + "incomplete_relation": "Questi elementi non posso essere uniti perché almeno uno di loro non è stato completamente scaricato." }, "move": { "title": "Muovi", @@ -332,7 +333,7 @@ }, "help": { "title": "Aiuto", - "help": "# Aiuto\n\nQuesto è un editor per [OpenStreetMap](http://www.openstreetmap.org/), la\nmappa del mondo gratuita e modificabile. Puoi usarlo per aggiungere ed aggiornare\ndati nella tua area, rendendo una mappa del mondo open-source e open-data\nmeglio per tutti.\n\nLe modifiche che fai a questa mappa saranno visibili a chiunque usa\nOpenStreetMap. Per fare una modifica, avrai bisogno di un\n[account gratuito OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) è un progetto collaborativo il cui [codice\nsorgente è disponibile su GitHub](https://github.com/systemed/iD).\n", + "help": "# Aiuto\n\nQuesto è un editor per [OpenStreetMap](http://www.openstreetmap.org/), la\nmappa del mondo gratuita e modificabile. Puoi usarlo per aggiungere ed aggiornare\ndati nella tua area, creando una mappa del mondo open-source e open-data\nmigliore per tutti.\n\nLe modifiche che fai a questa mappa saranno visibili a chiunque usa\nOpenStreetMap. Per fare una modifica, avrai bisogno di un\n[account gratuito OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) è un progetto collaborativo il cui [codice\nsorgente è disponibile su GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Modifica & salvataggio\n\nQuesto editor è stato pensato per funzionare principalmente online\ned anche in questo momento lo stai utilizzando tramite browser web.\n\n### Selezione degli Elementi\n\nPer selezionare un elemento della mappa, come ad esempio una strada o\nun punto di interesse, clicca su di esso sulla mappa. Questo farà in modo\nche l'elemento selezionato venga evidenziato, che si apra un pannello con\ni dettagli e che si apra un menu di azioni che è possibile fare con l'elemento\nstesso.\n\nPer selezionare più elementi tenendo premuto il tasto 'Maiusc' clicca su ogni\nelemento o trascina il mouse disegnando un riquadro sulla mappa. Questo\nfarà sì che tutti gli elementi all'interno del riquadro vengano selezionati\nconsentendo di compiere azioni su più elementi in una volta sola.\n\n### Salvataggio delle modifiche\n\nQuando si fanno dei cambiamenti, come modifiche alle strade, agli edifici e\nai luoghi, queste vengono memorizzate localmente fino a che non si effettua\nil salvataggio sul server. Non preoccuparti se fai un errore, puoi annullare\nla modifica premento il tasto 'Annulla' e rieffettuare la modifica cliccando\nsul tasto 'Ripeti'.\n\nSe ad esempio hai completato un'area della città e vuoi iniziare un'altra\narea clicca su 'Salva' e porre fine ad un gruppo di modifiche. Avrai comunque\nla possibilità di revisionare ciò che hai modificato inoltre l'editor fornirà\nsuggerimenti e avvertimenti se qualcosa nelle tue modifiche non sembra\nandare bene.\n\nSe tutto è a posto puoi aggiungere un piccolo commento per spiegare la\nmodifica effettuata e cliccare su 'Salva' di nuovo per caricare le modifiche su\n[OpenStreetMap.org](http://www.openstreetmap.org/), dove saranno visibili\na tutti gli utenti e disponibili agli altri per consentire di costruirci sopra o\nmigliorarle ulteriormente.\n\nSe non riesci a finire le modifiche in una seduta, puoi abbandonare la\nfinestra dell'editor e tornarci più tardi (utilizzando lo stesso browser e lo\nstesso computer): l'editor ti offrirà infatti la possibiltà di recuperare il tuo lavoro.\n", "roads": "# Strade\n\nE' possibile creare, aggiustare ed eliminare le strade con questo editor. Le strade possono essere di tutti i tipi: percorsi, autostrade, cammini, piste ciclabili o altro. E' possibile mappare ogni segmento calpestabile.\n\n### Selezione\n\nCliccare su una strada per selezionarla. Verranno visualizzati un contorno e un piccolo menu strumenti sulla mappa oltre ad una barra laterale che mostra informazioni dettagliate sulla strada.\n\n### Modifica\n\nVi capiterà spesso di vedere strade non combacianti con le immagini sullo sfondo o con il tracciato GPS. E' possibile allineare queste strada in modo che si trovino nella giusta posizione.\n\nPer prima cosa cliccare sulla strada che si vuole modificare. Questo farà in modo che la strada venga evidenziata e che vengano visualizzati i punti di controllo lungo di essa che possono essere spostati in luoghi più consoni. Se si vuole aggiungere nuovi punti di controllo per aggiungere maggiori dettagli, basta fare doppio clic su parte della strada senza nodi.\n\nSe la strada è connessa ad un'altra strada ma non è ben connessa sulla mappa, è possibile spostare uno di questi punti di controllo sull'altra strada in modo da unirli. E' importante per la mappa che le strade siano correttamente connesse anche per garantire giuste indicazioni di guida.\n\nE' possibile cliccare sullo strumento 'Sposta' o premere il tasto rapido `M` per muovere l'intera strada in una volta sola. Cliccare nuovamente per memorizzare lo spostamento.\n\n### Eliminizione\n\nSe la strada è completamente sbagliata, ovvero non compare sulle immagini satellitari e non viene rilevata nella realtà, è possibile eliminarla eliminandola dalla mappa. Attenzione ad effettuare questa operazione di eliminazione poiché, come per ogni altra modifica, i risultati vengono visti da tutti. Considera che le immagini satellitari sono spesso vecchie quindi è possibile che la strada sia stata costruita solo di recente.\n\nE' possibile eliminare una strada cliccando prima su di essa per selezionarla e poi sull'icona cestino o premendo il tasto 'Canc' della tastiera.\n\n### Creazione\n\nHai notato che in un punto della mappa dovrebbe esserci una strada ma non c'è ? Clicca sull'incona 'Linea' in alto a sinistra nell'editor o premi il tasto `2` per iniziare a disegnare una linea.\n\nCliccare sull'inizio della strada sulla mappa per iniziare a disegnarla. Se la strada è unita ad una strada già esistente, iniziare cliccando nel punto dove sono connesse.\n\nQuindi cliccare i nuovi punti lungo la strada in modo che segua il percorso giusto dettato dall'immagine satellitare o dai dati del GPS. Se la strada che stai disegnando attraversa un'altra strada, collegala cliccando sul punto di intersezione. Quando hai finito di disegnare fai doppio clic o premi 'Invio' o 'Enter' sulla tua tastiera.\n", "gps": "# GPS\n\nI dati provenienti dal GPS sono la sorgente dati più fidata per OpenStreetMap.\nQuesto editor supporta i tracciati locali - i file `.gpx` che si trovano sul tuo\ncomputer. È possibile raccogliere questo tipo di tracciati GPS con un gran\nnumero di applicazioni per smartphone o tramite dispositivi GPS personali.\n\nPer informazioni su come effettuare un rilevamento GPS è possibile leggere\n[Rilevamenti con un GPS](http://learnosm.org/en/beginner/using-gps/).\n\nPer utilizzare un tracciato GPX al fine di effettuare una mappatura, trascina il\nfile GPX sull'editor di mappe. Se viene riconosciuto verrà aggiunto alla mappa\ned evidenziato tramite una linea verde chiaro. Cliccare sul menu 'Impostazioni\nsfondo' che si trova sulla sinitra per abilitare, disabilitare o zoomare il livello creato dal file GPX.\n\nIl tracciato GPX non viene caricato direttamente su OpenStreetMap - il modo\nmigliore di utilizzarlo è quello di disegnare sulla mappa usando il tracciato\ncome guida per i nuovi elementi che vuoi aggiungere e [caricarlo comunque\nsu OpenStreetMap](http://www.openstreetmap.org/trace/create) per renderlo\npoi disponibile agli altri utenti.\n", @@ -791,6 +792,10 @@ "shop": { "label": "Tipo" }, + "social_facility_for": { + "label": "Tipo di utenza", + "placeholder": "Senza dimora, disabili, minori, ..." + }, "source": { "label": "Fonte" }, @@ -1136,6 +1141,22 @@ "name": "Riparo", "terms": "ricovero,rifugio,tettoia,pensilina,bivacco,grotta" }, + "amenity/social_facility": { + "name": "Centro socio-assistenziale", + "terms": "centro sociale,comunità,cooperativa sociale,centro assistenziale,rsa,casa di riposo,ospizio,servizi sociali,casa famiglia,comunità di recupero" + }, + "amenity/social_facility/food_bank": { + "name": "Banco alimentare", + "terms": "mensa del povero,mensa caritas" + }, + "amenity/social_facility/group_home": { + "name": "Comunità", + "terms": "casa comunitaria,terapia di gruppo,comunità" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Dormitorio", + "terms": "ricovero,senzadimora,barboni,senza fissa dimora,senza dimora,senza casa" + }, "amenity/studio": { "name": "Studio radiotelevisivo", "terms": "studio,radio,televisione,registrazione,in onda,studio di registrazione" @@ -1264,10 +1285,30 @@ "name": "Appartamenti", "terms": "appartamenti,condominio,palazzo,palazzone,casermone,case popolari,abitazioni,case,edilizia popolare,peep,iacp" }, + "building/bunker": { + "name": "Bunker", + "terms": "bunker,casamatta" + }, + "building/cathedral": { + "name": "Cattedrale", + "terms": "cattedrale,chiesa,monumento,religioso" + }, + "building/church": { + "name": "Chiesa", + "terms": "cristiano,abbazia,basilica,cattedrale,presbiterio,cappella,chiesa,casa di Dio,luogo di preghiera,luogo di culto,missione,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio" + }, "building/commercial": { "name": "Edificio commerciale", "terms": "Edificio commerciale" }, + "building/construction": { + "name": "Edificio in costruzione", + "terms": "cantiere,struttura,in costruzione" + }, + "building/dormitory": { + "name": "Dormitorio", + "terms": "dormitorio,struttura sociale" + }, "building/entrance": { "name": "Entrata", "terms": "Entrata" @@ -1276,6 +1317,22 @@ "name": "Garage", "terms": "Garage" }, + "building/garages": { + "name": "Garage", + "terms": "Garage,rimesse" + }, + "building/greenhouse": { + "name": "Serra", + "terms": "serra,coltivazione,piante,orto,coltivazione,vegetali" + }, + "building/hospital": { + "name": "Edificio ospedaliero", + "terms": "clinica,pronto soccorso,servizio sanitario,salute,hospice,ospizio,infermeria,istituzione,casa di cura,casa di riposo,sanatorio,ambulatorio,chirurgia,reparto" + }, + "building/hotel": { + "name": "Edificio alberghiero", + "terms": "albergo,hotel" + }, "building/house": { "name": "Casa", "terms": "Casa" @@ -1288,10 +1345,38 @@ "name": "Edificio industriale", "terms": "Edifico industriale" }, + "building/public": { + "name": "Edificio pubblico", + "terms": "comunita,edificio comunitario,comunità" + }, "building/residential": { "name": "Edificio residenziale", "terms": "Edificio residenziale" }, + "building/roof": { + "name": "Tettoia", + "terms": "tetto,pensilina" + }, + "building/school": { + "name": "Edificio scolastico", + "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università" + }, + "building/stable": { + "name": "Stalla", + "terms": "stalla,ricovero,scuderia" + }, + "building/train_station": { + "name": "Stazione ferroviaria", + "terms": "treno,stazione,centrale" + }, + "building/university": { + "name": "Edificio universitario", + "terms": "college,alma" + }, + "building/warehouse": { + "name": "Magazzino", + "terms": "magazzino,ripostiglio,rimessa" + }, "craft/blacksmith": { "name": "Maniscalco", "terms": "ferri di cavallo" @@ -1892,6 +1977,10 @@ "name": "Uffici", "terms": "Ufficio" }, + "office/accountant": { + "name": "Contabile", + "terms": "Commercialista, amministrativo, ragioniere" + }, "office/administrative": { "name": "Autorità locale", "terms": "Ufficio amministrativo,amministrazione,autorità locale,supervisione,comune" @@ -2100,6 +2189,10 @@ "name": "Negozio di liquori", "terms": "alcool,liquori,grappa,rum,vodka" }, + "shop/art": { + "name": "Negozio di opere d'arte", + "terms": "opere d'arte,quadri,sculture,galleria" + }, "shop/bakery": { "name": "Panificio", "terms": "Panificio" @@ -2116,6 +2209,10 @@ "name": "Negozio di biciclette", "terms": "Negozio biciclette" }, + "shop/bookmaker": { + "name": "Negozio di scommesse", + "terms": "scommesse,puntate,allibratore" + }, "shop/books": { "name": "Libreria", "terms": "Negozio di libri" @@ -2236,6 +2333,10 @@ "name": "Fabbro", "terms": "" }, + "shop/lottery": { + "name": "Ricevitoria", + "terms": "lotto,lotteria" + }, "shop/mall": { "name": "Centro commerciale", "terms": " Centro commerciale " diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json index 6cb70f06b..d958b6968 100644 --- a/vendor/assets/iD/iD/locales/ja.json +++ b/vendor/assets/iD/iD/locales/ja.json @@ -134,7 +134,8 @@ "annotation": "{n} 本のラインを結合", "not_eligible": "地物情報がマージできません", "not_adjacent": "ラインをマージするには、ラインが結合している必要があります。", - "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。" + "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。", + "incomplete_relation": "地物全体がダウンロードされていないため、マージさせることができません。" }, "move": { "title": "移動", @@ -332,7 +333,7 @@ }, "help": { "title": "ヘルプ", - "help": "# ヘルプ\n\nこのアプリケーションは、自由に編集できる世界地図 [OpenStreetMap](http://www.openstreetmap.org/)編集用のエディタです。あなたが知っている地域についての情報を追加したり、編集したりして、誰もが使いやすい情報としてデータをオープンに広めましょう。\n\nあなたが編集した結果は、OpenStreetMapを利用するすべてのひとが閲覧することができます。編集するためには [無料のOpenStreetMapアカウント](https://www.openstreetmap.org/user/new) が必要です。\n\nこの [iD エディタ](http://ideditor.com/) の[ソースコードはGitHubで管理](https://github.com/systemed/iD)されており、誰もが参加できるプロジェクトとして公開されています。\n", + "help": "# ヘルプ\n\nこのアプリケーションは、自由に編集できる世界地図 [OpenStreetMap](http://www.openstreetmap.org/)のエディターです。このエディターを利用して、あなたの地域のデータを追加したり更新したりして、誰にとってもｙろい便利なオープンソースかつオープンデータの世界地図を作成できます。\n\nあなたが編集した結果は、OpenStreetMapを利用するすべての人が閲覧することができます。編集するためには [無料のOpenStreetMapアカウント](https://www.openstreetmap.org/user/new) が必要です。\n\nこの [iDエディター](http://ideditor.com/) は[GitHub上のソースコード](https://github.com/openstreetmap/iD)による協力型プロジェクトです。\n", "editing_saving": "# データの編集と保存\n\nこのエディタはオンライン環境で使用されることを前提としています、現在あなたはブラウザを通じてアクセスしているはずです。\n\n### 地物の選択\n\nポイント情報や道路といった地物情報は、地図上に表示されている対象をクリックすることで選択ができます。選択された地物はハイライトされ、詳細情報が記載されたパネルが表示されます。このパネル内の情報を編集することで、対象の地物の情報を編集できます。\n\n複数の地物を範囲選択するには、キーボードのShiftキーを押しながら地図上をクリックし、ドラッグしてください。ドラッグした範囲が四角形で表示され、その四角形の内の地物がすべて選択されます。\n\n### 編集内容の保存\n\n道路や建物、特定の場所などの追加/編集結果は、OSMサーバに保存されるまではあなたのローカルPC上に格納されます。間違った編集をしてしまっても慌てないでください。巻き戻しボタン(Undo)をクリックすることで、編集作業を巻き戻すことができます。同じ編集をもう一度実施したい場合は、巻き戻しのキャンセルボタン(redo)をクリックしてください。\n\n編集に区切りがついたら、'保存'をクリックして作業を終了してください。例えば街の一区画の編集が終わり、そこから別の場所の編集に移動する場合などです。データを保存する前に、編集した内容をもう一度見直しましょう。データが間違っている可能性がある場所がエディタ上に表示されますので、必要に応じて修正を行なってください。\n\n編集内容に問題がなければ、そのまま保存を行いましょう。あなたの編集内容を簡潔に表すコメントを記入した後、もう一度'保存'をクリックすると、あなたの編集内容が[OpenStreetMap.org](http://www.openstreetmap.org/)に投稿されます。投稿されたデータはあなた以外のすべての利用者に対しても表示されるようになり、そこに情報を追加したり、編集したりすることができるようになります。\n\n編集を一度に完了させることができない場合は、ブラウザのエディタ表示をそのままにして、いったんブラウザを閉じてしまいましょう。同じブラウザとエディタを使えば、後々、作業の続きを実施することができます。\n", "roads": "# 道路\n\nこのエディタは道路を作成、修正、削除する機能を備えています。小路、自動車道、山道、自転車道等々、編集対象となる道路の種別に制限はありません。交差する道路を細かく地図に描くことも可能です。\n\n### 選択\n\n対象の道路をクリックすることで、選択することができます。選択された道路は強調表示され、ラインに対する操作を行う小さなツール項目がその近くに表示されます。道路の詳細情報は、サイドバーに一覧表示されます。\n\n### 修正\n\n既に描かれている道路の中には、背景画像の衛星写真やGPSトラックと明らかに位置が異なるものがあります。そうした道路を見つけたら、道路を正しい位置に修正しましょう。\n\nまずは変更対象となる道路をクリックして選択します。対象の道路が強調表示され、操作可能なポイントがラインの上に表示されて、位置の変更が可能となります。ラインとポイントを、より正しいと思われる位置に移動させてください。ライン上のポイントを増やすには、ラインの上でダブルクリックすることで、その位置にポイントを作成することが可能です。\n\n道路の接続状態が誤っている場合は、どちらかの道路の上に表示されているポイントをもう一つのラインの上に移動させ、2つのラインを接続してください。道路の接続は地図にとって非常に重要であり、車輌のナビゲーションを行うためには道路が正しく接続されていることが必須となります。\n\n'移動'ツールをクリックするか、キーボードでショートカットキー 'M' を押すことで、道路全体を一度に移動させることができます。もう一度クリックすることで、その位置へ対象が移動します。\n\n### 削除\n\n描かれている道路が完全に間違っている場合 - 衛星写真に映っておらず、より理想としては実際に現地で道路が無いことを確認できた場合 - その道路のデータそのものを削除し、地図から消すことが可能です。地物を削除する際の注意として、編集結果は他の編集と同様すべての利用者の目に触れること、また、衛星写真は撮影日時が古い可能性があり、道路が新しく敷設されているかもしれないことを意識してください。\n\n道路を削除するには、対象のラインをクリックして選択し、ツール項目からゴミ箱アイコンをクリックするか、'Delete'キーを押してください。\n\n### 新規作成\n\n道路があるはずなのにまだ描かれていない？ エディタ左上に表示されている'ライン'アイコンをクリックするか、ショートカットキー'2'を押すと、ラインの新規描画を行うことができます。\n\n地図をクリックすることで、その地点からラインの描画が開始されます。もし既に描かれている道路から枝分かれした道路の場合は、既存道路で分岐が行われている部分をクリックして、その位置から描画を始めるようにしてください。\n\n衛星画像やGPSログなどで表示されている道路の形に添ってクリックし、ポイントを作成してください。描画している道路が他の道路と交差している場合は、交差している位置でクリックし、ラインを接続してください。描画を終了するには、終了する位置でダブルクリックするか、キーボードの'Return'、あるいは'Enter'キーを押してください。\n\n", "gps": "# GPS\n\nOpenStreetMapにおいて、GPSデータは最も信用できる情報源です。iDエディタはあなたのPC上にある`.gpx`ファイルのトレース機能をサポートしています。GPSログは、スマートフォンのアプリケーションやGPSロガーを使用することで収集することができます。\n\nGPSを使用した現地調査の詳細な進め方については、[GPSによる調査](http://learnosm.org/jp/beginner/using-gps/)を参照してください。\n\nGPXログファイルをエディタの上にドラッグ＆ドロップすることで、ファイルの内容をエディタ上に表示させることができます。ファイル形式の読み込みが正常に完了すると、ログは明るい緑色の線としてエディタ上に表示されます。エディタの左側に配置されている'背景画像設定'メニューをクリックすると、ログの表示/非表示、GPXが配置されたレイヤーへのズームを設定することができます。\n\nこのGPXログファイルはOpenStreetMapへ直接アップロードされたものではありません。このログを参考情報として地図を描いたり、あなたが追加する地物の配置場所の参考情報とするのがよいでしょう。また、あなた以外のユーザにもGPSログを使ってもらうためには[OpenStreetMapへのアップロード機能](http://www.openstreetmap.org/trace/create)を利用してください。\n", @@ -791,6 +792,10 @@ "shop": { "label": "店舗種別" }, + "social_facility_for": { + "label": "施設の対象者", + "placeholder": "ホームレス, 障碍者, 孤児など" + }, "source": { "label": "情報源" }, @@ -1136,6 +1141,22 @@ "name": "避難所", "terms": "避難所,シェルター,逃げ場" }, + "amenity/social_facility": { + "name": "福祉施設", + "terms": "福祉施設, 支援施設" + }, + "amenity/social_facility/food_bank": { + "name": "フードバンク", + "terms": "フードバンク" + }, + "amenity/social_facility/group_home": { + "name": "グループホーム", + "terms": "グループホーム" + }, + "amenity/social_facility/homeless_shelter": { + "name": "ホームレス緊急一時宿泊施設", + "terms": "ホームレス緊急一時宿泊施設, ホームレスシェルター" + }, "amenity/studio": { "name": "スタジオ", "terms": "スタジオ" @@ -1264,21 +1285,73 @@ "name": "アパート", "terms": "アパート" }, + "building/barn": { + "name": "納屋", + "terms": "納屋" + }, + "building/bunker": { + "name": "掩体壕", + "terms": "掩体壕, 掩蔽壕" + }, + "building/cabin": { + "name": "ログハウス", + "terms": "ログハウス" + }, + "building/cathedral": { + "name": "大聖堂", + "terms": "大聖堂" + }, + "building/chapel": { + "name": "礼拝堂", + "terms": "礼拝堂" + }, + "building/church": { + "name": "教会", + "terms": "教会" + }, "building/commercial": { "name": "オフィスビル", "terms": "オフィスビル" }, + "building/construction": { + "name": "建設中の建物", + "terms": "建設中の建物" + }, + "building/detached": { + "name": "一戸建て住宅", + "terms": "一戸建て住宅" + }, + "building/dormitory": { + "name": "寮", + "terms": "寮" + }, "building/entrance": { "name": "出入口", "terms": "出入口, エントランス" }, "building/garage": { "name": "車庫", - "terms": "車庫,ガレージ" + "terms": "車庫, ガレージ" + }, + "building/garages": { + "name": "集合車庫", + "terms": "集合車庫" + }, + "building/greenhouse": { + "name": "温室", + "terms": "温室" + }, + "building/hospital": { + "name": "病院の建物", + "terms": "病院の建物, 病棟" + }, + "building/hotel": { + "name": "ホテルの建物", + "terms": "ホテルの建物, 宿泊棟" }, "building/house": { - "name": "住宅", - "terms": "住宅" + "name": "連結住宅", + "terms": "連結住宅" }, "building/hut": { "name": "小屋", @@ -1288,10 +1361,54 @@ "name": "工場", "terms": "工場" }, + "building/public": { + "name": "公共施設", + "terms": "公共施設" + }, "building/residential": { "name": "住宅", "terms": "住宅, アパート, マンション" }, + "building/retail": { + "name": "商業施設", + "terms": "商業施設, 店舗" + }, + "building/roof": { + "name": "屋根", + "terms": "屋根, 屋根付きテラス" + }, + "building/school": { + "name": "校舎", + "terms": "校舎, 学校の建物" + }, + "building/shed": { + "name": "格納庫", + "terms": "格納庫, 離れ" + }, + "building/stable": { + "name": "厩", + "terms": "厩, 馬小屋" + }, + "building/static_caravan": { + "name": "トレーラーハウス", + "terms": "トレーラーハウス" + }, + "building/terrace": { + "name": "テラスハウス", + "terms": "テラスハウス, 長屋" + }, + "building/train_station": { + "name": "駅舎", + "terms": "駅舎" + }, + "building/university": { + "name": "大学", + "terms": "大学, 大学の建物" + }, + "building/warehouse": { + "name": "倉庫", + "terms": "倉庫, 蔵" + }, "craft/basket_maker": { "name": "かご製造所", "terms": "かご,籠" @@ -1386,7 +1503,7 @@ }, "craft/painter": { "name": "塗装業", - "terms": "塗装業" + "terms": "塗装業, 外装業, ペンキ屋" }, "craft/photographer": { "name": "写真屋", @@ -2268,6 +2385,10 @@ "name": "酒店", "terms": "酒店, 酒屋" }, + "shop/art": { + "name": "美術工芸品店", + "terms": "美術工芸品店, 美術品店, アートショップ,工芸品店" + }, "shop/bakery": { "name": "パン屋", "terms": "パン屋, ベーカリー" @@ -2284,6 +2405,10 @@ "name": "自転車店", "terms": "自転車店" }, + "shop/bookmaker": { + "name": "公営競技投票券売り場", + "terms": "公営競技投票券売り場, 馬券売り場, 車券売り場, 舟券売り場" + }, "shop/books": { "name": "書店", "terms": "書店, 本屋" @@ -2404,6 +2529,10 @@ "name": "錠前屋", "terms": "錠前屋" }, + "shop/lottery": { + "name": "宝くじ売り場", + "terms": "宝くじ売り場" + }, "shop/mall": { "name": "ショッピングセンター", "terms": "ショッピングセンター, ショッピングモール, 複合商業施設" diff --git a/vendor/assets/iD/iD/locales/ko-KR.json b/vendor/assets/iD/iD/locales/ko-KR.json new file mode 100644 index 000000000..3879a3012 --- /dev/null +++ b/vendor/assets/iD/iD/locales/ko-KR.json @@ -0,0 +1,316 @@ +{ + "presets": { + "fields": { + "address": { + "label": "주소", + "placeholders": { + "housename": "건물명칭", + "number": "123", + "street": "길", + "city": "도시" + } + }, + "aeroway": { + "label": "종류" + }, + "amenity": { + "label": "종류" + }, + "atm": { + "label": "ATM" + }, + "bicycle_parking": { + "label": "종류" + }, + "building": { + "label": "건물" + }, + "building_area": { + "label": "건물" + }, + "construction": { + "label": "종류" + }, + "crossing": { + "label": "종류" + }, + "entrance": { + "label": "종류" + }, + "fax": { + "label": "Fax" + }, + "highway": { + "label": "종류" + }, + "historic": { + "label": "종류" + }, + "internet_access": { + "label": "인터넷 이용 가능 여부", + "options": { + "wlan": "Wifi", + "terminal": "터미널" + } + }, + "landuse": { + "label": "종류" + }, + "leisure": { + "label": "종류" + }, + "maxspeed": { + "label": "속도 제한" + }, + "office": { + "label": "종류" + }, + "oneway": { + "label": "일방통행" + }, + "opening_hours": { + "label": "말" + }, + "place": { + "label": "종류" + }, + "railway": { + "label": "종류" + }, + "religion": { + "label": "종교", + "options": { + "christian": "기독교", + "muslim": "이슬람교", + "buddhist": "불교", + "jewish": "유대교", + "hindu": "힌두교" + } + }, + "service": { + "label": "종류" + }, + "shop": { + "label": "종류" + }, + "sport": { + "label": "운동" + }, + "tourism": { + "label": "종류" + }, + "water": { + "label": "종류" + }, + "waterway": { + "label": "종류" + }, + "website": { + "label": "웹사이트" + }, + "wetland": { + "label": "종류" + }, + "wikipedia": { + "label": "위키페디아" + }, + "wood": { + "label": "종류" + } + }, + "presets": { + "aeroway/helipad": { + "name": "헬기 이착륙장" + }, + "amenity/bank": { + "name": "은행" + }, + "amenity/bar": { + "name": "바" + }, + "amenity/bicycle_parking": { + "name": "자전거 보관소" + }, + "amenity/bicycle_rental": { + "name": "자전거 대여소" + }, + "amenity/cafe": { + "name": "카페" + }, + "amenity/cinema": { + "name": "극장" + }, + "amenity/fast_food": { + "name": "패스트 푸드" + }, + "amenity/fire_station": { + "name": "소방소" + }, + "amenity/hospital": { + "name": "병원" + }, + "amenity/library": { + "name": "도서관" + }, + "amenity/pharmacy": { + "name": "약국" + }, + "amenity/place_of_worship/christian": { + "name": "성당" + }, + "amenity/police": { + "name": "경찰서" + }, + "amenity/post_box": { + "name": "사서함" + }, + "amenity/post_office": { + "name": "우체국" + }, + "amenity/pub": { + "name": "술집" + }, + "amenity/restaurant": { + "name": "식당" + }, + "amenity/school": { + "name": "학교" + }, + "amenity/toilets": { + "name": "화장실" + }, + "amenity/university": { + "name": "대학교" + }, + "building": { + "name": "건물" + }, + "highway/bus_stop": { + "name": "버스정류장" + }, + "highway/cycleway": { + "name": "자전거 도로" + }, + "highway/footway": { + "name": "산책로" + }, + "highway/motorway": { + "name": "고속도로" + }, + "highway/path": { + "name": "경로" + }, + "highway/primary": { + "name": "큰도시를 연결하는 국도" + }, + "highway/residential": { + "name": "주택가 도로.골목길" + }, + "highway/secondary": { + "name": "작은 도시와 마을을 연결하는 도로" + }, + "highway/service": { + "name": "주요 서비스-주차장,공원 등과 연계된 도로" + }, + "highway/steps": { + "name": "계단" + }, + "highway/tertiary": { + "name": "폭 4미터 이상의 넓은 도로.영국의 \"C\"도로." + }, + "highway/track": { + "name": "농업/임업용 도로" + }, + "highway/traffic_signals": { + "name": "신호등" + }, + "highway/trunk": { + "name": "고속도로가 아닌 도로" + }, + "highway/unclassified": { + "name": "미분류 도로" + }, + "historic/monument": { + "name": "산" + }, + "landuse": { + "name": "토지용도" + }, + "landuse/allotments": { + "name": "텃밭" + }, + "landuse/basin": { + "name": "온천" + }, + "landuse/commercial": { + "name": "상업" + }, + "landuse/construction": { + "name": "개발중" + }, + "landuse/farm": { + "name": "경작 및 재배에 사용되는 농지" + }, + "landuse/forest": { + "name": "숲" + }, + "landuse/grass": { + "name": "목초지" + }, + "landuse/industrial": { + "name": "공업" + }, + "landuse/quarry": { + "name": "채석장" + }, + "landuse/vineyard": { + "name": "포도농장" + }, + "leisure": { + "name": "레저" + }, + "leisure/golf_course": { + "name": "골프장" + }, + "leisure/park": { + "name": "공원" + }, + "leisure/pitch": { + "name": "축구,야구,스케이트 등 경기장" + }, + "leisure/pitch/american_football": { + "name": "미식 축구장" + }, + "leisure/pitch/baseball": { + "name": "야구장" + }, + "leisure/pitch/basketball": { + "name": "농구장" + }, + "leisure/pitch/soccer": { + "name": "축구장" + }, + "leisure/pitch/tennis": { + "name": "테니스장" + }, + "man_made/lighthouse": { + "name": "Q" + }, + "man_made/pier": { + "name": "방파제" + }, + "natural/bay": { + "name": "만" + }, + "natural/beach": { + "name": "해변" + }, + "natural/cliff": { + "name": "절벽" + }, + "natural/glacier": { + "name": "빙하" + } + } + } +} \ No newline at end of file diff --git a/vendor/assets/iD/iD/locales/ko.json b/vendor/assets/iD/iD/locales/ko.json index 45bf2d67b..2cdec56d8 100644 --- a/vendor/assets/iD/iD/locales/ko.json +++ b/vendor/assets/iD/iD/locales/ko.json @@ -332,7 +332,7 @@ }, "help": { "title": "도움말", - "help": "# 도움말\n\n이 편집기는 세계의 자유롭고 편집 가능한 지도인,\n[OpenStreetMap](http://www.openstreetmap.org/)을 위한 편집기입니다.\n모두를 위한 더 나은 세계의 오픈 소스 및 오픈 데이터 지도를 만들고, 당신의\n지역에서 데이터를 추가하거나 업데이드하려면 이를 사용할 수 있습니다.\n\n이 지도에서 만든 편집은 OpenStreetMap을 사용하는 모두에게\n보여질 수 있습니다. 편집을 하기 위해, [무료 OpenStreetMap\n계정](https://www.openstreetmap.org/user/new)이 필요합니다.\n\n[iD 편집기](http://ideditor.com/)는 [GitHub에 사용할 수 있는 소스\n코드](https://github.com/systemed/iD)로 된 협업 프로젝트입니다.\n", + "help": "# 도움말\n\n이 편집기는 세계의 자유롭고 편집할 수 있는 지도인,\n[OpenStreetMap](http://www.openstreetmap.org/)을 위한 편집기입니다.\n모두를 위한 더 나은 세계의 오픈 소스 및 오픈 데이터 지도를 만들고, 당신의\n지역에서 데이터를 추가하거나 업데이드하려면 이를 사용할 수 있습니다.\n\n이 지도에서 만든 편집은 OpenStreetMap을 사용하는 모두에게\n보여질 수 있습니다. 편집을 하기 위해, [무료 OpenStreetMap\n계정](https://www.openstreetmap.org/user/new)이 필요합니다.\n\n[iD 편집기](http://ideditor.com/)는 [GitHub에 사용할 수 있는 소스\n코드](https://github.com/openstreetmap/iD)로 된 협업 프로젝트입니다.\n", "editing_saving": "# 편집 및 저장\n\n이 편집기는 주로 온라인으로 작동하도록 설계되었고, 지금 웹사이트를 통해\n접근할 수 있습니다.\n\n### 기능 선택하기\n\n도로나 관심 있는 지점과 같은 지도 기능을 선택하려면, 지도에\n그것을 클릭하세요. 선택된 기능이 강조되고, 그것에 대한 세부 정보로\n된 패널을 열고, 기능을 수행할 수 있는 메뉴를 보여줍니다.\n\n여러 기능을 선택하려면 'Shift' 키를 누르고 있으세요. 다음 선택하려는\n기능을 클릭하거나, 사각형으로 그리기 위해 지도에 드래그하세요.\n상자가 그려지고 그 안에 있는 모든 지점이 선택됩니다.\n\n### 편집 저장하기\n\n도로, 건물과 장소 등을 편집하여 바꿀 때, 서버에 저장할 때까지는\n로컬에 저장됩니다. 실수를 걱정하지 마십시오 - 실행 취소\n버튼을 클릭해 바뀜을 실행 취소할 수 있고, 다시 실행 버튼을 클릭해\n바뀜을 다시 실행할 수 있습니다.\n\n편집의 그룹을 마치려면 '저장'을 클릭하세요 - 예를 들어, 마을의\n지역을 완료했고 새 지역에서 시작하고 싶으면 말입니다. 무엇을\n했는지 검토할 기회가 있을 것이며, 무언가 바꾸는 것에 대한 권한이\n없어 보이면 편집기가 유용한 제안과 경고를 제공합니다.\n\n모든 것이 좋아 보이면, 모든 다른 사용자에게 보여지고 구축하고 개선하기 위해 다른\n사용자가 사용할 수 있는 곳인, [OpenStreetMap.org](http://www.openstreetmap.org/)에\n바뀜을 게시하기 위해 바꾼 것을 설명할 짧은 요약을 입력하고 '저장'을\n다시 클릭할 수 있습니다.\n\n한 번에 앉아서 편집을 마칠 수 없으면, (같은 브라우저와 컴퓨터에서)\n편집기 창을 떠나고 나서 돌아올 수 있으며, 편집기 애플리케이션은\n작업을 되돌리도록 제공합니다.\n", "roads": "# 도로\n\n이 편집기로 도로를 만들고, 고치고, 삭제할 수 있습니다. 도로는 모든 종류가\n될 수 있습니다: 경로, 고속도로, 산책로, 자전거 도로와 더 많이 - 어떠한 자주 교차되는 세그먼트도 매핑할 수 있어야 합니다.\n\n### 선택하기\n\n도로를 선택하려면 도로를 클릭하세요. 지도와 도로에 대한 자세한\n정보를 보여주는 사이드바가 있는 작은 도구 메뉴와 함께, 외곽선이\n보여져야 합니다.\n\n### 수정하기\n\n때때로 도로 뒤나 GPS 트랙에 있는 영상이 정렬되지 않은 도로를\n볼 수 있습니다. 이러한 도로를 조정할 수 있으며 조정하면 올바른\n위치에 있게 됩니다.\n\n먼저 바꾸고 싶은 도로를 클릭하세요. 도로가 강조되고 더 나은 위치로\n드래그할 수 있는 조절 점이 보여집니다. 더 자세하게 하기 위해 새\n조절 점을 추가하고 싶으면, 노드 없이 도로의 부분을 더블 클릭하면\n추가됩니다.\n\n길을 다른 길로 연결하지만, 제대로 지도에 연결되어 있지 않으면,\n그들과 합치기 위해 다른 도로 위에 그 도로의 조절 점 중 하나를\n드래그할 수 있습니다. 도로 연결이 있는 것은 지도에 있어서 중요하고\n운전 경로를 제공하는 데 있어서 필수입니다.\n\n또한 한 번에 전체 도로를 옮기려면 '이동' 도구를 클릭하거나 `M` 바로가기 키를 누를 수\n있으며, 해당 움직임을 저장하려면 다시 클릭할 수 있습니다.\n\n### 삭제하기\n\n도로가 전체적으로 잘못되었다면 - 위성 영상에서 존재하지 않는 것을 볼 수\n있으며 이상적으로는 나타나지 않는 것으로 현지로 확인되었습니다 - 지도에서\n도로를 제거할 수 있습니다. 기능을 삭제할 때 주의하십시오 -\n어떠한 다른 편집, 모두에게 보여지는 결과와 위성 영상 같은 것은 때때로\n오래되었으며, 그래서 도로는 단순히 새로 지어졌을 수 있습니다.\n\n도로를 클릭하여 선택한 다음, 휴지통 아이콘을 클릭하거나 '삭제' 키를\n눌러 도로를 삭제할 수 있습니다.\n\n### 만들기\n\n어딘가에 찾은 도로가 있어야 하지만 없습니까? 선 그리기를 시작하려면\n편집기의 위 왼쪽에 '선' 아이콘을 클릭하거나 `2` 바로가기 키를 누르세요.\n\n그리기를 시작하려면 지도에 도로의 시작 부분을 클릭하세요. 도로가\n기존 도로에서 분기되어 있다면, 연결할 장소를 클릭하여 시작하세요.\n\n다음 위성 영상이나 GPS에 따라, 올바른 경로를 따를 수 있도록 도로를 따라\n점을 클릭하세요. 그리는 도로가 다른 도로와 교차하면, 교차점을 클릭하여\n도로를 연결하세요. 그리기가 완료되면, 더블 클릭하거나\n키보드에 있는 'Return' 또는 'Enter'를 누르세요.\n", "gps": "# GPS\n\nGPS 데이터는 OpenStreetMap에 대한 데이터의 가장 신뢰할 수 있는 자료입니다.\n이 편집기는 로컬 컴퓨터에 있는 `.gpx` 파일로 로컬 추적을 지원합니다. 스마트폰\n애플리케이션과 개인 GPS 하드웨어와 같은 것으로 GPS 추적을 모을 수 있습니다.\n\nGPS 측량을 수행하는 방법에 대한 자세한 정보는\n[GPS에 의한 측량](http://learnosm.org/en/beginner/using-gps/)을 읽으세요.\n\n매핑에 GPX 트랙을 사용하려면, 지도 편집기 위에 GPX 파일을 끌어 놓으세요.\n인식되면, 밝은 초록 선으로 지도에 추가됩니다. 활성화, 비활성화, 또는 새 GPX가\n배치된 레이어로 확대하려면 오른쪽에 있는 '배경 설정' 메뉴를 클릭하세요.\n\nGPX 트랙은 OpenStreetMap에 직접 올려지지 않습니다 - 그것을 사용하는 최상의\n방법은 새로운 기능을 추가하기 위한 가이드로 사용하여, 지도를 그리는 것이며,\n다른 사용자가 사용하기 위해 [OpenStreetMap에 그것을 올리는](http://www.openstreetmap.org/trace/create)\n것입니다.\n", diff --git a/vendor/assets/iD/iD/locales/lt.json b/vendor/assets/iD/iD/locales/lt.json index 46bd4a029..1408f1a85 100644 --- a/vendor/assets/iD/iD/locales/lt.json +++ b/vendor/assets/iD/iD/locales/lt.json @@ -2,11 +2,13 @@ "modes": { "add_area": { "title": "Plotas", - "description": "Pridėkite parkus, pastatus, ežerus ar kitas vietas į žemėlapį." + "description": "Pridėkite parkus, pastatus, ežerus ar kitas vietas į žemėlapį.", + "tail": "Spauskite ant žemėlapio, kad pradėtumėte braižyti plotą: parką, ežerą, pastatą ar pan." }, "add_line": { "title": "Linija", - "description": "Pridėti greitkelius, gatves, pėsčiųjų takus, kanalus ar kitas linijas į žemėlapį." + "description": "Pridėti greitkelius, gatves, pėsčiųjų takus, kanalus ar kitas linijas į žemėlapį.", + "tail": "Spauskite ant žemėlapio, kad pradėtumėte braižyti kelią, taką ar maršrutą." }, "add_point": { "title": "Taškas", @@ -16,65 +18,200 @@ "browse": { "title": "Naršyti", "description": "Perkelti ir padidinti žemėlapį." + }, + "draw_area": { + "tail": "Spauskite, kad pridėtumėte taškus jūsų plote. Spauskite ant pirmo taško, kad baigtumėte plotą." + }, + "draw_line": { + "tail": "Spauskite, kad pridėtumėte daugiau taškų linijoje. Spauskite ant kitų linijų, kad jas sujungtumėte. Spauskite du kartus, kad baigtumėte linijos piešimą." } }, "operations": { "add": { "annotation": { - "point": "Taškas pridėtas." + "point": "Taškas pridėtas.", + "vertex": "Viršūnė pridėta prie kelio.", + "relation": "Ryšys pridėtas." + } + }, + "start": { + "annotation": { + "line": "Pradėta linija.", + "area": "Pradėtas plotas." } }, + "continue": { + "key": "A", + "title": "Tęsti", + "description": "Tęsti šią liniją.", + "not_eligible": "Čia negalima tęsti jokios linijos.", + "multiple": "Čia galima tęsti daugiau nei vieną liniją. Norėdami parinkti liniją, spauskite Shift ir parinkite liniją.", + "annotation": { + "line": "Pratęsta linija.", + "area": "Pratęstas plotas." + } + }, + "cancel_draw": { + "annotation": "Nutrauktas braižymas." + }, + "change_role": { + "annotation": "Pakeista ryšio nario rolė." + }, + "change_tags": { + "annotation": "Pakeistos žymos." + }, "circularize": { - "key": "O" + "title": "Apvalinti", + "description": { + "line": "Suapvalinti šią liniją.", + "area": "Suapvalinti šį plotą." + }, + "key": "O", + "annotation": { + "line": "Suapvalinta linija.", + "area": "Suapvalintas plotas." + }, + "not_closed": "Negalima suapvalinti, nes linija nėra uždara." + }, + "orthogonalize": { + "title": "Statūs kampai", + "description": { + "line": "Keisti šios linijos kampus stačiais.", + "area": "Keisti šio ploto kampus stačiais." + }, + "key": "S", + "annotation": { + "line": "Keisti linijos kampus stačiais.", + "area": "Keisti ploto kampus stačiais." + }, + "not_squarish": "Negalima pakeisti kampų stačiais, nes jie labai nestatūs." + }, + "straighten": { + "title": "Tiesinti", + "description": "Tiesinti šią liniją.", + "key": "S", + "annotation": "Linija ištiesinta.", + "too_bendy": "Ši negali būti ištiesinta, nes ji per daug išlenkta." }, "delete": { "title": "Ištrinti", "description": "Pašalinti tai iš žemėlapio.", "annotation": { "point": "Taškas ištrintas.", + "vertex": "Viršūnė pašalinta iš kelio.", "line": "Linija ištrinta.", - "area": "Teritorija ištrinta." + "area": "Teritorija ištrinta.", + "relation": "Pašalintas ryšys.", + "multiple": "Pašalinta {n} objektų." + }, + "incomplete_relation": "Šio objekto negalima panaikinti, nes jis nebuvo pilnai atsiųstas." + }, + "add_member": { + "annotation": "Narys pridėtas prie ryšio." + }, + "delete_member": { + "annotation": "Narys pašalintas iš ryšio." + }, + "connect": { + "annotation": { + "point": "Kelias prijungtas prie taško.", + "vertex": "Kelias prijungtas prie kito.", + "line": "Kelias prijungtas prie linijos.", + "area": "Kelias prijungtas prie ploto." } }, "disconnect": { "title": "Atskirti", - "key": "D" + "description": "Atjungti šias linijas/plotus vieną nuo kito.", + "key": "D", + "annotation": "Atjungtos linijos/plotai.", + "not_connected": "Nepakankamai linijų/plotų, kad būtų galima atjungti." }, "merge": { "title": "Sujungti", "description": "Sujungti šias linijas.", - "key": "C" + "key": "C", + "annotation": "Sujungtos {n} linijos.", + "not_eligible": "Šie geoobjektai negali būti sulieti.", + "not_adjacent": "Šios linijos negali būti sulietos, nes jos nesusijungia.", + "restriction": "Šių linijų negalima sulieti, nes bent viena iš jų yra ryšio „{relation}“ narė." }, "move": { + "title": "Perkelti", + "description": "Perkelti tai į kitą vietą.", "key": "M", "annotation": { "point": "Taškas perkeltas.", - "line": "Linija perkelta." - } + "vertex": "Perkeltas taškas kelyje.", + "line": "Linija perkelta.", + "area": "Perkeltas plotas.", + "multiple": "Perkelti keli objektai." + }, + "incomplete_relation": "Šio geoobjekto negalima perkelti, nes jis nėra pilnai atsiųstas." }, "rotate": { "title": "Pasukti", + "description": "Pasukti šį objektą ties centro tašku.", "key": "R", "annotation": { - "line": "Linija pasukta." + "line": "Linija pasukta.", + "area": "Pasuktas plotas." } }, "reverse": { - "key": "V" + "title": "Atstatyti", + "description": "Pakeisti linijos kryptį.", + "key": "V", + "annotation": "Pakeista linijos kryptis." }, "split": { - "key": "X" + "title": "Padalinti", + "description": { + "line": "Dalinti šią liniją į dvi ties šiuo tašku.", + "area": "Dalinti šio ploto kontūrą į du.", + "multiple": "Dalinti linijų/plotų kontūrus į du ties šiuo tašku." + }, + "key": "X", + "annotation": { + "line": "Dalinti liniją.", + "area": "Dalinti ploto kontūrą.", + "multiple": "Dalinti {n} linijų/plotų kontūrus." + }, + "not_eligible": "Linijos negali būti dalinamos ties jų pradžia ar pabaiga.", + "multiple_ways": "Čia yra per daug linijų, kurias galima dalinti." } }, + "undo": { + "tooltip": "Atstatyti: {action}", + "nothing": "Nėra ką atstatyti." + }, + "redo": { + "tooltip": "Pakartoti: {action}", + "nothing": "Nėra ką pakartoti." + }, + "tooltip_keyhint": "Kombinacija:", + "browser_notice": "Šis redaktorius palaikomas Firefox, Chrome, Safari, Opera ir Internet Explorer 9 ir naujesnėse naršyklėse. Prašome atnaujinti jūsų naršyklę arba žemėlapio redagavimui naudoti Potlatch 2.", "translate": { "translate": "Versti", + "localized_translation_label": "Daugiakalbis pavadinimas", "localized_translation_language": "Pasirinkti kalbą", "localized_translation_name": "Pavadinimas" }, + "zoom_in_edit": "Padidinkite prieš redaguodami", "logout": "atsijungti", + "loading_auth": "Jungiamasi prie OpenStreetMap...", "report_a_bug": "pranešti apie klaidą", + "status": { + "error": "Nepavyksta prisijungti prie API.", + "offline": "API išjungtas. Bandykite redaguoti vėliau.", + "readonly": "API yra tik skaitymo režime. Prieš įrašydami savo pakeitimus turėsite palaukti." + }, "commit": { "title": "Išsaugoti pakeitimus", + "description_placeholder": "Trumpas jūsų indėlio aprašymas", + "message_label": "Pakeitimo aprašymas", + "upload_explanation": "Jūsų įkeliami pakeitimai bus matomi visuose žemėlapiuose, naudojančiuose OpenStreetMap duomenis.", + "upload_explanation_with_user": "Pakeitimai, kuriuos jūs įkeliate kaip naudotojas {user} bus matomi visuose žemėlapiuose, naudojančiuose OpenStreetMap duomenis.", "save": "Išsaugoti", "cancel": "Atšaukti", "warnings": "Įspėjimai", @@ -82,48 +219,201 @@ "deleted": "Ištrinta", "created": "Sukurta" }, + "contributors": { + "list": "Keitėjai {users}", + "truncated_list": "Keitėjai {users} ir {count} kitų" + }, "geocoder": { - "search": "Ieškoti visam pasaulyje..." + "search": "Ieškoti visam pasaulyje...", + "no_results_visible": "Nėra rezultatų matomame žemėlapio plote", + "no_results_worldwide": "Nėra rezultatų" }, "geolocate": { "title": "Rodyti mano vietą" }, "inspector": { + "no_documentation_combination": "Nėra šios žymos ar žymų kombinacijos aprašymo", + "no_documentation_key": "Šis raktas neturi dokumentacijos", + "show_more": "Rodyti daugiau", + "view_on_osm": "Žiūrėti svetainėje openstreetmap.org", + "all_tags": "Visos žymos", "all_members": "Visi nariai", "all_relations": "Visi ryšiai", + "new_relation": "Naujas ryšys...", + "role": "Rolė", + "choose": "Parinkite geoobjekto tipą", "results": "{n} paieškos {search} rezultatai", + "reference": "Žiūrėti OpenStreetMap Wikyje", + "back_tooltip": "Keisti objektą", "remove": "Pašalinti", "search": "Ieškoti", - "unknown": "Nežinoma" + "multiselect": "Pažymėti elementai", + "unknown": "Nežinoma", + "incomplete": "", + "feature_list": "Ieškoti objektų", + "edit": "Keisti objektą", + "none": "Jokio", + "node": "Taškas", + "way": "Kelias", + "relation": "Ryšys", + "location": "Vieta" + }, + "background": { + "title": "Fonas", + "description": "Fono nustatymai", + "percent_brightness": "{opacity}% ryškumas", + "none": "Jokio", + "custom": "Savas", + "custom_prompt": "Įveskite kaladėlių šabloną. Galimi raktažodžiai yra {z}, {x}, {y} Z/X/Y schemai arba {u} quadtile schemai.", + "fix_misalignment": "Taisyti poziciją", + "reset": "iš naujo" + }, + "restore": { + "heading": "Turite neįrašytų pakeitimų", + "description": "Ar norite atstatyti neįrašytus ankstesnės redagavimo sesijos pakeitimus?", + "restore": "Atstatyti", + "reset": "Iš naujo" }, "save": { - "title": "Išsaugoti" + "title": "Išsaugoti", + "help": "Įrašyti pakeitimus į OpenStreetMap, kad jie būtų matomi kitiems naudotojams.", + "no_changes": "Nėra pakeitimų.", + "error": "Bandant įrašyti įvyko klaida.", + "uploading": "Pakeitimai įkeliami į OpenStreetMap.", + "unsaved_changes": "Turite neįrašytų pakeitimų" + }, + "success": { + "edited_osm": "Pakeitėte OSM!", + "just_edited": "Jūs ką tik pakeitėte OpenStreetMap!", + "view_on_osm": "Žiūrėti OSM žemėlapyje", + "facebook": "Pasidalinti Facebook'e", + "twitter": "Pasidalinti Twitter'yje", + "google": "Pasidalinti Google+", + "help_html": "Jūsų pakeitimai turėtų pasirodyti „Standartiniame“ sluoksnyje po kelių minučių. Kiti sluoksniai ar konkretūs objektai gali pasirodyti vėliau\n(daugiau informacijos).\n" }, "confirm": { "okay": "Gerai" }, + "splash": { + "welcome": "Jus sveikina iD OpenStreetMap redaktorius", + "text": "iD yra draugiškas, bet galingas įrankis pildant didžiausią, atviriausią ir nemokamą/laisvą pasaulio žemėlapį. Šiuo metu naudojate versiją {version}. Daugiau informacijos rasite svetainėje {website}, o apie klaidas galite pranešti {github}.", + "walkthrough": "Pradėti pažingsninę demonstraciją", + "start": "Keisti dabar" + }, + "source_switch": { + "live": "gyva", + "lose_changes": "Turite neįrašytų pakeitimų. Perjungiant žemėlapio stotį jie bus panaikinti. Ar tikrai norite pakeisti žemėlapių stotį?", + "dev": "dev" + }, "tag_reference": { - "description": "Aprašymas" + "description": "Aprašymas", + "on_wiki": "{tag} svetainėje wiki.osm.org", + "used_with": "naudojama su {type}" + }, + "validations": { + "untagged_point": "Taškas be žymų", + "untagged_line": "Linija be žymų", + "untagged_area": "Plotas be žymų", + "many_deletions": "Jūs naikinate {n} objektų. Ar tikrai norite tai padaryti? Tai panaikins objektus iš žemėlapio, kurį visi mato svetainėje openstreetmap.org.", + "tag_suggests_area": "Žyma {tag} rodo, kad linija turėtų būti plotas, bet ji nėra plotas", + "untagged_tooltip": "Parinkite objekto tipą, kuris aprašo, kas yra šis {geometry}.", + "deprecated_tags": "Pasenusios žymos: {tags}" }, "zoom": { "in": "Sumažinti", "out": "Padidinti" }, + "cannot_zoom": "Negalima atitolinti šiame režime.", + "gpx": { + "local_layer": "Vietinis GPX failas", + "drag_drop": "Atitempkite ir numeskite .gpx failą ant puslapio arba spauskite naršymo mygtuką dešinėje", + "zoom": "Rodyti GPX pėdsako plotą", + "browse": "Naršyti .gpx failo" + }, "help": { - "title": "Pagalba" + "title": "Pagalba", + "help": "# Pagalba\n\nTai yra [OpenStreetMap](http://www.openstreetmap.org/) redaktorius.\nOpenStreetMap - atviras, redaguojamas pasaulio žemėlapis. Galite jį naudoti\nbei keisti duomenis, taip tobulindami atviro kodo ir atvirų duomenų pasaulio\nžemėlapį ir padėdami visiems.\n\nJūsų pakeitimai bus matomi visiems, kas naudoja OpenStreetMap. Norėdami\ndaryti pakeitimus, turėsite susikurti [nemokamą OpenStreetMap paskyrą](https://www.openstreetmap.org/user/new).\n\n[iD redaktorius](http://ideditor.com/) - tai bendruomenės projektas. Programos\nkodas yra atviras, jį galite rasti [GitHub](https://github.com/openstreetmap/iD).\n", + "roads": "# Keliai\n\nJūs galite kurti, taisyti ir naikinti kelius redaktoriaus pagalba. Keliai gali būti įvairių\ntipų: takai, vieškeliai, maršrutai, dviračių takai ir daug kitų, dažnai susikertančių,\njuos visus galima pažymėti.\n\n### Parinkimas\n\nNorėdami parinkti kelią - spauskite ant jo. Kelio kontūras bus paryškintas, taipogi\nbus rodomas mažas įrankių meniu ir šonine skiltimi, rodančia daugiau informacijos\napie kelią.\n\n### Keitimas\n\nDažnai pastebėsite kelius, kurių pozicija neatitinka fone esančios ortofotonuotraukos arba\njūsų GPS pėdsako. Galie pataisyti kelio poziciją, kad kelias būtų teisingoje vietoje.\n\nVisų pirma spauskite ant kelio, kurį norite keisti. Kelias bus paryškintas ir bus matomi\nkontroliniai taškai, kuriuos jūs galite pertempti į teisingesnes pozicijas. Jei norite pridėti\npapildomų kontrolinių taškų - du kartus spauskite ant kelio segmento, kuriame\ndar nėra taško - bus pridėtas naujas taškas.\n\nJei kelias jungiasi su kitu keliu, bet nėra teisingai sujungtas žemėlapyje, jūs galite\ntempti vieną iš kelio kontrolinių taškų ant kito kelio, kad juos sujungtumėte. Labai\nsvarbu teisingai sujungti kelius, nes tai naudojama maršrutizavimui.\n\nTaipogi galite naudoti įrankį „Perkelti“ arba spausti mygtuką „M“, jei norite perkelti\nvisą kelią iš karto, tada vėl spauskite „M“, kad patvirtintumėte perkėlimą.\n\n### Naikinimas\n\nJei kelias yra visiškai neteisingas - jūs matote, kad tokio kelio apskritai nėra ortofoto\nir jūs žinote, kad jo ir realybėje nėra - galite kelią ištrinti, kad jo nebeliktų žemėlapyje.\nNaikindami objektus būkite atidūs, kaip ir bet kuris kitas keitimas, naikinimas matomas\nvisiems naudotojams, o ortofotografijos dažnai būna pasenusios, tagi naujai\nnutiestas kelias gali būti tiesiog nematomas.\n\nKelią galite panaikinti pažymėję jį ir paspaudę šiukšlių dėžės piktogramą arba\npaspaudę mygtuką „Trinti“.\n\n### Kūrimas\n\nRadote vietą, kur turėtų būti kelias, bet jo nėra? Spauskite mygtuką „Linija“\narba klavišą „2“, kad pradėtumėte linijos piešimą.\n\nSpauskite žemėlapyje ant vietos, kur turi prasidėti jūsų kelias. Jeigu kelias atsišakoja\nnuo jau esamo kelio - pradėkite naujo kelio piešimą paspaudę ant atsišakojimo vietos.\n\nTada dėliokite kelio taškus taip, kad jo kontūras maksimaliai atitiktų realų kelią pagal\npalydovinę nuotrauką ar GPS pėdsakus. Jei jūsų piešiamas kelias kerta kitą kelią,\nsujunkite juos spaudžiant ties susikirtimo tašku. Kai baigsite braižyti, du kartus\nspauskite pele arba spauskite klaviatūros mygtuką „Enter“.\n", + "imagery": "# Nuotraukos\n\nIš oro ar palydovo darytos nuotraukos - svarbus žemėlapio paišymo pagalbininkas.\nDešinėje esančiame meniu rasite įvairių nuotraukų, darytų iš lėktuvų, palydovų ar\nkombinuotų šaltinių.\n\nTik įjungus redaktorių bus automatiškai įjungtas [Bing Maps](http://www.bing.com/maps/)\npalydovinis sluoksnis, bet priklausomai nuo to, kurioje geografinėje vietoje\nredaguojate - bus rodomi ir kiti nuotraukų šaltiniai. Kai kurios šalys, tokios kaip\nJAV, Prancūzija, Danija ir Lietuva turi labai aukštos kokybės ir tikslumo\nortofotonuotraukas. Pavyzdžiui Lietuvoje reikėtų naudoti NŽT ORT10LT.\n\nNuotraukos kartais būna pasislinkusios nuo realios pozicijos dėl nuotraukų\ntiekėjo klaidų. Jei matote, kad daug kelių ar kitų objektų yra pasislinkę nuo\nnuotraukos, nepulkite jų tempti į „teisingas“ vietas. Vietoje to geriau pataisykite\nnuotraukos poziciją pagal esamus duomenis, paspaudę fono parinkčių apačioje\n„Taisyti lygiavimą“. NŽT ORT10LT lygiavimas yra teisingas visoje Lietuvos\nteritorijoje, taigi jo taisyti nereikia.\n", + "addresses": "# Adresai\n\nAdresų informacija - viena naudingiausių žemėlapyje.\n\nOpenStreetMap adresai dažniausiai įrašomi kaip pastatų arba lankytinų vietų\natributai.\n\nJūs galite pridėti adreso informaciją vietoms, pažymėtoms kaip pastatų\nkontūrai bei pavieniams taškams. Geriausias adreso informacijos šaltinis\nyra vietinė apžiūra arba asmeninės žinios - kaip ir su bet kuriais kitais\nobjektais, naudoti šaltinius, tokius kaip Google Maps, maps.lt, Registrų Centras\nir pan. yra griežtai draudžiama.\n", + "buildings": "# Pastatai\n\nOpenStreetMap - tai didžiausia pasaulyje pastatų duomenų bazė. Jūs galite\nkurti ir tobulinti šią duomenų bazę.\n\n### Parinkimas\n\nPastatą parinkti galit paspaudę ant jo kontūro. Tai paryškins pastatą ir atvers\nmažą įrankių meniu bei šoninę skiltį su papildoma informacija apie pastatą.\n\n### Keitimas\n\nKartais pastatai būna nupiešti neteisingoje vietoje arba turi neteisingas žymas.\n\nNorėdami perkelti visą pastatą, pažymėkite jį, parinkite įrankį „Perkelti“.\nPerkelkite pastatą pelės pagalba ir spauskite, kai vieta yra teisinga.\n\nNorėdami patvarkyti pastato formą, spauskite ir tempkite pastato kontūro\ntaškus į teisingas vietas.\n\n### Kūrimas\n\nVienas pagrindinių klausimų apie pastatų registravimą žemėlapyje yra tai,\nkad OpenStreetMap pastatai registruojami ir kaip plotai, ir kaip taškai.\nBendra taisyklė yra žymėti pastatus plotais, jei tik tai įmanoma. Įmones ar\nlankytinas vietas, kurios veikia pastatuose, žymėti kaip taškus, esančius\npastato ploto viduje.\n\nPradėkite pastato braižyma parinkdami mygtuką „Plotas“ viršutinėje\nsąsajos dalyje. Pastato braižymą baikite spausdami „Enter“ arba paspaudę\nant pirmo pastato formos taško.\n\n### Naikinimas\n\nJei pastatas yra visiškai neteisingas - jūs aiškiai matote, kad pastato nėra\npalydovinėje nuotraukoje ar gal net patikrinote jo nebuvimą realiu apsilankymu\nvietoje - galite panaikinti pastatą iš žemėlapio. Naikindami objektus būkite\natidūs, kaip ir bet kuris kitas pakeitimas, šis bus matomas visiems naudotojams,\no palydovinės nuotraukos dažnai būna pasenusios, taigi gali būti, kad pastatas\ntiesiog yra naujai pastatytas, todėl ir nesimato nuotraukoje.\n\nPastatą panaikinti galite jį pažymėję ir paspaudę šiukšlinės piktogramą arba\nmygtuką „Trinti/Delete“.\n" }, "intro": { + "navigation": { + "title": "Navigacija", + "drag": "Pagrindinė žemėlapio sritis rodo OpenStreetMap duomenis virš fono. Galite keisti poziciją tempiant pele arba naudojant pelės ratuką - kaip ir bet kuriame kitame tinklo žemėlapyje. **Pastumkite žemėlapį!**", + "select": "Žemėlapio geoobjektai būna trijų tipų: taškai, linijos ir plotai. Visi geoobjektai gali būti pažymėti juos paspaudus. **Spauskite tašką, kad jį pažymėtumėte.**", + "header": "Antraštė rodo geoobjekto tipą.", + "pane": "Parinkus geoobjektą rodomas redaktorius. Antraštėje rodomas geoobjekto tipas, o pagrindinėje skiltyje matomi geoobjekto atributai, tokie kaip pavadinimas ir adresas. **Uždarykite geoobjekto redaktorių mygtuku „uždaryti“, esančiu viršutiniame dešiniame kampe.**" + }, + "points": { + "title": "Taškai", + "add": "Taškai gali būti naudojami vaizduoti tokius objektus kaip parduotuvės, restoranai ar paminklai. Jie žymi konkrečią vietą ir aprašo, kas ten yra. **Spauskite mygtuką „Taškas“, kad pridėtumėte tašką.**", + "place": "Taškas gali būti pažymėtas paspaudus ant žemėlapio. **Padėkite tašką ant pastato.**", + "search": "Yra daug skirtingų objektų, kurie gali būti vaizduojami taškais. Jūsų ką tik pridėtas taškas yra kavinė. **Ieškokite '{name}'**", + "choose": "**Sąraše parinkite Kavinę.**", + "describe": "Taškas dabar pažymėtas kaip kavinė. Naudodami geoobjektų redaktorių mes galima pridėti daugiau informacijos. **Pridėkite pavadinimą**", + "close": "Objektų redaktorių galima uždaryti mygtuku „X“. **Uždarykite objektų redaktorių**", + "reselect": "Dažnai taškai jau bus nupiešti, bet informacija bus nepilna arba joje bus klaidų. Mes galima keisti ir jau esamus taškus. **Pažymėkite jūsų ką tik sukurtą tašką.**", + "fixname": "**Pakeiskite pavadinimą ir uždarykite objektų redaktorių.**", + "reselect_delete": "Visi žemėlapio objektai gali būti panaikinti. **Spauskite ant jūsų sukurto taško.**", + "delete": "Meniu aplink tašką rasite veiksmus, kuriuos galite atlikti su pažymėtu objektu, įskaitant ir panaikinimą. **Panaikinkite tašką.**" + }, + "areas": { + "title": "Plotai", + "add": "Plotai - tai detalesnis objektų vaizdavimo būdas. Jie nurodo objekto išorės kontūrus. Plotus galima naudoti beveik visiems objektams, kuriuos galima žymėti taškais ir jei tik galima, ploto žymėjimas yra pageidaujamas. **Spauskite ploto mygtuką ir pridėkite naują plotą.**", + "corner": "Plotai paišomi dėliojant taškus, nurodančius ploto kontūrą. **Sukurkite pradinį tašką viename iš žaidimų aikštelės kampų.**", + "place": "Nupieškite plotą pridėdami daugiau taškų. Baikite ploto braižymą pažymėję pradinį tašką. **Nubraižykite žaidimų aikštelės plotą.**", + "search": "**Ieškoti '{name}'.**", + "choose": "**Sąraše parinkite žaidimų aikštelę.**", + "describe": "**Pridėkite pavadinimą ir uždarykite objektų redaktorių**" + }, "lines": { - "title": "Linijos" + "title": "Linijos", + "start": "**Pradėkite linijos braižymą spausdami ant kelio pabaigos.**", + "intersect": "Spauskite, kad pridėtumėte prie linijos daugiau taškų. Braižymo metu, jei reikia, galite pastumti žemėlapi. Keliai bei daug kitų linijų tipų paprastai yra dalis didelio tinklo. Labai svarbu, kad šios linijos būtų teisingai sujungtos, kad veiktų maršrutizavimas. **Spauskite ant Flower Street, kad sukurtumėte susikirtimą tarp dviejų linijų.**", + "finish": "Linijos braižymas gali būti baigiamas antrą kartą paspaudus ant paskutiniojo taško. **Baikite kelio braižymą.**", + "road": "**Sąraše parinkite kelią**", + "residential": "Yra įvairių kelių tipų, dažniausiai pasitaikantis - „Residential“. **Parinkite kelio tipą „Residential“**", + "describe": "**Įveskite kelio pavadinimą ir užverkite objektų redaktorių.**", + "restart": "Kelias turi susikirsti su Flower Street.", + "wrong_preset": "Neparinkote gyvenamosios gatvės tipo. **Spauskite čia ir parinkite iš naujo**" + }, + "startediting": { + "title": "Pradėti redagavimą", + "help": "Išsamesnę dokumentaciją ir šią pažingsninę demonstraciją rasite čia.", + "save": "Nepamirškite periodiškai įrašyti savo pakeitimų!", + "start": "Pradėkite žymėjimą!" } }, "presets": { "categories": { + "category-building": { + "name": "Pastatas" + }, + "category-golf": { + "name": "Golfas" + }, + "category-landuse": { + "name": "Žemėnauda" + }, + "category-path": { + "name": "Takas" + }, + "category-rail": { + "name": "Gelžkelis" + }, "category-road": { "name": "Kelias" }, "category-route": { "name": "Maršrutas" + }, + "category-water-area": { + "name": "Vanduo" + }, + "category-water-line": { + "name": "Vanduo" } }, "fields": { @@ -163,6 +453,9 @@ } } }, + "access_simple": { + "label": "Prieiga" + }, "address": { "label": "Adresas", "placeholders": { @@ -232,6 +525,9 @@ "description": { "label": "Aprašymas" }, + "elevation": { + "label": "Aukštis" + }, "entrance": { "label": "Tipas" }, @@ -375,12 +671,18 @@ "route_master": { "label": "Tipas" }, + "sac_scale": { + "label": "Tako sudėtingumas" + }, "service": { "label": "Tipas" }, "shelter": { "label": "Prieglobstis" }, + "shelter_type": { + "label": "Tipas" + }, "shop": { "label": "Tipas" }, @@ -409,6 +711,9 @@ "tracktype": { "label": "Tipas" }, + "trail_visibility": { + "label": "Maršruto matomumas" + }, "water": { "label": "Tipas" }, @@ -431,7 +736,8 @@ }, "presets": { "address": { - "name": "Adresas" + "name": "Adresas", + "terms": "adresas" }, "aeroway/aerodrome": { "name": "Oro uostas" @@ -442,12 +748,21 @@ "aeroway/hangar": { "name": "Angaras" }, + "aeroway/helipad": { + "name": "Sraigtasparnių aikštelė" + }, "aeroway/runway": { "name": "Pakilimo takas" }, + "amenity": { + "name": "Paslaugos" + }, "amenity/arts_centre": { "name": "Menų centras" }, + "amenity/atm": { + "name": "Bankomatas" + }, "amenity/bank": { "name": "Bankas" }, @@ -487,6 +802,9 @@ "amenity/courthouse": { "name": "Teismo rūmai" }, + "amenity/dentist": { + "terms": "odontologas,dantistas,stomatologas" + }, "amenity/drinking_water": { "name": "Geriamas vanduo" }, @@ -518,7 +836,8 @@ "name": "Biblioteka" }, "amenity/marketplace": { - "name": "Prekyvietė" + "name": "Prekyvietė", + "terms": "prekyvietė,turgus,turgelis" }, "amenity/pharmacy": { "name": "Vaistinė" @@ -557,7 +876,11 @@ "name": "Restoranas" }, "amenity/school": { - "name": "Mokykla" + "name": "Mokykla", + "terms": "mokykla,mokymo įstaiga" + }, + "amenity/shelter": { + "name": "Pastogė" }, "amenity/swimming_pool": { "name": "Baseinas" @@ -595,6 +918,9 @@ "barrier/city_wall": { "name": "Miesto siena" }, + "barrier/ditch": { + "name": "Griovys" + }, "barrier/entrance": { "name": "Įėjimas" }, @@ -607,21 +933,43 @@ "barrier/lift_gate": { "name": "Pakeliami vartai" }, + "barrier/toll_booth": { + "name": "Mokėjimo punktas" + }, "barrier/wall": { "name": "Siena" }, + "boundary/administrative": { + "name": "Administracinė riba" + }, "building": { - "name": "Pastatas" + "name": "Pastatas", + "terms": "pastatas,namas,statinys" }, "building/apartments": { "name": "Apartamentai" }, + "building/commercial": { + "name": "Komercinis pastatas", + "terms": "komercinis,pastatas,statinys" + }, + "building/entrance": { + "name": "Įėjimas" + }, "building/garage": { "name": "Garažas" }, "building/house": { "name": "Namas" }, + "building/industrial": { + "name": "Pramoninis pastatas", + "terms": "pramoninis,pastatas,statinys,gamykla,įmonė" + }, + "building/residential": { + "name": "Gyvenamasis pastatas", + "terms": "gyvenamasis,pastatas,namas,statinys" + }, "emergency/fire_hydrant": { "name": "Hidrantas" }, @@ -631,9 +979,15 @@ "entrance": { "name": "Įėjimas" }, + "footway/sidewalk": { + "name": "Šaligatvis" + }, "highway": { "name": "Greitkelis" }, + "highway/bridleway": { + "name": "Žirgų kelias" + }, "highway/bus_stop": { "name": "Autobuso stotelė" }, @@ -661,6 +1015,9 @@ "highway/primary": { "name": "Pagrindinis kelias" }, + "highway/residential": { + "name": "Gyvenamasis kelias" + }, "highway/road": { "name": "Nežinomas kelias" }, @@ -670,6 +1027,9 @@ "highway/service": { "name": "Aptarnaujantis kelias" }, + "highway/service/alley": { + "name": "Alėja" + }, "highway/service/emergency_access": { "name": "Pagalbos priėjimas" }, @@ -679,6 +1039,9 @@ "highway/stop": { "name": "Stop ženklas" }, + "highway/track": { + "name": "Kelias" + }, "highway/traffic_signals": { "name": "Eismo signala" }, @@ -688,6 +1051,9 @@ "highway/turning_circle": { "name": "Apsisukimo žiedas" }, + "highway/unclassified": { + "name": "Neklasifikuotas kelias" + }, "historic": { "name": "Istorinė vietovė" }, @@ -706,6 +1072,15 @@ "historic/ruins": { "name": "Griuvėsiai" }, + "historic/wayside_cross": { + "name": "Kryžius prie kelio" + }, + "historic/wayside_shrine": { + "name": "Pakelės šventovė" + }, + "landuse": { + "name": "Žemėnauda" + }, "landuse/allotments": { "name": "Žemės sklypai" }, @@ -748,12 +1123,18 @@ "landuse/residential": { "name": "Gyvenamosios vietos" }, + "landuse/retail": { + "name": "Prekyba" + }, "landuse/vineyard": { "name": "Vynuogynas" }, "leisure": { "name": "Laisvalaikis" }, + "leisure/dog_park": { + "name": "Šunų parkas" + }, "leisure/garden": { "name": "Sodas" }, @@ -799,9 +1180,15 @@ "line": { "name": "Linija" }, + "man_made": { + "name": "Žmogaus sukurtas" + }, "man_made/lighthouse": { "name": "Švyturys" }, + "man_made/observation": { + "name": "Stebėjimo bokštas" + }, "man_made/pier": { "name": "Prieplauka" }, @@ -814,6 +1201,18 @@ "man_made/water_tower": { "name": "Vandens bokštas" }, + "man_made/water_well": { + "name": "Vandens šulinys" + }, + "military/bunker": { + "name": "Bunkeris" + }, + "military/range": { + "name": "Karinis poligonas" + }, + "natural": { + "name": "Natūralus" + }, "natural/bay": { "name": "Įlanka" }, @@ -826,12 +1225,21 @@ "natural/coastline": { "name": "Pakrantė" }, + "natural/glacier": { + "name": "Ledynas" + }, "natural/grassland": { "name": "Pieva" }, "natural/peak": { "name": "Viršūnė" }, + "natural/scrub": { + "name": "Krūmai" + }, + "natural/spring": { + "name": "Šaltinis" + }, "natural/tree": { "name": "Medis" }, @@ -847,6 +1255,21 @@ "natural/water/reservoir": { "name": "Rezervuaras" }, + "natural/wetland": { + "name": "Drėgna žemė" + }, + "natural/wood": { + "name": "Medis" + }, + "office": { + "name": "Biuras" + }, + "office/company": { + "name": "Kompanijos kontora" + }, + "office/it": { + "name": "IT kontora" + }, "place": { "name": "Vieta" }, @@ -877,6 +1300,24 @@ "power/generator": { "name": "Jėgainė" }, + "power/line": { + "name": "Elektros linija" + }, + "power/pole": { + "name": "Elektros stulpas" + }, + "power/sub_station": { + "name": "Pastotė" + }, + "power/tower": { + "name": "Aukštos įtampos bokštas" + }, + "power/transformer": { + "name": "Transformatorius" + }, + "public_transport/platform": { + "name": "Platforma" + }, "railway": { "name": "Geležinkelis" }, @@ -886,9 +1327,15 @@ "railway/disused": { "name": "Nebenaudojamas geležinkelis" }, + "railway/level_crossing": { + "name": "Vieno lygio susikirtimas" + }, "railway/monorail": { "name": "Vienbėgis geležinkelis" }, + "railway/rail": { + "name": "Gelžkelis" + }, "railway/station": { "name": "Geležinkelio stotis" }, @@ -898,6 +1345,12 @@ "railway/subway_entrance": { "name": "Metro įėjimas" }, + "railway/tram": { + "name": "Tramvajus" + }, + "relation": { + "name": "Ryšys" + }, "route/ferry": { "name": "Kelto maršrutas" }, @@ -946,6 +1399,9 @@ "shop/department_store": { "name": "Universalinė parduotuvė" }, + "shop/doityourself": { + "name": "Pasidaryk pats parduotuvė" + }, "shop/electronics": { "name": "Elektronikos parduotuvė" }, @@ -962,7 +1418,8 @@ "name": "Dovanų parduotuvė" }, "shop/hairdresser": { - "name": "Kirpykla" + "name": "Kirpykla", + "terms": "kirpykla" }, "shop/hardware": { "name": "Techninės įrangos parduotuvė" @@ -976,6 +1433,9 @@ "shop/laundry": { "name": "Skalbykla" }, + "shop/locksmith": { + "name": "Raktininkas" + }, "shop/mall": { "name": "Prekybos centras" }, @@ -1015,6 +1475,9 @@ "shop/vacant": { "name": "Tuščia parduotuvė" }, + "shop/video": { + "name": "Vaizdo prekių parduotuvė" + }, "tourism": { "name": "Turizmas" }, @@ -1027,6 +1490,10 @@ "tourism/camp_site": { "name": "Stovyklavietė" }, + "tourism/chalet": { + "name": "Sodyba", + "terms": "sodyba,kaimo sodyba" + }, "tourism/guest_house": { "name": "Svečių namai" }, @@ -1048,6 +1515,9 @@ "tourism/picnic_site": { "name": "Pikniko stovyklavietė" }, + "tourism/viewpoint": { + "name": "Apžvalgos taškas" + }, "tourism/zoo": { "name": "Zoologijos sodas" }, @@ -1057,6 +1527,9 @@ "type/boundary/administrative": { "name": "Administracinė siena" }, + "type/multipolygon": { + "name": "Multipoligonas" + }, "type/restriction": { "name": "Apribojimas" }, @@ -1096,11 +1569,23 @@ "waterway/dam": { "name": "Užtvanka" }, + "waterway/ditch": { + "name": "Griovys" + }, + "waterway/drain": { + "name": "Vandens nuoteka" + }, "waterway/river": { "name": "Upė" }, + "waterway/riverbank": { + "name": "Upės kraštas" + }, "waterway/stream": { "name": "Upelis" + }, + "waterway/weir": { + "name": "Užtvanka" } } } diff --git a/vendor/assets/iD/iD/locales/lv.json b/vendor/assets/iD/iD/locales/lv.json index 75381511a..ee9990960 100644 --- a/vendor/assets/iD/iD/locales/lv.json +++ b/vendor/assets/iD/iD/locales/lv.json @@ -249,8 +249,7 @@ "local_layer": "Vietējais GPX fails" }, "help": { - "title": "Palīdzība", - "help": "# Palīdzība\n\nŠis ir redaktors, kas domāts [OpenStreetMap](http://www.openstreetmap.org/) -\n tā ir visiem pieejama un brīvi labojama pasaules karte. Tu vari lietot šo redaktoru, lai labotu un papildinātu datus tev labi zināmā apgabalā, tādejādi radot atvērtās piekļuvess pasaules karti labāku priekš ikviena, kas to lieto.\n\nLabojumi, ko tu veiksi kartē, būs redzami ikvienam, kas lieto OpenStreeMap.\nLai veiktu labojumus, tev vajag atvērt \n[brīvu OpenStreetMap kontu](https://www.openstreetmap.org/user/new).\n[iD editor](http://ideditor.com/) ir uz sadarbību orientēts projekts ar pilnu pieeju [izejas kodam, kas pieejams GitHub](https://github.com/systemed/iD).\n" + "title": "Palīdzība" }, "intro": { "navigation": { diff --git a/vendor/assets/iD/iD/locales/nl.json b/vendor/assets/iD/iD/locales/nl.json index 473ed11a3..cd01b9a22 100644 --- a/vendor/assets/iD/iD/locales/nl.json +++ b/vendor/assets/iD/iD/locales/nl.json @@ -327,7 +327,6 @@ }, "help": { "title": "Help", - "help": "# Help\n\nDit is een editor voor [OpenStreetMap](http://www.openstreetmap.org/), de\nvrije en aanpasbare wereldkaart. Je kan het gebruiken om gegevens in je \nomgeving toe te voegen of bij te werken, waarmee je een open source en open\ndata wereldkaart voor iedereen beter maakt.\n\nAanpassingen die je op deze kaart maakt zullen voor iedereen te zien zijn die\ngebruik maakt van OpenStreetMap. Om een aanpassing te maken, heb je een \n[gratis OpenStreetMap account](https://www.openstreetmap.org/user/new) nodig.\n\nDe [iD editor](http://ideditor.com/) is een samenwerkingsproject waarvan de \n[broncode beschikbaar is op GitHub](https://github.com/systemed/iD).\n", "editing_saving": "# Bewerken & Opslaan\n\nDeze editor is ontworpen om voornamelijk online te gebruiken, en je via de website hebt er toegang toe op dit moment.\n\n### Objecten selecteren\n\nOm objecten in een kaart te selecteren, zoals een weg of interessant punt, moet je op de kaart erop kikken. Het geselecteerde object zal dan oplichten, er zal een paneel met details geopend worden en een menu zal getoond worden dat je met dit object kan doen.\n\nHoud de 'Shift'-toets vast om meerdere objecten te kunnen selecteren. Klik daarna of op objecten die je wil selecteren of op de kaart wil verslepen of teken een rechthoek. Dit laatste zal een alle punten die erin vallen selecteren.\n\n### Opslaan van bewerkingen\n\nAls je wijzigingen maakt aan bestaande wegen, gebouwen en andere plaatsen worden deze eerst lokaal opgeslagen totdat je ze op de server opslaat. Maak je geen zorgen als je een fout maakt - je kan wijzigingen altijd ongedaan maken door op de undo-knop te klikken en ze weer herstellen door op de redo-knop te klikken.\n\nKlik op 'Opslaan' om een groep van bewerkingen op te slaan. - bijvoorbeeld als je een gebied of dorp hebt afgerond en je aan een ander gebied wil beginnen. Je krijgt de mogelijkheid om te herzien wat je hebt aangepast en de editor geeft je suggesties voor verbeteringen en waarschuwingen als er iets mis lijkt te zijn.\n\nAls alles er goed uit ziet kun je kort commentaar toevoegen die de wijziging die je hebt gemaakt beschrijft en klik daarna nogmaals op 'Opslaan' om de wijzigingen op te sturen aan [OpenStreetMap.org](http://www.openstreetmap.org/), waar ze zichtbaar zijn voor alle gebruikers en voor anderen om op voort te bouwen of uit te verbeteren.\n\nAls je in een sessie niet al je bewerkingen door kan voeren kun je het bewerkwindow open laten en later terugkomen (in dezelfde browser op dezelfde computer) en de bewerkapplicatie zal je aanbieden je werk weer terug te zetten.\n", "roads": "# Wegen\n\nJe kan met deze editor wegen maken, verbeteren en verwijderen. Wegen zijn er in\nallerlei soorten en maten: landweggetjes, snelwegen, paadjes, fietspaden en veel\nmeer - ieder stukje dat vaak wordt gebruikt kan in kaart worden gebracht.\n\n### Selecteren\n\nKlik op een weg om deze te selecteren. De omtrek verschijnt samen met een klein\nmenu op de kaart en een schermpje met informatie over de weg.\n\n### Aanpassen\n\nVaak kom je wegen tegen, die niet precies over het beeldmateriaal of de GPS-route\nerachter lopen. Je kan deze wegen aanpassen, zodat ze op de juiste plek komen te\nliggen.\n\nKlik eerst op de weg die je wilt aanpassen. Deze zal dan oplichten en er verschijnen\npuntjes langs de lijn die je kan verslepen naar een betere plek. Als je nieuwe\npuntjes wilt toevoegen voor meer detaillering, dubbelklik op een weggedeelte\nzonder een knooppunt en een nieuwe wordt toegevoegd.\n\nAls een weg is verbonden met een andere weg, maar niet in de kaart dan versleep\nje een van de puntjes op de andere weg om ze te verbinden. Dat wegen met elkaar\nzijn verbonden is belangrijk voor de kaart en essentieel om een routebeschrijving\nte kunnen maken.\n\nJe kan bovendien het 'Verplaats' gereedschap aanklikken of de 'V' snelkoppeling om\nde gehele weg in een keer te verplaatsen en opnieuw aanklikken om deze verplaatsing\nop te slaan.\n\n### Verwijderen\n\nAls een weg helemaal verkeerd is - je ziet dat het niet op het satellietbeeld te zien is\nen je hebt idealiter ter plaatse gecontroleerd, dat de weg er niet is - dan kan je het\nverwijderen, zodat het van de kaart verdwijnt. Wees voorzichtig met het verwijderen\nvan objecten - zoals bij iedere aanpassing is het resultaat voor iedereen zichtbaar en\nsatellietbeelden zijn vaak verouderd, dus de weg zou gewoon nieuw kunnen zijn aangelegd.\n\nJe kan een weg verwijderen door er op te klikken om het te selecteren, waarna je op het\nprullenbakicoon drukt of de 'Verwijderen' toets.\n\n### Aanmaken\n\nHeb je ergens een weg gevonden die nog niet op de kaart staat? Klik op het 'Lijn'\ngereedschap in de linker bovenhoek van de editor of druk op de snelkoppeling '2' om\neen lijn te tekenen.\n\nKlik op het begin van de weg op de kaart en begin te tekenen. Als de weg zich vertakt\nvan de bestaande weg, begin dan op de plek waar ze elkaar kruisen.\n\nKlik dan de punten langs de weg, zodat deze het juiste tracé volgt, volgens het\nsatellietbeeld of de GPS-route. Als de weg die je aan het tekenen bent een andere weg\nkruist, verbindt deze door op het kruispunt te klikken. Als je klaar met tekenen bent,\ndubbelklik of druk op 'Return' of 'Enter' op je toetsenbord.\n", "gps": "# GPS\n\nGP- gegevens vormen voor OpenStreetMap de meest betrouwbare bron voor gegevens. Deze editor\nondersteunt lokale routes - '.gpx' bestanden op je lokale computer. Je kan dit soort\nGPS-routes vastleggen met allerlei smartphoneapplicaties of\nmet je eigen GPS-apparatuur.\n\nVoor meer informatie over het doen van een GPS-veldwerk, lees\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)\n\nOm een GPS-route te gebruiken om te karteren, sleep een '.gpx.' bestand in je editor\nAls het wordt herkend, wordt het aan de kaart toegevoegd als een heldergroene\nlijn. Klik op het menu 'Achtergondinstellingen' aan de linkerkant om deze nieuwe kaartlaag\naan te zetten, uit te zetten of ernaar toe te zoomen.\n\nDe GPS-route wordt niet meteen naar OpenStreetMap verstuurd - de beste manier om\nhet te gebruiken is als een sjabloon voor het nieuwe objecten dat\nje toevoegt en ook om [het te uploaden naar OpenStreetMap](http://www.openstreetmap.org/trace/create)\nzodat andere gebruikers het ook kunnen gebruiken.\n", diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json index 4e8c585a1..60ca34b48 100644 --- a/vendor/assets/iD/iD/locales/pl.json +++ b/vendor/assets/iD/iD/locales/pl.json @@ -332,7 +332,6 @@ }, "help": { "title": "Pomoc", - "help": "# Pomoc\n\nTo jest edytor [OpenStreetMap](http://www.openstreetmap.org/),\nwolnej i edytowalnej mapy świata. Możesz go używać do dodawania i\naktualizacji danych w twoim rejonie, czyniąc otwartą mapę świata lepszą\ndla każdego.\n\nModyfikacje wprowadzone na tej mapie będą widoczne dla wszystkich\nużywających OpenStreetMap. Aby wprowadzić modyfikacje, potrzebujesz\n[darmowego konta OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[Edytor iD](http://ideditor.com/) jest projektem społecznościowym z\n[kodem dostępnym na GitHub](https://github.com/systemed/iD).\n", "editing_saving": "# Edycja i zapis\n\nTen edytor został zaprojektowany do pracy w trybie online i już go używasz poprzez stronę\ninternetową.\n\n### Wybieranie obiektów\n\nAby wybrać obiekt na mapie, na przykład droga, czy POI, kliknij go na mapie.\nSpowoduje to podświetlenie wybranego obiektu, otworzenie panelu zawierającego szczegóły\no nim i wyświetlenie menu z poleceniami, które możesz wykonać na obiekcie.\n\nWiele obiektów może zostać wybranych przez przytrzymanie wciśniętego klawisza 'Shift' i lewego klawisza myszy, z jednoczesnym przeciągnięciem zaznaczając interesujący nas obszar mapy. Spowoduje to wybór wszystkich obiektów zawartych w narysowanym prostokącie, umożliwiając Tobie wykonywanie działań na kilku obiektach naraz.\n\n### Zapisywanie modyfikacji\n\nGdy wprowadzisz zmiany, na przykład przez modyfikacje dróg, budynków i miejsc, są one\nprzechowywane lokalnie aż zapiszesz je na serwerze. Nie martw się, gdy popełnisz błąd - możesz\ncofnąć zmiany przez kliknięcie na przycisk cofnij i powtórzyć je poprzez kliknięcie na przycisk powtórz.\n\nKliknij 'Zapisz' aby skończyć grupę modyfikacji - na przykład, gdy skończyłeś pewien obszar miasta i\nchcesz zacząć następny. Będziesz miał wtedy szansę przejrzeć, co zrobiłeś, a edytor dostarczy pomocne\nsugestie i ostrzeżenia w razie, gdyby coś było nie tak z twoimi zmianami.\n\nJeśli wszystko dobrze wygląda, możesz podać krótki komentarz opisujący zmianę, którą wprowadziłeś\ni kliknąć 'Zapisz' ponownie, aby wysłać zmiany do [OpenStreetMap.org](http://www.openstreetmap.org/),\ngdzie będą one widoczne dla wszystkich użytkowników i dostępne dla innych do bazowania na nich i\ndalszego ulepszania.\n\nJeżeli nie możesz skończyć swoich modyfikacji w czasie jednej sesji, możesz opuścić okno edytora i\nwrócić później (na tym samym komputerze i w tej samej przeglądarce), a edytor zaoferuje ci przywrócenie\ntwojej pracy.\n", "roads": "# Drogi\n\nMożesz tworzyć, poprawiać i usuwać drogi używając tego edytora. Drogi mogą być wszelkiego rodzaju:\nścieżki, ulice, szlaki, ścieżki rowerowe i tak dalej - każdy często uczęszczany odcinek powinien dać się\nprzedstawić.\n\n### Zaznaczanie\n\nKliknij drogę, aby ją zaznaczyć. Obwiednia powinna stać się widoczna, wraz z małym menu\nnarzędziowym na mapie oraz panelem bocznym pokazującym więcej informacji na temat drogi.\n\n### Modyfikowanie\n\nCzęsto będziesz widział drogi, które nie są wyrównane ze zdjęciami satelitarnymi lub śladami GPS.\nMożesz dopasować te drogi tak, aby były we właściwym miejscu.\n\nNajpierw kliknij drogę, którą chcesz zmienić. Podświetli ją to oraz pokaże punkty kontrolne, które\nmożesz przesunąć w lepsze miejsce. Jeżeli chcesz dodać nowe punkty kontrolne, aby droga\nbyła bardziej szczegółowa, dwukrotnie kliknij część drogi bez punktu, a w tym miejscu nowy się\npojawi.\n\nJeżeli droga łączy się z inną drogą, ale nie jest prawidłowo połączona z nią na mapie, możesz\nprzeciągnąć jeden z puntów kontrolnych na drugą drogę w celu ich połączenia. Prawidłowe połączenia\ndróg są ważne dla mapy i kluczowe dla wyznaczania tras.\n\nMożesz też kliknąć narzędzie 'Przesuń' lub nacisnąć klawisz `M` aby przesunąć jednocześnie całą\ndrogę, a następnie kliknąć ponownie, aby zachować to przesunięcie.\n\n### Usuwanie\n\nGdy droga jest całkiem błędna - widzisz, że nie istnieje na zdjęciach satelitarnych (a najlepiej sam\nsprawdziłeś w terenie, że jej nie ma) - możesz usunąć ją. Uważaj, gdy usuwasz obiekty - wyniki usunięcia,\ntak jak każdej modyfikacji, są widoczne dla wszystkich, a zdjęcie satelitarne często nie są aktualne,\nwięc droga może być po prostu nowo wybudowana.\n\nMożesz usunąć drogę przez zaznaczenie jej, a następnie kliknięcie ikony kosza lub wciśnięcie\nklawisza 'Delete'.\n\n### Tworzenie\n\nGdzieś tam powinna być droga, ale jej nie ma? Kliknij przycisk 'Linia' w górnym lewym rogu edytora\nlub naciśnij klawisz '2' na klawiaturze, aby zacząć rysować linię.\n\nKliknij początek drogi na mapie, aby zacząć rysować. Jeżeli droga odchodzi od już istniejącej, zacznij\nprzez kliknięcie w miejscu, w którym się łączą.\n\nNastępnie klikaj na punktach wzdłuż drogi tak, aby biegła ona odpowiednio według zdjęć satelitarnych\nlub GPS. Jeżeli droga, którą rysujesz, krzyżuje się z inną, połącz je, klikając na punkcie przecięcia. Gdy\nskończysz rysować, dwukrotnie kliknij ostatni punkt lub naciśnij klawisz 'Enter' na klawiaturze.\n", "gps": "# GPS\n\nDane GPS są najbardziej zaufanym źródłem dla OpenStreetMap. Ten edytor obsługuje lokalne ślady -\npliki `.gpx` na twoim komputerze. Możesz zbierać tego rodzaju ślady GPS używając aplikacji na\nsmartfony lub sprzętu GPS.\n\nInformacje jak używać GPS-u do zbierania informacji o okolicy możesz znaleźć pod\n[Zbieranie informacji z GPS](http://learnosm.org/en/beginner/using-gps/).\n\nAby użyć śladu GPX do rysowania mapy, przeciągnij i upuść plik GPX na edytor. Jeżeli zostanie\nrozpoznany, zostanie dodany na mapę w postaci jaskrawej linii. Kliknij menu 'Ustawienia tła'\npo prawej stronie, aby włączyć, wyłączyć lub powiększyć do nowej warstwy GPX.\n\nŚlad GPX nie jest bezpośrednio wysyłany do OpenStreetMap - najlepiej użyć go do rysowania mapy,\nużywając go jako wzoru dla nowych obiektów, które dodasz. Aby wysłać ślad na serwer odwiedź stronę \n [Publiczne ślady GPS](http://www.openstreetmap.org/trace/create), będziesz mógł go udostępnić\ninnym użytkownikom.\n", @@ -396,6 +395,9 @@ "category-building": { "name": "Budynek" }, + "category-golf": { + "name": "Golf" + }, "category-landuse": { "name": "Zagospodarowanie terenu" }, @@ -505,6 +507,9 @@ "building_area": { "label": "Budynek" }, + "cans": { + "label": "Przyjmowanie puszek" + }, "capacity": { "label": "Pojemność", "placeholder": "50, 100, 200..." @@ -519,6 +524,9 @@ "anticlockwise": "Przeciwnie do wskazówek zegara" } }, + "clothes": { + "label": "Przyjmowanie ciuchów" + }, "collection_times": { "label": "Czas zbierania" }, @@ -574,6 +582,9 @@ "generator/type": { "label": "Typ" }, + "glass": { + "label": "Przyjmowanie szkła" + }, "highway": { "label": "Typ" }, @@ -710,6 +721,9 @@ "shelter": { "label": "Schronienie" }, + "shelter_type": { + "label": "Typ" + }, "shop": { "label": "Typ" }, @@ -753,6 +767,9 @@ "tree_type": { "label": "Typ" }, + "tunnel": { + "label": "Tunel" + }, "vending": { "label": "Rodzaje towarów" }, @@ -877,6 +894,9 @@ "name": "Kino", "terms": "duży ekran,drive-in,film,ruchomy obraz,pokaz zdjęć,zdjęcia,pokaz,silver screen" }, + "amenity/clock": { + "name": "Zegar" + }, "amenity/college": { "name": "Uczelnia", "terms": "uczelnia" @@ -972,6 +992,9 @@ "name": "Pub", "terms": "pub,piwo,wino" }, + "amenity/recycling": { + "name": "Recykling" + }, "amenity/restaurant": { "name": "Restauracja", "terms": "bar,kawiarnia,stołówka,jadalnia,drive-in,knajpa,jadłodajnia,fast food,grill,gospoda,klub nocny,pizzeria" @@ -983,6 +1006,15 @@ "amenity/shelter": { "name": "Schronienie" }, + "amenity/social_facility": { + "name": "Placówka pomocy społecznej" + }, + "amenity/social_facility/food_bank": { + "name": "Bank żywności" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Schronisko dla bezdomnych" + }, "amenity/swimming_pool": { "name": "Basen", "terms": "basen,pływalnia" @@ -1015,6 +1047,9 @@ "name": "Automat sprzedający", "terms": "automat do sprzedaży" }, + "amenity/veterinary": { + "name": "Weterynarz" + }, "amenity/waste_basket": { "name": "Kosz na śmieci", "terms": "kosz,kubeł,śmietnik" @@ -1101,6 +1136,9 @@ "name": "Apartamenty", "terms": "blok,kamienica" }, + "building/church": { + "name": "Kościół" + }, "building/commercial": { "name": "Nieruchomość komercyjna", "terms": "sklep,komercyjny,sprzedaż,handlowy" @@ -1129,6 +1167,51 @@ "name": "Budynek mieszkalny", "terms": "blok, kamienica, dom, czynszówka" }, + "building/warehouse": { + "name": "Magazyn" + }, + "craft/clockmaker": { + "name": "Zegarmistrz" + }, + "craft/confectionary": { + "name": "Cukiernik" + }, + "craft/dressmaker": { + "name": "Krawiec" + }, + "craft/electrician": { + "name": "Elektryk" + }, + "craft/gardener": { + "name": "Ogrodnik" + }, + "craft/glaziery": { + "name": "Szklarz" + }, + "craft/jeweler": { + "name": "Jubiler" + }, + "craft/locksmith": { + "name": "Ślusarz" + }, + "craft/optician": { + "name": "Optyk" + }, + "craft/painter": { + "name": "Malarz" + }, + "craft/photographer": { + "name": "Fotograf" + }, + "craft/photographic_labratory": { + "name": "Laboratorium fotograficzne" + }, + "craft/plumber": { + "name": "Hydraulik" + }, + "craft/roofer": { + "name": "Dekarz" + }, "emergency/ambulance_station": { "name": "Stacja pogotowia ratunkowego", "terms": "pogotowie ratunkowe" @@ -1216,6 +1299,9 @@ "name": "Droga lokalna", "terms": "lokalna, osiedlowa, zamieszkała" }, + "highway/rest_area": { + "name": "Obszar wypoczynkowy" + }, "highway/road": { "name": "Nieokreślona droga", "terms": "droga,nieznana,niewiadoma" @@ -1248,6 +1334,9 @@ "highway/service/parking_aisle": { "name": "Uliczka parkingowa" }, + "highway/services": { + "name": "Obszar usługowy" + }, "highway/steps": { "name": "Schody", "terms": "schody" @@ -1593,9 +1682,25 @@ "office/architect": { "terms": "architekt" }, + "office/educational_institution": { + "name": "Instytucja edukacyjna" + }, + "office/employment_agency": { + "name": "Agencja zatrudnienia" + }, + "office/estate_agent": { + "name": "Biuro nieruchomości" + }, + "office/insurance": { + "name": "Biuro ubezpieczeń" + }, "office/political_party": { + "name": "Partia polityczna", "terms": "partia polityczna" }, + "office/therapist": { + "name": "Terapeuta" + }, "office/travel_agent": { "name": "Biuro podróży" }, @@ -1653,6 +1758,9 @@ "power/transformer": { "name": "Transformator" }, + "public_transport/stop_position": { + "name": "Miejsce zatrzymania" + }, "railway": { "name": "Kolej", "terms": "torowisko, kolej" @@ -1725,6 +1833,9 @@ "name": "Sklep rowerowy", "terms": "sklep rowerowy" }, + "shop/bookmaker": { + "name": "Bukmacher" + }, "shop/books": { "name": "Księgarnia", "terms": "księgarnia" @@ -1828,6 +1939,9 @@ "shop/locksmith": { "name": "Ślusarz" }, + "shop/lottery": { + "name": "Kolektura" + }, "shop/mall": { "name": "Centrum handlowe" }, diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json index e4b899145..fdde3d88d 100644 --- a/vendor/assets/iD/iD/locales/pt-BR.json +++ b/vendor/assets/iD/iD/locales/pt-BR.json @@ -134,7 +134,8 @@ "annotation": "Mesclou {n} linhas.", "not_eligible": "Esses elementos não podem ser mesclados.", "not_adjacent": "Essas linhas não podem ser mescladas porque não estão conectadas.", - "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\"." + "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\".", + "incomplete_relation": "Estas funcionalidades não podem ser mescladas porque pelo menos uma delas não foi transferida completamente." }, "move": { "title": "Mover", @@ -332,7 +333,7 @@ }, "help": { "title": "Ajuda", - "help": "# Ajuda\n\nEsse é um editor para o [OpenStreetMap](http://www.openstreetmap.org/), o\nmapa livre e editável do mundo. Você pode usá-lo para adicionar e atualizar\no mapa na sua área, contribuindo com um mapa do mundo de código fonte\ne dados abertos para todos.\n\nAlterações feitas por você nesse mapa serão visíveis a todo mundo que usa o\nOpenStreetMap. Para poder editar o mapa, você precisará de uma\n[conta do OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nO [editor iD](http://ideditor.com/) é um projeto colaborativo com [código\nfonte disponível no GitHub](https://github.com/systemed/iD).\n", + "help": "# Ajuda\n\nEste é um editor para OpenStreetMap (http://www.openstreetmap.org/), o mapa mundial livre e editavel. Você pode usá-lo para adicionar e atualizar de dados em sua área, tornando um mapa mundi de codigo aberto melhor para todos.\nAs edições que você fizer nesse mapa serão visíveis para todos que usam OpenStreetMap. Para fazer uma edição você precisará de uma conta gratuita OpenStreetMap(https://www.openstreetmap.org/user/new).\n\nO editor iD (http://ideditor.com/) é um projeto colaborativo com o código fonte disponível no GitHub(https://github.com/openstreetmap/iD).\n", "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o elemento\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos elementos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos elementos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários elementos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n", "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um nó, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir recursos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n", "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos elementos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n", @@ -396,6 +397,9 @@ "category-building": { "name": "Prédio" }, + "category-golf": { + "name": "Golfe" + }, "category-landuse": { "name": "Uso da Terra" }, @@ -439,7 +443,7 @@ "description": "Acesso não permitido ao público em geral" }, "permissive": { - "title": "Permissivo", + "title": "Concedido", "description": "Acesso permitido até que o dono cancele a permissão" }, "private": { @@ -462,16 +466,43 @@ "address": { "label": "Endereço", "placeholders": { - "housename": "Nome da Casa", + "housename": "Complemento", "number": "123", "street": "Rua", - "city": "Cidade", + "city": "Município", "postcode": "CEP" } }, "admin_level": { "label": "Nível Administrativo" }, + "aerialway": { + "label": "Tipo" + }, + "aerialway/access": { + "label": "Acesso" + }, + "aerialway/bubble": { + "label": "Bolha" + }, + "aerialway/capacity": { + "label": "Capacidade (por hora)", + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "label": "Duração (minutos)", + "placeholder": "1, 2, 3..." + }, + "aerialway/heating": { + "label": "Aquecido" + }, + "aerialway/occupancy": { + "label": "Ocupação", + "placeholder": "2, 4, 8..." + }, + "aerialway/summer/access": { + "label": "Acesso (verão)" + }, "aeroway": { "label": "Tipo" }, @@ -505,6 +536,9 @@ "building_area": { "label": "Edifício" }, + "cans": { + "label": "Aceita Cans" + }, "capacity": { "label": "Capacidade", "placeholder": "50, 100, 200..." @@ -519,6 +553,9 @@ "anticlockwise": "Sentido Anti-horário" } }, + "clothes": { + "label": "Aceita Clothes" + }, "collection_times": { "label": "Horários de Coleta" }, @@ -528,6 +565,9 @@ "country": { "label": "País" }, + "covered": { + "label": "Coberto" + }, "crossing": { "label": "Tipo" }, @@ -544,7 +584,7 @@ "label": "Descrição" }, "elevation": { - "label": "Elevação" + "label": "Altitude" }, "emergency": { "label": "Emergência" @@ -574,6 +614,17 @@ "generator/type": { "label": "Tipo" }, + "glass": { + "label": "Aceita Vidro" + }, + "golf_hole": { + "label": "Referência", + "placeholder": "Buraco numero (1-18)" + }, + "handicap": { + "label": "Desvantagem", + "placeholder": "1-18" + }, "highway": { "label": "Tipo" }, @@ -587,7 +638,10 @@ "label": "Código ICAO" }, "incline": { - "label": "Aclive" + "label": "Declividade" + }, + "information": { + "label": "Tipo" }, "internet_access": { "label": "Acesso a Internet", @@ -611,7 +665,7 @@ "label": "Tipo" }, "levels": { - "label": "Níveis", + "label": "Número de andares", "placeholder": "2, 4, 6..." }, "lit": { @@ -655,6 +709,13 @@ "operator": { "label": "Operador" }, + "paper": { + "label": "Aceita Papel" + }, + "par": { + "label": "par", + "placeholder": "3, 4, 5..." + }, "park_ride": { "label": "Estacionamento de Intercâmbio" }, @@ -665,6 +726,12 @@ "label": "Telefone", "placeholder": "+55 11 0982 1098" }, + "piste/difficulty": { + "label": "Dificuldade" + }, + "piste/type": { + "label": "Modelo" + }, "place": { "label": "Tipo" }, @@ -708,7 +775,7 @@ "label": "Tipo" }, "shelter": { - "label": "Abrigo" + "label": "Abrigo contra Intempéries" }, "shelter_type": { "label": "Tipo" @@ -728,7 +795,7 @@ "options": { "bridge": "Ponte", "tunnel": "Túnel", - "embankment": "Aterro", + "embankment": "Aterro Elevado", "cutting": "Escavação" } }, @@ -808,7 +875,7 @@ "terms": "Hangar" }, "aeroway/helipad": { - "name": "Heliporto", + "name": "Heliponto", "terms": "Heliporto, Heliponto, ponto de pouso de helicópteros" }, "aeroway/runway": { @@ -816,8 +883,8 @@ "terms": "Pista de pouso e decolagem" }, "aeroway/taxiway": { - "name": "Taxiway", - "terms": "Pista de taxiamento" + "name": "Pista de taxiamento", + "terms": "Taxiway" }, "aeroway/terminal": { "name": "Terminal de Aeroporto", @@ -828,15 +895,15 @@ "terms": "Serviço" }, "amenity/arts_centre": { - "name": "Centro de Artes", - "terms": "Artes, Teatro, Cinema, Espetáculo, Exposições" + "name": "Centro/Escola de Artes", + "terms": "Centro de Artes, Escola de Artes, Artes, Centro Artístico, Escola Artística, Teatro, Cinema, Espetáculo, Exposições" }, "amenity/atm": { "name": "Caixa Eletrônico", "terms": "Caixa eletrônico" }, "amenity/bank": { - "name": "Banco", + "name": "Agência bancária", "terms": "Banco" }, "amenity/bar": { @@ -891,6 +958,9 @@ "name": "Tribunal", "terms": "Tribunal, Fórum" }, + "amenity/dentist": { + "name": "Dentista" + }, "amenity/drinking_water": { "name": "Água Potável", "terms": "Água Potável, Bebedouro" @@ -904,7 +974,7 @@ "terms": "fast food, lanchonete, lanches, Lancheria" }, "amenity/fire_station": { - "name": "Bombeiros", + "name": "Posto de Bombeiros", "terms": "Posto de Bombeiros, Bombeiros, Central de Bombeiros" }, "amenity/fountain": { @@ -912,7 +982,7 @@ "terms": "Chafariz, Fonte Aquática" }, "amenity/fuel": { - "name": "Posto de Gasolina", + "name": "Posto de Combustível", "terms": "Posto de Gasolina" }, "amenity/grave_yard": { @@ -944,7 +1014,7 @@ "terms": "Farmácia, Drogaria, Farmácia de Manipulação" }, "amenity/place_of_worship": { - "name": "Templo", + "name": "Local de Prática Religiosa", "terms": "Local de Culto, Lugar de Adoração, Abadia, Basílica, Betel, Catedral, Mor, Capela, Igreja, Aprisco, Casa de Deus, Casa de oração, Casa de adoração, Mesquita, Oratório, Paróquia, Santuário, Sinagoga, Tabernáculo, Templo" }, "amenity/place_of_worship/buddhist": { @@ -983,6 +1053,9 @@ "name": "Estação de Patrulha", "terms": "Patrulha, Ranger" }, + "amenity/recycling": { + "name": "Reciclagem" + }, "amenity/restaurant": { "name": "Restaurante", "terms": "Restaurante" @@ -1004,7 +1077,7 @@ "terms": "Ponto de Táxi" }, "amenity/telephone": { - "name": "Telefone", + "name": "Telefone Público", "terms": "Telefone" }, "amenity/theatre": { @@ -1012,11 +1085,11 @@ "terms": "Teatro" }, "amenity/toilets": { - "name": "Banheiros", + "name": "Banheiros Públicos", "terms": "Banheiros, Sanitário, WC, Toiletes, Toilettes, Lavabo, Toalete" }, "amenity/townhall": { - "name": "Prefeitura", + "name": "Paço Municipal", "terms": "Prefeitura" }, "amenity/university": { @@ -1028,7 +1101,7 @@ "terms": "Totem de vendas, Máquina de Venda Automática" }, "amenity/waste_basket": { - "name": "Cesto de Lixo", + "name": "Lixeira", "terms": "Cesto de Lixo, Lixeira, Balde de Lixo" }, "area": { @@ -1044,8 +1117,8 @@ "terms": "Bloco" }, "barrier/bollard": { - "name": "Poste", - "terms": "Pilar, Poste, Cabeço" + "name": "Pilarete", + "terms": "Pilar, Poste, Cabeço, Pedestal, Estaca" }, "barrier/cattle_grid": { "name": "Mata-burro", @@ -1080,23 +1153,23 @@ "terms": "Cerca viva" }, "barrier/kissing_gate": { - "name": "Porteira Giratória", + "name": "Kissing Gate", "terms": "Porteira Giratória" }, "barrier/lift_gate": { - "name": "Cancela", + "name": "Cancela Elevatória", "terms": "Cancela" }, "barrier/retaining_wall": { - "name": "Barreira de Retenção", - "terms": "Muro de Contenção" + "name": "Muro de Contenção", + "terms": "Barreira de Retenção" }, "barrier/stile": { - "name": "Passagem Fixa por Barreira", + "name": "Travessia em Cerca/Muro", "terms": "Passagem Fixa por Barreira" }, "barrier/toll_booth": { - "name": "Pedágio", + "name": "Cabine de Pedágio", "terms": "Pedágio" }, "barrier/wall": { @@ -1115,6 +1188,12 @@ "name": "Apartamentos", "terms": "Apartamentos, Kit net" }, + "building/chapel": { + "name": "Capela" + }, + "building/church": { + "name": "Igreja" + }, "building/commercial": { "name": "Edifício Comercial", "terms": "Edifício Comercial, Prédio Comercial" @@ -1124,9 +1203,13 @@ "terms": "Entrada" }, "building/garage": { - "name": "Garagem", + "name": "Garagem Individual", "terms": "Garagem" }, + "building/garages": { + "name": "Garagens", + "terms": "Garagens" + }, "building/house": { "name": "Casa", "terms": "Casa" @@ -1143,8 +1226,29 @@ "name": "Edifício Residencial", "terms": "Edifício Residencial" }, + "building/roof": { + "name": "Teto" + }, + "craft/beekeeper": { + "name": "Apicultor" + }, + "craft/blacksmith": { + "name": "Ferreiro" + }, + "craft/brewery": { + "name": "Cervejaria" + }, + "craft/carpenter": { + "name": "Carpinteiro" + }, + "craft/locksmith": { + "name": "Chaveiro" + }, + "craft/photographer": { + "name": "Fotógrafo" + }, "embankment": { - "name": "Aterro", + "name": "Aterro Elevado", "terms": "aterro,terrapleno" }, "emergency/ambulance_station": { @@ -1164,8 +1268,8 @@ "terms": "Entrada" }, "footway/crossing": { - "name": "Cruzamento", - "terms": "cruzamento,passagem" + "name": "Travessia", + "terms": "faixa de segurança,cruzamento,passagem" }, "footway/sidewalk": { "name": "Calçada", @@ -1176,27 +1280,27 @@ "terms": "Rodovia" }, "highway/bridleway": { - "name": "Trilha de Equitação", - "terms": "Hipovia, Picadeiro, Caminho para Calvagada" + "name": "Hipovia", + "terms": "Hipovia, Picadeiro, Caminho para Calvagada, Trilha de Equitação" }, "highway/bus_stop": { "name": "Ponto de Ônibus", "terms": "Ponto de Ônibus, Parada de Ônibus" }, "highway/crossing": { - "name": "Cruzamento", - "terms": "Travessia, Faixa de Segurança" + "name": "Faixa de Pedestre", + "terms": "Interseção" }, "highway/cycleway": { "name": "Ciclovia", "terms": "Ciclovia" }, "highway/footway": { - "name": "Via de Pedestre", - "terms": "Caminho de Pedestre, Passeio, Calçada" + "name": "Pista de Caminhada", + "terms": "Via de Pedestre, Caminho de Pedestre, Passeio, Calçada" }, "highway/living_street": { - "name": "Rua Viva", + "name": "Via de Espaço Compartilhado", "terms": "Rua Viva, Rua Preferencial a Pedestres" }, "highway/mini_roundabout": { @@ -1204,19 +1308,19 @@ "terms": "Mini-Rotatória" }, "highway/motorway": { - "name": "Auto-Estrada", - "terms": "Autoestrada" + "name": "Autoestrada", + "terms": "Auto-estrada, auto estrada" }, "highway/motorway_junction": { "name": "Saída de Autoestrada", "terms": "Saída de Autoestrada" }, "highway/motorway_link": { - "name": "Acesso a Autoestrada", + "name": "Ligação de Autoestrada", "terms": "Acesso a Autoestrada" }, "highway/path": { - "name": "Caminho", + "name": "Trilha Não-Automotiva", "terms": "Trilha" }, "highway/pedestrian": { @@ -1228,8 +1332,8 @@ "terms": "Via Primária" }, "highway/primary_link": { - "name": "Acesso a Via Primária", - "terms": "Acesso Primário" + "name": "Ligação Primária", + "terms": "Acesso Primário, Acesso a Via Primária" }, "highway/residential": { "name": "Via Residencial", @@ -1244,8 +1348,8 @@ "terms": "Via Secundária" }, "highway/secondary_link": { - "name": "Acesso a Via Secundária", - "terms": "Acesso a Via Secundária" + "name": "Ligação Secundária", + "terms": "Acesso Secundário, Acesso a Via Secundária" }, "highway/service": { "name": "Via de Serviço", @@ -1272,8 +1376,8 @@ "terms": "Corredor de Estacionamento" }, "highway/steps": { - "name": "Escadaria", - "terms": "Degraus, Escada" + "name": "Via com Degraus", + "terms": "Degraus, Escada, Escadaria" }, "highway/stop": { "name": "Placa de Pare", @@ -1284,12 +1388,12 @@ "terms": "Via Terciária" }, "highway/tertiary_link": { - "name": "Acesso a Via Terciária", - "terms": "Acesso a Via Terciária" + "name": "Ligação Terciária", + "terms": "Acesso Terciário, Acesso a Via Terciária" }, "highway/track": { - "name": "Trilha", - "terms": "Caminho" + "name": "Estrada Rústica", + "terms": "Trilha Automotiva, Estrada de Fazenda, Estrada Agrícola, Estrada Bucólica, Caminho" }, "highway/traffic_signals": { "name": "Semáforo", @@ -1300,11 +1404,11 @@ "terms": "Via Expressa" }, "highway/trunk_link": { - "name": "Acesso a Via Expressa", + "name": "Ligação de Via Expressa", "terms": "Acesso a Via Expressa" }, "highway/turning_circle": { - "name": "Rotatória", + "name": "Balão de Retorno", "terms": "Balão de Retorno" }, "highway/unclassified": { @@ -1341,11 +1445,11 @@ }, "historic/wayside_cross": { "name": "Cruz de Beira de Estrada", - "terms": "Cruz de Beira de Estrada" + "terms": "Cruz de Beira de Estrada, Cruzeiro" }, "historic/wayside_shrine": { - "name": "Ermida", - "terms": "Ermida" + "name": "Capelinha de Beira de Estrada", + "terms": "Ermida, Alminhas" }, "landuse": { "name": "Uso da Terra", @@ -1360,7 +1464,7 @@ "terms": "Bacia" }, "landuse/cemetery": { - "name": "Cemitério", + "name": "Cemitério Secular", "terms": "Sepulcrário, Cemitério" }, "landuse/commercial": { @@ -1372,7 +1476,7 @@ "terms": "Construção" }, "landuse/farm": { - "name": "Fazenda", + "name": "Lavoura", "terms": "Fazenda" }, "landuse/farmland": { @@ -1380,7 +1484,7 @@ "terms": "agricultura,terra,campo,roça" }, "landuse/farmyard": { - "name": "Granja", + "name": "Pátio de Fazenda", "terms": "Pátio de Fazenda" }, "landuse/forest": { @@ -1397,7 +1501,7 @@ }, "landuse/meadow": { "name": "Prado", - "terms": "Prado, Pasto" + "terms": "Prado, Pasto, Pradaria" }, "landuse/orchard": { "name": "Pomar", @@ -1412,11 +1516,11 @@ "terms": "Residencial" }, "landuse/retail": { - "name": "Comércio", - "terms": "Varejo" + "name": "Varejo", + "terms": "Varejo, comércio" }, "landuse/vineyard": { - "name": "Vinhedo", + "name": "Vinha", "terms": "Vinha, Vinhedo" }, "leisure": { @@ -1428,8 +1532,8 @@ "terms": "Comum, Habitual, Frequente" }, "leisure/dog_park": { - "name": "Parque de Cães", - "terms": "Parque de Cães" + "name": "Cachorródromo", + "terms": "Canódromo, Parque de Cães, Parque Canino" }, "leisure/garden": { "name": "Jardim", @@ -1444,12 +1548,12 @@ "terms": "Marina" }, "leisure/park": { - "name": "Parque", - "terms": "Parque" + "name": "Parque/Praça", + "terms": "Parque, praça" }, "leisure/pitch": { - "name": "Campo de Esportes", - "terms": "Campo Esportivo, Quadra Esportiva" + "name": "Quadra Esportiva", + "terms": "Campo de Esportes, Campo Esportivo, Quadra Esportiva" }, "leisure/pitch/american_football": { "name": "Campo de Futebol Americano", @@ -1488,8 +1592,8 @@ "terms": "Rampa Náutica" }, "leisure/sports_center": { - "name": "Centro Esportivo", - "terms": "Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes," + "name": "Centro/Clube Esportivo", + "terms": "Centro Esportivo, Clube Esportivo, Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes, Academia de Ginástica" }, "leisure/stadium": { "name": "Estádio", @@ -1512,8 +1616,8 @@ "terms": "Construção Humana" }, "man_made/breakwater": { - "name": "Quebra-mar", - "terms": "Quebra-mar" + "name": "Molhe/Quebra-Mar", + "terms": "Molhe, Quebra-Mar" }, "man_made/cutline": { "name": "Linha de Corte em Floresta", @@ -1524,7 +1628,7 @@ "terms": "aterro,terrapleno" }, "man_made/flagpole": { - "name": "Mastro", + "name": "Mastro de Bandeira", "terms": "matro,bandeira,pau de bandeira" }, "man_made/lighthouse": { @@ -1540,12 +1644,12 @@ "terms": "Píer" }, "man_made/pipeline": { - "name": "Encanamento", - "terms": "Tubulação" + "name": "Tubulação", + "terms": "Encanamento" }, "man_made/survey_point": { - "name": "Marco Geodésico", - "terms": "Marco Geodésico" + "name": "Ponto de Exame Geográfico", + "terms": "Marco Geodésico, Equipamento de GPS Diferencial" }, "man_made/tower": { "name": "Torre", @@ -1556,7 +1660,7 @@ "terms": "Estação de Tratamento de Esgoto" }, "man_made/water_tower": { - "name": "Caixa d'água", + "name": "Caixa d'Água", "terms": "Caixa d'Água" }, "man_made/water_well": { @@ -1604,8 +1708,7 @@ "terms": "Orla Marítima, Linha Costeira" }, "natural/fell": { - "name": "Colina", - "terms": "Caiu" + "name": "Fell" }, "natural/glacier": { "name": "Geleira", @@ -1616,20 +1719,20 @@ "terms": "Pradaria" }, "natural/heath": { - "name": "Matagal", - "terms": "Matagal" + "name": "Urzal", + "terms": "Urzal" }, "natural/peak": { - "name": "Pico", + "name": "Cume", "terms": "Pico, Topo de Montanha, Serra, Montanha, Monte" }, "natural/scree": { - "name": "Cascalho", - "terms": "Seixos, Pedras" + "name": "Pedregulhos", + "terms": "Seixos, Pedras, Cascalho" }, "natural/scrub": { "name": "Arbustos", - "terms": "Moita, Arbusto" + "terms": "Moita, Arbusto, Matagal" }, "natural/spring": { "name": "Nascente", @@ -1716,7 +1819,7 @@ "terms": "advogado,advocacia,escritório" }, "office/newspaper": { - "name": "Jornal", + "name": "Escritório de Jornal", "terms": "jornal,notícia" }, "office/ngo": { @@ -1752,8 +1855,8 @@ "terms": "Local" }, "place/city": { - "name": "Cidade", - "terms": "Cidade" + "name": "Cidade Maior", + "terms": "Cidade, Município" }, "place/hamlet": { "name": "Lugarejo", @@ -1772,8 +1875,8 @@ "terms": "Localidade" }, "place/town": { - "name": "Vila", - "terms": "Vila, Cidade" + "name": "Cidade Menor", + "terms": "Vila, Cidade, Município" }, "place/village": { "name": "Povoado", @@ -1792,7 +1895,7 @@ "terms": "Gerador, Energia" }, "power/line": { - "name": "Linha de Transmissão de Energia Elétrica", + "name": "Linha de Transmissão", "terms": "Fio Elétrico" }, "power/minor_line": { @@ -1800,7 +1903,7 @@ "terms": "Menor Linha de Energia" }, "power/pole": { - "name": "Poste Elétrico", + "name": "Poste de Transmissão", "terms": "Poste Elétrico" }, "power/sub_station": { @@ -1832,12 +1935,11 @@ "terms": "Ferrovia Abandonada" }, "railway/disused": { - "name": "Ferrovia em Desuso", + "name": "Ferrovia Inativa", "terms": "Ferrovia em Desuso" }, "railway/halt": { - "name": "Interrupção de Ferrovia", - "terms": "Final de Ferrovia, Interrupção de Estrada de Ferro" + "name": "Parada de Ferrovia" }, "railway/level_crossing": { "name": "Passagem de Nível", @@ -1852,7 +1954,7 @@ "terms": "Plataforma de Trem" }, "railway/rail": { - "name": "Trilho", + "name": "Trilho de trem", "terms": "Trilho" }, "railway/station": { @@ -1860,7 +1962,7 @@ "terms": "Estação Ferroviária" }, "railway/subway": { - "name": "Metrô", + "name": "Trilho de metrô", "terms": "Metrô" }, "railway/subway_entrance": { @@ -1868,7 +1970,7 @@ "terms": "Entrada de Metrô" }, "railway/tram": { - "name": "Bonde", + "name": "Trilho de bonde", "terms": "Bonde" }, "relation": { @@ -1876,7 +1978,7 @@ "terms": "Relação" }, "route/ferry": { - "name": "Rota de Barco", + "name": "Rota de Balsa", "terms": "Rota de Barco, Rota de Balsa" }, "shop": { @@ -1916,7 +2018,7 @@ "terms": "Açougue" }, "shop/car": { - "name": "Concessionária de Automóveis", + "name": "Revenda de Automóveis", "terms": "Concessionária de Automóveis" }, "shop/car_parts": { @@ -1924,7 +2026,7 @@ "terms": "Loja de Peças Automotivas" }, "shop/car_repair": { - "name": "Oficina Automotiva", + "name": "Oficina Mecânica", "terms": "Oficina Automotiva" }, "shop/chemist": { @@ -1952,15 +2054,15 @@ "terms": "Delicatessen" }, "shop/department_store": { - "name": "Loja de Departamentos", + "name": "Loja de Departamento", "terms": "Loja de Departamento" }, "shop/doityourself": { - "name": "Loja de Bricolagem", + "name": "Loja de Ferragens/Bricolagem", "terms": "Loja de Bricolagem, Faça você mesmo" }, "shop/dry_cleaning": { - "name": "Limpeza a Seco", + "name": "Lavagem de Roupas a Seco", "terms": "Limpeza a Seco, Lavagem a Seco" }, "shop/electronics": { @@ -1984,7 +2086,7 @@ "terms": "Loja de Móveis, Decoração" }, "shop/garden_centre": { - "name": "Loja de Jardinagem", + "name": "Centro de Jardinagem", "terms": "Loja de Jardinagem" }, "shop/gift": { @@ -1992,8 +2094,8 @@ "terms": "Loja de Presentes" }, "shop/greengrocer": { - "name": "Quitanda", - "terms": "Quitanda" + "name": "Verdureiro", + "terms": "Quitanda, Quitandeiro" }, "shop/hairdresser": { "name": "Cabeleireiro", @@ -2004,15 +2106,15 @@ "terms": "Loja de Ferragens, Material de Construção, Loja de Tintas, Loja de Parafusos" }, "shop/hifi": { - "name": "Loja de Equipamentos de Áudio", - "terms": "Loja de Equipamentos de Áudio" + "name": "Loja de Aparelhos Hi-Fi", + "terms": "Loja de Equipamentos de Áudio, Loja de Aparelhos de Alta Fidelidade" }, "shop/jewelry": { "name": "Joalheria", "terms": "Joalheria" }, "shop/kiosk": { - "name": "Quiosque", + "name": "Quiosque Comercial", "terms": "Quiosque" }, "shop/laundry": { @@ -2024,20 +2126,20 @@ "terms": "Técnico de Chaves e Cadeados, Cópia de Chaves, Conserto de Cadeados" }, "shop/mall": { - "name": "Shopping Center", - "terms": "Centro Comercial, Galeria" + "name": "Centro Comercial", + "terms": "Shopping Center, Galeria" }, "shop/mobile_phone": { "name": "Loja de Celulares", "terms": "Loja de Celulares, Loja de Telefones Celulares" }, "shop/motorcycle": { - "name": "Concessionária de Motos", + "name": "Revenda de Motos", "terms": "Concessionária de Motos" }, "shop/music": { - "name": "Loja Musical", - "terms": "Loja de Discos Musicais, Loja de CD's, Loja de Vinil" + "name": "Loja de Instrumentos Musicais", + "terms": "Loja de Discos Musicais, Loja de CD's, Loja de Vinil, Loja Musical" }, "shop/newsagent": { "name": "Banca de Jornal", @@ -2048,7 +2150,7 @@ "terms": "Ótica" }, "shop/outdoor": { - "name": "Loja de Esportes de Aventura", + "name": "Loja de Esporte/Aventura", "terms": "Loja de Esportes de Aventura" }, "shop/pet": { @@ -2092,12 +2194,12 @@ "terms": "Loja Desocupada" }, "shop/variety_store": { - "name": "Loja de Variedades", - "terms": "Loja de Variedades" + "name": "Loja de Variedades a 1,99", + "terms": "Loja de Variedades, Um e Noventa e Nove, 1.99, 199" }, "shop/video": { - "name": "Loja ou Locadora de Vídeos", - "terms": "Loja de Vídeos" + "name": "Loja/Locadora de Vídeos", + "terms": "Loja de Vídeos, Locadora de Vídeos, Videolocadora" }, "tourism": { "name": "Turismo", @@ -2116,8 +2218,8 @@ "terms": "Atração Turística" }, "tourism/camp_site": { - "name": "Camping", - "terms": "Parque de Campismo, Acampamento" + "name": "Local de Acampamento", + "terms": "Parque de Campismo, Acampamento, Camping" }, "tourism/caravan_site": { "name": "Estacionamento de Trailers", @@ -2132,12 +2234,12 @@ "terms": "Guesthouse" }, "tourism/hostel": { - "name": "Albergue", - "terms": "Albergue, Hostel" + "name": "Hostel", + "terms": "Albergue" }, "tourism/hotel": { "name": "Hotel", - "terms": "Hotel, Pousada" + "terms": "Hotel, Pousada, Motel" }, "tourism/information": { "name": "Informações Turísticas", @@ -2152,7 +2254,7 @@ "terms": "Museu" }, "tourism/picnic_site": { - "name": "Lugar de Piquenique", + "name": "Local de Piquenique", "terms": "Lugar de Piquenique" }, "tourism/theme_park": { @@ -2240,7 +2342,7 @@ "terms": "Outro" }, "waterway": { - "name": "Hidrovia", + "name": "Via Aquática", "terms": "Canal, Hidrovia, Curso d'Água" }, "waterway/canal": { @@ -2248,15 +2350,15 @@ "terms": "Canal" }, "waterway/dam": { - "name": "Represa", - "terms": "Represa, Barragem" + "name": "Barragem", + "terms": "Represa" }, "waterway/ditch": { "name": "Vala", "terms": "Vala" }, "waterway/drain": { - "name": "Dreno", + "name": "Valeta de drenagem", "terms": "Dreno" }, "waterway/river": { diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json index 08c58a2d8..2faf80472 100644 --- a/vendor/assets/iD/iD/locales/pt.json +++ b/vendor/assets/iD/iD/locales/pt.json @@ -328,7 +328,6 @@ }, "help": { "title": "Ajuda", - "help": "# Ajuda\n\nIsto é um editor do [OpenStreetMap](http://www.openstreetmap.org/), o mapa mundial livre e editável. Pode utilizá-lo para adicionar e atualizar dados do mapa\nna sua área, colaborando na construção de um mapa mundial melhor para todos.\n\nAs edições que fizer neste mapa serão visíveis a todas as pessoas que utilizem\no OpenStreetMap. Para poder alterar o mapa é necessário ter uma\n[conta no OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nO [editor iD](http://ideditor.com/) é um projeto colaborativo com [código-fonte disponível no site GitHub](https://github.com/systemed/iD).\n", "roads": "# Estradas\n\nPode criar, corrigir e eliminar estradas com o editor. As estradas podem ser\nde qualquer tipo: caminhos, autoestradas, carreiros florestais ou agrícolas,\nruas pedonais, ciclovias, entre outras. Qualquer local que seja frequentemente\natravessado por pessoas deve ser normalmente colocado no mapa.\n\n### Selecionar\n\nClique numa estrada para a selecionar. Aparece o painel lateral direito para\npoder editar as caraterísticas da estrada e botões em redor da estrada.\n\n### Alterar\n\nClique na estrada que quer alterar. Se quiser adicionar pontos à estrada entre\ndois pontos existentes basta clicar 2 vezes sobre o segmento da estrada.\nPode então deslocar esse ponto acabado de criar.\n\nSe existir uma estrada com ligação a outra no terreno mas que no mapa não\nestão ligadas, basta deslocar um ponto de uma das estradas até à outra estrada\npara ficarem ligadas. É muito importante as estradas estarem corretamente\nligadas umas às outras para que os programas de rotas possam fornecer\ninformações corretas aos utilizadores.\n\nPode também clicar no botão de 'Mover' ou premir a tecla 'M' para mover\na estrada toda de uma só vez. No entanto deve-se ter cuidado ao fazer isso\npois todos os pontos da estrada, incluindo os pontos partilhados com\noutras estradas, serão todos movidos.\n\nPara dividir uma estrada em duas, útil por exemplo quando existe uma estrada\nno mapa que na realidade são 2 estradas diferentes com referências diferentes,\nclique no ponto da estrada onde quer dividir e clique no botão da tesoura que\naparece ao lado do ponto. Esse botão aparece apenas se estiver o ponto\nselecionado e não a linha. Pode também combinar as 2 linhas numa só\nselecionando as duas estradas e clicando no botão + que aparece ao lado.\nSe existirem no mapa 2 estradas ligadas (nas extremidades ou num cruzamento)\nmas que na realidade não se ligam ou cruzam, basta selecionar o ponto comum\ne clicar no botão ao lado de desligar as linhas. Pode então deslocar o ponto\npara outro local.\n\n### Eliminar\n\nSe uma estrada estiver errada - pode-se confirmar pela imagem de satélite (ter em\nconta que a imagem de satélite pode ter alguns anos e a estrada pode ter sido\nconstruida posteriormente) e preferencialmente confirmar presencialmente - pode\neliminar a estrada toda. É necessária precaução ao eliminar elementos do mapa.\nTal como qualquer outra alteração, os resultados serão visíveis a todos os outros.\n\nPode eliminar uma estrada clicando nela para a selecionar e de seguida\nclicar no ícone do caixote do lixo que aparece ao lado, ou simplesmente\npressionar na tecla 'Del' do teclado.\n\n### Criar\n\nEncontrou alguma estrada que não existe no mapa? Clique no botão 'Linha' que\nestá na parte superior ou pressione a tecla '2' para começar a desenhar a linha.\n\nClique no ponto inicial da estrada para começar a desenhá-la. Se Já existir\numa estrada no mapa, mas que está incompleta, pode continuá-la bastando\npara isso clicar no ponto da extremidade da estrada existente.\n\nAdicione então outros pontos de acordo com as imagens de satélite ou os trilhos\nGPS. Se a estrada que está a desenhar cruzar com outra estrada, crie um ponto\npor cima da outra estrada onde se cruzam. Quando terminar de desenhar\na estrada, clique duas vezes no último ponto da estrada ou pressione as teclas\nde mudança de linha ou 'Enter'.\n", "gps": "# GPS\n\nOs dados GPS são os de maior confiança para o OpenStreetMap. Este editor\npermite usar ficheiros `.gpx` como fundo para ajudar a editar mapas.\nPode obter dados GPS com vários telemóveis, assim como dispositivos GPS.\n\nPara mais informações sobre a obtenção de dados GPS ver a página [Gravando trilhos GPS] (http://wiki.openstreetmap.org/wiki/Recording_GPS_tracks).\n\nPara usar um ficheiro GPX como imagem de fundo, arraste o ficheiro do seu\ncomputador para o mapa. Se o ficheiro for reconhecido corretamente o trilho GPS\nserá mostrado a verde. Clique em 'Configuração da imagem de fundo' do lado\ndireito para mostrar ou esconder o trilho GPS, assim como enquadrar todo\no trilho GPS na janela.\n\nEste trilho GPS não é carregado para o OpenStreetMap para estar disponível\na outros editores, é apenas um ficheiro local GPS que pode utilizar para servir\nde referência e ajuda a editar o mapa. Também pode [carregar o ficheiro GPX para o OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npara que outros o possam utilizar ao editar mapas.\n\n", "addresses": "# Endereços\n\nEndereços são das informações mais importantes para o mapa.\n\nApesar de endereços serem frequentemente representados em muitos mapas como parte de ruas, no OpenStreetMap eles são armazenados como atributos de edifícios e locais ao longo de ruas.\n\nDados de endereço podem ser adicionados tanto a locais representados como contornos de edifícios, como aos representados como um único ponto. A fonte ideal de dados de endereço é a recolha no local ou conhecimento pessoal — tal como com qualquer outro elemento, a cópia de fontes comerciais como o Google Maps é estritamente proibida.\n", diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json index 991b617bd..53a6e44c2 100644 --- a/vendor/assets/iD/iD/locales/ru.json +++ b/vendor/assets/iD/iD/locales/ru.json @@ -134,7 +134,8 @@ "annotation": "Объединены {n} линий.", "not_eligible": "Эти объекты нельзя склеить.", "not_adjacent": "Эти линии не склеить, потому что они не соединены.", - "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\"" + "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\"", + "incomplete_relation": "Эти объекты нельзя объединить, потому что как минимум один из них не был загружен целиком." }, "move": { "title": "Сместить", @@ -332,7 +333,7 @@ }, "help": { "title": "Справка", - "help": "# Справка\n\nЭто редактор [OpenStreetMap](http://www.openstreetmap.org/): общедоступной,\nсвободно редактируемой карты мира. Вы можете использовать этот редактор для добавления\nи обновления карты вашей местности, помогая всем,\nулучшая открытую и свободную карту мира\n\nВаши правки увидит каждый пользователь карты OpenStreetMap. Для\nредактирования вам потребуется [зарегистрироваться в OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[Редактор iD](http://ideditor.com/) — открытый совместный проект\nс [исходным кодом на GitHub](https://github.com/systemed/iD).\n", + "help": "# Справка\n\nЭто редактор [OpenStreetMap](http://www.openstreetmap.org/): общедоступной,\nсвободно редактируемой карты мира. Вы можете использовать этот редактор для добавления\nи обновления карты вашей местности, помогая всем,\nулучшая открытую и свободную карту мира\n\nВаши правки увидит каждый пользователь карты OpenStreetMap. Для\nредактирования вам потребуется [зарегистрироваться в OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[Редактор iD](http://ideditor.com/) — открытый совместный проект\nс [исходным кодом на GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Редактирование и сохранение\n\nЭтот редактор создан, в основном, для онлайн-редактирования, и сейчас вы работаете с ним через веб-сайт.\n\n### Выбор объектов\n\nЧтобы выбрать объект карты, например, дорогу или точку интереса, щёлкните по нему на карте. Выбранный объект будет помечен выделением, откроется панель его свойств, а рядом с ним появится меню с действиями, которые вы можете над ним совершить.\n\nУдерживая клавишу «Shift», можно выделить несколько объектов сразу. Это можно сделать, щёлкая по ним, или же растягивая рамку выделения с нажатой клавишей мыши. Все точки внутри неё будут выделены.\n\n### Сохранение правок\n\nКогда вы редактируете карту, например, изменяете дороги, здания и места, эти изменения хранятся на вашем компьютере, пока вы не сохраните их на сервер. Не бойтесь ошибиться — изменения можно откатить кнопкой «Отмена», или снова повторить их кнопкой «Повтор».\n\nНажмите «Сохранить» для сохранения группы изменений — например, вы закончили редактировать один район города и хотите продолжить с другим. У вас будет возможность просмотреть ваши изменения, а редактор покажет предложения и предупреждения, если во внесенных данных что-то не так.\n\nЕсли все верно, введите краткое описание ваших изменений и еще раз нажмите «Сохранить» для отправки данных на [OpenStreetMap.org](http://www.openstreetmap.org/), где они станут видны другим участникам для просмотра и дальнейшего развития карты.\n\nЕсли у вас не получается закончить с правками за один раз, окно редактора можно закрыть, тогда при следующем запуске редактора (на том же компьютере и в том же браузере) программа предложит восстановить вашу работу.\n", "roads": "# Дороги\n\nВ этом редакторе вы можете создавать, изменять и удалять дороги. Дороги бывают самых разных типов: тропы, шоссе, грунтовки, велодорожки и другие — любой участок местности, по которому есть какое-либо движение.\n\n### Выбор\n\nКликните на дороге, чтобы выбрать её. Дорога подсветится выделением, справа появится редактор свойств, а рядом с ней появятся иконки действий.\n\n### Изменение\n\nИногда вы увидите дороги, не совпадающие со снимком подложки или GPS-треком. Такие дороги можно отредактировать.\n\nКликните на дороге, которую надо изменить. Линия дороги подсветится, и на ней появятся контрольные точки, которые можно перетащить на более правильные места. Если вы захотите сделать дорогу более детализированной, дважды щелкните на линии для добавления в этом месте новой контрольной точки.\n\nЕсли в реальности дороги соединяются на перекрестке, а на карте не соединены — перетяните одну из контрольных точек дороги на линию другой. Правильное соединение дорог очень важно для карты и навигаторов, прокладывающих по ней маршрут.\n\nЧтобы передвинуть линию дороги целиком — выберите инструмент «Перемещение» или нажмите горячую клавишу `M`. Повторный щелчок мышью зафиксирует дорогу на новом месте.\n\n### Удаление\n\nЕсли дорога нарисована совсем неправильно — её не видно на спутниковом снимке, а в идеальном случае — вы были на месте и сами убедились в её отсутствии — вы можете удалить дорогу с карты. Будьте очень осторожны, удаляя что-либо, — как и другие ваши правки, это затрагивает всех пользователей карты. Спутниковые снимки часто бывают устаревшими, так что дорога может быть просто недавно построенной.\n\nЧтобы удалить дорогу, выберите её щелчком мыши, затем щелкните по иконке мусорного ведра или нажмите клавишу «Delete».\n\n### Создание\n\nНашли место, где в реальности дорога, а на карте её нет? Щелкните на кнопку «Линия» слева вверху окна редактора или нажмите клавишу `2` чтобы начать рисовать линию.\n\nЩелкните на карте в месте, где должна начинаться дорога. Если она ответвляется от уже нарисованной можно начать рисование щелчком мыши в месте их пересечения.\n\nЗатем щёлкайте на карте вдоль траектории дороги, согласно спутниковому снимку или GPS-треку. Если новая дорога пересекается с другой, обязательно щёлкните на уже существующей, чтобы создать точку перекрестка. Чтобы закончить рисование, сделайте двойной щелчок мышью или нажмите «Enter» на клавиатуре.\n", "gps": "# GPS\n\nДанные GPS — наиболее достоверный источник данных для OpenStreetMap. Этот редактор поддерживает загрузку файлов треков в формате `.gpx` с вашего компьютера. Вы можете записывать такие треки с помощью приложений для смартфонов и GPS-устройств.\n\nБолее подробно о сборе данных GPS можно прочесть на странице\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nЧтобы использовать GPX-трек при рисовании карты, перетяните файл трека прямо в окно редактора. Если трек успешно загрузится, то он отобразится на карте в виде ярко-зелёной линии. В меню «Настройки подложки» можно выключить, включить или масштабировать слой с треками.\n\nТрек при этом не будет загружен в базу OpenStreetMap, лучший способ его использования — нарисовать новые объекты карты, основываясь на данных трека, или [загрузить его на OpenStreetMap](http://www.openstreetmap.org/trace/create), чтобы другие смогли им воспользоваться.\n", @@ -598,6 +599,9 @@ "fixme": { "label": "Исправь меня" }, + "gauge": { + "label": "Колея" + }, "generator/method": { "label": "Метод" }, @@ -862,18 +866,28 @@ "name": "Большая кабина (взад-вперёд)" }, "aerialway/chair_lift": { - "name": "Ряд кресел" + "name": "Ряд кресел", + "terms": "кресельный подъёмник" }, "aerialway/gondola": { "name": "Гондола-кабина (по кругу)", "terms": "гондола, лодка" }, "aerialway/magic_carpet": { - "name": "Ковёр-лифт" + "name": "Ковёр-лифт", + "terms": "ленточный подъёмник, конвейерный подъёмник" + }, + "aerialway/platter": { + "name": "тарельчатый подъёмник", + "terms": "тарельчатый подъёмник" }, "aerialway/pylon": { "name": "Опора канатной дороги" }, + "aerialway/rope_tow": { + "name": "бугельный подъёмник", + "terms": "бугельный подъёмник" + }, "aerialway/station": { "name": "Терминал канатной дороги" }, @@ -978,7 +992,8 @@ "terms": "клиника, поликлиника, больница" }, "amenity/clock": { - "name": "Часы" + "name": "Часы", + "terms": "часы, время" }, "amenity/college": { "name": "Колледж", @@ -1041,7 +1056,8 @@ "terms": "Рынок" }, "amenity/parking": { - "name": "Автомобильная стоянка" + "name": "Автомобильная стоянка", + "terms": "парковка, паркинг, автостоянка" }, "amenity/pharmacy": { "name": "Аптека", @@ -1084,7 +1100,8 @@ "terms": "Паб" }, "amenity/recycling": { - "name": "Переработка мусора" + "name": "Переработка мусора", + "terms": "Переработка мусора, Мусоропереработка, Утилизация мусора, Переработка отходов, Утилизация отходов" }, "amenity/restaurant": { "name": "Ресторан", @@ -1095,7 +1112,14 @@ "terms": "Школа, лицей, гимназия" }, "amenity/shelter": { - "name": "Укрытие" + "name": "Укрытие", + "terms": "Укрытие, Навес, Защита от непогоды" + }, + "amenity/social_facility": { + "name": "Социальное учреждение" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Ночлежка для бездомных" }, "amenity/studio": { "name": "Студия" @@ -1132,6 +1156,10 @@ "name": "Торговый Автомат", "terms": "Торговый автомат, автомат, торгомат" }, + "amenity/veterinary": { + "name": "Ветеринар", + "terms": "ветеринар, ветеринарный врач" + }, "amenity/waste_basket": { "name": "Мусорная корзина", "terms": "мусорная корзина, урна" @@ -1141,30 +1169,36 @@ "terms": "Область" }, "barrier": { - "name": "Преграда" + "name": "Преграда", + "terms": "препятствие, преграда, барьер, заграждение" }, "barrier/block": { - "name": "Бетонный блок" + "name": "Бетонный блок", + "terms": "Блок, преграда" }, "barrier/bollard": { - "name": "Столбики" + "name": "Столбики", + "terms": "Столб, столбик, преграда" }, "barrier/cattle_grid": { - "name": "Сетка для животных" + "name": "Сетка для животных", + "terms": "Сетка для животных, Препятствие для животных" }, "barrier/city_wall": { "name": "Городская стена", "terms": "Городская стена" }, "barrier/cycle_barrier": { - "name": "Барьер для велосипедистов" + "name": "Барьер для велосипедистов", + "terms": "Барьер для велосипедистов, Велосипедное препятствие" }, "barrier/ditch": { "name": "Траншея", "terms": "канава, ров" }, "barrier/entrance": { - "name": "Проход" + "name": "Проход", + "terms": "вход, дверь, главный вход" }, "barrier/fence": { "name": "Забор", @@ -1179,20 +1213,24 @@ "terms": "Живая изгородь, Зелёное ограждение" }, "barrier/kissing_gate": { - "name": "Преграда для животных" + "name": "Преграда для животных", + "terms": "Ворота с защитой от животных, Преграда для животных" }, "barrier/lift_gate": { "name": "Шлагбаум", "terms": "шлагбаум" }, "barrier/retaining_wall": { - "name": "Укрепляющая стена" + "name": "Укрепляющая стена", + "terms": "Подпорная стена" }, "barrier/stile": { - "name": "Турникет" + "name": "Турникет", + "terms": "Турникет" }, "barrier/toll_booth": { - "name": "Пункт оплаты проезда" + "name": "Пункт оплаты проезда", + "terms": "Пункт оплаты проезда, Касса, Пропускной пункт" }, "barrier/wall": { "name": "Стена", @@ -1210,10 +1248,33 @@ "name": "Многоквартирный дом", "terms": "многоэтажка, высотка" }, + "building/bunker": { + "name": "Бункер" + }, + "building/cathedral": { + "name": "Собор", + "terms": "Собор, Храм" + }, + "building/chapel": { + "name": "Капелла" + }, + "building/church": { + "name": "Церковь, Храм", + "terms": "Церковь, Храм" + }, "building/commercial": { "name": "Деловое здание", "terms": "Деловое здание, Коммерческое здание, Деловая недвижимость" }, + "building/construction": { + "name": "Строящееся здание" + }, + "building/detached": { + "name": "Отдельностоящий частный жилой дом" + }, + "building/dormitory": { + "name": "Общежитие" + }, "building/entrance": { "name": "Вход", "terms": "вход, дверь, главный вход" @@ -1222,6 +1283,18 @@ "name": "Гараж", "terms": "гараж, ракушка" }, + "building/garages": { + "name": "Гаражи" + }, + "building/greenhouse": { + "name": "Теплица" + }, + "building/hospital": { + "name": "Здание больницы" + }, + "building/hotel": { + "name": "Здание гостиницы" + }, "building/house": { "name": "Дом", "terms": "дом, частный дом, изба, хата" @@ -1234,12 +1307,43 @@ "name": "Промышленное здание", "terms": "Промышленное здание, Производственное здание, Индустриальное здание, Цех" }, + "building/public": { + "name": "Общественное здание, Общественный центр" + }, "building/residential": { "name": "Жилой Дом", "terms": "Жилой дом, Жилое здание" }, + "building/retail": { + "name": "Магазин розничной торговли" + }, + "building/roof": { + "name": "Крыша" + }, + "building/school": { + "name": "Здание школы" + }, + "building/shed": { + "name": "Сарай" + }, + "building/stable": { + "name": "Конюшня" + }, + "building/terrace": { + "name": "Блокированные дома" + }, + "building/train_station": { + "name": "Железнодорожный вокзал" + }, + "building/university": { + "name": "Здание университета, института " + }, + "building/warehouse": { + "name": "Склад" + }, "craft/basket_maker": { - "name": "Корзина" + "name": "Корзина", + "terms": "корзинщик" }, "craft/beekeeper": { "name": "Пчеловод", @@ -1252,7 +1356,11 @@ "name": "Строительство лодок" }, "craft/bookbinder": { - "name": "Книгосборка" + "name": "Книгосборка", + "terms": "переплётчик" + }, + "craft/brewery": { + "name": "Пивоваренный завод" }, "craft/carpenter": { "name": "Плотник", @@ -1262,7 +1370,8 @@ "name": "Ковровое покрытие" }, "craft/clockmaker": { - "name": "Часовщик" + "name": "Часовщик", + "terms": "часовщик" }, "craft/confectionary": { "name": "Кондитерские изделия" @@ -1271,10 +1380,12 @@ "name": "Портной" }, "craft/electrician": { - "name": "Электрик" + "name": "Электрик", + "terms": "электрик" }, "craft/gardener": { - "name": "Садовник" + "name": "Садовник", + "terms": "садовник" }, "craft/handicraft": { "name": "Рукодельник" @@ -1283,7 +1394,11 @@ "name": "Установка кондиционеров" }, "craft/jeweler": { - "name": "Ювелир" + "name": "Ювелир", + "terms": "ювелир" + }, + "craft/key_cutter": { + "name": "Изготовление ключей" }, "craft/locksmith": { "name": "Изготовление ключей" @@ -1294,9 +1409,6 @@ "craft/optician": { "name": "Оптика" }, - "craft/painter": { - "name": "Маляр" - }, "craft/photographer": { "name": "фотограф", "terms": "фотограф, фото оператор" @@ -1317,7 +1429,8 @@ "name": "Мачтовая мастерская" }, "craft/roofer": { - "name": "Кровельщик" + "name": "Кровельщик", + "terms": "кровельщик" }, "craft/saddler": { "name": "Конюх" @@ -1336,7 +1449,8 @@ "name": "Скульптор" }, "craft/shoemaker": { - "name": "Сапожник" + "name": "Сапожник", + "terms": "сапожник, башмачник" }, "craft/stonemason": { "name": "Каменщик" @@ -1354,7 +1468,8 @@ "name": "Мебельщик" }, "craft/watchmaker": { - "name": "Часовщик" + "name": "Часовщик", + "terms": "часовщик" }, "craft/window_construction": { "name": "Оконщик" @@ -1376,13 +1491,16 @@ "terms": "аварийный телефон, телефон спасения, 112, 911, 01, 02, 03, 04" }, "entrance": { - "name": "Вход" + "name": "Вход", + "terms": "вход, дверь, главный вход" }, "footway/crossing": { - "name": "Пешеходный переход" + "name": "Пешеходный переход", + "terms": "Пешеходный переход" }, "footway/sidewalk": { - "name": "Тротуар с дорогой" + "name": "Тротуар", + "terms": "Тротуар, Тротуарчик, Пешеходная обочина" }, "golf/bunker": { "name": "Бункер", @@ -1401,54 +1519,71 @@ "terms": "Лунка для гольфа" }, "golf/lateral_water_hazard": { - "name": "Боковая водная преграда" + "name": "Боковая водная преграда", + "terms": "Боковая водная преграда, Боковое водное препятствие" }, "golf/rough": { "name": "Раф", "terms": "Неровная площадка, Высокая трава" }, + "golf/tee": { + "name": "Стартовая площадка", + "terms": "Стартовая площадка, Стартовая зона" + }, "golf/water_hazard": { - "name": "Водная преграда" + "name": "Прямая водная преграда", + "terms": "Водное препятствие, Водная преграда, Прямая водная преграда" }, "highway": { - "name": "Дорога" + "name": "Дорога", + "terms": "шоссе, магистраль, автомагистраль, дорога, автодорога, трасса, путь, автострада" }, "highway/bridleway": { - "name": "Конная тропа" + "name": "Конная тропа", + "terms": "Конная тропа, Дорога для верховой езды, Дорога для конной езды" }, "highway/bus_stop": { "name": "Автобусная остановка", "terms": "остановка, остановка общественного транспорта, автобусная остановка" }, "highway/crossing": { - "name": "Пешеходный переход" + "name": "Пешеходный переход", + "terms": "перекресток, переезд, пересечение, железнодорожный переезд, переправа, скрещение" }, "highway/cycleway": { - "name": "Велодорожка" + "name": "Велодорожка", + "terms": "велодорожка, велосипедная дорожка" }, "highway/footway": { - "name": "Пешеходная дорожка" + "name": "Пешеходная дорожка", + "terms": "Пешеходная тропа, Пешая тропа" }, "highway/living_street": { - "name": "Жилая улица" + "name": "Жилая улица", + "terms": "Жилая улица, Улица в жилой застройке, Жилая зона" }, "highway/mini_roundabout": { - "name": "Миникруг" + "name": "Миникруг", + "terms": "Мини круговое движение, Маленький поворотный круг" }, "highway/motorway": { - "name": "Автомагистраль" + "name": "Автомагистраль", + "terms": "Автомагистраль, Скоростная автострада, Скоростное шоссе, Автобан, Скоростная автодорога, Хайвэй, Скоростна автотрасса" }, "highway/motorway_junction": { "name": "Автомагистраль" }, "highway/motorway_link": { - "name": "Съезд с автомагистрали" + "name": "Съезд с автомагистрали", + "terms": "Съезд с автомагистрали, Съезд со скоростной автострады, Съезд со скоростного шоссе, Съезд с автобана, Съезд со скоростной автодороги, Съезд с хайвэя, Съезд со скоростной автотрассы" }, "highway/path": { - "name": "Тропа" + "name": "Тропа", + "terms": "Тропа, Тропинка, Тропка" }, "highway/pedestrian": { - "name": "Пешеходная дорога" + "name": "Пешеходная дорога", + "terms": "Пешеходная улица" }, "highway/primary": { "name": "Дорога регионального значения", @@ -1458,10 +1593,12 @@ "name": "Съезд с дороги регионального значения" }, "highway/residential": { - "name": "Улица" + "name": "Улица", + "terms": "Улица, Жилая улица" }, "highway/road": { - "name": "Дорога неизвестного класса" + "name": "Дорога неизвестного класса", + "terms": "неизвестная" }, "highway/secondary": { "name": "Важная дорога" @@ -1470,16 +1607,20 @@ "name": "Съезд с важной дороги" }, "highway/service": { - "name": "Проезд" + "name": "Проезд", + "terms": "Проезд, Автопроезд" }, "highway/service/alley": { - "name": "Аллея" + "name": "Служебный проезд", + "terms": "Служебный проезд, Сервисный проезд, Второстепенный проезд" }, "highway/service/drive-through": { - "name": "Сервис не выходя из машины" + "name": "Сервис не выходя из машины", + "terms": "Сервис не выходя из машины, Обслуживание не выходя из машины" }, "highway/service/driveway": { - "name": "Дорога" + "name": "Дорога", + "terms": "Подъездная дорога, Подъезд к чему-либо" }, "highway/service/emergency_access": { "name": "Неотложная помощь" @@ -1517,22 +1658,27 @@ "terms": "Заезд на магистраль, Съезд с магистрали" }, "highway/turning_circle": { - "name": "Разворот" + "name": "Разворот", + "terms": "Площадка ля разворота, Разворотный круг, Разворотный тупик" }, "highway/unclassified": { "name": "Обычная дорога" }, "historic": { - "name": "Историческое место" + "name": "Историческое место", + "terms": "Археологическая площадка, Археологические раскопки" }, "historic/archaeological_site": { - "name": "Археологические раскопки" + "name": "Археологические раскопки", + "terms": "Археологическая площадка, Археологические раскопки" }, "historic/boundary_stone": { - "name": "Пограничный камень" + "name": "Пограничный камень", + "terms": "межевой камень" }, "historic/castle": { - "name": "Замок" + "name": "Замок", + "terms": "Замок, Форт, Укрепление" }, "historic/memorial": { "name": "Памятник, мемориал", @@ -1543,35 +1689,44 @@ "terms": "монумент" }, "historic/ruins": { - "name": "Развалины" + "name": "Развалины", + "terms": "руины, развалины" }, "historic/wayside_cross": { - "name": "Придорожный крест" + "name": "Придорожный крест", + "terms": "Придорожный крест" }, "historic/wayside_shrine": { - "name": "Придорожная часовня" + "name": "Придорожная часовня", + "terms": "Придорожная часовня" }, "landuse": { - "name": "Землепользование" + "name": "Землепользование", + "terms": "Землепользование" }, "landuse/allotments": { - "name": "Садовые участки" + "name": "Садовые участки", + "terms": "Участки садов и огородов, Сады и огороды" }, "landuse/basin": { - "name": "Хранилище сточных вод" + "name": "Хранилище сточных вод", + "terms": "Бассейн, Искусственный водоём, Копаный пруд" }, "landuse/cemetery": { "name": "Кладбище", "terms": "кладбище" }, "landuse/commercial": { - "name": "Коммерческая застройка" + "name": "Коммерческая застройка", + "terms": "Коммерческое землепользование, Территории торгово-офисного назначения" }, "landuse/construction": { - "name": "Стройплощадка" + "name": "Стройплощадка", + "terms": "стройка, строительство" }, "landuse/farm": { - "name": "Земельные угодья" + "name": "Земельные угодья", + "terms": "Ферма, Сельхоз предприятие" }, "landuse/farmland": { "name": "Сельскохозяйственные угодья" @@ -1580,13 +1735,16 @@ "name": "Ферма" }, "landuse/forest": { - "name": "Лес" + "name": "Лес", + "terms": "лес, лесной массив" }, "landuse/grass": { - "name": "Трава" + "name": "Трава", + "terms": "Газон, Искусственный газон, Земля используемая под газон" }, "landuse/industrial": { - "name": "Промышленная застройка" + "name": "Промышленная застройка", + "terms": "Промышленная территория, Производственная территория, Промышленное землепользование" }, "landuse/meadow": { "name": "Луг", @@ -1601,7 +1759,8 @@ "terms": "карьер, каменоломня, открытая разработка" }, "landuse/residential": { - "name": "Жилой квартал" + "name": "Жилой квартал", + "terms": "Жилая территория, Селитебная территория, Жилые земли, Селитебные земли" }, "landuse/retail": { "name": "Торговля" @@ -1611,37 +1770,44 @@ "terms": "виноградник" }, "leisure": { - "name": "Отдых" + "name": "Отдых", + "terms": "Территории для отдыха" }, "leisure/dog_park": { - "name": "Площадка для Выгула Собак" + "name": "Площадка для Выгула Собак", + "terms": "собачья площадка" }, "leisure/garden": { "name": "Сад", "terms": "Парк, Сквер" }, "leisure/golf_course": { - "name": "Площадка для гольфа" + "name": "Площадка для гольфа", + "terms": "Поле для гольфа, Гольфполе" }, "leisure/marina": { - "name": "Яхтклуб" + "name": "Яхтклуб", + "terms": "Марина, Стоянка для яхт" }, "leisure/park": { "name": "Парк", "terms": "парк" }, "leisure/pitch": { - "name": "Спортплощадка" + "name": "Спортплощадка", + "terms": "спортивная площадка" }, "leisure/pitch/american_football": { "name": "Регбийное поле", "terms": "поле для американского футбола" }, "leisure/pitch/baseball": { - "name": "Бейсбольная площадка" + "name": "Бейсбольная площадка", + "terms": "Бейсбол" }, "leisure/pitch/basketball": { - "name": "Баскетбольная площадка" + "name": "Баскетбольная площадка", + "terms": "баскетбольная площадка" }, "leisure/pitch/skateboard": { "name": "Скейт-парк", @@ -1656,14 +1822,16 @@ "terms": "теннисный корт" }, "leisure/pitch/volleyball": { - "name": "Волейбольная площадка" + "name": "Волейбольная площадка", + "terms": "волейбольная площадка" }, "leisure/playground": { "name": "Детская площадка", "terms": "детская площадка, игровая площадка" }, "leisure/slipway": { - "name": "Стапель" + "name": "Стапель", + "terms": "Стапель" }, "leisure/sports_center": { "name": "Спортивный Комплекс", @@ -1674,20 +1842,24 @@ "terms": "Стадион, спортивная арена" }, "leisure/swimming_pool": { - "name": "Бассейн" + "name": "Бассейн", + "terms": "плавательный бассейн, плавательный бассеин" }, "leisure/track": { "name": "Гоночная Трасса", "terms": "Трасса для Гонок, Трек, Трасса, Автодром" }, "line": { - "name": "Линия" + "name": "Линия", + "terms": "Линия" }, "man_made": { - "name": "Сооружения" + "name": "Сооружения", + "terms": "рукотворное" }, "man_made/breakwater": { - "name": "Волнорез" + "name": "Волнорез", + "terms": "Мол, Оградительное гидросооружение" }, "man_made/cutline": { "name": "Просека", @@ -1698,7 +1870,8 @@ "terms": "насыпь" }, "man_made/flagpole": { - "name": "Флагшток" + "name": "Флагшток", + "terms": "флагшток" }, "man_made/lighthouse": { "name": "Маяк", @@ -1717,10 +1890,12 @@ "terms": "трубопровод" }, "man_made/survey_point": { - "name": "Тригонометрический пункт" + "name": "Тригонометрический пункт", + "terms": "Тригонометрический пункт" }, "man_made/tower": { - "name": "Башня" + "name": "Башня", + "terms": "Башня" }, "man_made/wastewater_plant": { "name": "Станция водоочистки", @@ -1735,22 +1910,27 @@ "terms": "колодец" }, "man_made/water_works": { - "name": "Станция водоподготовки" + "name": "Станция водоподготовки", + "terms": "Водозабор" }, "military/airfield": { "name": "Аэродром" }, "military/barracks": { - "name": "Бараки" + "name": "Бараки", + "terms": "Бараки, Казарма" }, "military/bunker": { - "name": "Бункер" + "name": "Бункер", + "terms": "Бункер, Подземное убежище, Подземное укрытие" }, "military/range": { - "name": "Военный полигон" + "name": "Военный полигон", + "terms": "Военный полигон, Стрельбище" }, "natural": { - "name": "Природа" + "name": "Природа", + "terms": "Природные объекты" }, "natural/bay": { "name": "Бухта", @@ -1761,20 +1941,24 @@ "terms": "пляж" }, "natural/cliff": { - "name": "Скала" + "name": "Скала", + "terms": "Скала, Утёс, Шхеры" }, "natural/coastline": { "name": "Береговая линия", "terms": "береговая линия, побережье" }, "natural/glacier": { - "name": "Ледник" + "name": "Ледник", + "terms": "ледник" }, "natural/grassland": { - "name": "Травяной луг" + "name": "Травяной луг", + "terms": "Травяной луг, Луговина, Лужок, Выкос, Перелесье" }, "natural/heath": { - "name": "Поросший луг" + "name": "Поросший луг", + "terms": "Поросший луг" }, "natural/peak": { "name": "Вершина", @@ -1784,17 +1968,20 @@ "name": "Осыпь" }, "natural/scrub": { - "name": "Кустарник" + "name": "Кустарник", + "terms": "Кустарник, Кусты, Кустовник, Подлесок, Лозняк, Чапыжник" }, "natural/spring": { - "name": "Родник" + "name": "Родник", + "terms": "Ручей, Ключ" }, "natural/tree": { "name": "Дерево", "terms": "дерево" }, "natural/water": { - "name": "Водоём" + "name": "Водоём", + "terms": "Вода, Водоём" }, "natural/water/lake": { "name": "Озеро", @@ -1805,17 +1992,20 @@ "terms": "пруд" }, "natural/water/reservoir": { - "name": "Водохранилище" + "name": "Водохранилище", + "terms": "Водохранилище, Рукотворное озеро, Водоместилище," }, "natural/wetland": { "name": "Болото", "terms": "болото, заболоченная территория" }, "natural/wood": { - "name": "Лес" + "name": "Лес", + "terms": "Лес, Деревья, Роща, Чаща" }, "office": { - "name": "Офисы" + "name": "Офисы", + "terms": "Офисы, Офис, Контора, Канцелярия" }, "office/accountant": { "name": "Бухгалтерская контора", @@ -1844,7 +2034,8 @@ "terms": "Бюро по недвижимости, Риелтор, Риелторская фирма, Риелторская компания," }, "office/financial": { - "name": "Финансовая организация" + "name": "Финансовая организация", + "terms": "финансовая организация" }, "office/government": { "name": "Правительственное учреждение" @@ -1866,7 +2057,8 @@ "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение," }, "office/physician": { - "name": "Фельдшер" + "name": "Фельдшер", + "terms": "врач" }, "office/political_party": { "name": "Политическая партия", @@ -1877,7 +2069,8 @@ "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки" }, "office/telecommunication": { - "name": "Телеком" + "name": "Телеком", + "terms": "Телеком" }, "office/therapist": { "name": "Терапевт" @@ -1886,36 +2079,48 @@ "name": "Турагентство", "terms": "Туристическое агентство, Бюро путешествий, Турфирма, Туристическая фирма" }, + "piste": { + "name": "Лыжная трасса" + }, "place": { - "name": "Населённый пункт" + "name": "Населённый пункт", + "terms": "Населённый пункт, Местность" }, "place/city": { - "name": "Большой город" + "name": "Большой город", + "terms": "город" }, "place/hamlet": { - "name": "Малое село" + "name": "Малое село", + "terms": "Деревня" }, "place/island": { "name": "Остров", "terms": "остров" }, "place/isolated_dwelling": { - "name": "Изолированное жильё" + "name": "Изолированное жильё", + "terms": "Хутор, Заимка" }, "place/locality": { - "name": "Местность" + "name": "Местность", + "terms": "Урочище, Заброшенное поселение" }, "place/town": { - "name": "Город" + "name": "Город", + "terms": "Город" }, "place/village": { - "name": "Деревня" + "name": "Деревня", + "terms": "Село, Станица, Поселение, Посёлок городского типа" }, "point": { - "name": "Точка" + "name": "Точка", + "terms": "точка" }, "power": { - "name": "Электричество" + "name": "Электричество", + "terms": "Электроэнергетика" }, "power/generator": { "name": "Силовой Генератор", @@ -1929,49 +2134,61 @@ "name": "Низковольтная ЛЭП" }, "power/pole": { - "name": "Столб ЛЭП" + "name": "Столб ЛЭП", + "terms": "Столб линии электропередачи, Опора маломощной линии электропередачи" }, "power/sub_station": { "name": "Трансформаторная подстанция", "terms": "подстанция" }, "power/tower": { - "name": "Опора ЛЭП" + "name": "Опора ЛЭП", + "terms": "Опора ЛЭП, Опора линии электропередачи" }, "power/transformer": { "name": "Трансформатор", "terms": "трансформатор" }, "public_transport/platform": { - "name": "Платформа" + "name": "Платформа", + "terms": "Платформа, Остановка, Посадочная платформа, Место посадки и высадки пассажиров" }, "public_transport/stop_position": { "name": "Место остановки транспорта", "terms": "остановка" }, "railway": { - "name": "Железная дорога" + "name": "Железная дорога", + "terms": "железная дорога" }, "railway/abandoned": { - "name": "Разобранная железная дорога" + "name": "Разобранная железная дорога", + "terms": "Разобранная железнодорожная ветка," }, "railway/disused": { - "name": "Заброшенная железная дорога" + "name": "Заброшенная железная дорога", + "terms": "Неиспользуемая железнодорожная ветка" }, "railway/funicular": { - "name": "Фуникулёр" + "name": "Фуникулёр", + "terms": "фуникулёр, канатная дорога" }, "railway/halt": { "name": "Железнодорожный остановочный пункт", "terms": "Железнодорожная станция, ЖД станция" }, "railway/level_crossing": { - "name": "Переезд" + "name": "Переезд", + "terms": "Железнодорожный переезд" }, "railway/monorail": { "name": "Монорельс", "terms": "монорельсовая железная дорога, монорельс" }, + "railway/narrow_gauge": { + "name": "Узкоколейная железная дорога", + "terms": "узкоколейная железная дорога, узкоколейка, узкоколейная ЖД" + }, "railway/platform": { "name": "Железнодорожная платформа", "terms": "железнодорожная платформа, ж/д платформа" @@ -1988,118 +2205,151 @@ "terms": "Метро, Подземка, " }, "railway/subway_entrance": { - "name": "Вход в метро" + "name": "Вход в метро", + "terms": "вход в метро, вход в подземку" }, "railway/tram": { - "name": "Трамвайные пути" + "name": "Трамвайные пути", + "terms": "трамвай" }, "relation": { - "name": "Отношение" + "name": "Отношение", + "terms": "отношение" }, "route/ferry": { - "name": "Паромный маршрут" + "name": "Паромный маршрут", + "terms": "паром, паромная переправа" }, "shop": { - "name": "Магазин" + "name": "Магазин", + "terms": "Магазин, Торговая лавка, Точка продаж" }, "shop/alcohol": { - "name": "Винный магазин" + "name": "Винный магазин", + "terms": "Винный магазин, Винная лавка, Вино-водочный магазин" }, "shop/bakery": { - "name": "Хлебный" + "name": "Хлебный", + "terms": "Булочная, Хлебный магазин" }, "shop/beauty": { - "name": "Салон красоты" + "name": "Салон красоты", + "terms": "салон красоты" }, "shop/beverages": { - "name": "Магазин напитков" + "name": "Магазин напитков", + "terms": "Магазин напитков, Продажа напитков" }, "shop/bicycle": { - "name": "Веломагазин" + "name": "Веломагазин", + "terms": "Веломагазин" }, "shop/books": { "name": "Книжный", "terms": "книги, книжный" }, "shop/boutique": { - "name": "Бутик" + "name": "Бутик", + "terms": "Бутик, Фирменный магазин" }, "shop/butcher": { "name": "Мясной", "terms": "мясной, мясная лавка, мясник" }, "shop/car": { - "name": "Автодилер" + "name": "Автодилер", + "terms": "Автомобильный салон, Диллерский автоцентр " }, "shop/car_parts": { - "name": "Автозапчасти" + "name": "Автозапчасти", + "terms": "автозапчасти" }, "shop/car_repair": { - "name": "Автомастерская" + "name": "Автомастерская", + "terms": "автомастерская, ремонт авто, станция техобслуживания, автосервис" }, "shop/chemist": { - "name": "Бытовая химия" + "name": "Бытовая химия", + "terms": "Бытовая химия" }, "shop/clothes": { - "name": "Одежда" + "name": "Одежда", + "terms": "магазин одежды" }, "shop/computer": { - "name": "Компьютерный магазин" + "name": "Компьютерный магазин", + "terms": "Компьютерный магазин" }, "shop/confectionery": { - "name": "Кондитерская" + "name": "Кондитерская", + "terms": "Кондитерская" }, "shop/convenience": { - "name": "Продуктовый" + "name": "Продуктовый", + "terms": "Продуктовый магазин, Магазин шаговой доступности" }, "shop/deli": { - "name": "Кулинария" + "name": "Кулинария", + "terms": "Кулинария, Гастрономия" }, "shop/department_store": { - "name": "Универсам" + "name": "Универсам", + "terms": "Универсам" }, "shop/doityourself": { - "name": "Магазин \"Сделай сам\"" + "name": "Магазин \"Сделай сам\"", + "terms": "Магазин \"Сделай Сам\", Всё для ремонта" }, "shop/dry_cleaning": { "name": "пылесосы", "terms": "химчистка" }, "shop/electronics": { - "name": "Магазин электроники" + "name": "Магазин электроники", + "terms": "Магазин электроники" }, "shop/farm": { "name": "Продуктовый Лоток" }, "shop/fishmonger": { - "name": "Рыбный магазин" + "name": "Рыбный магазин", + "terms": "рыботорговец" }, "shop/florist": { - "name": "Цветочный" + "name": "Цветочный", + "terms": "Цветочный магазин" }, "shop/furniture": { - "name": "Мебельный" + "name": "Мебельный", + "terms": "Мебельный магазин" }, "shop/garden_centre": { - "name": "Садовые принадлежности" + "name": "Садовые принадлежности", + "terms": "садовый центр" }, "shop/gift": { - "name": "Подарки" + "name": "Подарки", + "terms": "Магазин подарков" }, "shop/greengrocer": { - "name": "Овощи, фрукты" + "name": "Овощи, фрукты", + "terms": "Овощи-фрукты" }, "shop/hairdresser": { - "name": "Парикмахерская" + "name": "Парикмахерская", + "terms": "Парикмахерская, Парикмахер, Парикмахерский салон, Стилист" }, "shop/hardware": { - "name": "Хозяйственный магазин" + "name": "Хозяйственный магазин", + "terms": "Хозяйственный магазин, Хозмаг" }, "shop/hifi": { - "name": "Техника Hi-fi" + "name": "Техника Hi-fi", + "terms": "Техника Hi-fi, Акустика Hi-fi" }, "shop/jewelry": { - "name": "Ювелирный" + "name": "Ювелирный", + "terms": "ювелир" }, "shop/kiosk": { "name": "Киоск", @@ -2109,79 +2359,102 @@ "name": "Прачечная", "terms": "прачечная" }, + "shop/locksmith": { + "name": "Изготовление ключей" + }, "shop/mall": { - "name": "Торговый центр" + "name": "Торговый центр", + "terms": "Торговый центр, Торговый дом" }, "shop/mobile_phone": { - "name": "Мобильные телефоны" + "name": "Мобильные телефоны", + "terms": "Салон сотовой связи, Продажа сотовых телефонов" }, "shop/motorcycle": { - "name": "Магазин мотоциклов" + "name": "Магазин мотоциклов", + "terms": "Магазин мотоциклов, Мотодиллер" }, "shop/music": { - "name": "Музыкальный магазин" + "name": "Музыкальный магазин", + "terms": "Музыкальный магазин, Аудио салон" }, "shop/newsagent": { - "name": "Газеты-журналы" + "name": "Газеты-журналы", + "terms": "Газеты-журналы, Новостной киоск, Пресса, Союзпечать" }, "shop/optician": { "name": "Оптика", "terms": "оптика, очки" }, "shop/outdoor": { - "name": "Товары для отдыха и туризма" + "name": "Товары для отдыха и туризма", + "terms": "Товары для отдыха и туризма, Товары для кэмпинга, Туристическое снаряжение" }, "shop/pet": { - "name": "Зоомагазин" + "name": "Зоомагазин", + "terms": "зоомагазин" }, "shop/photo": { "name": "Магазин Фототоваров", "terms": "Фототовары, Фототехника" }, "shop/shoes": { - "name": "Обувной" + "name": "Обувной", + "terms": "Обувной магазин" }, "shop/sports": { - "name": "Спорттовары" + "name": "Спорттовары", + "terms": "магазин спорттоваров, Спорттовары, Спортивные товары" }, "shop/stationery": { - "name": "Канцелярский магазин" + "name": "Канцелярский магазин", + "terms": "Канцелярский магазин, Канцтовары" }, "shop/supermarket": { - "name": "Гипермаркет" + "name": "Гипермаркет", + "terms": "супермаркет" }, "shop/toys": { - "name": "Игрушки" + "name": "Игрушки", + "terms": "магазин игрушек" }, "shop/travel_agency": { - "name": "Бюро путешествий" + "name": "Бюро путешествий", + "terms": "Турагенство" }, "shop/tyres": { - "name": "Шины, покрышки" + "name": "Шины, покрышки", + "terms": "Шины, Покрышки, Автопокрышки, Автошины" }, "shop/vacant": { "name": "Закрытый магазин" }, "shop/variety_store": { - "name": "Товары по одной цене" + "name": "Товары по одной цене", + "terms": "Товары по одной цене, \"Всё по одной цене\", Магазин фиксированной цены" }, "shop/video": { - "name": "Видеомагазин" + "name": "Видеомагазин", + "terms": "Видео салон, Продажа фильмов и видеозаписей" }, "tourism": { - "name": "Туризм" + "name": "Туризм", + "terms": "Туризм, Отдых, Путешествия" }, "tourism/alpine_hut": { "name": "Альпийский домик" }, "tourism/artwork": { - "name": "Произведение искусства" + "name": "Произведение искусства", + "terms": "Произведение искусства" }, "tourism/attraction": { - "name": "Достопримечательность" + "name": "Достопримечательность", + "terms": "Достопримечательность" }, "tourism/camp_site": { - "name": "Кемпинг" + "name": "Кемпинг", + "terms": "лагерь, палаточный лагерь, турбаза, место для лагеря" }, "tourism/caravan_site": { "name": "Стоянка автодомов" @@ -2190,7 +2463,8 @@ "name": "Сельский домик, шале" }, "tourism/guest_house": { - "name": "Гостевой дом" + "name": "Гостевой дом", + "terms": "Гостевой дом" }, "tourism/hostel": { "name": "Хостел", @@ -2201,7 +2475,8 @@ "terms": "гостиница, отель" }, "tourism/information": { - "name": "Инфопункт" + "name": "Инфопункт", + "terms": "Инфопункт, Инфостэнд, Информационный пункт" }, "tourism/motel": { "name": "Мотель", @@ -2212,7 +2487,8 @@ "terms": "музей" }, "tourism/picnic_site": { - "name": "Место для пикника" + "name": "Место для пикника", + "terms": "Место для пикника, Поляна для пикника" }, "tourism/theme_park": { "name": "Парк развлечений" @@ -2225,40 +2501,50 @@ "terms": "зоопарк" }, "type/boundary": { - "name": "Граница" + "name": "Граница", + "terms": "Граница" }, "type/boundary/administrative": { - "name": "Административная граница" + "name": "Административная граница", + "terms": "Административная граница" }, "type/multipolygon": { - "name": "Многоугольник" + "name": "Многоугольник", + "terms": "Мультиполигон, Многоугольник" }, "type/restriction": { - "name": "Ограничение" + "name": "Ограничение", + "terms": "Ограничение, Ограничение направлений движения, Ограничение манёвра" }, "type/route": { - "name": "Маршрут" + "name": "Маршрут", + "terms": "Маршрут" }, "type/route/bicycle": { - "name": "Велосипедный маршрут" + "name": "Велосипедный маршрут", + "terms": "Вело маршрут, Велосипедный маршрут" }, "type/route/bus": { - "name": "Автобусный маршрут" + "name": "Автобусный маршрут", + "terms": "Автобусный маршрут" }, "type/route/detour": { "name": "Объезд" }, "type/route/ferry": { - "name": "Паромный маршрут" + "name": "Паромный маршрут", + "terms": "паром, паромная переправа" }, "type/route/foot": { - "name": "Пешеходный маршрут" + "name": "Пешеходный маршрут", + "terms": "Пеший маршрут, Пешеходный маршрут" }, "type/route/hiking": { "name": "Пешеходный Маршрут" }, "type/route/pipeline": { - "name": "Трубопроводный маршрут" + "name": "Трубопроводный маршрут", + "terms": "трубопровод" }, "type/route/power": { "name": "Маршрут электроэнергии" @@ -2270,42 +2556,51 @@ "name": "Железнодорожный маршрут" }, "type/route/tram": { - "name": "Трамвайный маршрут" + "name": "Трамвайный маршрут", + "terms": "Трамвайный маршрут" }, "type/route_master": { "name": "Главное Отношение Маршрута" }, "vertex": { - "name": "Другое" + "name": "Другое", + "terms": "другое" }, "waterway": { - "name": "Водный путь" + "name": "Водный путь", + "terms": "Водоток, Водное русло" }, "waterway/canal": { "name": "Канал", "terms": "канал" }, "waterway/dam": { - "name": "Дамба" + "name": "Дамба", + "terms": "дамба" }, "waterway/ditch": { "name": "Оросительная канава", "terms": "канава, ров" }, "waterway/drain": { - "name": "Дренажный канал" + "name": "Дренажный канал", + "terms": "Канава, Дождевая канава" }, "waterway/river": { - "name": "Река" + "name": "Река", + "terms": "река" }, "waterway/riverbank": { - "name": "Поверхность реки" + "name": "Поверхность реки", + "terms": "Урез берега реки" }, "waterway/stream": { - "name": "Ручей" + "name": "Ручей", + "terms": "Ручей" }, "waterway/weir": { - "name": "Плотина" + "name": "Плотина", + "terms": "Плотина, Гидроплотина" } } } diff --git a/vendor/assets/iD/iD/locales/sk.json b/vendor/assets/iD/iD/locales/sk.json index 2fe9f728a..29b8610f7 100644 --- a/vendor/assets/iD/iD/locales/sk.json +++ b/vendor/assets/iD/iD/locales/sk.json @@ -332,7 +332,7 @@ }, "help": { "title": "Pomoc", - "help": "# Pomoc\n\nToto je editor pre [OpenStreetMap](http://www.openstreetmap.org/), slobodnú a upravovateľnú mapu sveta. Môžete ho používať na pridávanie a aktualizovanie údajov vo vašom okolí a vylepšiť tak mapu sveta s otvoreným kódom a dátami pre všetkých.\n\nÚpravy, ktoré v tejto mape spravíte, budú viditeľné pre každého, kto používa OpenStreetMap. Na to, aby ste mohli upravovať, budete potrebovať [OpenStreetMap účet](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je kolaboratívny projekt so [zdrojovým kódom dostupným na GitHub](https://github.com/systemed/iD).\n", + "help": "# Pomoc\n\nToto je editor pre [OpenStreetMap](http://www.openstreetmap.org/), slobodnú a upravovateľnú mapu sveta. Môžete ho používať na pridávanie a aktualizovanie údajov vo vašom okolí a vylepšiť tak mapu sveta s otvoreným kódom a dátami pre všetkých.\n\nÚpravy, ktoré v tejto mape spravíte, budú viditeľné pre každého, kto používa OpenStreetMap. Na to, aby ste mohli upravovať, budete potrebovať [bezplatný OpenStreetMap účet](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je kolaboratívny projekt so [zdrojovým kódom dostupným na GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Upravovanie a ukladanie\n\nTento editor je primárne navrhnutý na prácu online, a aj práve teraz ho používate cez internetovú stránku.\n\n### Výber objektov\n\nPre výber objektu, ako napríklad cesta alebo bod záujmu, naň kliknite na mape. Týmto sa vybraný objekt zvýrazní, otvorí sa panel s jeho detajlami a zobrazí sa ponuka s úkonmi, ktoré môžete s objektom urobiť.\n\nViacero objektov je možné vybrať podržaním klávesu \"Shift\". Potom jednoducho kliknite na objekty, ktoré chcete vybrať, alebo pretiahnite po mape akoby ste chceli nakresliť obdĺžnik. Týmto sa zobrazí rám a vyberú sa všetky objekty, ktoré sa v ňom nachádzajú.\n\n### Ukladanie úprav\n\nKed urobíte zmeny ako úpravy ciest, budov a miest, tieto budú lokálne uložené, až pokiaľ ich neuložíte na server. Netrápte sa ak urobíte chybu. Zmeny môžete vrátit späť kliknutím na tlačítko vrátiť a zopakovať kliknutím na tlačitko zopakovať.\n\nKeď chcete ukončit sériu úprav, kliknite na \"Uložiť\". Napríklad ak ste dokončili časť mesta a chcete začať s inou časťou. Budete mať možnosť si prehliadnuť, čo ste urobili a editor poskytne užitočné návrhy a varovania ak niečo nie je so zmenami vporiadku.\n\nAk všetko vyzerá vporiadku, môžete vyplniť krátky komentár vysvetľujúci, čo ste urobili a kliknite znovu na \"Uložiť\" pre odoslanie zmien na [OpenStreetMap.org](http://www.openstreetmap.org/), kde budú viditeľné pre ostatných používateľov a tak dostupné pre ďalšie vylepšenia.\n\nAk nemôžete dokončiť úpravy počas jedného sedenia, môžete zatvoriť okno prehliadača, vrátiť sa späť (na rovnakom prehliadači a počítači) a editor vám ponúkne obnoviť vašu prácu.\n", "roads": "# Cesty\n\nS týmto editorom môžete cesty vytvoriť, opraviť alebo vymazať. Cesty môžu byť rôzneho druhu: chodníky, diaľnice, lesné cestičky, cyklochodníky a iné. Akýkoľvek často prechádzaný úsek by malo byť možné zmapovať.\n\n### Výber\n\nKliknite na cestu pre jej výber. Viditeľným by sa mal stať jej obrys spolu s malou ponukou nástrojov na mape a postranným panelom, ukazujúcim dodatočné informácie o ceste.\n\n### Úprava\n\nČasto krát uvidíte cesty, ktoré nie sú zarovnané so snímkami pod nimi alebo s GPS stopu. Tieto cesty môžete upraviť tak, aby boli na správnom mieste.\n\nNajskôr kliknite na cestu, ktorú chcete zmeniť. Týmto sa zvýrazní a po jej dĺžke sa ukážu kontrolné body, ktoré môžete pretiahnuť na lepšiu pozíciu. Ak chcete pridať nový kontrolný bod pre viac detailov, dva krát kliknite na časť cesty bez uzla a jeden bude pridaný.\n\nAk sa cesta spája s inou cestou, ale nie je správne spojená na mape, môžete pretiahnuť jeden z jej kontrolných bodov na druhú cestu, aby ste ich spojili. Spojenie ciest je dôležité pre mapu a nevyhnutné pre poskytovanie navigácie na cestách.\n\nMôžete tiež kliknúť na nástroj \"Presuň\" alebo stlačiť kláves \"M\" pre posunutie celej cesty naraz a potom kliknite znovu, aby ste uložili presun.\n\n### Vymazávanie\n\nAk je cesta úplne nesprávna - vidíte, že cesta neexistuje na satelitných snímkoch a najlepšie mate potvrdené zo samotného miesta, že tam cesta nie je - môžete ju vymazať, čím ju odstránite z mapy. Pri vymazávaní objektov buďte obozretný, rovnako ako pri iných úpravách sú výsledky viditeľné ostatnými a satelitné snímky sú často neaktuálne, takže cesta môže byť jednoducho novopostavená.\n\nCestu môžete vymazať, tak že na ňu kliknete čim ju vyberiete a potom kliknete na ikonu smetného koša alebo stlačením klávesu \"Delete\".\n\n### Vytváranie\n\nZistili ste, že niekde by mala byť cesta ale ona tam nie je? Kliknite naľavo hore na ikonu \"Čiara\" alebo stlačte kláves \"2\" pre kreslenie čiary.\n\nAby ste začali kresliť, kliknite na začiatok cesty na mape. Ak cesta odbočuje z inej existujúcej cesty, začnite kliknútím na miesto, kde sa spájajú.\n\nPotom kliknite na body pozdĺž cesty tak, aby nasledovali správny smer podľa satelitných snímkov alebo GPS. Ak cesta, ktorú kreslíte, pretína ďalšiu cestu, spojte ich kliknutím v mieste križovatky. Keď ste hotový s skreslením, dva krát kliknite alebo stlačte kláves \"Enter\" na vašej klávesnici.\n", "gps": "# GPS\nGPS údaje sú najviac dôveryhodný zdroj dát pre OpenStreetMap. Tento editor podporuje stopy z lokálnych \".gpx\" súborov na vašom počítači. Tento typ GPS stôp môžete zachytiť pomocou rôznych aplikácií pre múdre telefóny ako aj GPS prístrojmi.\n\nPre informácie, ako robiť GPS prieskum, si prečítajte [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nAby ste použili GPX trasu pre mapovanie, pretiahnite a pustite GPX súbor na mapový editor. Po rozpoznaní, bude pridaný na mapu ako jasná zelená čiara. Kliknite na ponuku \"Nastavenia pozadia\" na ľavej strane pre zapnutie, vypnutie alebo priblíženie na túto novú GPX vrstvu.\n\nGPX trasa nie je priamo nahraná na OpenStreetMap. Najlepší spôsob ako ju využiť je, použiť ju ako predlohu pre zakreslovanie nových objektov a potom ju [nahrať na OpenStreetMap](http://www.openstreetmap.org/trace/create) pre ďalších uživateľov.\n \n", @@ -791,6 +791,10 @@ "shop": { "label": "Typ" }, + "social_facility_for": { + "label": "Služby poskytované pre", + "placeholder": "Bezdomovcov, postihnutých, deti, atď." + }, "source": { "label": "Zroj" }, @@ -1136,6 +1140,22 @@ "name": "Prístrešok", "terms": "pristresok,útulňa,utulna" }, + "amenity/social_facility": { + "name": "Sociálne zariadenie", + "terms": "socialne zariadenie" + }, + "amenity/social_facility/food_bank": { + "name": "Potravinová banka", + "terms": "potravinova banka,vydaj jedla,výdaj jedla,jedlo,strava" + }, + "amenity/social_facility/group_home": { + "name": "Dom sociálnych služieb", + "terms": "dom socialnych sluzieb,domov dochodcov,domov dôchodcov" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Ubytovňa pre bezdomovcov", + "terms": "ubytovna pre bezdomovcov,útulok,utulok" + }, "amenity/studio": { "name": "Štúdio", "terms": "Studio" @@ -1264,6 +1284,9 @@ "name": "Bytovka", "terms": "Bytovka,obytna budova,panelak,panelák,vežiak,veziak,barak,barák,činžiak,cinziak,apartmany,apartmány" }, + "building/barn": { + "name": "Stodola" + }, "building/commercial": { "name": "Komerčná budova", "terms": "Obchody,firmy,firma,predaj,podnik,podniky,kancelarie,kancelárie" diff --git a/vendor/assets/iD/iD/locales/sq.json b/vendor/assets/iD/iD/locales/sq.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/vendor/assets/iD/iD/locales/sq.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/vendor/assets/iD/iD/locales/sr.json b/vendor/assets/iD/iD/locales/sr.json index fc481baf7..1d6523ada 100644 --- a/vendor/assets/iD/iD/locales/sr.json +++ b/vendor/assets/iD/iD/locales/sr.json @@ -332,7 +332,6 @@ }, "help": { "title": "Помоћ", - "help": "# Помоћ\n\nОво је уређивач [Опенстреетмапа] (http://www.openstreetmap.org/), \nслободне и уредиве мапу света. Можете је користити за додавање и ажурирање \nподатака у вашој области, чинећи карту света отвореног кода и слободних података \nбољом за све.\n\nИзмене које направите на овој мапи ће бити видљив свима који користи \nОпенстреетмап. Да би направили измену, биће вам потребан \n[бесплатан Опенстреетмап налог] (https://www.openstreetmap.org/user/new).\n\n[ИД едитор] (http://ideditor.com/) је заједнички пројекат чији је [изворни \nкод доступан на GitHub] (https://github.com/systemed/iD) .\n", "editing_saving": "# Уређивање и чување⏎\n⏎\nОвај уређивач је дизајниран да ради пре свега на мрежи, и ви му управо сада ⏎\nприступате преко сајта.⏎\n⏎\n### Одабир обележја⏎\n⏎\nДа бисте изабрали обележје на мапи, као што је пут или тражени објекат, кликните ⏎\nна њега на мапи. То ће обележити изабрани објекат, отворите панел са ⏎\nдетаљима о њему, и показати мени ствари које можете да урадите са обележјем.⏎\n⏎\nВише обележја може бити изабрано држањем 'Shift' тастера, кликом миша, ⏎\nи превлачењем на мапи. Ово ће обележити све објекте унутар оквира који ⏎\nје нацртан, што омогућава да урадите ствари над неколико објеката одједном.⏎\n⏎\n### Чување измена⏎\n⏎\nКада направите измене као што је измена путева, зграда и места, оне се ⏎\nчувају локално док их не сачувате на серверу. Не брините ако направите ⏎\nгрешку - можете опозвати измене тако што ћете кликнути на дугме за опозив, и ⏎\nповратити измене кликом на дугме за повраћај.⏎\n⏎\nКликните на „Сачувај“ да бисте завршили групу измена - на пример, ако сте завршили ⏎\nподручје града и желите да почнете на новом простору. Имаћете прилику ⏎\nда размотрите шта сте урадили, а уређивач вас снабдева корисним предлозима ⏎\nи упозорењима уколико нешто није у реду у вези са изменама.⏎\n⏎\nАко све изгледа добро, можете унети кратак коментар у којем је објашњена измена ⏎\nкоју сте направили, и кликните поново на „Сачувај“ да бисте поставили измене ⏎\nна [OpenStreetMap.org] (http://www.openstreetmap.org/), где су видљиве ⏎\nсвим другим корисницима и на располагању другима да надограђују и побољшавају.⏎\n⏎\nАко не можете да завршите своје измене у одједанпут, можете да напустите прозор ⏎\nуређивача и вратите се касније (на истом прегледачу и рачунару), а ⏎\nапликација ће понудити да обнови ваш рад.\n\nапликација уређивача ће понудити да обновите ваш рад.⏎\n", "roads": "# Путеви\n\nМожете правити, поправљати, и брисати путеве са овим уређивачем. Путеви могу бити \nсвих врста: стазе, ауто-путеви, путићи, бициклистичке стазе, и више - било који често \nкоришћени сегмент би требало да буде мапоиран.\n\n### Избор\n\nКликните на путу да бисте га изабрали. Контура би требало да постане видљива, \nзаједно са малим менијем алатки на мапи и траком са стране која показује више \nинформација о путу.\n\n### Измена\n\nЧесто ћете видети путеве који нису усклађени са сликом иза њих\nили са ГПС путањом. Можете да прилагодите ове путеве, тако буду на исправном\nместу.\n\nПрво кликните на путу који желите да промените. То ће га истаћи и показати\nконтролне тачке дуж пута које можете превући на боље локације. Ако\nжелите да додате нове контролне тачке за више детаља, кликните двапут део\nпута без чвора, и чвор ће бити додат.\n\nАко се пут повезује са другим путем, али је неправилно повезан на\nмапи, можете да повучете неку од његових контролних тачака на други пут с\nциљем да се повежу. Повезивање путева је важно за мапе\nи од суштинског значаја за пружање упутстава при вожњи.\n\nТакође можете да кликнете на 'Премести' алатку или притисните `M` тастер пречице за премештање целог \nпута одједном, а затим поново кликните да бисте сачували померање.\n\n### Брисање\n\nАко је пут потпуно неисправан - можете видети да он не постоји на сателитским\nснимцима и идеално су потврдили локално да није присутан - можете да избришете\nто, што га уклања са мапе. Будите опрезни приликом брисања објеката -\nкао и све друге измене, резултате виде сви, а сателитски снимци\nсу често застарели, тако да пут може бити у скорије време изграђен.\n\nМожете обрисати пут тако што ћете кликнути на њега да бисте га изабрали, затим кликните\nна иконицу канте за смеће или притисните тастер 'Delete'.\n\n### Прављење\n\nНашли сте да би негде требало да постоји пут, али га нема на мапи? Кликните на 'Путања'\nикону у горњем левом углу уређивача или притисните тастер за пречицу `2` да бисте \nпочели са цртањем путање.\n\nКликните на почетак пута на мапи да бисте почели са цртањем. Ако се пут\nодваја од постојећег пута, почните тако што ћете кликнути на месту где су повезани.\n\nЗатим кликните на места дуж пута, тако да следи праву путању, према\nсателитским снимцима или ГПС-у. Ако је пут који цртате укрштен другим путем, повежите\nих тако што ћете кликнути на тачку пресека. Када завршите цртање, кликните двапут\nили притисните 'Return' или 'Enter' на тастатури.\n", "gps": "# ГПС\n\nГПС подаци су најпоузданији извор података за Опенстреетмап. Овај уређивач\nподржава локалне путање - `.gpx` датотеке на локалном рачунару. Можете прикупити\nову врсту ГПС путања са бројних апликација за паметне телефоне , као и са\nличним ГПС хардвером.\n⏎\nЗа информације о томе како да извршите ГПС премеравање, прочитајте\n[Премеравање са ГПС] (http://learnosm.org/en/beginner/using-gps/).\n\nДа бисте користили GPX путању за мапирање, превуците и отпустите GPX датотеку\nна мапу уређивача. Ако је препозната, биће додата на мапу као светло зелена\nлинија. Кликните на мени 'Подешавања позадине' на левој страни како бисте омогућили,\nонемогућили, или увећали на овај нови GPX слој.\n\nGPX путања се директно не преноси на Опенстреетмап - најбољи начин да\nје користите јесте да исцртавате на мапи, користећи путању као водиљу за нове\nобјекте које додајете, као и да [учитавате податке на Поенстритмап](http://www.openstreetmap.org/trace/create)⏎\nкако би и други корисници могли да их користе.\n", @@ -563,6 +562,9 @@ "description": { "label": "Опис" }, + "electrified": { + "label": "Електрификација" + }, "elevation": { "label": "Надморска висина" }, @@ -585,6 +587,9 @@ "fixme": { "label": "Поправи ме" }, + "gauge": { + "label": "Колосек" + }, "generator/method": { "label": "Начин" }, @@ -902,6 +907,9 @@ "amenity/cinema": { "name": "Биоскоп" }, + "amenity/clock": { + "name": "Сат" + }, "amenity/college": { "name": "Факултет" }, @@ -1100,18 +1108,42 @@ "craft/optician": { "name": "Оптичар" }, + "craft/painter": { + "name": "Сликар" + }, "craft/photographer": { "name": "Фотограф" }, + "craft/pottery": { + "name": "Грнчар" + }, "craft/saddler": { "name": "Седлар" }, + "craft/sawmill": { + "name": "Пилана" + }, + "craft/scaffolder": { + "name": "Скелар" + }, "craft/shoemaker": { "name": "Обућар" }, "craft/stonemason": { "name": "Каменорезац" }, + "craft/sweep": { + "name": "Oџачар" + }, + "craft/tailor": { + "name": "Kројач" + }, + "craft/tinsmith": { + "name": "Калајџија" + }, + "craft/upholsterer": { + "name": "Тапетар" + }, "craft/watchmaker": { "name": "Часовничар" }, @@ -1551,6 +1583,9 @@ "railway/disused": { "name": "Некоришћена железница" }, + "railway/funicular": { + "name": "Успињача" + }, "railway/level_crossing": { "name": "Прелаз у нивоу" }, diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json index 835ae6847..088216154 100644 --- a/vendor/assets/iD/iD/locales/sv.json +++ b/vendor/assets/iD/iD/locales/sv.json @@ -41,6 +41,11 @@ } }, "continue": { + "key": "A", + "title": "Fortsätt", + "description": "Fortsätt denna linje.", + "not_eligible": "Ingen linje kan fortsätta här.", + "multiple": "Flera linjer kan fortsätta härifrån. För att välja en linje, tryck på tangenten Skift och klicka på den för att välja.", "annotation": { "line": "Fortsatte en linje.", "area": "Fortsatt ett område." @@ -69,10 +74,24 @@ "not_closed": "Denna kan inte göras rund då den inte är en loop." }, "orthogonalize": { + "title": "Räta upp", + "description": { + "line": "Räta upp hörnen på denna linje.", + "area": "Räta upp hörnen på denna ytan." + }, + "key": "S", "annotation": { "line": "Gjort hörnen på en linje fyrkantiga.", "area": "Gjort hörnen på ett område fyrkantiga." - } + }, + "not_squarish": "Denna kan inte rätas upp då den inte är fyrkantig." + }, + "straighten": { + "title": "Räta ut", + "description": "Räta ut denna linje.", + "key": "S", + "annotation": "Rätade ut en linje.", + "too_bendy": "Den kan inte rätas upp då den är för böjd." }, "delete": { "title": "Ta bort", @@ -115,7 +134,8 @@ "annotation": "Sammanfogade {n} linjer.", "not_eligible": "Dessa objekt kan inte slås samman.", "not_adjacent": "Dessa linjer kan inte slås ihop då dem inte är ihopsatta.", - "restriction": "Dessa linjer kan inte slås samman då minst en av dem tillhör relationen \"{relation}\"." + "restriction": "Dessa linjer kan inte slås samman då minst en av dem tillhör relationen \"{relation}\".", + "incomplete_relation": "Dessa objekt kan inte sammanfogas då åtminstone ett inte hämtats fullständigt." }, "move": { "title": "Flytta", @@ -132,6 +152,7 @@ }, "rotate": { "title": "Rotera", + "description": "Rotera detta objekt runt dess centerpunkt.", "key": "R", "annotation": { "line": "Roterade en linje.", @@ -162,9 +183,11 @@ } }, "undo": { + "tooltip": "Ångra: {action}", "nothing": "Inget att ångra." }, "redo": { + "tooltip": "Gör om: {action}", "nothing": "Inget att upprepa." }, "tooltip_keyhint": "Genväg:", @@ -201,6 +224,11 @@ "list": "Ändrad av {users}", "truncated_list": "Ändrad av {users} och {count} andra" }, + "geocoder": { + "search": "Sök hela världen...", + "no_results_visible": "Inget hittades i visad kartyta", + "no_results_worldwide": "Inget hittades" + }, "geolocate": { "title": "Visa var jag är" }, @@ -220,14 +248,24 @@ "back_tooltip": "Ändra objekt", "remove": "Ta bort", "search": "Sök", + "multiselect": "Välj objekt", "unknown": "Okänd", "incomplete": "", - "edit": "Ändra objekt" + "feature_list": "Sök efter egenskaper", + "edit": "Ändra objekt", + "none": "Ingen", + "node": "Nod", + "way": "Väg", + "relation": "Relation", + "location": "Plats" }, "background": { "title": "Bakgrund", "description": "Bakgrundsinställningar", "percent_brightness": "{opacity}% ljusstyrka", + "none": "Ingen", + "custom": "Anpassa", + "fix_misalignment": "Justera bildplacering", "reset": "ta bort" }, "restore": { @@ -248,7 +286,9 @@ "edited_osm": "Redigerat OSM!", "just_edited": "Du har nu redigerat OpenStreetMap!", "view_on_osm": "Visa på OSM", - "facebook": "Dela på Facebook" + "facebook": "Dela på Facebook", + "twitter": "Dela på Twitter", + "google": "Dela på Google+" }, "confirm": { "okay": "Ok" @@ -275,6 +315,7 @@ "untagged_area": "Otaggat område", "many_deletions": "Du håller på att ta bort {n} objekt. Är du helt säker? Detta tar bort dem för alla som använder openstreetmap.org.", "tag_suggests_area": "Taggen {tag} indikerar att detta borde vara ett område istället för en linje", + "untagged_tooltip": "Välj en typ som beskriver vad denna {geometry} är.", "deprecated_tags": "Borttagna taggar: {tags}" }, "zoom": { @@ -283,11 +324,16 @@ }, "cannot_zoom": "Går ej att zooma ut ytterligare med nuvarande sätt.", "gpx": { - "local_layer": "Lokal gpx-fil" + "local_layer": "Lokal gpx-fil", + "drag_drop": "Dra och släpp en .gpx-fil på sidan, eller klicka på knappen till höger för att bläddra", + "zoom": "Zooma till GPX-spår", + "browse": "Bläddra efter en .gpx-fil" }, "help": { "title": "Hjälp", - "help": "# Hjälp\n\nDet här är en editor för [OpenStreetMap](http://www.openstreetmap.org/), den fria och editerbara världskartan. Du kan använda den för att lägga till och uppdatera data i ditt område och hjälpa till att skapa en världskarta för alla, baserad på öppen källkod och öppen data.\n\nUppdateringar som du gör i den här kartan blir synliga för alla som använder OpenStreetMap. För att kunna göra ändringar måste du ha ett \n[gratis OpenStreetMap-konto](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) är ett samarbetsprojekt där [källkoden är tillgänglig på GitHub](https://github.com/systemed/iD).\n" + "help": "# Hjälp\n\nDetta är en redigerare för [OpenStreetMap](http://www.openstreetmap.org/), den\nfri och redigerbara världskartan. Du kan använda den för att lägga till och uppdatera\ndata i ditt närområde, allt för att ytterligare förbättra en världskarta för alla baserad på öppen källkod och data.\n\nÄndringar du gör i den här kartan kommer att visas för alla som använder\nOpenStreetMap. För att göra en ändring behöver du ett\n[gratis OpenStreetMap-konto](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) är ett samarbetsprojekt med [källkodkod \ntillgänglig på GitHub](https://github.com/openstreetmap/iD).\n", + "gps": "# GPS \n\nGPS-data är den mest pålitliga källan för uppgifter till OpenStreetMap. Denna redigerare \nstödjer lokala spår – ”.GPX”-filer på din lokala dator. Du kan skapa \ndenna typ av GPS-spår med ett flertal smartphone-appar samt med\npersonlig GPS-hårdvara. \n\nFör information om hur man skapar en GPS-spårning, läs \n[Kartläggning med en GPS](http://learnosm.org/en/beginner/using-gps/). \n\nFör att använda ett GPX-spår för kartläggning, dra och släpp GPX-filen på \nkartredigeraren. Om den känns igen kommer den att läggas till på kartan som en klargrön \nlinje. Klicka på menyn \"Bakgrundsinställningar\" på höger sida för att aktivera, \navaktivera eller zooma till detta nya GPX-drivna lager. \n\nGPX spår överförs inte direkt till OpenStreetMap - det bästa sättet att \nanvända dem är att rita på kartan, använda den som en guide för de nya objekt som \ndu lägger till, och också [ladda upp dem till OpenStreetMap](http://www.openstreetmap.org/trace/create) \nför att användas av andra.\n", + "buildings": "# Byggnader\n\nOpenStreetMap är världens största databas över byggnader. Du kan skapa\noch förbättra denna databas.\n\n### Markering\n\nDu kan markera en byggnad genom att klicka på dess kant. Detta kommer att markera \nbyggnaden och öppna en litet verktygsmeny och ett sidofält som visar mer information\nom byggnaden.\n\n### Modifiering\n\nIbland är byggnader felaktigt placerade eller har felaktiga taggar.\n\nFör att flytta en hel byggnad, markera den och klicka sedan på \"Flytta\"-verktyget. flytta\nmus för att flytta byggnaden, och klicka när den är korrekt placerad.\n\nFör att fixa den specifika formen av en byggnad, klicka och dra noderna som bildar\nramen till bättre platser.\n\n### Skapa\n\nEn av de viktigaste frågorna att tänka på vid tilläggning av byggnader till kartan är att\nOpenStreetMap registrerar byggnader både som form och punkt. Tumregeln\när att _kartlägga en byggnad som en form när möjligt_ och kartlägg företag, bostäder,\nfacilitet, och andra saker finns i byggandena som punkter placerade\ninuti byggnadernas ram.\n\nBörja rita en byggnad som en ram genom att klicka på knappen \"område\" högst upp till vänster\ngränssnittet, och avsluta det antingen genom att trycka på \"Retur\" på tangentbordet\neller genom att klicka på den första ritade noden för att stänga formen.\n\n### Radering\n\nOm en byggnad är helt fel – du kan se att den inte finns med i någon satellitbild\noch helst har bekräftat lokalt att det inte finns – kan du ta bort\nden, vilket tar bort det från kartan. Var försiktig när du tar bort objekt –\nlikt alla ändringar kommer resultatet ses av alla och satellitbilder\när ofta föråldrad, så byggnaden kan helt enkelt vara nybyggd.\n\nDu kan ta bort en byggnad genom att klicka på den för att markera den och sedan klicka på\nikonen papperskorg eller trycka på \"Delete\"-tangenten.\n" }, "intro": { "navigation": { @@ -321,6 +367,7 @@ }, "lines": { "title": "Linjer", + "add": "Linjer används för att representera objekt så som vägar, järnvägar och floder. **Klicka på knappen Linje för att lägga till en ny linje.***", "start": "**Påbörja linjen genom att klicka på slutet av vägen.**", "intersect": "Klicka för att lägga till fler punkter på linjen (vägen). Du kan flytta kartan under tiden du ritar. Vägar och många andra typer av linjer är en del av ett större nät med linjer. Det är därför viktigt att linjer blir korrekt anslutna till varandra för att exempelvis körinstruktioner ska fungera.**Klicka på Flower Street för att skapa en anslutning mellan de två linjerna (vägarna).**", "finish": "Linjer avslutas genom att klicka på slutpunkten en gång till.**Avsluta linjen.**", @@ -338,24 +385,57 @@ }, "presets": { "categories": { + "category-landuse": { + "name": "Landanvänding" + }, + "category-path": { + "name": "Stig" + }, + "category-rail": { + "name": "Spår" + }, "category-road": { "name": "Väg" + }, + "category-route": { + "name": "Rutt" } }, "fields": { "access": { "label": "Tillgång", + "placeholder": "Okänt", "types": { + "access": "Generell", + "foot": "Fotgängare", "motor_vehicle": "Motorfordon", "bicycle": "Cyklar", "horse": "Hästar" }, "options": { "yes": { - "title": "Tillåtna" + "title": "Tillåtna", + "description": "Tillträde är tillåtet enligt lag" + }, + "no": { + "title": "Förbjudet", + "description": "Tillträde ej tillåten för allmänheten" }, "permissive": { - "title": "Påbjuden" + "title": "Påbjuden", + "description": "Tillträde tillåten fram till dess ägare återkallar tillståndet" + }, + "private": { + "title": "Privat", + "description": "Tillträde tillåten endast med tillstånd av ägaren på individuell basis" + }, + "designated": { + "title": "Föredragen", + "description": "Åtkomst tillåten enligt skyltar eller specifika lokala lagar" + }, + "destination": { + "title": "Destination", + "description": "Åtkomst tillåten endast för att nå en destination" } } }, @@ -387,6 +467,9 @@ "bicycle_parking": { "label": "Typ" }, + "boundary": { + "label": "Typ" + }, "building": { "label": "Byggnad" }, @@ -396,7 +479,11 @@ "capacity": { "label": "Kapacitet" }, + "cardinal_direction": { + "label": "Riktning" + }, "clock_direction": { + "label": "Riktning", "options": { "clockwise": "Medsols", "anticlockwise": "Motsols" @@ -414,6 +501,21 @@ "crossing": { "label": "Typ" }, + "cuisine": { + "label": "Kök" + }, + "denomination": { + "label": "Samfund" + }, + "denotation": { + "label": "Betydelse" + }, + "description": { + "label": "Beskrivning" + }, + "elevation": { + "label": "Höjd" + }, "emergency": { "label": "Akut" }, @@ -421,27 +523,45 @@ "label": "Typ" }, "fax": { - "label": "Fax" + "label": "Fax", + "placeholder": "+46 31 123 4567" }, "fee": { "label": "Avgift" }, + "fixme": { + "label": "Ordna mig" + }, "highway": { "label": "Typ" }, "historic": { "label": "Typ" }, + "iata": { + "label": "IATA" + }, + "icao": { + "label": "ICAO" + }, + "incline": { + "label": "Lutning" + }, "internet_access": { "label": "Internetaccess", "options": { "wlan": "Wifi", + "wired": "Trådbunden", "terminal": "Terminal" } }, "landuse": { "label": "Typ" }, + "lanes": { + "label": "Filer", + "placeholder": "1, 2, 3..." + }, "layer": { "label": "Lager" }, @@ -449,16 +569,22 @@ "label": "Typ" }, "levels": { - "label": "Våningar" + "label": "Våningar", + "placeholder": "2, 4, 6..." + }, + "location": { + "label": "Lokalisering" }, "man_made": { "label": "Typ" }, "maxspeed": { - "label": "Hastighetsbegränsning" + "label": "Hastighetsbegränsning", + "placeholder": "50, 70, 90..." }, "name": { - "label": "Namn" + "label": "Namn", + "placeholder": "Vanligt namn (om något)" }, "natural": { "label": "Natur" @@ -484,8 +610,15 @@ "operator": { "label": "Operatör" }, + "park_ride": { + "label": "Pendelparkering" + }, + "parking": { + "label": "Typ" + }, "phone": { - "label": "Telefon" + "label": "Telefon", + "placeholder": "+46 31 123 4567" }, "place": { "label": "Typ" @@ -499,15 +632,33 @@ "ref": { "label": "Referens" }, + "relation": { + "label": "Typ" + }, "religion": { "label": "Religion", "options": { "christian": "Kristendom", "muslim": "Muslim", "buddhist": "Buddist", - "hindu": "Hinduist" + "jewish": "Judendom", + "hindu": "Hinduist", + "shinto": "Shintoism", + "taoist": "Taoism" } }, + "restriction": { + "label": "Typ" + }, + "route": { + "label": "Typ" + }, + "route_master": { + "label": "Typ" + }, + "sac_scale": { + "label": "Svårighetsgrad" + }, "service": { "label": "Typ" }, @@ -525,18 +676,32 @@ }, "structure": { "label": "Struktur", + "placeholder": "Okänt", "options": { "bridge": "Bro", "tunnel": "Tunnel", - "embankment": "Vägbank" + "embankment": "Vägbank", + "cutting": "Vägsnitt" } }, + "supervised": { + "label": "Övervakad" + }, "surface": { "label": "Beläggning" }, "tourism": { "label": "Typ" }, + "towertype": { + "label": "Typ av torn" + }, + "tracktype": { + "label": "Typ" + }, + "trail_visibility": { + "label": "Synlighet" + }, "water": { "label": "Typ" }, @@ -544,7 +709,8 @@ "label": "Typ" }, "website": { - "label": "Websida" + "label": "Websida", + "placeholder": "http://exempel.se/" }, "wetland": { "label": "Typ" @@ -560,20 +726,51 @@ } }, "presets": { + "address": { + "name": "Adress", + "terms": "Adress, husnummer, destination, gatuadress, postnummer, postort" + }, "aeroway": { "name": "Flygbana" }, "aeroway/aerodrome": { - "name": "Flygplats" + "name": "Flygplats", + "terms": "flygplats, flygfält, flyghamn, aerodrom, landningsplats, lufthamn" + }, + "aeroway/apron": { + "name": "Parkering av flygplan (Apron)" + }, + "aeroway/gate": { + "name": "Gate" + }, + "aeroway/hangar": { + "name": "Hangar" }, "aeroway/helipad": { "name": "Helikopterplatta" }, + "aeroway/runway": { + "name": "Start- och landningsbana" + }, + "aeroway/taxiway": { + "name": "Taxibana" + }, + "aeroway/terminal": { + "name": "Flygterminal" + }, + "amenity": { + "name": "Facilitet" + }, + "amenity/atm": { + "name": "Uttagsautomat", + "terms": "uttagsautomat, bankomat, minuten, atm, otto" + }, "amenity/bank": { "name": "Bank" }, "amenity/bar": { - "name": "Bar" + "name": "Bar", + "terms": "Bar, krog, servering, matställe, pub, cocktailsalong, saloon" }, "amenity/bench": { "name": "Bänk" @@ -587,12 +784,29 @@ "amenity/cafe": { "name": "Café" }, + "amenity/car_rental": { + "name": "Biluthyrning" + }, + "amenity/car_sharing": { + "name": "Bilpool" + }, + "amenity/car_wash": { + "name": "Biltvätt" + }, + "amenity/childcare": { + "name": "Barnomsorg", + "terms": "Barnomsorg, Förskola, Dagis, Barnhem, Dagmamma" + }, "amenity/cinema": { - "name": "Biograf" + "name": "Biograf", + "terms": "Bio, Biograf, Biografteater" }, "amenity/courthouse": { "name": "Domstol" }, + "amenity/drinking_water": { + "name": "Dricksvatten " + }, "amenity/embassy": { "name": "Embassad" }, @@ -614,6 +828,9 @@ "amenity/hospital": { "name": "Sjukhus" }, + "amenity/kindergarten": { + "name": "Förskola" + }, "amenity/library": { "name": "Bibliotek" }, @@ -626,6 +843,9 @@ "amenity/place_of_worship": { "name": "Plats för tillbedjan" }, + "amenity/place_of_worship/buddhist": { + "name": "Buddhisttempel" + }, "amenity/place_of_worship/christian": { "name": "Kyrka" }, @@ -656,6 +876,9 @@ "amenity/swimming_pool": { "name": "Simbassäng" }, + "amenity/taxi": { + "name": "Taxihållplats" + }, "amenity/telephone": { "name": "Telefon" }, @@ -671,6 +894,12 @@ "amenity/university": { "name": "Universitet" }, + "amenity/waste_basket": { + "name": "Soptunna" + }, + "area": { + "name": "Yta" + }, "barrier": { "name": "Barriär" }, @@ -686,6 +915,9 @@ "barrier/city_wall": { "name": "Stadsmur" }, + "barrier/cycle_barrier": { + "name": "Cykelbarriär " + }, "barrier/ditch": { "name": "Dike" }, @@ -701,12 +933,21 @@ "barrier/hedge": { "name": "Häck" }, + "barrier/kissing_gate": { + "name": "Grind vid betesmark" + }, "barrier/lift_gate": { "name": "Bom" }, "barrier/retaining_wall": { "name": "Stödmur" }, + "barrier/stile": { + "name": "Övergång" + }, + "barrier/toll_booth": { + "name": "Tullstation" + }, "barrier/wall": { "name": "Vägg" }, @@ -722,29 +963,51 @@ "building/entrance": { "name": "Entré" }, + "building/garage": { + "name": "Garage" + }, "building/house": { "name": "Hus" }, + "building/industrial": { + "name": "Industribyggnad" + }, + "building/residential": { + "name": "Bostadshus", + "terms": "Bostadshus, Boningshus, Flerfamiljshus, Hyreshus" + }, "emergency/phone": { "name": "Nödtelefon" }, "entrance": { "name": "Entré" }, + "highway": { + "name": "Väg", + "terms": "Väg, gata, förbindelse, led, trafikled, körbana, stråk, stig, gång, bana, sträcka, passage" + }, "highway/bridleway": { - "name": "Ridväg" + "name": "Ridväg", + "terms": "Ridväg, ridstig, häst, rida, ridning" }, "highway/bus_stop": { - "name": "Busshållsplats" + "name": "Busshållplats", + "terms": "Busstopp, busshållplats, buss, hållplats, anhalt, station, busstation, " }, "highway/crossing": { - "name": "Korsning" + "name": "Korsning", + "terms": "Korsning, kryss, mot, plankorsning" }, "highway/cycleway": { - "name": "Cykelväg" + "name": "Cykelväg", + "terms": "cykelväg, cykelled, gc-väg, gång- och cykelväg" }, "highway/footway": { - "name": "Gångväg" + "name": "Gångväg", + "terms": "gångväg, gc-väg, gång- och cykelväg, stig" + }, + "highway/living_street": { + "name": "Gångfartsområde" }, "highway/mini_roundabout": { "name": "Minirondell" @@ -752,24 +1015,85 @@ "highway/motorway": { "name": "Motorväg" }, + "highway/motorway_junction": { + "name": "Trafikplats", + "terms": "Motorvägkorsning, trafikplats, mot" + }, + "highway/motorway_link": { + "name": "Anslutning, motorväg" + }, "highway/path": { "name": "Stig" }, + "highway/pedestrian": { + "name": "Gågata" + }, + "highway/primary": { + "name": "Primär väg" + }, + "highway/primary_link": { + "name": "Anslutning, primär väg" + }, "highway/residential": { "name": "Bostadsgata" }, + "highway/rest_area": { + "name": "Rastplats" + }, "highway/road": { "name": "Okänd väg" }, + "highway/secondary": { + "name": "Sekundär väg" + }, + "highway/secondary_link": { + "name": "Anslutning, sekundär väg" + }, "highway/service": { "name": "Serviceväg" }, + "highway/service/alley": { + "name": "Gränd" + }, + "highway/service/drive-through": { + "name": "Drive-through" + }, + "highway/service/driveway": { + "name": "Uppfart" + }, + "highway/service/emergency_access": { + "name": "Utryckningsfordon" + }, + "highway/service/parking_aisle": { + "name": "Parkeringsväg" + }, + "highway/services": { + "name": "Rastplats med försäljning" + }, "highway/steps": { - "name": "Steg" + "name": "Trappa" + }, + "highway/stop": { + "name": "Stoppskylt" + }, + "highway/tertiary": { + "name": "Tertiär väg" + }, + "highway/tertiary_link": { + "name": "Anslutning, tertiär väg" + }, + "highway/track": { + "name": "Bruksväg" }, "highway/traffic_signals": { "name": "Trafiksignaler" }, + "highway/trunk": { + "name": "Huvudväg" + }, + "highway/trunk_link": { + "name": "Anslutning, huvudväg" + }, "highway/turning_circle": { "name": "Vändplan" }, @@ -797,12 +1121,21 @@ "historic/ruins": { "name": "Ruiner" }, + "historic/wayside_cross": { + "name": "Vägkors" + }, + "historic/wayside_shrine": { + "name": "Helgedom längs väg" + }, "landuse": { "name": "Markanvändning" }, "landuse/allotments": { "name": "Kolonilotter" }, + "landuse/basin": { + "name": "Avrinningsområde" + }, "landuse/cemetery": { "name": "Kyrkogård" }, @@ -839,12 +1172,18 @@ "landuse/residential": { "name": "Bostadsområde" }, + "landuse/retail": { + "name": "Detaljhandel" + }, "landuse/vineyard": { "name": "Vingård" }, "leisure": { "name": "Nöje" }, + "leisure/dog_park": { + "name": "Hundpark" + }, "leisure/garden": { "name": "Trädgård" }, @@ -875,6 +1214,9 @@ "leisure/pitch/tennis": { "name": "Tennisplan" }, + "leisure/pitch/volleyball": { + "name": "Volleybollplan" + }, "leisure/playground": { "name": "Lekplats" }, @@ -887,21 +1229,42 @@ "leisure/swimming_pool": { "name": "Simbassäng" }, + "line": { + "name": "Linje" + }, "man_made": { "name": "Människoskapad" }, + "man_made/breakwater": { + "name": "Vågbrytare" + }, + "man_made/cutline": { + "name": "Snittlinje" + }, "man_made/lighthouse": { "name": "Fyr" }, "man_made/pier": { "name": "Pir" }, + "man_made/pipeline": { + "name": "Pipeline" + }, + "man_made/survey_point": { + "name": "Trianguleringspunkt" + }, + "man_made/tower": { + "name": "Torn" + }, "man_made/wastewater_plant": { "name": "Avloppsreningsverk" }, "man_made/water_tower": { "name": "Vattentorn" }, + "man_made/water_well": { + "name": "Brunn" + }, "man_made/water_works": { "name": "Vattenverk" }, @@ -932,6 +1295,9 @@ "natural/peak": { "name": "Topp" }, + "natural/scrub": { + "name": "busksnår" + }, "natural/spring": { "name": "Källa" }, @@ -962,14 +1328,32 @@ "place": { "name": "Plats" }, + "place/city": { + "name": "Större stad" + }, "place/hamlet": { - "name": "Småby" + "name": "By", + "terms": "By, småort, gårdssamling, gårdar, litet samhälle" }, "place/island": { "name": "Ö" }, + "place/isolated_dwelling": { + "name": "Isolerad boplats" + }, + "place/locality": { + "name": "Plats" + }, + "place/town": { + "name": "Mellanstor stad", + "terms": "stad, samhälle, ort" + }, "place/village": { - "name": "By" + "name": "Mindre samhälle", + "terms": "tätort, ort" + }, + "point": { + "name": "Punkt" }, "power": { "name": "Kraft" @@ -983,6 +1367,9 @@ "power/sub_station": { "name": "Transformator" }, + "power/tower": { + "name": "Högspänningsmast" + }, "power/transformer": { "name": "Transformator" }, @@ -998,30 +1385,57 @@ "railway/level_crossing": { "name": "Plankorsning" }, + "railway/monorail": { + "name": "Monorail" + }, "railway/platform": { "name": "Perrong" }, + "railway/rail": { + "name": "Räls" + }, "railway/station": { "name": "Järnvägsstation" }, "railway/subway": { "name": "Tunnelbana" }, + "railway/subway_entrance": { + "name": "Tunnelbaneingång" + }, "railway/tram": { "name": "Spårvagn" }, + "relation": { + "name": "Relation" + }, + "route/ferry": { + "name": "Färjerutt" + }, "shop": { "name": "Affär" }, + "shop/alcohol": { + "name": "Vin-och-spritaffär" + }, "shop/bakery": { "name": "Bageri" }, + "shop/beauty": { + "name": "Skönhetssalong" + }, + "shop/beverages": { + "name": "Dryckaffär" + }, "shop/bicycle": { "name": "Cykelaffär" }, "shop/books": { "name": "Bokhandel" }, + "shop/boutique": { + "name": "Boutique (Dyra kläder och accessoarer)" + }, "shop/butcher": { "name": "Slaktare" }, @@ -1034,18 +1448,39 @@ "shop/car_repair": { "name": "Bilverkstad" }, + "shop/chemist": { + "name": "Kemiaffär (hygien, kosmetika & städ)" + }, "shop/clothes": { "name": "Klädaffär" }, "shop/computer": { "name": "Datorbutik" }, + "shop/confectionery": { + "name": "Godisaffär" + }, + "shop/convenience": { + "name": "Närbutik" + }, + "shop/deli": { + "name": "Delikatessaffär" + }, "shop/department_store": { "name": "Varuhus" }, + "shop/doityourself": { + "name": "Byggmarknad" + }, + "shop/dry_cleaning": { + "name": "Kemtvätt" + }, "shop/electronics": { "name": "Elektronikbutik" }, + "shop/farm": { + "name": "Gårdsbutik" + }, "shop/fishmonger": { "name": "Fiskhandlare" }, @@ -1055,6 +1490,9 @@ "shop/furniture": { "name": "Möbelaffär" }, + "shop/garden_centre": { + "name": "Trädgårdscenter" + }, "shop/gift": { "name": "Presentbutik" }, @@ -1067,30 +1505,54 @@ "shop/hardware": { "name": "Järnaffär" }, + "shop/hifi": { + "name": "HiFi-butik" + }, "shop/jewelry": { "name": "Juvelerare" }, "shop/kiosk": { "name": "Kiosk" }, + "shop/laundry": { + "name": "Tvättinrättning" + }, "shop/mall": { "name": "Galleria" }, "shop/mobile_phone": { "name": "Mobiltelefonbutik" }, + "shop/motorcycle": { + "name": "Återförsäljare av motorcyklar" + }, "shop/music": { "name": "Musikaffär" }, + "shop/newsagent": { + "name": "Tidningsaffär" + }, "shop/optician": { "name": "Optiker" }, + "shop/outdoor": { + "name": "Friluftsaffär" + }, "shop/pet": { "name": "Djurbutik" }, "shop/shoes": { "name": "Skoaffär" }, + "shop/sports": { + "name": "Sportaffär" + }, + "shop/stationery": { + "name": "Pappershandel" + }, + "shop/supermarket": { + "name": "Snabbköp" + }, "shop/toys": { "name": "Leksaksaffär" }, @@ -1100,18 +1562,36 @@ "shop/tyres": { "name": "Däckfirma" }, + "shop/vacant": { + "name": "Tom lokal" + }, + "shop/variety_store": { + "name": "Fyndbutik" + }, "shop/video": { "name": "Videobutik" }, "tourism": { "name": "Turism" }, + "tourism/alpine_hut": { + "name": "Fjällstuga" + }, + "tourism/artwork": { + "name": "Konst" + }, "tourism/attraction": { "name": "Turistattraktion" }, "tourism/camp_site": { "name": "Kampingplats" }, + "tourism/caravan_site": { + "name": "Ställplats" + }, + "tourism/chalet": { + "name": "Stuga" + }, "tourism/guest_house": { "name": "Gästhus" }, @@ -1142,6 +1622,60 @@ "tourism/zoo": { "name": "Zoo" }, + "type/boundary": { + "name": "Gräns" + }, + "type/boundary/administrative": { + "name": "Administrativ gräns" + }, + "type/multipolygon": { + "name": "Multipolygon" + }, + "type/restriction": { + "name": "Restriktion" + }, + "type/route": { + "name": "Rutt" + }, + "type/route/bicycle": { + "name": "cykelrutt" + }, + "type/route/bus": { + "name": "Bussrutt" + }, + "type/route/detour": { + "name": "Alternativ rutt" + }, + "type/route/ferry": { + "name": "Färjerutt" + }, + "type/route/foot": { + "name": "Vandringsrutt" + }, + "type/route/pipeline": { + "name": "Rörledningsrutt" + }, + "type/route/power": { + "name": "Kraftledningsrutt" + }, + "type/route/road": { + "name": "Vägrutt" + }, + "type/route/train": { + "name": "Tågrutt" + }, + "type/route/tram": { + "name": "Spårvagnsrutt" + }, + "type/route_master": { + "name": "Huvudrutt" + }, + "vertex": { + "name": "Annat" + }, + "waterway": { + "name": "Vattenväg" + }, "waterway/canal": { "name": "Kanal" }, diff --git a/vendor/assets/iD/iD/locales/ta.json b/vendor/assets/iD/iD/locales/ta.json new file mode 100644 index 000000000..4361cf0b3 --- /dev/null +++ b/vendor/assets/iD/iD/locales/ta.json @@ -0,0 +1,687 @@ +{ + "modes": { + "add_area": { + "title": "பரப்பளவு" + }, + "add_line": { + "title": "கோடு" + }, + "add_point": { + "title": "புள்ளி" + } + }, + "operations": { + "continue": { + "key": "A" + }, + "circularize": { + "key": "O" + }, + "orthogonalize": { + "key": "S" + }, + "straighten": { + "key": "S" + }, + "delete": { + "title": "நீக்கு", + "annotation": { + "line": "கோடு நீக்கப்பட்டது.", + "area": "பரப்பளவு நீக்கப்பட்டது." + } + }, + "disconnect": { + "key": "D" + }, + "merge": { + "key": "C" + }, + "move": { + "title": "நகர்த்து", + "key": "M" + }, + "rotate": { + "key": "R" + }, + "reverse": { + "key": "V" + }, + "split": { + "key": "X" + } + }, + "translate": { + "translate": "மொழிமாற்றம் செய்" + }, + "logout": "விடுபதிகை", + "commit": { + "title": "மாற்றங்களைச் சேமி", + "save": "சேமி", + "deleted": "நீக்கப்பட்டது", + "created": "உருவாக்கப்பட்டது" + }, + "inspector": { + "remove": "நீக்கு", + "search": "தேடு", + "incomplete": "<பதிவிறக்கம் செய்யப்படவில்லை>", + "way": "வழி", + "relation": "தொடர்பு", + "location": "இடம்" + }, + "save": { + "title": "சேமி" + }, + "confirm": { + "okay": "சரி" + }, + "help": { + "title": "உதவி" + }, + "intro": { + "lines": { + "title": "கோடுகள்" + } + }, + "presets": { + "categories": { + "category-path": { + "name": "வழி" + }, + "category-rail": { + "name": "இரயில்" + }, + "category-road": { + "name": "சாலை" + } + }, + "fields": { + "access": { + "placeholder": "அறியப்படவில்லை", + "types": { + "horse": "குதிரைகள்" + }, + "options": { + "yes": { + "title": "அனுமதிக்கப்படுகிறது" + }, + "private": { + "title": "தனியார்" + } + } + }, + "address": { + "label": "முகவரி", + "placeholders": { + "housename": "வீட்டின் பெயர்", + "number": "123", + "street": "தெரு", + "city": "மாநகரம்" + } + }, + "aerialway": { + "label": "வகை" + }, + "aerialway/capacity": { + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "placeholder": "1, 2, 3..." + }, + "aerialway/occupancy": { + "placeholder": "2, 4, 8..." + }, + "aeroway": { + "label": "வகை" + }, + "amenity": { + "label": "வகை" + }, + "artwork_type": { + "label": "வகை" + }, + "atm": { + "label": "ஏ.டி.எம்" + }, + "barrier": { + "label": "வகை" + }, + "bicycle_parking": { + "label": "வகை" + }, + "boundary": { + "label": "வகை" + }, + "building": { + "label": "கட்டிடம்" + }, + "building_area": { + "label": "கட்டிடம்" + }, + "capacity": { + "label": "கொள்ளளவு", + "placeholder": "50, 100, 200..." + }, + "cardinal_direction": { + "label": "திசை" + }, + "clock_direction": { + "label": "திசை" + }, + "construction": { + "label": "வகை" + }, + "country": { + "label": "நாடு" + }, + "crossing": { + "label": "வகை" + }, + "entrance": { + "label": "வகை" + }, + "fax": { + "placeholder": "+31 42 123 4567" + }, + "fire_hydrant/type": { + "label": "வகை" + }, + "fixme": { + "label": "என்னை சரிபடுத்து" + }, + "generator/source": { + "label": "மூலம்" + }, + "generator/type": { + "label": "வகை" + }, + "handicap": { + "placeholder": "1-18" + }, + "highway": { + "label": "வகை" + }, + "historic": { + "label": "வகை" + }, + "information": { + "label": "வகை" + }, + "landuse": { + "label": "வகை" + }, + "lanes": { + "label": "சந்துகள்", + "placeholder": "1, 2, 3..." + }, + "leisure": { + "label": "வகை" + }, + "levels": { + "placeholder": "2, 4, 6..." + }, + "location": { + "label": "இடம்" + }, + "man_made": { + "label": "வகை" + }, + "maxspeed": { + "label": "வேக எல்லை", + "placeholder": "40, 50, 60..." + }, + "name": { + "label": "பெயர்" + }, + "natural": { + "label": "இயற்கையான" + }, + "note": { + "label": "குறிப்பு" + }, + "office": { + "label": "வகை" + }, + "oneway": { + "label": "ஒரு வழி" + }, + "oneway_yes": { + "label": "ஒரு வழி" + }, + "opening_hours": { + "label": "மணிநேரங்கள்" + }, + "par": { + "placeholder": "3, 4, 5..." + }, + "parking": { + "label": "வகை" + }, + "phone": { + "label": "தொலைபேசி", + "placeholder": "+31 42 123 4567" + }, + "piste/type": { + "label": "வகை" + }, + "place": { + "label": "வகை" + }, + "power": { + "label": "வகை" + }, + "railway": { + "label": "வகை" + }, + "relation": { + "label": "வகை" + }, + "religion": { + "label": "மதம்", + "options": { + "christian": "கிறித்தவர்", + "muslim": "இசுலாமியர்", + "buddhist": "புத்த மதத்தினர்", + "hindu": "இந்து" + } + }, + "restriction": { + "label": "வகை" + }, + "route": { + "label": "வகை" + }, + "route_master": { + "label": "வகை" + }, + "service": { + "label": "வகை" + }, + "shelter_type": { + "label": "வகை" + }, + "shop": { + "label": "வகை" + }, + "source": { + "label": "மூலம்" + }, + "sport": { + "label": "விளையாட்டு" + }, + "structure": { + "options": { + "bridge": "பாலம்" + } + }, + "studio_type": { + "label": "வகை" + }, + "tourism": { + "label": "வகை" + }, + "tracktype": { + "label": "வகை" + }, + "tree_type": { + "label": "வகை" + }, + "water": { + "label": "வகை" + }, + "waterway": { + "label": "வகை" + }, + "website": { + "label": "இணையதளம்", + "placeholder": "http://example.com/" + }, + "wetland": { + "label": "வகை" + }, + "wikipedia": { + "label": "விக்கிப்பீடியா" + }, + "wood": { + "label": "வகை" + } + }, + "presets": { + "address": { + "name": "முகவரி" + }, + "aeroway/aerodrome": { + "name": "விமானநிலையம்" + }, + "amenity/bank": { + "name": "வங்கி" + }, + "amenity/bicycle_parking": { + "name": "ஈருருளை நிறுத்தகம்" + }, + "amenity/cafe": { + "name": "டீக்கடை" + }, + "amenity/cinema": { + "name": "சினிமா" + }, + "amenity/clock": { + "name": "கடிகாரம்" + }, + "amenity/college": { + "name": "கல்லூரி" + }, + "amenity/fire_station": { + "name": "தீயணைப்பு நிலையம்" + }, + "amenity/grave_yard": { + "name": "இடுகாடு" + }, + "amenity/hospital": { + "name": "மருத்துவமனை" + }, + "amenity/library": { + "name": "புத்தகச்சாலை" + }, + "amenity/marketplace": { + "name": "பஜார்" + }, + "amenity/pharmacy": { + "name": "மருந்தகம்" + }, + "amenity/place_of_worship": { + "name": "வழிபாட்டு இடம்" + }, + "amenity/place_of_worship/muslim": { + "name": "தர்கா" + }, + "amenity/police": { + "name": "காவல்" + }, + "amenity/post_box": { + "name": "அஞ்சல்பெட்டி" + }, + "amenity/post_office": { + "name": "அஞ்சலகம்" + }, + "amenity/restaurant": { + "name": "உணவகம்" + }, + "amenity/school": { + "name": "பள்ளி" + }, + "amenity/swimming_pool": { + "name": "நீச்சல் குளம்" + }, + "amenity/telephone": { + "name": "தொலைபேசி" + }, + "amenity/theatre": { + "name": "திரையரங்கம்" + }, + "amenity/toilets": { + "name": "கழிவறைகள்" + }, + "amenity/university": { + "name": "பல்கலைக்கழகம்" + }, + "area": { + "name": "பரப்பளவு" + }, + "barrier/entrance": { + "name": "நுழைவுவாயில்" + }, + "barrier/fence": { + "name": "வேலி" + }, + "barrier/gate": { + "name": "கதவு" + }, + "barrier/wall": { + "name": "சுவர்" + }, + "building": { + "name": "கட்டடம்" + }, + "building/apartments": { + "name": "அபார்ட்மண்டுகள்" + }, + "building/entrance": { + "name": "நுழைவுவாயில்" + }, + "building/house": { + "name": "வீடு" + }, + "craft/painter": { + "name": "ஓவியர்" + }, + "entrance": { + "name": "நுழைவுவாயில்" + }, + "highway/bus_stop": { + "name": "பேருந்து நிலையம்" + }, + "highway/footway": { + "name": "நடைபாதை" + }, + "highway/path": { + "name": "வழி" + }, + "highway/steps": { + "name": "படிகட்டுகள்" + }, + "highway/track": { + "name": "பாதை" + }, + "historic/castle": { + "name": "கோட்டை" + }, + "landuse/construction": { + "name": "கட்டுமானம்" + }, + "landuse/farm": { + "name": "பண்ணை" + }, + "landuse/farmyard": { + "name": "பண்ணை" + }, + "landuse/forest": { + "name": "காடு" + }, + "landuse/grass": { + "name": "புல்வெளி" + }, + "landuse/industrial": { + "name": "தொழிற்சாலை" + }, + "leisure/marina": { + "name": "மரினா" + }, + "leisure/park": { + "name": "பூங்கா" + }, + "leisure/pitch/soccer": { + "name": "காற்பந்து அரங்கம்" + }, + "leisure/pitch/tennis": { + "name": "டென்னிசு அரங்கம்" + }, + "leisure/playground": { + "name": "விளையாட்டுத் திடல்" + }, + "leisure/stadium": { + "name": "விளையாட்டு அரங்கம்" + }, + "leisure/swimming_pool": { + "name": "நீச்சல் குளம்" + }, + "line": { + "name": "கோடு" + }, + "man_made": { + "name": "மனிதனால் கட்டப்பட்டது" + }, + "man_made/lighthouse": { + "name": "கலங்கரை விளக்கம்" + }, + "man_made/water_tower": { + "name": "தண்ணீர்த் தொட்டி" + }, + "natural": { + "name": "இயற்கையான" + }, + "natural/beach": { + "name": "கடற்கரை" + }, + "natural/coastline": { + "name": "கடற்கரை" + }, + "natural/glacier": { + "name": "பனிப் பாறை" + }, + "natural/peak": { + "name": "மலை உச்சி" + }, + "natural/tree": { + "name": "மரம்" + }, + "natural/water": { + "name": "தண்ணீர்" + }, + "natural/water/lake": { + "name": "ஏரி" + }, + "natural/water/pond": { + "name": "குளம்" + }, + "natural/water/reservoir": { + "name": "நீர்த் தேக்கம்" + }, + "natural/wood": { + "name": "மரம்" + }, + "office": { + "name": "அலுவலகம்" + }, + "office/newspaper": { + "name": "செய்தித்தாள்" + }, + "place": { + "name": "இடம்" + }, + "place/city": { + "name": "மாநகரம்" + }, + "place/island": { + "name": "தீவு" + }, + "place/town": { + "name": "நகரம்" + }, + "place/village": { + "name": "கிராமம்" + }, + "point": { + "name": "புள்ளி" + }, + "railway": { + "name": "இரயில்வே" + }, + "railway/abandoned": { + "name": "பயன்படுத்தப்படாத இரயில்வே" + }, + "railway/disused": { + "name": "பயன்படுத்தப்படாத இரயில்வே" + }, + "railway/monorail": { + "name": "மோனோ இரயில்" + }, + "railway/platform": { + "name": "இரயில்வே நடைமேடை" + }, + "railway/rail": { + "name": "இரயில்" + }, + "railway/station": { + "name": "இரயில் நிலையம்" + }, + "railway/subway": { + "name": "சுரங்கப்பாதை" + }, + "railway/subway_entrance": { + "name": "சுரங்கப்பாதை நுழைவுவாயில்" + }, + "relation": { + "name": "தொடர்பு" + }, + "shop": { + "name": "கடை" + }, + "shop/alcohol": { + "name": "மதுபானக் கடை" + }, + "shop/books": { + "name": "புத்தகக்கடை" + }, + "shop/car": { + "name": "வாகன விற்பனையகம்" + }, + "shop/clothes": { + "name": "ஜவுளிக் கடை" + }, + "shop/computer": { + "name": "கணினி விற்பனையகம்" + }, + "shop/dry_cleaning": { + "name": "உலர் சலவையகம்" + }, + "shop/florist": { + "name": "பூக்கடை" + }, + "shop/laundry": { + "name": "சலவையகம்" + }, + "shop/shoes": { + "name": "காலணியகம்" + }, + "tourism": { + "name": "சுற்றுலா" + }, + "tourism/artwork": { + "name": "ஓவியம்" + }, + "tourism/hotel": { + "name": "உணவகம்" + }, + "tourism/information": { + "name": "தகவல்" + }, + "tourism/museum": { + "name": "அருங்காட்சியகம்" + }, + "tourism/zoo": { + "name": "உயிரியல் பூங்கா" + }, + "type/boundary": { + "name": "எல்லை" + }, + "type/route/bus": { + "name": "பேருந்து தடம்" + }, + "vertex": { + "name": "பிற" + }, + "waterway/canal": { + "name": "கால்வாய்" + }, + "waterway/dam": { + "name": "அணை" + }, + "waterway/river": { + "name": "ஆறு" + }, + "waterway/riverbank": { + "name": "ஆற்றாங்கரை" + } + } + } +} \ No newline at end of file diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json index b933cc8db..706c1342e 100644 --- a/vendor/assets/iD/iD/locales/te.json +++ b/vendor/assets/iD/iD/locales/te.json @@ -2,13 +2,17 @@ "modes": { "add_area": { "title": "ప్రదేశం", - "description": "పార్కులను, కట్టడాలను, సరస్సులను లేదా ఇతర ప్రదేశాలను పటంలో చేర్చండి." + "description": "పార్కులను, కట్టడాలను, సరస్సులను లేదా ఇతర ప్రదేశాలను పటంలో చేర్చండి.", + "tail": "పార్కు, సరస్సు, భవంతి లేదా వేరే ఏదైన కట్టడం గీయుటకు మ్యాప్ మీద క్లిక్ చేయండి" }, "add_line": { - "title": "గీత" + "title": "గీత", + "tail": "రోడ్డు గీయుటకు మ్యాప్ మీద క్లిక్ చేయండి" }, "add_point": { - "title": "బిందువు" + "title": "బిందువు", + "description": "హోటెల్, పోస్ట్ బాక్స్ ఇతరత్రా ప్రదేశాలను మ్యాప్ కి జతపరచండి", + "tail": "కొత్త పాయంట్ గీయుటకు మ్యాప్ మీద క్లిక్ చేయండి" } }, "operations": { @@ -24,6 +28,7 @@ } }, "continue": { + "key": "ఏ", "title": "కొనసాగించు", "description": "ఈ గీతను కొనసాగించండి.", "not_eligible": "గీతను ఇక్కడకు కొనసాగించలేరు.", @@ -39,27 +44,89 @@ "description": { "line": "ఈ గీతను వృత్తంగా చేయి.", "area": "ఈ ప్రదేశాన్ని వృత్తంగా చేయి." + }, + "key": "ఓ", + "annotation": { + "line": "గీత సర్కల్ గా మార్చబడింది", + "area": "ఒక స్థలం సర్కల్ గా మార్చబడింది" } }, "orthogonalize": { - "title": "చతురస్రం" + "title": "చతురస్రం", + "key": "ఎస్" }, "straighten": { "title": "తిన్నగాచేయి", - "description": "ఈ గీతను తిన్నగా చేయి." + "description": "ఈ గీతను తిన్నగా చేయి.", + "key": "ఎస్" }, "delete": { "title": "తొలగించు", + "description": "మ్యాప్ నుండి ఇది తొలగించు", + "annotation": { + "point": "ఒక బిందువును తొలగించారు.", + "line": "గీత తొలగించబడింది", + "area": "స్థలం తొలగించబడింది", + "relation": "సంబంధం తొలగించబడింది", + "multiple": "{n} వస్తువులు తొలగించబడ్డాయి" + } + }, + "connect": { "annotation": { - "point": "ఒక బిందువును తొలగించారు." + "point": "పాయంట్ ఒక దారికి కలపబడింది", + "vertex": "ఒక దారి మరొక దారితో కలపబడింది", + "line": "గీత ఒక దారికి కలపబడింది", + "area": "స్థలము ఒక దారికి కలపబడింది" } }, + "disconnect": { + "key": "డీ" + }, + "merge": { + "title": "విలీనం చెయ్యు", + "description": "ఈ గీతలను విలీనం చెయ్యు", + "key": "సీ", + "annotation": "{n} గీతలు విలీనం చేయబడ్డాయి", + "not_eligible": "ఈ విశేషాలు విలీనానికి చేయబడలేవు", + "not_adjacent": "గీతాలు కలిసి లేకపోవడం వలన విలీనం చేయటం కుదరదు." + }, "move": { "title": "తరలించు", - "description": "దీన్ని వేరే చోటకు తరలించండి." + "description": "దీన్ని వేరే చోటకు తరలించండి.", + "key": "ఎమ్", + "annotation": { + "point": "ఒక బిందువు తరలించబడింది", + "line": "ఒక గీత తరలించబడింది", + "area": "ఒక ప్రదేశం తరలించబడింది", + "multiple": "పలు వస్తువులు తరలించబడ్డాయి" + } }, "rotate": { - "description": "ఈ అంశాన్ని దాని కేంద్ర బిందువు చుట్టూ తిప్పండి." + "title": "తిప్పు", + "description": "ఈ అంశాన్ని దాని కేంద్ర బిందువు చుట్టూ తిప్పండి.", + "key": "ఆర్", + "annotation": { + "line": "ఒక గీత తిప్పబడింది", + "area": "ఒక స్థలం తిప్పబడింది" + } + }, + "reverse": { + "description": "ఈ గీతను వ్యతిరేక దిశగా పంపు", + "key": "వీ" + }, + "split": { + "title": "విడగొట్టు", + "description": { + "area": "ఈ స్థల సరిహద్దుని రెండుగా విడగొట్టు." + }, + "key": "ఎక్స్", + "annotation": { + "line": "గీతను విడగొట్టు", + "area": "స్థలం సరిహద్దును విడగొట్టు", + "multiple": "{n} గీతలను/స్థలాలను విడగొట్టు" + }, + "not_eligible": "గీత మొదలు లేదా ఆఖరిన విడగొట్టడానికి వీలు లేదు.", + "multiple_ways": "చాలా గీతాలు ఉన్నందు వల్ల విడగొట్టడం కుదరదు." } }, "translate": { @@ -68,14 +135,25 @@ "localized_translation_language": "భాషను ఎంచుకోండి", "localized_translation_name": "పేరు" }, + "zoom_in_edit": "మార్చడానికి దగ్గరగా వీక్షించు", + "report_a_bug": "ఒక తప్పును నివేదించు", "commit": { "title": "మార్పులను భద్రపరచు", "description_placeholder": "మీ మార్పులకు టూకీ వివరణ", + "message_label": "మార్పుని తెలిపే సందేశం", "save": "భద్రపరచు", "cancel": "రద్దుచేయి", - "warnings": "హెచ్చరికలు" + "warnings": "హెచ్చరికలు", + "modified": "మార్చబడింది", + "deleted": "తొలగించబడింది", + "created": "సృష్టించబడింది" + }, + "contributors": { + "list": "మార్పులు చేసిన {users}", + "truncated_list": "మార్పులు చేసినవారు {users} మరియు {count} మంది" }, "geocoder": { + "search": "విశ్వవ్యాప్తంగా వెతుకు", "no_results_visible": "కనిపిస్తూన్న పటంలో ఫలితాలు ఏమీ లేవు", "no_results_worldwide": "ఫలితాలు ఏమీ లేవు" }, @@ -83,29 +161,48 @@ "title": "నా ప్రాంతాన్ని చూపించు" }, "inspector": { + "no_documentation_combination": "ఈ ట్యాగ్ కాంబినేషన్ కి సంబంధించి ఎటువంటి సమాధానము లేదు", + "no_documentation_key": "ఈ కీకి సంబంధించి ఎటువంటి సమాధానము లేదు", "show_more": "మరింత చూపించు", + "view_on_osm": "openstreetmap.org లో చూడండి", + "all_tags": "అన్ని ట్యాగులు", "all_members": "అందరు సభ్యులు", "all_relations": "అన్ని సంబంధాలు", "new_relation": "కొత్త సంబంధం...", "role": "పాత్ర", + "choose": "విశేష రకాన్ని ఎంచుకోండి", "results": "{search} కి {n} ఫలితాలు", + "reference": "OpenStreetMap వికీలో చూడండి", + "back_tooltip": "విశేషం మార్పు", "remove": "తొలగించు", "search": "వెతుకు", - "unknown": "గుర్తు తెలియని" + "multiselect": "ఎన్నుకున్న అంశాలు", + "unknown": "గుర్తు తెలియని", + "feature_list": "విశేషాలు వెతుకు", + "edit": "విశేషం మార్చు", + "none": "ఏవీ కాదు", + "way": "దారి", + "relation": "సంబంధం", + "location": "ప్రాంతం" }, "background": { "title": "వెనుతలం", - "description": "వెనుతలపు అమరికలు" + "description": "వెనుతలపు అమరికలు", + "none": "ఏవీ కాదు" }, "restore": { - "heading": "భద్రపరచని మార్పులు ఉన్నాయి" + "heading": "భద్రపరచని మార్పులు ఉన్నాయి", + "restore": "పునరుద్ధరించు" }, "save": { "title": "భద్రపరచు", "no_changes": "భద్రపరచాల్సిన మార్పులేమీ లేవు.", + "error": "భద్రపరచడంలో పొరపాటు జరిగింది", "unsaved_changes": "భద్రపరచని మార్పులు ఉన్నాయి" }, "success": { + "just_edited": "మీరు ఇప్పుడే OpenStreetMapను మార్చారు", + "view_on_osm": "OSM/ఓఎస్ఎం లో వీక్షించు", "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి", "twitter": "ట్విట్టర్లో పంచుకోండి", "google": "గూగుల్+లో పంచుకోండి" @@ -114,23 +211,39 @@ "okay": "సరే" }, "splash": { + "walkthrough": "దర్శన మొదలుపెట్టు", "start": "ఇప్పుడే సవరించండి" }, "tag_reference": { "description": "వివరణ" }, + "zoom": { + "in": "దగ్గరగా వీక్షించు", + "out": "దూరంగా వీక్షించు" + }, "help": { "title": "సహాయం" }, "intro": { "points": { - "title": "బిందువులు" + "title": "బిందువులు", + "choose": "జాబితా నుండి కఫే ఎంచుకోండి", + "reselect_delete": "మ్యాప్ లోని అన్ని విశేషాలను తొలగించవచ్చు **మీరు సృష్టించిన పాయంట్ను క్లిక్ చేయండి**" }, "areas": { - "title": "ప్రదేశాలు" + "title": "ప్రదేశాలు", + "search": "**'{name}' కొరకు వెతుకు**", + "choose": "జాబితా నుండి మైదానం ఎంచుకోండి" }, "lines": { - "title": "గీతలు" + "title": "గీతలు", + "road": "జాబితా నుండి రోడ్డు ఎంచుకోండి" + }, + "startediting": { + "title": "కూర్పు మొదలుపెట్టు", + "help": "మరిన్ని వివరాలు ఇక్కడ లబించును", + "save": "మీరు మార్చిన విశేషాలను భద్రపరచడం మరచిపోకండి!", + "start": "మ్యాప్ చేయడం మొదలుపెట్టు" } }, "presets": { diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json index f9846b7cf..f65295f00 100644 --- a/vendor/assets/iD/iD/locales/uk.json +++ b/vendor/assets/iD/iD/locales/uk.json @@ -332,7 +332,7 @@ }, "help": { "title": "Довідка", - "help": "# Довідка\n\nЦе редактор для [OpenStreetMap](http://www.openstreetmap.org/),\nвільної мапи світу, яку може редагувати кожний. Ви можете використовувати \nредактор для додавання та уточнення даних у вашій місцевості, роблячи \nмапу вільних та відкритих даних світу ще кращою.\n\nВаші правки будуть доступні кожному, хто користується мапою OpenStreetMap. \nДля того, щоб їх вносити вам потрібно [зареєструватись в OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[Редактор iD](http://ideditor.com/) — є спільним проектом [сирці якого \nдоступні на GitHub](https://github.com/systemed/iD).\n", + "help": "# Довідка\n\nЦе редактор [OpenStreetMap](http://www.openstreetmap.org/) —\nвільної мапи світу, правити яку може кожен. Ви можете використовувати\nйого для додавання та виправлення даних, створюючи найкращу \nвідкриту мапу світу з вільними, доступними всім, картографічними даними.\n\nВиправлення, які ви вносите до цієї мапи, будуть доступні всім\nіншим, хто використовує OpenStreetMap. Для того, щоб вносити\nзміни вам потрібно мати \n[обліковий запис OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[Редактор iDr](http://ideditor.com/) — є спільним проектом з [сирцями\nдоступними на GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Редагування та збереження\n\nЦей редактор створений переважно для роботи онлайн, і ви зараз\nпрацюєте з ним на веб-сайті.\n\n### Виділення об’єктів\n\nДля виділення об’єктів на мапі, таких як дороги чи пам’ятки, треба\nклацнути по них на мапі. Виділені об’єкти будуть підсвічені, з’явиться\nпанель з подробицями про них та меню із переліком того, що можна\nзробити.\n\nДля виділення кількох об’єктів натисніть 'Shift', або клацніть та потягніть\nмишею по мапі. Будуть виділені всі об’єкти, що попали у прямокутник\nвиділення, це дозволить вам виконувати дії одночасно над кількома\nоб’єктами.\n\n### Збереження правок\n\nПісля того як ви зробили зміни, виправивши дорогу, чи будинок, вони є\nлокальними доки ви не збережете їх на сервері. Не хвилюйтесь, якщо\nви припустились помилки, ви можете відмінити зміни натиснувши на\nкнопку 'Відмінити', а також повернути зміни — натиснувши 'Повернути'\n\nНатисніть 'Зберегти', щоб закінчити групу правок, наприклад, якщо ви\nзакінчили роботу над одним районом міста і бажаєте перейти до іншого.\nВи будете мати можливість переглянути те, що ви зробили, а редактор\nзапропонує вам корисні поради та видасть попередження, якщо ваші\nправки не виглядають вірними.\n\nЯкщо все виглядає добре, ви можете додати коротке пояснення того, що\nви зробили та натиснути кнопку 'Зберегти' ще раз, щоб надіслати зміни\nдо [OpenStreetMap.org](http://www.openstreetmap.org/), де вони стануть\nдоступні для всіх інших користувачів для перегляду та вдосконалення.\n\nЯкщо ви не можете закінчити ваші правки за один раз, ви можете лишити\nвікно з редактором відкритим і повернутись (на тому самому комп’ютері та\nоглядачі) до роботи потім — редактор запропонує вам відновити вашу\nроботу.\n", "roads": "# Дороги\n\nВи можете створювати, виправляти та вилучати дороги з допомогою\nцього редактора. Дороги можуть бути будь-якого типу: автомагістралі, \nстежки, велодоріжки та багато інших — все що частіше за все має\nперетин між собою, повинне бути нанесено на мапу.\n\n### Виділення\n\nКлацніть по дорозі для того щоб її вибрати. Вона стані підсвіченою\nпо всій довжині, поряд на мапі з’явиться невеличке меню з інструментами,\nа на бічній панелі буде показано додаткову інформацію про дорогу.\n\n### Зміна\n\nДоволі часто вам будуть траплятись дороги, що не співпадають із дорогами\nна супутниковому знімку чи треками GPS. Ви можете виправити їх положення.\nАле з початку вирівняйте положення знімку по треках GPS. \n\nПотім клацніть по дорозі, яку ви маєте намір змінити. Вона стане підсвіченою\nі на ній з’являться контрольні точки, які можна рухати, підлаштовуючи положення\nта форму дороги. Якщо вам потрібно додати нову точку, для підвищення деталізації,\nдодайте її подвійним клацанням на відрізку дороги. \n\nЯкщо дорога повинна з’єднуватись з іншою дорогою, але на мапі лінії не\nз’єднані, підтягніть одну із контрольних точок однієї дорого до іншої, для\nїх з’єднання. Мати з’єднані дороги — дуже важливо для мапи, а особливо\nдля впровадження можливості прокладання маршрутів.\n\nВи також можете обрати інструмент 'Перемістити' або натиснути 'M' для \nпереміщення всієї дороги, повторне клацання зберігає нове положення\nдороги.\n\n### Вилучення\n\nЯкщо дороги накреслені зовсім невірно і це добре видно по супутникових\nзнімках, а, в ідеалі, ви точно знаєте що їх у цьому місці немає — ви можете\nїх вилучити, що призведе до їх вилучення з мапи. Проте будьте уважними,\nвилучення, як і інші виправлення, призведуть до змін на мапі, що доступна\nкожному; також зауважте, що супутникові знімки з часом застарівають, отже\nновозбудована дорога буде на них відсутня. \n\nВи можете вилучити дорогу клацнувши на неї для виділення, потім натиснувши\nна значок із смітником чи натиснувши клавішу 'Delete'.\n\n### Створення\n\nЩо робити — знайшли місце де повинна бути дорога, а її там немає? Оберіть \nінструмент 'Лінія' зверху ліворуч або натисніть клавішу '2' для того, щоб\nрозпочати креслення ліній.\n\nКлацніть на початку дороги на мапі для того, щоб розпочати креслення. Якщо\nдорога відгалужується від існуючої дороги, розпочніть з місця їх з’єднання.\n\nПотім клацайте вздовж дороги так щоб утворився правильний шлях, відповідно\nдо супутникових знімків та/чи треків GPS. Якщо дорога, яку ви креслите, перетинає\nіншу дорогу, з’єднуйте їх клацаючи в точці їх перехрещення. Для закінчення\nкреслення виконайте подвійне клацання мишею чи натисніть 'Enter' на \nклавіатурі.\n", "gps": "# GPS\n\nGPS дані є найбільш надійним джерелом даних для OpenStreetMap.\nЦей редактор підтримує роботу з локальними треками — файлами `.gpx`\nз вашого комп’ютера. Ви можете отримати GPS треки за допомогою\nчисленних застосунків для смартфонів так само, як і з допомогою\nспеціального GPS-обладнання. \n\nДля того, щоб дізнатись як проводити збір GPS даних прочитайте\n[Збір інформації за допомогою GPS](http://learnosm.org/en/beginner/using-gps/).\n\nДля того, щоб скористатись GPX треками, перетягніть файл GPX у\nредактор мап. Після того, як його буде розпізнано, він буде доданий\nна мапу у вигляді лінії світло-зеленого кольору. Клацніть на меню\n'Налаштування тла' праворуч для того, щоб показати, приховати чи\nмасштабувати новий шар з GPX.\n\nGPX трек не буде завантажений безпосередньо до OpenStreetMap,\nкращий спосіб його використання — креслити об’єкти на мапі,\nвикористовуючи його як орієнтир для додавання об’єктів. \nТакож його можна [вивантажити до OpenStreetMap](http://www.openstreetmap.org/trace/create), щоб \nним могли користуватись інші.\n", diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json index 04f0296a0..0a00c6e4a 100644 --- a/vendor/assets/iD/iD/locales/vi.json +++ b/vendor/assets/iD/iD/locales/vi.json @@ -134,7 +134,8 @@ "annotation": "gộp {n} đường kẻ", "not_eligible": "Không thể gộp các đối tượng này.", "not_adjacent": "Không thể gộp các đường kẻ không nối liền với nhau.", - "restriction": "Không thể gộp các đường kẻ này vì ít nhất một trong những đường kẻ trực thuộc quan hệ “{relation}”." + "restriction": "Không thể gộp các đường kẻ này vì ít nhất một trong những đường kẻ trực thuộc quan hệ “{relation}”.", + "incomplete_relation": "Không thể gộp vì một trong số đối tượng này chưa được tải về hoàn toàn." }, "move": { "title": "Di chuyển", @@ -332,7 +333,7 @@ }, "help": { "title": "Trợ giúp", - "help": "# Trợ giúp\n\nĐây là trình vẽ của [OpenStreetMap](http://www.openstreetmap.org/), bản đồ có mã nguồn mở và dữ liệu mở cho phép mọi người cùng sửa đổi. Bạn có thể sử dụng chương trình này để bổ sung và cập nhật dữ liệu bản đồ tại khu vực của bạn. Bạn có thể cải tiến bản đồ thế giới mở để cho mọi người sử dụng.\n\nCác sửa đổi của bạn trên bản đồ này sẽ xuất hiện cho mọi người dùng OpenStreetMap. Để sửa bản đồ, bạn cần có một [tài khoản OpenStreetMap miễn phí](https://www.openstreetmap.org/user/new).\n\n[Trình vẽ iD](http://ideditor.com/) là một dự án cộng tác. [Tất cả mã nguồn](https://github.com/systemed/iD) được xuất bản tại GitHub.\n", + "help": "# Trợ giúp\n\nĐây là trình vẽ của [OpenStreetMap](http://www.openstreetmap.org/), bản đồ có mã nguồn mở và dữ liệu mở cho phép mọi người cùng sửa đổi. Bạn có thể sử dụng chương trình này để bổ sung và cập nhật dữ liệu bản đồ tại khu vực của bạn. Bạn có thể cải tiến bản đồ thế giới mở để cho mọi người sử dụng.\n\nCác sửa đổi của bạn trên bản đồ này sẽ xuất hiện cho mọi người dùng OpenStreetMap. Để sửa bản đồ, bạn cần có một [tài khoản OpenStreetMap miễn phí](https://www.openstreetmap.org/user/new).\n\n[Tình vẽ iD](http://ideditor.com/) là một dự án cộng tác và xuất bản [tất cả mã nguồn tại GitHub](https://github.com/openstreetmap/iD).\n", "editing_saving": "# Sửa đổi & Lưu giữ\n\nĐây là một chương trình vẽ trực tuyến, hiện tại bạn đang truy cập nó qua một trang Web.\n\n### Lựa chọn Đối tượng\n\nĐể lựa chọn một đối tượng, thí dụ con đường hay một điểm, nhấn chuột vào nó trên bản đồ. Khi đối tượng được chọn, bạn sẽ thấy một biểu mẫu ở bên phải chứa các chi tiết về đối tượng, cũng như một trình đơn giống bảng màu của họa sĩ chứa các tác vụ để thực hiện với đối tượng.\n\nĐể lựa chọn nhiều đối tượng cùng lúc, nhấn giữ phím Shift và nhấn chuột vào từng đối tượng một. Thay thế, nhấn giữ Shift và kéo chuột trên bản đồ để vẽ hộp bao. Các đối tượng nằm vào hộp này sẽ được chọn.\n\n### Lưu giữ Sửa đổi\n\nKhi bạn sửa đổi các tuyến đường, tòa nhà, và địa điểm, các thay đổi này được lưu giữ trên máy cho đến khi bạn đăng nó lên máy chủ. Đừng lo nhầm lẫn: chỉ việc nhấn vào các nút Hoàn tác và Làm lại.\n\nNhấn “Lưu” để hoàn thành các sửa đổi, thí dụ bạn vừa vẽ xong một khu và muốn bắt đầu vẽ khu mới. Trình vẽ sẽ trình bày các thay đổi để bạn xem lại, cũng như các gợi ý và cảnh báo nếu bạn đã sửa nhầm lẫn.\n\nSau khi vẽ xong, bạn sẽ nhập lời tóm lược các thay đổi và nhấn “Lưu” lần nữa để đăng các thay đổi lên [OpenStreetMap.org](http://www.openstreetmap.org/). Các thay đổi sẽ xuất hiện tại trang web này để mọi người xem và cập nhật nếu có sai sót.\n\nNếu bạn chưa xong mà cần rời khỏi máy tính, bạn có thể đóng trình vẽ này. Lần sau trở lại, trình vẽ này sẽ cho phép khôi phục các thay đổi chưa lưu của bạn (miễn là bạn sử dụng cùng máy tính và trình duyệt).\n", "roads": "# Đường sá\n\nTrình vẽ này cho phép tạo, sửa, và xóa các con đường. Con đường không nhất thiết phải là đường phố: có thể vẽ đường cao tốc, đường mòn, đường đi bộ, đường xe đạp…\n\n### Lựa chọn\n\nNhấn vào con đường để lựa chọn nó. Con đường sẽ được tô sáng, một trình đơn công cụ sẽ xuất hiện bên cạnh đường, và thanh bên sẽ trình bày các chi tiết của con đường.\n\n### Sửa đổi\n\nNhiều khi bạn sẽ gặp những con đường bị chệch đối với hình nền hoặc tuyến đường GPS. Bạn có thể chỉnh lại các con đường này để chính xác hơn.\n\nTrước tiên, nhấn vào con đường cần chỉnh lại. Đường sẽ được tô sáng và các nốt sẽ xuất hiện để bạn kéo sang vị trí đúng hơn. Để thêm chi tiết, nhấn đúp vào một khúc đường chưa có nốt, và một nốt mới sẽ xuất hiện để bạn kéo.\n\nNếu con đường nối với đường khác trên thực tiếp, nhưng trên bản đồ thì chưa nối liền, hãy kéo một nốt của một con đường sang đường kia để nối liền hai con đường. Nối liền các đường tại giao lộ là một điều rất quan trọng tăng khả năng chỉ đường.\n\nĐể di chuyển toàn bộ con đường cùng lúc, nhấn vào công cụ “Di chuyển” hoặc nhấn phím tắt `M`, chuyển chuột sang vị trí mới, rồi nhấn chuột để hoàn thành việc di chuyển.\n\n### Xóa\n\nHãy tưởng tượng bạn gặp một con đường hoàn toàn sai: bạn không thấy được con đường trong hình ảnh trên không và, theo lý tưởng, cũng đã ghé vào chỗ đó để xác nhận rằng nó không tồn tại. Nếu trường hợp này, bạn có thể xóa con đường hoàn toàn khỏi bản đồ. Xin cẩn thận khi xóa đối tượng: giống như mọi sửa đổi khác, mọi người sẽ thấy được kết quả. Ngoài ra, hình ảnh trên không nhiều khi lỗi thời – con đường có thể mới xây – thành thử tốt nhất là ghé vào chỗ đó để quan sát chắc chắn, nếu có thể.\n\nĐể xóa một con đường, lựa chọn nó bằng cách nhấn vào nó, rồi nhấn vào hình thùng rác hoặc nhấn phím Delete.\n\n### Tạo mới\n\nBạn có tìm ra một con đường chưa được vẽ trên bản đồ? Hãy bắt đầu vẽ đường kẻ mới bằng cách nhấn vào nút “Đường” ở phía trên bên trái của trình vẽ, hoặc nhấn phím tắt `2`.\n\nNhấn vào bản đồ tại điểm bắt đầu của con đường. Hoặc nếu con đường chia ra từ đường khác đã tồn tại, trước tiên nhấn chuột tại giao lộ giữa hai con đường này.\n\nSau đó, nhấn chuột lần lượt theo lối đường dùng hình ảnh trên không hoặc tuyến đường GPS. Khi nào con đường giao với đường khác, nhấn chuột tại giao lộ để nối liền hai con đường này. Sau khi vẽ xong, nhấn đúp vào nốt cuối dùng hoặc nhấn phím Return hay Enter.\n", "gps": "# GPS\n\nHệ thống định vị toàn cầu, còn gọi GPS, là nguồn dữ liệu tin tưởng nhất trong dự án OpenStreetMap. Trình vẽ này hỗ trợ các tuyến đường thu thập được từ máy GPS, tức tập tin `.gpx` trên máy tính của bạn. Bạn có thể thu loại tuyến đường GPS này bằng một ứng dụng cài đặt trên điện thoại thông minh hoặc máy thu GPS, chẳng hạn máy Garmin.\n\nĐọc thêm về cách thu thập dữ liệu bằng GPS tại “[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)”.\n\nĐể sử dụng một tuyến đường GPX trong việc vẽ bản đồ, kéo thả tập tin GPX vào trình vẽ bản đồ này. Nếu trình vẽ nhận ra tuyến đường, tuyến đường sẽ được tô màu xanh nõn chuối trên bản đồ. Mở hộp “Tùy chọn Hình nền” ở thanh công cụ bên phải để bật tắt hoặc thu phóng lớp GPX này.\n\nTuyến đường GPX không được tải lên OpenStreetMap trực tiếp. Cách tốt nhất để sử dụng nó là vạch đường theo nó trên bản đồ, cũng như [tải nó lên OpenStreetMap](http://www.openstreetmap.org/trace/create) để cho người khác sử dụng.\n", @@ -791,6 +792,10 @@ "shop": { "label": "Kiểu" }, + "social_facility_for": { + "label": "Dân được phục vụ", + "placeholder": "Vô gia cư, Khuyết tật, Trẻ em, v.v." + }, "source": { "label": "Nguồn" }, @@ -1136,6 +1141,22 @@ "name": "Nhà trú", "terms": "nhà trú, chỗ che chở, nhà trú bão, nhà trú mưa, nhà trú ẩn, điểm trú bão, điểm trú mưa, điểm trú ẩn, túp lều, mái, nóc, cho che cho, nha tru bao, nha tru mua, nha tru an, diem tru bao, diem tru mau, diem tru an, tup leu, mai, noc" }, + "amenity/social_facility": { + "name": "Dịch vụ Xã hội", + "terms": "dịch vụ xã hội, người vô gia cư, người khuyết tật, trẻ em, trung tâm điều trị nghiện ma túy, trung tâm điều trị nghiện rượu, dich vu xa hoi, nguoi vo gia cu, nguoi khuyet tat, tre em, trung tam dieu tri nghien ma tuy, trung tam dieu tri nghien ruou" + }, + "amenity/social_facility/food_bank": { + "name": "Phân phát Thực phẩm", + "terms": "nhà phân phát thực phẩm, dịch vụ phân phối thực phẩm, cơ quan cung cấp thực phẩm, cơ quan cung cấp thức ăn, cơ quan cung cấp đồ ăn, giao thức ăn cho người đói, food bank, nha phan phat thuc pham, dich vu phan phoi thuc pham, co quan cung cap thuc pham, co quan cung cap thuc an, co quan cung cap do an, giao thuc an cho nguoi doi" + }, + "amenity/social_facility/group_home": { + "name": "Nhà trọ Cộng đồng", + "terms": "nhà trọ cộng đồng, nhà tập thể, group home, nha tro cong dong, nha tap the" + }, + "amenity/social_facility/homeless_shelter": { + "name": "Cứu trợ Người Vô gia cư", + "terms": "trung tâm cứu trợ người vô gia cư, trung tâm cho người vô gia cư, nhà tạm trú cho người vô gia cư, trung tam cuu tro nguoi vo gia cu, trung tam cho nguoi vo gia cu, nha tam tru cho nguoi vo gia cu" + }, "amenity/studio": { "name": "Studio", "terms": "studio, xtuđiô, đài radio, đài rađiô, kênh radio, kênh rađiô, đài vô tuyến, kênh vô tuyến, đài phát thanh, đài TV, kênh TV, đài tivi, kênh tivi, đài truyền hình, kênh truyền hình, đài quảng bá, đài kênh quảng bá, phát tin, kênh phát tin, studio, xtudio, dai radio, dai radio, kenh radio, kenh radio, dai vo tuyen, kenh vo tuyen, dai phat thanh, dai TV, kenh TV, dai tivi, kenh tivi, dai truyen hinh, kenh truyen hinh, dai quang ba, dai kenh quang ba, phat tin, kenh phat tin" @@ -1264,10 +1285,46 @@ "name": "Khu chung cư", "terms": "khu chung cư, khu chung cu" }, + "building/barn": { + "name": "Chuồng", + "terms": "chuồng, chuồng trâu bò, chuồng ngựa, kho thóc, chuong, chuong trau bo, chuong ngua, kho thoc" + }, + "building/bunker": { + "name": "Boong ke", + "terms": "boong ke, boong-ke, boongke" + }, + "building/cabin": { + "name": "Nhà tranh", + "terms": "nhà tranh, túp lều, nhà gỗ, nha tranh, tup leu, nha go" + }, + "building/cathedral": { + "name": "Nhà thờ Chánh tòa", + "terms": "nhà thờ chánh tòa, nhà thờ chánh toà, nhà thờ chính tòa, nhà thờ chính toà, vương cung thánh đường, đại vương cung thánh đường, tiểu vương cung thánh đường, nha tho chanh toa, nha tho chinh toa, vuong cung thanh duong, dai vuong cung thanh duong, tieu vuong cung thanh duong" + }, + "building/chapel": { + "name": "Nhà nguyện", + "terms": "nhà nguyện, nhà thờ nhỏ, nha nguyen, nha tho nho" + }, + "building/church": { + "name": "Nhà thờ", + "terms": "nhà thờ, Ki-tô giáo, Kitô giáo, Thiên Chúa giáo, đạo Thiên Chúa, Công giáo, Tin Lành, giáo xứ, thánh đường, nha tho, Ki-to giao, Kito giao, Thien Chua giao, dao Thien Chua, Cong giao, Tin Lanh, giao xu, thanh duong" + }, "building/commercial": { "name": "Tòa nhà Thương mại", "terms": "tòa nhà thương mại, toà nhà thương mại, toa nha thuong mai" }, + "building/construction": { + "name": "Tòa nhà đang Xây dựng", + "terms": "tòa nhà đang xây dựng, toà nhà đang xây dựng, nhà đang xây, toa nha dang xay dung, nha dang xay" + }, + "building/detached": { + "name": "Nhà Tách biệt", + "terms": "nhà tách biệt, nhà biệt lập, nha tach biet, nha biet lap" + }, + "building/dormitory": { + "name": "Ký túc xá", + "terms": "ký túc xá, kí túc xá, ký túc sá, kí túc sá, cư xá, ky tuc xa, ki tuc xa, ky tuc sa, ki tuc sa, cu xa" + }, "building/entrance": { "name": "Cửa vào", "terms": "cửa vào, lối vào, cua vao, loi vao" @@ -1276,6 +1333,22 @@ "name": "Ga ra", "terms": "ga ra, ga-ra" }, + "building/garages": { + "name": "Dãy Ga ra", + "terms": "dãy ga ra, dãy ga-ra, dãy nhà để xe, day ga ra, day ga-ra, day nha de xe" + }, + "building/greenhouse": { + "name": "Nhà kính", + "terms": "nhà kính, nhà kiếng, nhà trồng rau, nhà trồng hoa, nha kinh, nha kieng, nha trong rau, nha trong hoa" + }, + "building/hospital": { + "name": "Tòa nhà Bệnh viện", + "terms": "tòa nhà bệnh viện, toà nhà bệnh viện, tòa nhà nhà thường, toà nhà nhà thường" + }, + "building/hotel": { + "name": "Tòa nhà Khách sạn", + "terms": "tòa nhà khách sạn, toà nhà khách sạn" + }, "building/house": { "name": "Nhà ở", "terms": "nhà ở, căn nhà, tòa nhà, toà nhà, nha o, can nha, toa nha" @@ -1288,10 +1361,54 @@ "name": "Tòa nhà Công nghiệp", "terms": "tòa nhà công nghiệp, toà nhà công nghiệp, toa nha cong nghiep" }, + "building/public": { + "name": "Tòa nhà Công cộng", + "terms": "tòa nhà công cộng, toà nhà công cộng" + }, "building/residential": { "name": "Tòa nhà Dân cư", "terms": "tòa nhà dân cư, toà nhà dân cư, nhà ở, căn nhà, toa nha dan cu, nha o, can nha" }, + "building/retail": { + "name": "Tòa nhà Bán lẻ", + "terms": "tòa nhà bán lẻ, toà nhà bán lẻ, toa nha ban le" + }, + "building/roof": { + "name": "Mái Che", + "terms": "mái che, mái, mái nhà, nóc, mai che, mai, mai nha, noc" + }, + "building/school": { + "name": "Nhà Trường", + "terms": "nhà trường, trường học, học viện, nha truong, truong học, hoc vien" + }, + "building/shed": { + "name": "Lán", + "terms": "lán, lán trại, lều lán, túp lều, chuồng, lan, lan trai, leu lan, tup leu, chuong" + }, + "building/stable": { + "name": "Chuồng Ngựa", + "terms": "chuồng ngựa, chuong ngua" + }, + "building/static_caravan": { + "name": "Nhà Lưu động để Một Chỗ", + "terms": "nhà lưu động để một chỗ, nhà di động để một chỗ, nha luu dong de mot cho, nha di dong de mot cho" + }, + "building/terrace": { + "name": "Dãy Nhà", + "terms": "dãy nhà, day nha" + }, + "building/train_station": { + "name": "Nhà ga", + "terms": "nhà ga,nha ga" + }, + "building/university": { + "name": "Tòa nhà Đại học", + "terms": "tòa nhà đại học, toà nhà đại học, tòa nhà trường đại học, toà nhà trường đại học, toa nha dai hoc, toa nha truong dai hoc" + }, + "building/warehouse": { + "name": "Nhà kho", + "terms": "nhà kho, kho, kho tàng, kho bãi, nha kho, kho tang, kho bai" + }, "craft/basket_maker": { "name": "Đan Rổ rá", "terms": "nghề đan rổ rá, người đan rổ rá, tiệm đan rổ rá, nghe dan ro ra, nguoi dan ro ra, tiem dan ro ra" @@ -2268,6 +2385,10 @@ "name": "Tiệm Rượu", "terms": "tiệm rượu, nơi bán rượu, chỗ bán rượu, quầy bán rượu, cửa hàng rượu, cửa hàng bán rượu, tiệm bán rượu, tiem ruou, noi ban ruou, cho ban ruou, quay ban ruou, cua hang ruou, cua hang ban ruou, tiem ban ruou" }, + "shop/art": { + "name": "Tiệm Nghệ phẩm", + "terms": "tiệm nghệ phẩm, tiệm bức tranh, tiệm bức vẽ, cửa hàng nghệ phẩm, cửa hàng bức tranh, cửa hàng bức vẽ, quán nghệ phẩm, quán bức tranh, quán bức vẽ, nơi bán nghệ phẩm, nơi bán bức tranh, nơi bán bức vẽ, tiem nghe pham, tiem buc tranh, tiem buc ve, cua hang nghe pham, cua hang buc tranh, cua hang buc ve, quan nghe pham, quan buc tranh, quan buc ve, noi ban nghe pham, noi ban buc tranh, noi ban buc ve" + }, "shop/bakery": { "name": "Tiệm Bánh", "terms": "tiệm bánh, tiệm bánh mì, tiệm bán bánh, nơi bán bánh, chỗ bán bánh, quầy bán bánh, nhà bán bánh, tiem banh, tiem banh mi, tiem ban banh, noi ban banh, cho ban banh, quay ban banh, nha ban banh" @@ -2284,6 +2405,10 @@ "name": "Tiệm Xe đạp", "terms": "tiệm xe đạp, cửa hàng xe đạp, chỗ bán xe đạp, tiem xe dap, cua hang xe dap, cho ban xe dap" }, + "shop/bookmaker": { + "name": "Phòng Đánh cá Ngựa", + "terms": "phòng đánh cá ngựa, văn phòng đánh cá ngựa, cửa sổ đánh cá ngựa, tiệm đánh cá ngựa, cửa hàng đánh cá ngựa, nơi đánh cá ngựa, phong danh ca ngua, van phong danh ca ngua, cua so danh ca ngua, tiem danh ca ngua, cua hang danh ca ngua, noi danh ca ngua" + }, "shop/books": { "name": "Hiệu Sách", "terms": "hiệu sách, tiệm sách, chỗ bán sách vở, hieu sach, tiem sach, cho ban sach vo" @@ -2404,6 +2529,10 @@ "name": "Thợ khóa", "terms": "thợ khóa, thợ sửa khóa, thợ khoá, trợ sửa khoá, thợ kim khí, tho khoa, tho sua khoa, tho kim khi" }, + "shop/lottery": { + "name": "Tiệm Xổ số", + "terms": "quầy xổ số, quầy vé xổ số, tiệm xổ số, tiệm vé xổ số, cửa hàng xổ số, cửa hàng vé xổ số, quán xổ số, quán vé xổ số, nơi bán vé xổ số, nơi mua vé xổ số, quay xo so, quay ve xo so, tiem xo so, tiem ve xo so, cua hang xo so, cua hang ve xo so, quan xo so, quan ve xo so, noi ban ve xo so, noi mua ve xo so" + }, "shop/mall": { "name": "Trung tâm Thương mại", "terms": "trung tâm thương mại, khu thương mại, trung tam thuong mai, khu thuong mai" diff --git a/vendor/assets/iD/iD/locales/yue.json b/vendor/assets/iD/iD/locales/yue.json index d1ccb9113..bc6313513 100644 --- a/vendor/assets/iD/iD/locales/yue.json +++ b/vendor/assets/iD/iD/locales/yue.json @@ -332,7 +332,6 @@ }, "help": { "title": "指南", - "help": "# 指南\n\n爾個編器，係爲 [公家街圖](http://www.openstreetmap.org/)而做。 有世界地圖，任用亦改得。你可以用佢，喺你處加嘢改嘢。如此一來，裏面嘅料，人人可以任用。\n\n邊個用公家街圖，都見得到你整嘅地圖。要改得到，就要開定個\n[免費公家街圖戶口](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) 係合作而成， [程式碼放喺 GitHub](https://github.com/systemed/iD).\n", "editing_saving": "# 改同記\n\n爾個程式，係上網用嘅，你用到佢，就係喺你上緊嘅網站上面。\n\n### 㨂地貌\n\n㨂地圖地貌，好似路，名勝，就喺地圖撳佢一下。咁佢就會顯眼，同埋有一大欄，講佢明細。亦有選單，你可以點地貌。\n\n要揀多個一種，就撳實【Shift】掣先。一係跟手撳落地貌，揀你想揀。一係拖個長方形出來，包住佢嘅點都着咗。\n\n### 記修改\n\n你修改路、屋宇及地方之時，爾啲修改只喺你部電腦上面，直至你記上地圖電腦。唔好擔心，若你出錯，你可以撳還原掣還原，重做掣重做。\n\n撳【記低】就完成一組修改。畀個例，你畫完個鎮，又會去畫另一度。咁你有機會去校閱你改過乜。同埋，若然有乜改得唔妥，程式亦會有用提議同警告。\n\n若然樣樣都妥當，咁你就打啲解釋，講下你改過乜，之後【記低】送修改上 [OpenStreetMap.org](http://www.openstreetmap.org/)。如此一來，人人都會睇到，等人再以此建立同改善。\n\n若你一次改唔晒，你都可以閂咗程式，下次返來，用同一部電腦同瀏覽器，程式會畀機會你囘復修改。\n", "roads": "# 路\n\n用個程式，你開得，整得，刪得啲路。路有幾種，徑、公路、山徑、單車徑等等，乜嘢相交一段都要畫面出來。\n\n### 揀\n\n撳一下條路，就揀到。個外形會見得明顯，亦有架生仔選單，外加邊註欄有多啲路嘅資料。\n\n### 改\n\n你耐不耐見到條路，同背景相，或全球定位系統行縱，並唔一致。你要調較到佢哋啱位。\n\n首先撳一下，你想改嗰條路。咁條路就會特別顯眼，同埋有一點點畀你畀拉到啱位。若你想加多幾點，更加仔細，就喺條路上面，無節嘅地方，快撳兩下，咁就會開多一節。\n\n若然條路要駁去其他路，之但係無駁妥，咁你就拖住一點，拉到其他路，整到聯埋。地圖來講，駁通啲路係咁緊要，同埋駕車搵路亦必須。\n\n你亦可以用【搬】爾個架生，或撳快掣【M】，一次過搬成條路，再撳多下，就記好搬動。\n\n### 刪\n\n若成條路都唔啱，你亦要望下衞星相，以及最好親身確認，佢真係唔喺度，你就可以刪咗佢，卽係由地圖度搬走。小心啲刪走地貌，同其他改法一樣，有時地貌係人人都見到，但係衞星相過晒時，新路未必見。\n\n你刪條路，就撳佢一下，揀咗佢。跟住撳垃圾筒公仔，或者撳快掣【Delete】。\n\n### 開新\n\n要搵地方，緊係要有條路，係咪？去程式左上角，咁住【綫】個公仔，或者撳快掣【2】，就開始畫綫。\n\n地圖度，撳住路頭個位開始畫。若然條路由原路分出，就由原路上面路口位，撳一下開始。\n\n撳嘅點，應該人係跟實條路，跟䘙星相，或跟全球定位系統行蹤。若果你條路，會橫過另一條，你就喺路口位，撳落另一條路上，就起咗個交叉點。你要畫完，就快撳兩下。又或者咁鍵盤【Return】或【Enter】掣。\n", "gps": "# 全球定位系統\n\n數據取自全球定位系統，係公家街圖至可靠來源。爾個造圖程式，用到本機行蹤，卽放你電腦嘅【.gpx】檔案。你收集全球定位系統行蹤，取自智能電話程式，或者個人全球定位系統儀。\n\n點去用全球定位系統測量，睇下[用全球定位系統測量](http://learnosm.org/en/beginner/using-gps/).\n\n用GPX途徑製圖，拖GPX檔案落造圖程式。若然讀得明，佢會加入地圖，用鮮綠綫顯現。喺右邊，撳落【背景設定】選單。咁就開得，閂得，放大縮細新嘅GPX層。\n\n爾個GPX途徑，唔會直上公家街圖，最好用法，就係用佢製圖。按此加新地貌，亦可[傳上公家街圖](http://www.openstreetmap.org/trace/create)以作其他用途。\n", diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json index 095cbf576..e3b45f21a 100644 --- a/vendor/assets/iD/iD/locales/zh-CN.json +++ b/vendor/assets/iD/iD/locales/zh-CN.json @@ -297,7 +297,7 @@ "splash": { "welcome": "欢迎使用OpenStreetMap iD编辑器", "text": "ID编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是{version}版本。欲知详情，请浏览{website}及在{github}报告程序错误。“", - "walkthrough": "开始导览", + "walkthrough": "开始演练", "start": "现在编辑" }, "source_switch": { @@ -332,8 +332,8 @@ }, "help": { "title": "帮助", - "help": "# 帮助\n\n这是一个[OpenStreetMap](http://www.openstreetmap.org/)的编辑器。\nOpenStreetMap是自由及可编辑的世界地图。你可以用这个编辑器来添加和更新您所在区域的地图资料，令这个开源和开放的世界地图变得更好。\n\n您在这个地图上所做的编辑，所有使用OpenStreetMap的人将可看见。为了进行编辑，你需要一个[免费的OpenStreetMap帐户](https://www.openstreetmap.org/user/new)。\n\n这个[iD编辑器](http://ideditor.com/) 是一个合作开发的开源系统， [源码可在GitHub找到](https://github.com/systemed/iD)。\n", "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的信息。\n\n### 编辑道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想编辑的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n", + "gps": "# GPS\n\nGPS 数据是 OpenStreetMap 中最可信的信息。本编辑器\n支持你电脑中的本地路线数据 - `.gpx`。你可以通过某些\n智能手机中的应用程序或个人 GPS 设备收集此类型的 GPS \n路线数据。\n\n关于如何进行 GPS 测量的信息请参阅[使用 GPS 测量信息]\n(http://learnosm.org/en/beginner/using-gps/)。\n\n要使用 GPX 路线绘制地图，拖动 GPX 文件至地图编辑器中。\n如果被识别到了，会变成亮绿色的线。点击右侧的“背景设置”\n菜单来开启、关闭、或者缩放这个新的GPX图层。\n\nGPX 路线数据不会被直接上传到 OpenStreetMap 中。使用\n它的最好的方式是以它为参照绘制出你需要添加的要素。你可\n以可以[上传到 OpenStreetMap ](http://www.openstreetmap.org/trace/create)\n以便其他用处。\n", "addresses": "＃地址\n\n地址是地图上的最有用的一些信息。\n\nOpenStreetMap通过沿街位置记录建筑和场所的地址，地址通常表示为街道的一部分。\n\n您可以添加地址信息映射为建筑轮廓的地方以及那些映射为单个点。地址的最佳来源数据是来自于实地调查或个人的知识与任何其他功能，从谷歌地图商业来源的复制是严格禁止的。\n", "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的滑鼠以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的'Return'键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一项建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n" }, @@ -369,6 +369,7 @@ }, "lines": { "title": "线", + "add": "线条用来表示例如道路、铁道与河流之类的要素。**点击线条按钮来添加新的线条。**", "start": "**点击道路末端，以开始绘制线段。 **", "intersect": "点击向线添加更多节点。必要时您可以在绘制时拖动地图。道路和许多其它类型的线都是一个更大的网络的组成部分，因此正确连接这些线以便导航应用使用是十分重要的。**点击 Flower Street 创建连接两条线的交叉点。**", "finish": "再次点击最后一个节点可结束绘制线。**完成道路的绘制。**", @@ -539,6 +540,9 @@ "country": { "label": "国家" }, + "covered": { + "label": "覆盖" + }, "crossing": { "label": "类型" }, @@ -591,6 +595,9 @@ "generator/type": { "label": "类型" }, + "golf_hole": { + "label": "参考" + }, "handicap": { "placeholder": "1-18" }, @@ -678,6 +685,9 @@ "operator": { "label": "经营者" }, + "par": { + "placeholder": "3, 4, 5..." + }, "park_ride": { "label": "停车换乘" }, @@ -822,6 +832,21 @@ "name": "地址", "terms": "地址,址" }, + "aerialway": { + "name": "缆车线路", + "terms": "缆车线路" + }, + "aerialway/cable_car": { + "name": "缆车" + }, + "aerialway/pylon": { + "name": "缆车塔", + "terms": "缆车塔" + }, + "aerialway/station": { + "name": "缆车站", + "terms": "缆车站" + }, "aeroway": { "name": "机场路径", "terms": "机场" @@ -918,6 +943,10 @@ "name": "电影院", "terms": "电影院,电影,戏院" }, + "amenity/clinic": { + "name": "诊所", + "terms": "诊所,门诊,医务所" + }, "amenity/clock": { "name": "时钟", "terms": "时钟,钟表,钟" @@ -1030,6 +1059,9 @@ "name": "野郊访客处", "terms": "野郊访客处" }, + "amenity/recycling": { + "terms": "回收,循环利用,再造" + }, "amenity/restaurant": { "name": "餐馆", "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼" @@ -1042,6 +1074,10 @@ "name": "亭", "terms": "棚,棚屋" }, + "amenity/studio": { + "name": "工作室", + "terms": "工作室" + }, "amenity/swimming_pool": { "name": "游泳池", "terms": "游泳池,泳池" @@ -1194,10 +1230,30 @@ "name": "住宅建筑物", "terms": "住宅建筑物" }, + "craft/brewery": { + "name": "酿酒厂", + "terms": "酒厂,酿酒厂,酒坊" + }, + "craft/pottery": { + "name": "陶器场", + "terms": "陶器场" + }, + "craft/sawmill": { + "name": "锯木厂", + "terms": "锯木厂" + }, "craft/tailor": { "name": "裁缝", "terms": "裁缝" }, + "craft/upholsterer": { + "name": "室内装潢", + "terms": "室内装潢,室内设计,室内装饰" + }, + "craft/watchmaker": { + "name": "制表商", + "terms": "钟表制作,制表商,钟表匠" + }, "embankment": { "name": "堤坝", "terms": "堤,堤坝,堤岸" @@ -1226,6 +1282,14 @@ "name": "人行道", "terms": "人行道,便道,走道" }, + "golf/fairway": { + "name": "高尔夫球道", + "terms": "球道,高尔夫球道" + }, + "golf/green": { + "name": "高尔夫球洞草坪区", + "terms": "球洞草坪区,高尔夫球洞草坪区" + }, "golf/hole": { "name": "高尔夫球洞" }, @@ -2042,7 +2106,7 @@ "terms": "干洗店" }, "shop/electronics": { - "name": "电子产品店", + "name": "电器店", "terms": "电器店" }, "shop/farm": { diff --git a/vendor/assets/iD/iD/locales/zh-HK.json b/vendor/assets/iD/iD/locales/zh-HK.json index 43423e935..2536c2b42 100644 --- a/vendor/assets/iD/iD/locales/zh-HK.json +++ b/vendor/assets/iD/iD/locales/zh-HK.json @@ -328,7 +328,6 @@ }, "help": { "title": "指南", - "help": "# 指南\n\n爾個編器，係爲 [公家街圖](http://www.openstreetmap.org/)而做。 有世界地圖，任用亦改得。你可以用佢，喺你處加嘢改嘢。如此一來，裏面嘅料，人人可以任用。\n\n邊個用公家街圖，都見得到你整嘅地圖。要改得到，就要開定個\n[免費公家街圖戶口](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) 係合作而成， [程式碼放喺 GitHub](https://github.com/systemed/iD).\n", "editing_saving": "# 改同記\n\n爾個程式，係上網用嘅，你用到佢，就係喺你上緊嘅網站上面。\n\n### 㨂地貌\n\n㨂地圖地貌，好似路，名勝，就喺地圖撳佢一下。咁佢就會顯眼，同埋有一大欄，講佢明細。亦有選單，你可以點地貌。\n\n要揀多個一種，就撳實【Shift】掣先。一係跟手撳落地貌，揀你想揀。一係拖個長方形出來，包住佢嘅點都着咗。\n\n### 記修改\n\n你修改路、屋宇及地方之時，爾啲修改只喺你部電腦上面，直至你記上地圖電腦。唔好擔心，若你出錯，你可以撳還原掣還原，重做掣重做。\n\n撳【記低】就完成一組修改。畀個例，你畫完個鎮，又會去畫另一度。咁你有機會去校閱你改過乜。同埋，若然有乜改得唔妥，程式亦會有用提議同警告。\n\n若然樣樣都妥當，咁你就打啲解釋，講下你改過乜，之後【記低】送修改上 [OpenStreetMap.org](http://www.openstreetmap.org/)。如此一來，人人都會睇到，等人再以此建立同改善。\n\n若你一次改唔晒，你都可以閂咗程式，下次返來，用同一部電腦同瀏覽器，程式會畀機會你囘復修改。\n", "roads": "# 路\n\n用個程式，你開得，整得，刪得啲路。路有幾種，徑、公路、山徑、單車徑等等，乜嘢相交一段都要畫面出來。\n\n### 揀\n\n撳一下條路，就揀到。個外形會見得明顯，亦有架生仔選單，外加邊註欄有多啲路嘅資料。\n\n### 改\n\n你耐不耐見到條路，同背景相，或全球定位系統行縱，並唔一致。你要調較到佢哋啱位。\n\n首先撳一下，你想改嗰條路。咁條路就會特別顯眼，同埋有一點點畀你畀拉到啱位。若你想加多幾點，更加仔細，就喺條路上面，無節嘅地方，快撳兩下，咁就會開多一節。\n\n若然條路要駁去其他路，之但係無駁妥，咁你就拖住一點，拉到其他路，整到聯埋。地圖來講，駁通啲路係咁緊要，同埋駕車搵路亦必須。\n\n你亦可以用【搬】爾個架生，或撳快掣【M】，一次過搬成條路，再撳多下，就記好搬動。\n\n### 刪\n\n若成條路都唔啱，你亦要望下衞星相，以及最好親身確認，佢真係唔喺度，你就可以刪咗佢，卽係由地圖度搬走。小心啲刪走地貌，同其他改法一樣，有時地貌係人人都見到，但係衞星相過晒時，新路未必見。\n\n你刪條路，就撳佢一下，揀咗佢。跟住撳垃圾筒公仔，或者撳快掣【Delete】。\n\n### 開新\n\n要搵地方，緊係要有條路，係咪？去程式左上角，咁住【綫】個公仔，或者撳快掣【2】，就開始畫綫。\n\n地圖度，撳住路頭個位開始畫。若然條路由原路分出，就由原路上面路口位，撳一下開始。\n\n撳嘅點，應該人係跟實條路，跟䘙星相，或跟全球定位系統行蹤。若果你條路，會橫過另一條，你就喺路口位，撳落另一條路上，就起咗個交叉點。你要畫完，就快撳兩下。又或者咁鍵盤【Return】或【Enter】掣。\n", "gps": "# 全球定位系統\n\n數據取自全球定位系統，係公家街圖至可靠來源。爾個造圖程式，用到本機行蹤，卽放你電腦嘅【.gpx】檔案。你收集全球定位系統行蹤，取自智能電話程式，或者個人全球定位系統儀。\n\n點去用全球定位系統測量，睇下[用全球定位系統測量](http://learnosm.org/en/beginner/using-gps/).\n\n用GPX途徑製圖，拖GPX檔案落造圖程式。若然讀得明，佢會加入地圖，用鮮綠綫顯現。喺右邊，撳落【背景設定】選單。咁就開得，閂得，放大縮細新嘅GPX層。\n\n爾個GPX途徑，唔會直上公家街圖，最好用法，就係用佢製圖。按此加新地貌，亦可[傳上公家街圖](http://www.openstreetmap.org/trace/create)以作其他用途。\n", diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json index 5bbc6b7c5..ee017637c 100644 --- a/vendor/assets/iD/iD/locales/zh-TW.json +++ b/vendor/assets/iD/iD/locales/zh-TW.json @@ -30,7 +30,8 @@ "add": { "annotation": { "point": "已添加一點。", - "vertex": "給路徑添加了一節點。" + "vertex": "給路徑添加了一節點。", + "relation": "增加一項關係。" } }, "start": { @@ -40,6 +41,11 @@ } }, "continue": { + "key": "A", + "title": "繼續繪製", + "description": "繼續繪製此線段", + "not_eligible": "無法在此繼續繪製線段", + "multiple": "有多條線段可在此延續。要選擇其中一條，請按 Shift 鍵並點擊它。", "annotation": { "line": "繼續繪製一線段。", "area": "繼續繪製一區域。" @@ -68,10 +74,24 @@ "not_closed": "非圈狀物件，不能環形化。" }, "orthogonalize": { + "title": "方角化", + "description": { + "line": "將此線方角化。", + "area": "將此區域方角化。" + }, + "key": "S", "annotation": { "line": "已將線段上的彎角換成直角。", "area": "已將區域的彎角換成直角。" - } + }, + "not_squarish": "物件無法被方角化，因為它並非近似方形。" + }, + "straighten": { + "title": "拉直", + "description": "拉直此線段", + "key": "S", + "annotation": "拉直一條線段。", + "too_bendy": "這條線段無法被拉直，因為有過多彎折。" }, "delete": { "title": "刪除", @@ -114,7 +134,8 @@ "annotation": "合併了 {n} 條線段。", "not_eligible": "不能合併這些物件。", "not_adjacent": "這些線段並不連接，不能合併。", - "restriction": "這些線段不能合併，因為其中最少有一條線段是\"{relation}\" 關係的成員。" + "restriction": "這些線段不能合併，因為其中最少有一條線段是\"{relation}\" 關係的成員。", + "incomplete_relation": "這些物件不能合併，因為其中最少有一件未有完全下載。" }, "move": { "title": "移動", @@ -131,6 +152,7 @@ }, "rotate": { "title": "旋轉", + "description": "以物件中心點為軸心旋轉物件", "key": "R", "annotation": { "line": "旋轉了一線段。", @@ -161,9 +183,11 @@ } }, "undo": { + "tooltip": "復原: {action}", "nothing": "沒有動作可以撤銷。" }, "redo": { + "tooltip": "取消復原: {action}", "nothing": "沒有動作可以重做。" }, "tooltip_keyhint": "快速鍵", @@ -177,7 +201,7 @@ "zoom_in_edit": "放大以開始編輯", "logout": "登出", "loading_auth": "正在連接 OpenStreetMap...", - "report_a_bug": "回報錯誤", + "report_a_bug": "回報編輯器問題", "status": { "error": "未能連接至伺服器介面。", "offline": "伺服器介面離線，請稍後再嘗試編輯。", @@ -200,6 +224,11 @@ "list": "正顯示 {users} 的編輯", "truncated_list": "正顯示 {users} 和另外 {count} 位用戶的編輯" }, + "geocoder": { + "search": "搜尋全世界...", + "no_results_visible": "可見的地圖區域中沒有搜尋結果", + "no_results_worldwide": "找不到搜尋結果" + }, "geolocate": { "title": "顯示我的位置" }, @@ -211,6 +240,7 @@ "all_tags": "所有標籤", "all_members": "所有成員", "all_relations": "所有關係", + "new_relation": "建立新關係...", "role": "角色", "choose": "選擇物件種類", "results": "{search} 的 {n} 個結果", @@ -218,14 +248,25 @@ "back_tooltip": "修改物件", "remove": "移除", "search": "搜尋", + "multiselect": "已選擇的物件", "unknown": "未知種類", "incomplete": "<未有下載>", - "edit": "編輯特徵" + "feature_list": "搜尋物件", + "edit": "編輯特徵", + "none": "無", + "node": "節點", + "way": "路徑", + "relation": "關係", + "location": "地點" }, "background": { "title": "背景", "description": "背景圖像設定", "percent_brightness": "{opacity}%的光度", + "none": "無", + "custom": "客製化", + "custom_prompt": "輸入地圖影像區塊的模版。以 Z/X/Y 方式存取區塊的伺服器，可在模版中使用{z}, {x}, {y}作參數，而以quadtile存取區塊的伺服器，則可使用{u}作參數。", + "fix_misalignment": "校準", "reset": "重設" }, "restore": { @@ -248,7 +289,8 @@ "view_on_osm": "於OSM上顯示", "facebook": "在 Facebook 上分享", "twitter": "分享到 Twitter", - "google": "分享到 Google+" + "google": "分享到 Google+", + "help_html": "您的修改應會在數分鐘內在\"標準\"圖層中出現。其他圖層和某些物件則可能會花較長時間。\n(details).\n" }, "confirm": { "okay": "確定" @@ -275,6 +317,7 @@ "untagged_area": "未有標籤的區域", "many_deletions": "你正在刪除 {n} 個物件。這些物件會從openstreetmap.org上所有人可以看見的地圖上刪除，你是否確定需要這樣做？", "tag_suggests_area": "{tag} 標籤所建議的線段應為區域，但這個不是一區域", + "untagged_tooltip": "選擇可描述這個{geometry}的一個物件種類。", "deprecated_tags": "已棄用的標籤︰{tags}" }, "zoom": { @@ -283,14 +326,22 @@ }, "cannot_zoom": "在此模式下不能再縮小。", "gpx": { - "local_layer": "本機GPX檔案" + "local_layer": "本機GPX檔案", + "drag_drop": "拖移一個 .gpx 檔案到頁面上，或是點擊右方的按鈕以瀏覽", + "zoom": "放大至 GPX 軌跡", + "browse": "開啟一個 .gpx 檔案" }, "help": { "title": "幫助", - "help": "# 幫助\n\n這是一個[OpenStreetMap](http://www.openstreetmap.org/)的編輯器。\nOpenStreetMap是自由及可編輯的世界地圖。你可以用這個編輯器來添加和更新您所在區域的地圖資料，令這個開源和開放資料的世界地圖變得更好。\n\n您在這個地圖上所做的編輯，所有使用OpenStreetMap的人將可看見。為了進行編輯，你需要一個[免費的OpenStreetMap帳戶](https://www.openstreetmap.org/user/new)。\n\n這個[iD編輯器](http://ideditor.com/) 是一個合作開發的開源系統， [源碼可在GitHub找到](https://github.com/systemed/iD)。\n", + "help": "# 幫助\n\n這是一個[OpenStreetMap](http://www.openstreetmap.org/)的編輯器。\nOpenStreetMap是自由及可編輯的世界地圖。您可以用這個編輯器來添加和更新您所在區域的地圖資料，令這個開源和開放資料的世界地圖變得更好。\n\n您在這個地圖上所做的編輯，所有使用OpenStreetMap的人將可看見。為了進行編輯，您需要一個[免費的OpenStreetMap帳戶](https://www.openstreetmap.org/user/new)。\n\n這個[iD編輯器](http://ideditor.com/) 是一個合作開發的開源系統， [源碼可在GitHub找到](https://github.com/openstreetmap/iD)。\n", + "editing_saving": "# 編輯和保存\n\n這個編輯器的設計，主要是為在網上進行編輯工作，而你現正通過一個網站使用它。\n\n### 選擇物件\n\n要選擇地圖上一個物件，如道路或興趣點，可於地圖上點擊該物件。這將令所選取的物件以高亮顯示，並開啟一個載有其細節的面板，以及顯示一個您可對該物件進行的操作的功能菜單。\n\n要選擇多個物件，可以按住'Shift'鍵，在地圖上點擊並拖曳。這將選擇所顯示的方框內的所有物件，讓您可同時對幾個物件進行操作。\n\n### 保存編輯\n\n當您對地圖作出修改，如編輯道路，建築物和場所，這些修改都只是儲存在本機上而未被上載，直到您將它們保存到伺服器為止。如果您期間作出錯誤的修改，亦不用擔心，您可以點擊“撤消”按鈕修改，亦可點擊“重做”按鈕，重做經撤消的修改。\n\n點擊“保存”按鈕以完成一組編輯 － 例如，如果您已經完成了某市鎮的一個區域，而想開始一個新的區域。您將有機會覆核你做了什麼編輯，而如果看起來您作出了一些不適當的改變，編輯器會提供有用的建議及警告。\n\n如果一切看起來不錯，您可以輸入簡短的註釋，解釋您作出的修改，並再點擊“保存”以向[OpenStreetMap.org](http://www.openstreetmap.org/)發布這些修改。這些修改將可被其他OpenStreetMap用戶看見，並可供其他用戶在其上作進一步修訂及完善。\n\n如果您不能一次就完成您的編輯，您可以離開編輯器視窗，日後(在相同的瀏覽器和電腦上)回來，編輯器將讓你選擇是否希望恢復上一次未完成的編輯。\n", "roads": "# 道路\n\n您可以利用這個編輯器創建，修復，及刪除道路。道路可以有很多種：路徑，公路，郊遊徑，單車徑，和更多 － 任何經常使用的路段都可製圖。\n\n### 選擇道路\n\n點擊圖上的道路以選擇該道路。道路的輪廓會以高亮度顯示，而同時地圖上會出現小工具選單，旁邊亦會彈出面板，顯示有關該道路的資訊。\n\n### 修訂道路\n\n您或會經常注意到，道路並非對齊在背景中顯示的衛星圖像或GPS軌跡。您可以調整這些道路，讓他們位於正確的位置。\n\n首先，點擊您想修訂的道路。這會將道路以高亮度顯示，並顯示沿著這道路的節點，你可以拖曳這些節點到更好的位置。如果您想增加細節，可以為道路添加新的節點，點擊兩下道路上沒有節點的部分，便可在該處増加節點。\n\n如果道路連接到另一條道路，但在地圖上並未妥善連接，你可以拖曳道路的其中一個節點到另一條道路上，以連接兩條道路。連接好道路，對地圖非常重要，特別是對提供駕駛指示的應用程序而言，是必要的。\n\n您也可以點擊'移動'工具或按`M`快速鍵，來移動整條道路，然後點擊一下以完成移動的動作。\n\n### 刪除道路\n\n如果一條道路完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將道路刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該道路或許只是新建的。\n\n要刪除道路，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n\n### 繪製新道路\n\n發現某處應有一條道路，但地圖上沒有？點擊編輯器左上方的'線'圖標，或按下`2`快速鍵，以開始繪製線段。\n\n在地圖上點擊道路的開端，以開始繪製道路。如果道路從一條現有的道路分支出來，應點擊兩者連接的地方，以開始繪製。\n\n然後點擊沿著道路的點，以根據衛星影像或GPS軌跡，正確地繪製道路。如果您繪製的道路如果與另一條道路交匯，請點擊相交點以將它們連接起來。當您完成繪製後，可點擊兩下或按鍵盤上的 'Return' 或 ’Enter’ 鍵。\n\n", + "gps": "# GPS軌跡\n\nGPS數據是OpenStreetMap中最可信的的數據來源。此編輯器\n支援在您的電腦上的GPS軌跡 - `.gpx`文件。你可以使用多個智能手機的應用程序或個人GPS硬件，收集這類GPS數據。\n\n有關如何進行GPS測量的資料，請參閱[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)。\n\n要使用一個GPX軌跡製圖，可將GPX文件拖曳到編輯器中。如果編輯器能讀取該文件，它會被添加到地圖上，並以明亮的綠色線顯示。點擊左側的'設置背景'選單，便可啟用、停用或縮放這個新的的GPX圖層。\n\nGPX軌跡並不會直接上載到OpenStreetMap － 使用GPX軌跡的最佳方式，是以它作為指引，在繪製地圖時添加新的物件，並[上傳至 OpenStreetMap](http://www.openstreetmap.org/trace/create)來讓其他使用者運用。\n", + "imagery": "# 圖像\n\n空照圖是繪製地圖重要的資料來源。在畫面右方的'背景圖像設定'選單中，可選擇使用的圖像，\n他們分別為空照圖、衛星影像和其他可自由編輯的圖像資源。\n\n編輯器預設使用[Bing Maps](http://www.bing.com/maps/)的衛星圖層，\n但當您平移或縮放地圖至一個新的地理區域，或可使用新的資源。\n在一些國家，像美國、法國和丹麥，部分區域有非常高品質的圖像。\n\n圖像會與地圖數據有所偏移。如果你看見很多的道路與背景有偏移，請不要立刻將它們全部搬移以與背景刎合。相反，你可以在「背景設定」選單中，點擊下方的「校準底圖」，以調整圖像以配合現有地圖數據。 \n\n圖像有時候或會因為圖像提供者方面的誤差，與地圖資料有所偏移。\n如果您看到有很多路與背景是平移錯位的，請不要立刻將它們全部搬移以與背景刎合。\n您只需要點擊圖像設定介面底部的'校準'來調整圖像，讓它符合現有資料。\n", "addresses": "# 地址 \n\n地址是地圖中最有用的訊息之一。 \n\n雖然地址通常被視為街道的一部分，在 OpenStreetMap 中，它們是沿相關街道的建築物和地方的屬性。 \n\n您可以將地址訊息，添加到以建築物輪廓為代表、或以點為代表的地方之上。地址資料的最佳來源，是實地調查或個人知識 － 與任何其他物件一樣，抄襲商業來源（如谷歌地圖）的資料，是嚴格禁止的。\n", - "buildings": "# 建築物\n\nOpenStreetMap 是世界上最大的建築物的數據庫。您可以建立\n和改善這個數據庫。\n\n### 選擇建築物\n\n您可以點擊建築物的邊界，以選擇該建築物。該建築物將以高亮度顯示，並會開啟小工具選單，和在右邊顯示有關建築物更多資料的面板。\n\n### 修改建築物\n\n有時候，建築物的位置或其標籤或許會不正確。\n\n要移動整個建築物的位置，先選擇該建築物，然後點擊’移動’工具。移動您的滑鼠以移動築物，在移到正確位置上點擊一下。\n\n要更正建築物的形狀，點擊並拖曳建築物輪廓的節點，以移到更佳的位置。\n\n### 繪製新建築物\n\n為地圖添加建築物的主要問題之一，是 OpenStreetMap 可以用輪廓或點的形式，記錄建築物。一般來說，應_盡可能以區域記錄建築物的輪廓_，並以置於建築輪廓內的點，記錄建築物中的公司、住宅、設施及其他東西。\n\n要開始繪製建築物，先單擊左上方的’區域’按鈕，最後則按鍵盤上的’Return'鍵或點擊所繪的第一個節點，完成輪廓的繪製。\n\n### 刪除建築物\n\n如果一項建築物完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將建築物刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該建築物或許只是新建的。\n\n要刪除建築物，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n" + "inspector": "# 使用檢視面板\n\n檢視面板是畫面右面的用戶界面元素，當您選擇一個物件時便會出現，讓您可編輯物件的詳細資料。\n\n### 選擇物件類型\n\n在您添加一個點、線段或區域後，您可以選擇物件的類型，例如該物件應是高速公路還是住宅區道路，是超級市場還是咖啡廳。檢視面板將顯示常用物件類型的按鈕，要找出其他物件類型，您可以在搜尋框中輸入您所要的物件類型。\n\n點擊物件類型按鈕右下角的'i'字，可顯示物件類型的更多資訊。點擊按鈕以選擇該類型。\n\n### 使用表格和編輯標籤\n\n在您選擇物件類型後，或選擇已經被編配類型的物件時，檢查面板會顯示該物件詳細資料的欄位，\n如名稱和地址。\n\n在欄位下方，您可以點擊圖標，以添加其他詳細資料，如[維基百科](http://www.wikipedia.org/)的條目資料，輪椅可否到達，以及其他更多資料。\n\n在面板的底部，點擊'增加標籤'以添加其他任意的標籤到該物件。您可透過[Taginfo](http://taginfo.openstreetmap.org/)，了解有關常用的標籤組合的更多資料。\n\n您在檢查面板所做的更改，會自動應用到地圖上。您可以隨時點擊'撤消'按鈕，撤消這些更改。\n\n### 關閉檢查面板\n\n您可以點擊檢查面板右上角的關閉按鈕、按’Escape'鍵，或在地圖上點擊，以關閉檢查面板。\n", + "buildings": "# 建築物\n\nOpenStreetMap 是世界上最大的建築物的數據庫。您可以建立\n和改善這個數據庫。\n\n### 選擇建築物\n\n您可以點擊建築物的邊界，以選擇該建築物。該建築物將以高亮度顯示，並會開啟小工具選單，和在右邊顯示有關建築物更多資料的面板。\n\n### 修改建築物\n\n有時候，建築物的位置或其標籤或許會不正確。\n\n要移動整個建築物的位置，先選擇該建築物，然後點擊’移動’工具。移動您的滑鼠以移動築物，在移到正確位置上點擊一下。\n\n要更正建築物的形狀，點擊並拖曳建築物輪廓的節點，以移到更佳的位置。\n\n### 繪製新建築物\n\n為地圖添加建築物的主要問題之一，是 OpenStreetMap 可以用輪廓或點的形式，記錄建築物。一般來說，應_盡可能以區域記錄建築物的輪廓_，並以置於建築輪廓內的點，記錄建築物中的公司、住宅、設施及其他東西。\n\n要開始繪製建築物，先單擊左上方的’區域’按鈕，最後則按鍵盤上的’Return'鍵或點擊所繪的第一個節點，完成輪廓的繪製。\n\n### 刪除建築物\n\n如果一項建築物完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將建築物刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該建築物或許只是新建的。\n\n要刪除建築物，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n", + "relations": "# 關係\n\n關係是在 OpenStreetMap 裡將其他物件組合在一起的特殊物件。\n舉兩個常見的例子－*路線關係*可用來將屬於某一高速公路或道路的路段併合；而*多重多邊形*則可用來將數條線段組合，以勾劃出較為複雜區域(如分開為數個區塊，或像甜甜圈一樣中間穿洞的區域)。\n\n在一個關係中組合在一起的物件，稱為該關係的*成員*。\n在面板裡，您可以看到一個物件屬於哪些關係，並可點選當中任何一個關係。\n當您點選了一個關係後，面板會列出關係中的所有成員，\n而這些成員亦會在地圖上標示出來。\n\n在您編輯時，iD在大多數情況下都會自動處理所涉及的關係。唯您主要須注意的，是若您刪除舊有的路段以重繪更精確的路段，\n您必須確保將新的路段，仍為原本路段所屬各關係的成員。\n\n## 編輯關係\n\n如果您想編輯關係，以下是基本要領。\n\n要將物件加入一個現有的關係，請選擇該物件，\n點擊面板中\"所有關係\"下的\"+\"按鈕，並選擇或輸入關係的名稱。\n\n要增加一個新的關係，點選第一個要加入新關係作為成員的物件，\n點擊面板中\"所有關係\"下的\"+\"按鈕，並選擇\"建立新關係...\"。\n\n要將物件從一個關係中移除，選擇該物件，\n點擊您想將該物件移除的關係旁的垃圾桶按鈕。\n\n您可以運用\"合併\"工具，創建內含空洞的多重多邊形。\n繪製兩個區域(內部與外部)，按住 Shift 鍵並分別點選它們兩者，\n然後點擊 \"合併\"(+)按鈕。\n" }, "intro": { "navigation": { @@ -324,13 +375,15 @@ }, "lines": { "title": "線", + "add": "線後可用於表示如道路、鐵路以及河流。 **點擊線按鈕來新增一條線段。**", "start": "**點擊道路末端，以開始繪製線段。**", "intersect": "點擊以為線段添加更多的節點。在繪圖是，如有需要，您可以拖曳地圖。道路和許多其他類型的線段，是整個體系的一部分。這些線段正確地連接起來，對導航的應用程序的運作相當重要。**點擊Flower Street，建立連接這兩條線段的相交點。**", "finish": "再次點擊最後的節點，可完成繪製線段。**完成繪製此道路**", "road": "**從列表中選擇道路。**", "residential": "道路有不同種類，最常見的為住宅區道路。**選擇住宅區道路**", "describe": "**給道路一個名稱，並關閉物件編輯器。**", - "restart": "這道路須與Flower Street相交。" + "restart": "這道路須與Flower Street相交。", + "wrong_preset": "您尚未選擇住宅區道路。**點擊這裡以再次選擇**" }, "startediting": { "title": "開始編輯", @@ -341,6 +394,12 @@ }, "presets": { "categories": { + "category-building": { + "name": "樓宇" + }, + "category-golf": { + "name": "高爾夫球" + }, "category-landuse": { "name": "土地用途" }, @@ -355,6 +414,12 @@ }, "category-route": { "name": "路線" + }, + "category-water-area": { + "name": "水" + }, + "category-water-line": { + "name": "水" } }, "fields": { @@ -395,6 +460,9 @@ } } }, + "access_simple": { + "label": "通行限制" + }, "address": { "label": "地址", "placeholders": { @@ -408,15 +476,51 @@ "admin_level": { "label": "行政級別" }, + "aerialway": { + "label": "種類" + }, + "aerialway/access": { + "label": "通行方向" + }, + "aerialway/bubble": { + "label": "椅罩" + }, + "aerialway/capacity": { + "label": "輸送客量（每小時）", + "placeholder": "500, 2500, 5000..." + }, + "aerialway/duration": { + "label": "時間（分鐘）", + "placeholder": "1, 2, 3..." + }, + "aerialway/heating": { + "label": "暖氣" + }, + "aerialway/occupancy": { + "label": "載客數", + "placeholder": "2, 4, 8..." + }, + "aerialway/summer/access": { + "label": "通行方向（夏季）" + }, "aeroway": { "label": "種類" }, "amenity": { "label": "種類" }, + "artist": { + "label": "藝術家" + }, + "artwork_type": { + "label": "種類" + }, "atm": { "label": "自動櫃員機" }, + "backrest": { + "label": "椅背" + }, "barrier": { "label": "種類" }, @@ -432,6 +536,9 @@ "building_area": { "label": "建築物" }, + "cans": { + "label": "接受金屬罐" + }, "capacity": { "label": "容量", "placeholder": "50, 100, 200..." @@ -446,6 +553,9 @@ "anticlockwise": "反時針" } }, + "clothes": { + "label": "接受衣物" + }, "collection_times": { "label": "收集時間" }, @@ -455,6 +565,9 @@ "country": { "label": "國家" }, + "covered": { + "label": "有蓋" + }, "crossing": { "label": "種類" }, @@ -470,8 +583,11 @@ "description": { "label": "描述" }, + "electrified": { + "label": "電氣化" + }, "elevation": { - "label": "高度" + "label": "海拔" }, "emergency": { "label": "緊急" @@ -486,9 +602,35 @@ "fee": { "label": "費用" }, + "fire_hydrant/type": { + "label": "種類" + }, "fixme": { "label": "Fix Me" }, + "gauge": { + "label": "軌距" + }, + "generator/method": { + "label": "方法" + }, + "generator/source": { + "label": "來源" + }, + "generator/type": { + "label": "種類" + }, + "glass": { + "label": "接受玻璃" + }, + "golf_hole": { + "label": "參考編號", + "placeholder": "球洞編號(1－18)" + }, + "handicap": { + "label": "差點", + "placeholder": "1-18" + }, "highway": { "label": "種類" }, @@ -504,6 +646,9 @@ "incline": { "label": "斜度" }, + "information": { + "label": "種類" + }, "internet_access": { "label": "網際網絡連接", "options": { @@ -529,6 +674,9 @@ "label": "屋宇層數", "placeholder": "2, 4, 6..." }, + "lit": { + "label": "照明" + }, "location": { "label": "位置" }, @@ -556,7 +704,7 @@ "label": "種類" }, "oneway": { - "label": "單程路" + "label": "單行道" }, "oneway_yes": { "label": "單程路" @@ -567,6 +715,13 @@ "operator": { "label": "營運商" }, + "paper": { + "label": "接受廢紙" + }, + "par": { + "label": "標準桿數", + "placeholder": "3,4,5..." + }, "park_ride": { "label": "泊車轉乘" }, @@ -577,6 +732,15 @@ "label": "電話", "placeholder": "+31 42 123 4567" }, + "piste/difficulty": { + "label": "難度" + }, + "piste/grooming": { + "label": "雪道種類" + }, + "piste/type": { + "label": "種類" + }, "place": { "label": "種類" }, @@ -600,7 +764,7 @@ "buddhist": "佛教", "jewish": "猶太教", "hindu": "印度教", - "shinto": "神道教徒", + "shinto": "神道教", "taoist": "道教" } }, @@ -622,9 +786,16 @@ "shelter": { "label": "遮雨棚／涼亭" }, + "shelter_type": { + "label": "種類" + }, "shop": { "label": "種類" }, + "social_facility_for": { + "label": "服務對象", + "placeholder": "露宿者，殘疾人士，小童等" + }, "source": { "label": "來源" }, @@ -641,12 +812,18 @@ "cutting": "挖土" } }, + "studio_type": { + "label": "種類" + }, "supervised": { "label": "受監察" }, "surface": { "label": "路面鋪設" }, + "toilets/disposal": { + "label": "處置方式" + }, "tourism": { "label": "種類" }, @@ -659,6 +836,15 @@ "trail_visibility": { "label": "路徑可見度" }, + "tree_type": { + "label": "種類" + }, + "tunnel": { + "label": "隧道" + }, + "vending": { + "label": "貨品種類" + }, "water": { "label": "種類" }, @@ -684,14 +870,45 @@ }, "presets": { "address": { - "name": "地址" + "name": "地址", + "terms": "地址,位置,位址" + }, + "aerialway": { + "name": "吊道" + }, + "aerialway/cable_car": { + "name": "纜車" + }, + "aerialway/chair_lift": { + "name": "吊椅" + }, + "aerialway/gondola": { + "name": "吊車" + }, + "aerialway/magic_carpet": { + "name": "輸送帶" + }, + "aerialway/platter": { + "name": "吊盤" + }, + "aerialway/pylon": { + "name": "吊道塔" + }, + "aerialway/rope_tow": { + "name": "牽繩" + }, + "aerialway/station": { + "name": "車站" + }, + "aerialway/t-bar": { + "name": "T型吊桿" }, "aeroway": { "name": "機場相關設施" }, "aeroway/aerodrome": { "name": "機場", - "terms": "機場,飛機" + "terms": "機場,飛機場" }, "aeroway/apron": { "name": "停機坪" @@ -703,7 +920,7 @@ "name": "飛機庫" }, "aeroway/helipad": { - "name": "直昇機場" + "name": "直昇機坪" }, "aeroway/runway": { "name": "跑道" @@ -717,6 +934,9 @@ "amenity": { "name": "便利設施" }, + "amenity/arts_centre": { + "name": "藝術中心" + }, "amenity/atm": { "name": "自動櫃員機" }, @@ -727,7 +947,7 @@ "name": "酒吧" }, "amenity/bench": { - "name": "長凳" + "name": "長椅" }, "amenity/bicycle_parking": { "name": "單車停泊處" @@ -735,21 +955,37 @@ "amenity/bicycle_rental": { "name": "單車租賃" }, + "amenity/boat_rental": { + "name": "小艇租賃" + }, "amenity/cafe": { "name": "咖啡廳" }, "amenity/car_rental": { - "name": "租車店" + "name": "汽車租車店", + "terms": "汽車出租店,租車店,汽車租車店" }, "amenity/car_sharing": { - "name": "汽車共享站" + "name": "汽車共享站", + "terms": "共享汽車站,汽車共享站" }, "amenity/car_wash": { - "name": "洗車店" + "name": "洗車店", + "terms": "洗車行,洗車店" + }, + "amenity/childcare": { + "name": "托兒所", + "terms": "幼兒園,托兒所" }, "amenity/cinema": { "name": "戲院" }, + "amenity/clinic": { + "name": "診所" + }, + "amenity/clock": { + "name": "時鐘" + }, "amenity/college": { "name": "書院", "terms": "學院,大學,專校,大專" @@ -757,8 +993,14 @@ "amenity/courthouse": { "name": "法院" }, + "amenity/dentist": { + "name": "牙醫" + }, + "amenity/doctor": { + "name": "醫生" + }, "amenity/drinking_water": { - "name": "飲水處", + "name": "飲處", "terms": "飲水,水源,活水" }, "amenity/embassy": { @@ -785,8 +1027,8 @@ "terms": "醫院,醫學中心" }, "amenity/kindergarten": { - "name": "幼稚園", - "terms": "幼稚園,幼兒園,托兒所" + "name": "幼兒園", + "terms": "幼稚園,幼兒園" }, "amenity/library": { "name": "圖書館" @@ -794,6 +1036,9 @@ "amenity/marketplace": { "name": "市場" }, + "amenity/parking": { + "name": "停車場" + }, "amenity/pharmacy": { "name": "藥房", "terms": "藥房,藥局" @@ -827,6 +1072,12 @@ "amenity/pub": { "name": "酒館" }, + "amenity/ranger_station": { + "name": "郊野公園管理站" + }, + "amenity/recycling": { + "name": "回收設施" + }, "amenity/restaurant": { "name": "餐廳", "terms": "飯店,飯館,酒樓,餐館" @@ -835,6 +1086,24 @@ "name": "學校", "terms": "學校,小學,中學,國小,國中,高中,校園,校區" }, + "amenity/shelter": { + "name": "亭" + }, + "amenity/social_facility": { + "name": "社福設施" + }, + "amenity/social_facility/food_bank": { + "name": "食物銀行" + }, + "amenity/social_facility/group_home": { + "name": "安老院" + }, + "amenity/social_facility/homeless_shelter": { + "name": "露宿者中心" + }, + "amenity/studio": { + "name": "工作室" + }, "amenity/swimming_pool": { "name": "游泳池", "terms": "游泳池,泳池" @@ -860,6 +1129,12 @@ "name": "大學", "terms": "大專" }, + "amenity/vending_machine": { + "name": "自動販賣機" + }, + "amenity/veterinary": { + "name": "獸醫" + }, "amenity/waste_basket": { "name": "廢物箱" }, @@ -900,7 +1175,7 @@ "name": "樹籬" }, "barrier/kissing_gate": { - "name": "單人轉門 " + "name": "單人轉門" }, "barrier/lift_gate": { "name": "道閘" @@ -921,25 +1196,247 @@ "name": "行政界線" }, "building": { - "name": "建築物" + "name": "樓宇" }, "building/apartments": { - "name": "分層屋宇" + "name": "分層公寓" + }, + "building/commercial": { + "name": "商用樓宇" }, "building/entrance": { "name": "入口" }, + "building/garage": { + "name": "車庫" + }, + "building/garages": { + "name": "車庫" + }, + "building/greenhouse": { + "name": "溫室" + }, + "building/hospital": { + "name": "醫院建築物" + }, + "building/hotel": { + "name": "酒店建築物" + }, "building/house": { "name": "洋房" }, + "building/hut": { + "name": "棚屋" + }, + "building/industrial": { + "name": "工業樓宇" + }, + "building/public": { + "name": "公共建築物" + }, + "building/residential": { + "name": "住宅屋宇" + }, + "building/retail": { + "name": "零售樓宇" + }, + "building/roof": { + "name": "上蓋" + }, + "building/school": { + "name": "學校建築物" + }, + "building/shed": { + "name": "小屋" + }, + "building/stable": { + "name": "馬房" + }, + "building/static_caravan": { + "name": "固定的拖掛式房車" + }, + "building/terrace": { + "name": "排屋" + }, + "building/train_station": { + "name": "鐵路站建築物" + }, + "building/university": { + "name": "大學建築物" + }, + "building/warehouse": { + "name": "倉庫" + }, + "craft/boatbuilder": { + "name": "造船廠" + }, + "craft/brewery": { + "name": "釀酒廠" + }, + "craft/carpenter": { + "name": "木匠" + }, + "craft/carpet_layer": { + "name": "地氈工程" + }, + "craft/caterer": { + "name": "到會服務" + }, + "craft/clockmaker": { + "name": "製鐘廠" + }, + "craft/confectionary": { + "name": "甜品店" + }, + "craft/dressmaker": { + "name": "製衣店" + }, + "craft/electrician": { + "name": "電氣工程" + }, + "craft/gardener": { + "name": "園藝師" + }, + "craft/glaziery": { + "name": "玻璃工程" + }, + "craft/handicraft": { + "name": "手工藝" + }, + "craft/hvac": { + "name": "空調工程" + }, + "craft/insulator": { + "name": "隔熱工程" + }, + "craft/jeweler": { + "name": "首飾店" + }, + "craft/key_cutter": { + "name": "配匙店" + }, + "craft/locksmith": { + "name": "鎖匠" + }, + "craft/metal_construction": { + "name": "鐵工工程" + }, + "craft/optician": { + "name": "眼鏡行" + }, + "craft/painter": { + "name": "油漆工程" + }, + "craft/photographer": { + "name": "攝影店" + }, + "craft/photographic_labratory": { + "name": "沖印店" + }, + "craft/plasterer": { + "name": "批盪工程" + }, + "craft/plumber": { + "name": "水喉匠" + }, + "craft/pottery": { + "name": "陶器工場" + }, + "craft/rigger": { + "name": "吊運服務" + }, + "craft/roofer": { + "name": "屋頂工程" + }, + "craft/saddler": { + "name": "車船坐椅" + }, + "craft/sailmaker": { + "name": "遊艇廠" + }, + "craft/sawmill": { + "name": "鋸木廠" + }, + "craft/scaffolder": { + "name": "棚架工程" + }, + "craft/sculpter": { + "name": "雕塑工程" + }, + "craft/shoemaker": { + "name": "鞋匠" + }, + "craft/stonemason": { + "name": "切石廠" + }, + "craft/sweep": { + "name": "煙囪清掃工" + }, + "craft/tailor": { + "name": "裁縫" + }, + "craft/tiler": { + "name": "地磚鋪設工程" + }, + "craft/tinsmith": { + "name": "錫匠" + }, + "craft/upholsterer": { + "name": "室内裝修" + }, + "craft/watchmaker": { + "name": "鐘錶匠" + }, + "craft/window_construction": { + "name": "製窗廠" + }, + "embankment": { + "name": "基堤" + }, + "emergency/ambulance_station": { + "name": "救護站" + }, + "emergency/fire_hydrant": { + "name": "消防栓" + }, "emergency/phone": { "name": "緊急電話" }, "entrance": { "name": "入口" }, + "footway/crossing": { + "name": "行人過路線" + }, + "footway/sidewalk": { + "name": "路邊行人路" + }, + "golf/bunker": { + "name": "沙坑" + }, + "golf/fairway": { + "name": "球道" + }, + "golf/green": { + "name": "果嶺" + }, + "golf/hole": { + "name": "球洞" + }, + "golf/lateral_water_hazard": { + "name": "側面水障礙區" + }, + "golf/rough": { + "name": "深草區" + }, + "golf/tee": { + "name": "開球區" + }, + "golf/water_hazard": { + "name": "水障礙區" + }, "highway": { - "name": "公路" + "name": "道路" }, "highway/bridleway": { "name": "馬道" @@ -986,6 +1483,9 @@ "highway/residential": { "name": "住宅區道路" }, + "highway/rest_area": { + "name": "公路休憩區" + }, "highway/road": { "name": "未知種類的道路" }, @@ -999,7 +1499,8 @@ "name": "輔助道路" }, "highway/service/alley": { - "name": "後巷" + "name": "巷弄", + "terms": "小巷,巷弄,後巷,橫巷,窄巷,胡同" }, "highway/service/drive-through": { "name": "駕駛通過以獲取服務" @@ -1013,10 +1514,16 @@ "highway/service/parking_aisle": { "name": "停車場通道" }, + "highway/services": { + "name": "公路服務區" + }, "highway/steps": { "name": "樓梯", "terms": "樓梯,階梯,石階" }, + "highway/stop": { + "name": "停車標誌" + }, "highway/tertiary": { "name": "三級道路" }, @@ -1090,6 +1597,9 @@ "name": "農場", "terms": "農田,稻田,農地,田" }, + "landuse/farmland": { + "name": "耕地" + }, "landuse/farmyard": { "name": "農莊" }, @@ -1123,6 +1633,12 @@ "leisure": { "name": "休閒設施" }, + "leisure/common": { + "name": "公共用地" + }, + "leisure/dog_park": { + "name": "狗公園" + }, "leisure/garden": { "name": "花園", "terms": "花園,果園,菜園,植物園,公園" @@ -1149,6 +1665,9 @@ "name": "籃球場", "terms": "籃球場,球場" }, + "leisure/pitch/skateboard": { + "name": "滑板公園" + }, "leisure/pitch/soccer": { "name": "足球場" }, @@ -1164,12 +1683,18 @@ "leisure/slipway": { "name": "船架滑道" }, + "leisure/sports_center": { + "name": "體肓中心" + }, "leisure/stadium": { "name": "體育場" }, "leisure/swimming_pool": { "name": "游泳池" }, + "leisure/track": { + "name": "賽道" + }, "line": { "name": "線" }, @@ -1182,9 +1707,18 @@ "man_made/cutline": { "name": "山林分界線" }, + "man_made/embankment": { + "name": "基堤" + }, + "man_made/flagpole": { + "name": "旗桿" + }, "man_made/lighthouse": { "name": "燈塔" }, + "man_made/observation": { + "name": "瞭望塔" + }, "man_made/pier": { "name": "碼頭" }, @@ -1209,6 +1743,18 @@ "man_made/water_works": { "name": "水務設施" }, + "military/airfield": { + "name": "軍用機場" + }, + "military/barracks": { + "name": "軍營" + }, + "military/bunker": { + "name": "地堡" + }, + "military/range": { + "name": "軍事靶場" + }, "natural": { "name": "自然物件" }, @@ -1224,6 +1770,9 @@ "natural/coastline": { "name": "海岸線" }, + "natural/fell": { + "name": "高原荒地" + }, "natural/glacier": { "name": "冰川", "terms": "冰川,冰河" @@ -1237,6 +1786,9 @@ "natural/peak": { "name": "山頂" }, + "natural/scree": { + "name": "碎石崖錐" + }, "natural/scrub": { "name": "灌木叢" }, @@ -1244,7 +1796,7 @@ "name": "溫泉" }, "natural/tree": { - "name": "樹" + "name": "樹木" }, "natural/water": { "name": "水" @@ -1256,7 +1808,8 @@ "name": "池塘" }, "natural/water/reservoir": { - "name": "水塘" + "name": "貯水庫", + "terms": "水塘" }, "natural/wetland": { "name": "濕地", @@ -1268,6 +1821,71 @@ "office": { "name": "辦公室" }, + "office/accountant": { + "name": "會計師樓" + }, + "office/administrative": { + "name": "行政辦公室" + }, + "office/architect": { + "name": "建築師樓" + }, + "office/company": { + "name": "公司辦事處" + }, + "office/educational_institution": { + "name": "教育機構" + }, + "office/employment_agency": { + "name": "職業介紹所" + }, + "office/estate_agent": { + "name": "地產代理" + }, + "office/financial": { + "name": "金融機構辦公室" + }, + "office/government": { + "name": "政府辦公室" + }, + "office/insurance": { + "name": "保險公司辦公室" + }, + "office/it": { + "name": "資訊科技公司辦公室" + }, + "office/lawyer": { + "name": "律師樓", + "terms": "法律事務所" + }, + "office/newspaper": { + "name": "報社", + "terms": "報社,報館" + }, + "office/ngo": { + "name": "非政府機構辦公室" + }, + "office/physician": { + "name": "醫務所" + }, + "office/political_party": { + "name": "政黨辦公室" + }, + "office/research": { + "name": "研究所" + }, + "office/telecommunication": { + "name": "電訊公司辦事處" + }, + "office/therapist": { + "name": "治療師" + }, + "office/travel_agent": { + "name": "旅行社" + }, + "piste": { + "name": "滑雪場" + }, "place": { "name": "地方" }, @@ -1298,8 +1916,14 @@ "power": { "name": "電力設施" }, + "power/generator": { + "name": "發電機" + }, "power/line": { - "name": "電線" + "name": "電纜" + }, + "power/minor_line": { + "name": "次要電纜" }, "power/pole": { "name": "電線桿" @@ -1313,6 +1937,12 @@ "power/transformer": { "name": "變電所" }, + "public_transport/platform": { + "name": "站台" + }, + "public_transport/stop_position": { + "name": "停車位置" + }, "railway": { "name": "鐵路" }, @@ -1322,12 +1952,21 @@ "railway/disused": { "name": "廢棄的鐵路" }, + "railway/funicular": { + "name": "纜车" + }, + "railway/halt": { + "name": "鐵路停車處" + }, "railway/level_crossing": { "name": "平交道" }, "railway/monorail": { "name": "單軌電車" }, + "railway/narrow_gauge": { + "name": "窄軌鐵路" + }, "railway/platform": { "name": "鐵道月台" }, @@ -1359,6 +1998,9 @@ "name": "酒類商店", "terms": "酒店,酒莊" }, + "shop/art": { + "name": "藝術品店" + }, "shop/bakery": { "name": "麵包店" }, @@ -1372,6 +2014,9 @@ "shop/bicycle": { "name": "單車店" }, + "shop/bookmaker": { + "name": "書商" + }, "shop/books": { "name": "書店" }, @@ -1382,7 +2027,7 @@ "name": "肉販" }, "shop/car": { - "name": "車行" + "name": "汽車行" }, "shop/car_parts": { "name": "汽車零件店" @@ -1421,7 +2066,7 @@ "name": "電器店" }, "shop/farm": { - "name": "水果攤" + "name": "農場直賣店" }, "shop/fishmonger": { "name": "海產店" @@ -1459,6 +2104,12 @@ "shop/laundry": { "name": "洗衣店" }, + "shop/locksmith": { + "name": "鎖匠" + }, + "shop/lottery": { + "name": "投注站" + }, "shop/mall": { "name": "商場" }, @@ -1466,7 +2117,7 @@ "name": "行動電話店" }, "shop/motorcycle": { - "name": "電單車行" + "name": "機車行" }, "shop/music": { "name": "音樂店" @@ -1483,6 +2134,9 @@ "shop/pet": { "name": "寵物店" }, + "shop/photo": { + "name": "攝影用品店" + }, "shop/shoes": { "name": "鞋店" }, @@ -1594,6 +2248,9 @@ "type/route/foot": { "name": "步行路線" }, + "type/route/hiking": { + "name": "遠足路線" + }, "type/route/pipeline": { "name": "管道路線" }, diff --git a/vendor/assets/iD/iD/locales/zh.json b/vendor/assets/iD/iD/locales/zh.json index 8b425521b..c03a161a0 100644 --- a/vendor/assets/iD/iD/locales/zh.json +++ b/vendor/assets/iD/iD/locales/zh.json @@ -284,7 +284,6 @@ }, "help": { "title": "帮助", - "help": "# 帮助\n\n这是一个[OpenStreetMap](http://www.openstreetmap.org/)的编辑器。\nOpenStreetMap是自由及可编辑的世界地图。你可以用这个编辑器来添加和更新您所在区域的地图资料，令这个开源和开放资料的世界地图变得更好。\n\n您在这个地图上所做的编辑，所有使用OpenStreetMap的人将可看见。为了进行编辑，你需要一个[免费的OpenStreetMap帐户](https://www.openstreetmap.org/user/new)。\n\n这个[iD编辑器](http://ideditor.com/) 是一个合作开发的开源系统， [源码可在GitHub找到](https://github.com/systemed/iD)。\n", "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的资讯。\n\n### 修订道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想修订的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n", "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立\n和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的滑鼠以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的'Return'键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一项建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n" }, diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js index 6928837f6..e40bfbfaf 100644 --- a/vendor/assets/leaflet/leaflet.js +++ b/vendor/assets/leaflet/leaflet.js @@ -7,7 +7,7 @@ var oldL = window.L, L = {}; -L.version = '0.7.1'; +L.version = '0.7.2'; // define Leaflet for Node module pattern loaders, including Browserify if (typeof module === 'object' && typeof module.exports === 'object') { @@ -2436,7 +2436,8 @@ L.TileLayer = L.Class.extend({ attribution: '', zoomOffset: 0, opacity: 1, - /* (undefined works too) + /* + maxNativeZoom: null, zIndex: null, tms: false, continuousWorld: false, @@ -2485,9 +2486,6 @@ L.TileLayer = L.Class.extend({ // create a container div for tiles this._initContainer(); - // create an image to clone for tiles - this._createTileProto(); - // set up events map.on({ 'viewreset': this._reset, @@ -2707,9 +2705,10 @@ L.TileLayer = L.Class.extend({ if (!this._map) { return; } - var bounds = this._map.getPixelBounds(), - zoom = this._map.getZoom(), - tileSize = this.options.tileSize; + var map = this._map, + bounds = map.getPixelBounds(), + zoom = map.getZoom(), + tileSize = this._getTileSize(); if (zoom > this.options.maxZoom || zoom < this.options.minZoom) { return; @@ -2870,12 +2869,14 @@ L.TileLayer = L.Class.extend({ zoom = options.maxZoom - zoom; } - return zoom + options.zoomOffset; + zoom += options.zoomOffset; + + return options.maxNativeZoom ? Math.min(zoom, options.maxNativeZoom) : zoom; }, _getTilePos: function (tilePoint) { var origin = this._map.getPixelOrigin(), - tileSize = this.options.tileSize; + tileSize = this._getTileSize(); return tilePoint.multiplyBy(tileSize).subtract(origin); }, @@ -2894,7 +2895,7 @@ L.TileLayer = L.Class.extend({ _getWrapTileNum: function () { var crs = this._map.options.crs, size = crs.getSize(this._map.getZoom()); - return size.divideBy(this.options.tileSize); + return size.divideBy(this._getTileSize())._floor(); }, _adjustTilePoint: function (tilePoint) { @@ -2918,12 +2919,6 @@ L.TileLayer = L.Class.extend({ return this.options.subdomains[index]; }, - _createTileProto: function () { - var img = this._tileImg = L.DomUtil.create('img', 'leaflet-tile'); - img.style.width = img.style.height = this.options.tileSize + 'px'; - img.galleryimg = 'no'; - }, - _getTile: function () { if (this.options.reuseTiles && this._unusedTiles.length > 0) { var tile = this._unusedTiles.pop(); @@ -2937,7 +2932,10 @@ L.TileLayer = L.Class.extend({ _resetTile: function (/*tile*/) {}, _createTile: function () { - var tile = this._tileImg.cloneNode(false); + var tile = L.DomUtil.create('img', 'leaflet-tile'); + tile.style.width = tile.style.height = this._getTileSize() + 'px'; + tile.galleryimg = 'no'; + tile.onselectstart = tile.onmousemove = L.Util.falseFn; if (L.Browser.ielt9 && this.options.opacity !== undefined) { @@ -3140,13 +3138,9 @@ L.TileLayer.Canvas = L.TileLayer.extend({ this.drawTile(tile, tile._tilePoint, this._map._zoom); }, - _createTileProto: function () { - var proto = this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile'); - proto.width = proto.height = this.options.tileSize; - }, - _createTile: function () { - var tile = this._canvasProto.cloneNode(false); + var tile = L.DomUtil.create('canvas', 'leaflet-tile'); + tile.width = tile.height = this.options.tileSize; tile.onselectstart = tile.onmousemove = L.Util.falseFn; return tile; }, @@ -6535,26 +6529,15 @@ L.DomEvent = { }, getMousePosition: function (e, container) { - var body = document.body, - docEl = document.documentElement, - //gecko makes scrollLeft more negative as you scroll in rtl, other browsers don't - //ref: https://code.google.com/p/closure-library/source/browse/closure/goog/style/bidi.js - x = L.DomUtil.documentIsLtr() ? - (e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft : e.clientX) : - (L.Browser.gecko ? e.pageX - body.scrollLeft - docEl.scrollLeft : - e.pageX ? e.pageX - body.scrollLeft + docEl.scrollLeft : e.clientX), - y = e.pageY ? e.pageY - body.scrollTop - docEl.scrollTop: e.clientY, - pos = new L.Point(x, y); - if (!container) { - return pos; + return new L.Point(e.clientX, e.clientY); } - var rect = container.getBoundingClientRect(), - left = rect.left - container.clientLeft, - top = rect.top - container.clientTop; + var rect = container.getBoundingClientRect(); - return pos._subtract(new L.Point(left, top)); + return new L.Point( + e.clientX - rect.left - container.clientLeft, + e.clientY - rect.top - container.clientTop); }, getWheelDelta: function (e) { diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js index 4f8c9e230..2fe41be1a 100644 --- a/vendor/assets/leaflet/leaflet.osm.js +++ b/vendor/assets/leaflet/leaflet.osm.js @@ -2,7 +2,9 @@ L.OSM = {}; L.OSM.TileLayer = L.TileLayer.extend({ options: { - url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + url: document.location.protocol === 'https:' ? + 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' : + 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', attribution: '© OpenStreetMap and contributors, under an open license' }, @@ -14,28 +16,36 @@ L.OSM.TileLayer = L.TileLayer.extend({ L.OSM.Mapnik = L.OSM.TileLayer.extend({ options: { - url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + url: document.location.protocol === 'https:' ? + 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' : + 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', maxZoom: 19 } }); L.OSM.CycleMap = L.OSM.TileLayer.extend({ options: { - url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' + url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png', + attribution: "Tiles courtesy of Andy Allan" } }); L.OSM.TransportMap = L.OSM.TileLayer.extend({ options: { - url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png' + url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png', + attribution: "Tiles courtesy of Andy Allan" } }); L.OSM.MapQuestOpen = L.OSM.TileLayer.extend({ options: { - url: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', + url: document.location.protocol === 'https:' ? + 'https://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png' : + 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', subdomains: '1234', - attribution: "Tiles courtesy of MapQuest " + attribution: document.location.protocol === 'https:' ? + "Tiles courtesy of MapQuest " : + "Tiles courtesy of MapQuest " } });